From febcb77f067c6a69290b216953887489a3259093 Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 11 Jul 2017 10:14:35 -0400 Subject: Decompile secret base data --- data/secret_base.s | 77 ------------------------------------------------------ 1 file changed, 77 deletions(-) delete mode 100644 data/secret_base.s (limited to 'data') diff --git a/data/secret_base.s b/data/secret_base.s deleted file mode 100644 index 59ded8ddf..000000000 --- a/data/secret_base.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 -gUnknown_083D1358:: @ 83D1358 - .2byte 0x26, 0x36 - .2byte 0x27, 0x37 - .2byte 0x1A0, 0x1A1 - .2byte 0x1A8, 0x1A9 - .2byte 0x1B0, 0x1B1 - .2byte 0x208, 0x210 - .2byte 0x271, 0x278 - -gUnknown_083D1374:: @ 83D1374 - .byte 0, 0 - .byte 1, 3 - .byte 6, 0 - .byte 5, 9 - .byte 12, 0 - .byte 1, 3 - .byte 18, 0 - .byte 7, 13 - .byte 1, 0 - .byte 2, 3 - .byte 7, 0 - .byte 9, 2 - .byte 13, 0 - .byte 13, 4 - .byte 19, 0 - .byte 1, 2 - .byte 2, 0 - .byte 1, 3 - .byte 8, 0 - .byte 1, 2 - .byte 14, 0 - .byte 3, 15 - .byte 20, 0 - .byte 3, 14 - .byte 3, 0 - .byte 9, 3 - .byte 9, 0 - .byte 8, 7 - .byte 15, 0 - .byte 3, 6 - .byte 21, 0 - .byte 5, 9 - .byte 4, 0 - .byte 2, 3 - .byte 10, 0 - .byte 5, 6 - .byte 16, 0 - .byte 15, 3 - .byte 22, 0 - .byte 4, 10 - .byte 5, 0 - .byte 3, 3 - .byte 11, 0 - .byte 1, 2 - .byte 17, 0 - .byte 7, 8 - .byte 23, 0 - .byte 9, 6 - - .align 2 -gUnknown_083D13D4:: @ 83D13D4 - .4byte SecretBaseText_DelRegist, sub_80BCA84 - .4byte gUnknownText_Exit, sub_80BCBF8 - - .align 2 -gUnknown_083D13E4:: @ 83D13E4 - .4byte sub_80BCB90 - .4byte sub_80BCBC0 - -gUnknown_083D13EC:: @ 83D13EC - .byte 0x23,0x24,0xF,0x1F,0x21,0x2F,0xE,0x14,0x20,0x22,0x0,0x0 -- cgit v1.2.3 From 9158d035af3ab866c62b7825ad332b74191d5ef2 Mon Sep 17 00:00:00 2001 From: Doesnty Date: Wed, 2 Aug 2017 14:18:39 -0500 Subject: Improve battle_4 --- data/battle_scripts_1.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0945d75c8..e046794b3 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3485,7 +3485,7 @@ BattleScript_PerishSongTimerGoesDown:: @ 81D921D waitmessage 64 end2 -gUnknown_081D9224:: @ 81D9224 +BattleScript_AllStatsUp:: @ 81D9224 jumpifstat USER, 3, 1, 12, BattleScript_1D9251 jumpifstat USER, 3, 2, 12, BattleScript_1D9251 jumpifstat USER, 3, 3, 12, BattleScript_1D9251 @@ -3659,7 +3659,7 @@ BattleScript_1D93EC: @ 81D93EC waitmessage 64 jump BattleScript_EndTurn -gUnknown_081D93FA:: @ 81D93FA +BattleScript_AtkDefDown:: @ 81D93FA setbyte 0x20160dc, 0 playstatchangeanimation USER, 6, 13 playstatchangeanimation USER, 2, 9 @@ -3731,7 +3731,7 @@ BattleScript_OneHitKOMsg:: @ 81D94A9 waitmessage 64 return -gUnknown_081D94B0:: @ 81D94B0 +BattleScript_SAtkDown2:: @ 81D94B0 setbyte 0x20160dc, 0 playstatchangeanimation USER, 16, 11 setbyte 0x201601e, 164 -- cgit v1.2.3 From e262fb05fb9a4a1fe1f1c3966e2c7e465b446ea9 Mon Sep 17 00:00:00 2001 From: Touched Date: Tue, 22 Aug 2017 18:15:36 +0200 Subject: Convert data/field_ground_effect.s to C --- data/field_ground_effect.s | 72 ---------------------------------------------- 1 file changed, 72 deletions(-) delete mode 100644 data/field_ground_effect.s (limited to 'data') diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s deleted file mode 100644 index d3dbceedb..000000000 --- a/data/field_ground_effect.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_08376040:: @ 8376040 - .4byte MetatileBehavior_IsJumpSouth - .4byte MetatileBehavior_IsJumpNorth - .4byte MetatileBehavior_IsJumpWest - .4byte MetatileBehavior_IsJumpEast - -gUnknown_08376050:: @ 8376050 - .byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 - -@ Each byte corresponds to a sprite priority for a field object. -@ This is directly the inverse of gFieldObjectPriorities_08376070. -gFieldObjectPriorities_08376060:: @ 8376060 - .byte 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2 - -@ Each byte corresponds to a sprite priority for a field object. -@ This is the inverse of gFieldObjectPriorities_08376060. -@ 1 = Above player sprite -@ 2 = Below player sprite -gFieldObjectPriorities_08376070:: @ 8376070 - .byte 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1 - - .align 2 -gUnknown_08376080:: @ 8376080 - .4byte nullsub_50 - .4byte DoTracksGroundEffect_Footprints - .4byte DoTracksGroundEffect_BikeTireTracks - -@ First byte is a Field Effect script id. (gFieldEffectScriptPointers) -@ Last three bytes are unknown. -gSandFootprints_FieldEffectData:: @ 837608C - .byte 0xD, 0x0, 0x18, 0x0 - -@ Specifies which bike track shape to show next. -@ For example, when the bike turns from up to right, it will show -@ a track that curves to the right. -@ Each 4-byte row corresponds to the initial direction of the bike, and -@ each byte in that row is for the next direction of the bike in the order -@ of down, up, left, right. -gBikeTireTracks_Transitions:: @ 8376090 - .byte 1, 2, 7, 8 - .byte 1, 2, 6, 5 - .byte 5, 8, 3, 4 - .byte 6, 7, 3, 4 - - .align 2 -gUnknown_083760A0:: @ 83760A0 - .4byte GroundEffect_SpawnOnTallGrass - .4byte sub_8063E94 - .4byte sub_8063EE0 - .4byte sub_8063F2C - .4byte GroundEffect_WaterReflection - .4byte GroundEffect_IceReflection - .4byte GroundEffect_FlowingWater - .4byte sub_8063FA0 - .4byte sub_8063FCC - .4byte GroundEffect_Ripple - .4byte GroundEffect_StepOnPuddle - .4byte GroundEffect_SandPile - .4byte GroundEffect_JumpOnTallGrass - .4byte GroundEffect_JumpOnLongGrass - .4byte GroundEffect_JumpOnShallowWater - .4byte GroundEffect_JumpOnWater - .4byte GroundEffect_JumpLandingDust - .4byte GroundEffect_ShortGrass - .4byte GroundEffect_HotSprings - .4byte GroundEffect_Seaweed -- cgit v1.2.3 From bfc4b338cbd3e78062c71ff6f72f821631277c1b Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 22 Aug 2017 17:34:42 -0500 Subject: rename some mauville man stuff --- data/mauville_old_man.s | 23 ++--------------------- data/scripts/giddy.inc | 2 +- data/specials.inc | 2 +- 3 files changed, 4 insertions(+), 23 deletions(-) (limited to 'data') diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index 5c4bd47b9..f96963d2d 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -3,27 +3,8 @@ .section .rodata - .align 1 -gUnknown_083E537C:: @ 83E537C -.ifdef ENGLISH - ec_word SISTER - ec_word EATS - ec_word SWEETS - ec_word VORACIOUS - ec_word AND - ec_word DROOLING -.else - ec_word SISTER - ec_word MUST_BE - ec_word SWEETS - ec_word VORACIOUS - ec_word DROOLING - ec_word THICK -.endif - - .align 2 -gUnknown_083E5388:: @ 83E5388 +gGiddyAdjectives:: @ 83E5388 .4byte OtherText_SoPretty .4byte OtherText_SoDarling .4byte OtherText_SoRelaxed @@ -34,7 +15,7 @@ gUnknown_083E5388:: @ 83E5388 .4byte OtherText_SoMagical .align 2 -gUnknown_083E53A8:: @ 83E53A8 +gGiddyQuestions:: @ 83E53A8 .4byte OtherText_WantVacationNicePlace .4byte OtherText_BoughtCrayonsIsNice .4byte OtherText_IfWeCouldFloat diff --git a/data/scripts/giddy.inc b/data/scripts/giddy.inc index 263589fe9..bc7b1b8f1 100644 --- a/data/scripts/giddy.inc +++ b/data/scripts/giddy.inc @@ -30,7 +30,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 end MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E - special sub_80F7CF4 + special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 waittext yesnobox 20, 8 diff --git a/data/specials.inc b/data/specials.inc index 0eb6b742d..e588a29d3 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -112,7 +112,7 @@ gSpecials:: def_special sub_80F7C90 def_special sub_80F7C54 def_special sub_80F83D0 - def_special sub_80F7CF4 + def_special ScrSpecial_GenerateGiddyLine def_special sub_80F7CC8 def_special sub_80F889C def_special sub_80F8888 -- cgit v1.2.3 From 988f5a685a36d3591d07f71ca778d988fb26720a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 01:10:30 -0500 Subject: decompile up to sub_80F8598 --- data/mauville_old_man.s | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'data') diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index f96963d2d..4ccec0db3 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -3,37 +3,6 @@ .section .rodata - .align 2 -gGiddyAdjectives:: @ 83E5388 - .4byte OtherText_SoPretty - .4byte OtherText_SoDarling - .4byte OtherText_SoRelaxed - .4byte OtherText_SoSunny - .4byte OtherText_SoDesirable - .4byte OtherText_SoExciting - .4byte OtherText_SoAmusing - .4byte OtherText_SoMagical - - .align 2 -gGiddyQuestions:: @ 83E53A8 - .4byte OtherText_WantVacationNicePlace - .4byte OtherText_BoughtCrayonsIsNice - .4byte OtherText_IfWeCouldFloat - .4byte OtherText_SandWashesAwayMakeSad - .4byte OtherText_WhatsBottomSeaLike - .4byte OtherText_SeeSettingSun - .4byte OtherText_LyingInGreenGrass - .4byte OtherText_SecretBasesWonderful - - .align 1 -gUnknown_083E53C8:: @ 83E53C8 - .2byte 0x0, 0 - .2byte 0xC, 0 - .2byte 0xD, 0 - .2byte 0x12, 0 - .2byte 0x13, 0 - .2byte 0x15, 0 - .align 2 gUnknown_083E53E0:: @ 83E53E0 .4byte 0x132, UnknownString_81AEFFC, UnknownString_81AF013, UnknownString_81AF022 @@ -71,8 +40,6 @@ gUnknown_083E53E0:: @ 83E53E0 .4byte 0x12e, UnknownString_81B0523, UnknownString_81B053E, UnknownString_81B0554 .4byte 0x12f, UnknownString_81B05D8, UnknownString_81B05F3, UnknownString_81B0610 .4byte 0x130, UnknownString_81B06A9, UnknownString_81B06C6, UnknownString_81B06D9 - -gUnknown_083E5610:: @ 83E5610 .4byte 0x131, UnknownString_81B0763, UnknownString_81B0781, UnknownString_81B0797 .align 2 -- cgit v1.2.3 From 1ae38be0a46d1d901a2d9e5bb22938a0cecf6b7f Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 15:19:55 -0500 Subject: do some renaming and reorganizing --- data/event_scripts.s | 11 +- data/mauville_old_man.s | 49 ------ data/scripts/bard.inc | 67 -------- data/scripts/giddy.inc | 51 ------ data/scripts/hipster.inc | 25 --- data/scripts/mauville_man.inc | 350 ++++++++++++++++++++++++++++++++++++++++++ data/scripts/storyteller.inc | 82 ---------- data/scripts/trader.inc | 88 ----------- data/specials.inc | 10 +- data/text/bard.inc | 18 +-- 10 files changed, 365 insertions(+), 386 deletions(-) delete mode 100644 data/mauville_old_man.s delete mode 100644 data/scripts/bard.inc delete mode 100644 data/scripts/giddy.inc delete mode 100644 data/scripts/hipster.inc create mode 100644 data/scripts/mauville_man.inc delete mode 100644 data/scripts/storyteller.inc delete mode 100644 data/scripts/trader.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index d6702745a..33bb39308 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4744,16 +4744,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F .include "data/scripts/gabby_and_ty.inc" - .include "data/scripts/bard.inc" - .include "data/scripts/hipster.inc" - .include "data/text/trader.inc" - .include "data/scripts/trader.inc" - .include "data/text/storyteller.inc" - .include "data/scripts/storyteller.inc" - .include "data/text/giddy.inc" - .include "data/scripts/giddy.inc" - .include "data/text/bard.inc" - .include "data/text/hipster.inc" + .include "data/scripts/mauville_man.inc" .include "data/field_move_scripts.inc" .include "data/item_ball_scripts.inc" diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s deleted file mode 100644 index 4ccec0db3..000000000 --- a/data/mauville_old_man.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083E53E0:: @ 83E53E0 - .4byte 0x132, UnknownString_81AEFFC, UnknownString_81AF013, UnknownString_81AF022 - .4byte 0x102, UnknownString_81AF0A3, UnknownString_81AF0BB, UnknownString_81AF0CA - .4byte 0x103, UnknownString_81AF149, UnknownString_81AF164, UnknownString_81AF174 - .4byte 0x104, UnknownString_81AF1E5, UnknownString_81AF1FD, UnknownString_81AF20A - .4byte 0x106, UnknownString_81AF281, UnknownString_81AF299, UnknownString_81AF2A9 - .4byte 0x109, UnknownString_81AF32C, UnknownString_81AF345, UnknownString_81AF34D - .4byte 0x10b, UnknownString_81AF3D0, UnknownString_81AF3ED, UnknownString_81AF3FC - .4byte 0x10c, UnknownString_81AF46D, UnknownString_81AF481, UnknownString_81AF49B - .4byte 0x10d, UnknownString_81AF511, UnknownString_81AF529, UnknownString_81AF536 - .4byte 0x10e, UnknownString_81AF5A9, UnknownString_81AF5BD, UnknownString_81AF5CD - .4byte 0x10f, UnknownString_81AF63F, UnknownString_81AF661, UnknownString_81AF676 - .4byte 0x110, UnknownString_81AF711, UnknownString_81AF726, UnknownString_81AF73D - .4byte 0x111, UnknownString_81AF7BF, UnknownString_81AF7D9, UnknownString_81AF7F1 - .4byte 0x112, UnknownString_81AF88A, UnknownString_81AF8A1, UnknownString_81AF8AA - .4byte 0x113, UnknownString_81AF91B, UnknownString_81AF935, UnknownString_81AF943 - .4byte 0x114, UnknownString_81AF9C8, UnknownString_81AF9E0, UnknownString_81AF9F6 - .4byte 0x11a, UnknownString_81AFA79, UnknownString_81AFA92, UnknownString_81AFA9E - .4byte 0x11b, UnknownString_81AFB17, UnknownString_81AFB2D, UnknownString_81AFB48 - .4byte 0x11c, UnknownString_81AFBD8, UnknownString_81AFBE7, UnknownString_81AFC04 - .4byte 0x21d, UnknownString_81AFC8A, UnknownString_81AFC9D, UnknownString_81AFCBE - .4byte 0x11e, UnknownString_81AFD44, UnknownString_81AFD60, UnknownString_81AFD80 - .4byte 0x121, UnknownString_81AFE1D, UnknownString_81AFE36, UnknownString_81AFE42 - .4byte 0x124, UnknownString_81AFEC2, UnknownString_81AFEDD, UnknownString_81AFEEE - .4byte 0x125, UnknownString_81AFF68, UnknownString_81AFF7B, UnknownString_81AFF88 - .4byte 0x126, UnknownString_81AFFFB, UnknownString_81B000D, UnknownString_81B0015 - .4byte 0x127, UnknownString_81B009D, UnknownString_81B00B6, UnknownString_81B00C9 - .4byte 0x128, UnknownString_81B014D, UnknownString_81B0165, UnknownString_81B0173 - .4byte 0x129, UnknownString_81B01E9, UnknownString_81B0201, UnknownString_81B0213 - .4byte 0x12a, UnknownString_81B0290, UnknownString_81B02A5, UnknownString_81B02B6 - .4byte 0x12b, UnknownString_81B0337, UnknownString_81B0351, UnknownString_81B0364 - .4byte 0x12c, UnknownString_81B03E9, UnknownString_81B0401, UnknownString_81B040C - .4byte 0x12d, UnknownString_81B046E, UnknownString_81B0489, UnknownString_81B049A - .4byte 0x12e, UnknownString_81B0523, UnknownString_81B053E, UnknownString_81B0554 - .4byte 0x12f, UnknownString_81B05D8, UnknownString_81B05F3, UnknownString_81B0610 - .4byte 0x130, UnknownString_81B06A9, UnknownString_81B06C6, UnknownString_81B06D9 - .4byte 0x131, UnknownString_81B0763, UnknownString_81B0781, UnknownString_81B0797 - - .align 2 -gUnknown_083E5620:: @ 83E5620 - .4byte 0x24 - .4byte gSaveBlock1 + 0x2D94 - .4byte 0xC diff --git a/data/scripts/bard.inc b/data/scripts/bard.inc deleted file mode 100644 index 3f25b100f..000000000 --- a/data/scripts/bard.inc +++ /dev/null @@ -1,67 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 - special sub_80F7B14 - switch RESULT - case 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE784 - case 1, MauvilleCity_PokemonCenter_1F_EventScript_1AE845 - case 2, MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB - case 3, MauvilleCity_PokemonCenter_1F_EventScript_1B0816 - case 4, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE784:: @ 81AE784 - lock - faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0A91, 5 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7C8 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5:: @ 81AE7A5 - setvar 0x8004, 0 - special sub_80F7C54 - pause 60 - special sub_80F7B2C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AED, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE7C8:: @ 81AE7C8 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AC3, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2:: @ 81AE7D2 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0B2C, 5 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1:: @ 81AE7F1 - setvar 0x8004, 6 - call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 - lock - faceplayer - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BD0, 4 - setvar 0x8004, 1 - special sub_80F7C54 - pause 60 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BFA, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1 - special sub_80F7B40 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C23, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE83B:: @ 81AE83B - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BA6, 4 - release - end diff --git a/data/scripts/giddy.inc b/data/scripts/giddy.inc deleted file mode 100644 index bc7b1b8f1..000000000 --- a/data/scripts/giddy.inc +++ /dev/null @@ -1,51 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB - lock - faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C - special sub_80F7CC8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26 - special sub_80F7CC8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E - special ScrSpecial_GenerateGiddyLine - special ShowFieldMessageStringVar4 - waittext - yesnobox 20, 8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F - msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4 - release - end diff --git a/data/scripts/hipster.inc b/data/scripts/hipster.inc deleted file mode 100644 index 3e24e4868..000000000 --- a/data/scripts/hipster.inc +++ /dev/null @@ -1,25 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventScript_1AE845:: @ 81AE845 - lock - faceplayer - setflag 2054 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4 - special sub_80F7C70 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A - special sub_80F7C90 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4 - special sub_80F7C84 - release - end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc new file mode 100644 index 000000000..f406d33fe --- /dev/null +++ b/data/scripts/mauville_man.inc @@ -0,0 +1,350 @@ +@ From mauville_old_man.h +@ TODO: Put these in a header + +MAUVILLE_MAN_BARD = 0 +MAUVILLE_MAN_HIPSTER = 1 +MAUVILLE_MAN_TRADER = 2 +MAUVILLE_MAN_STORYTELLER = 3 +MAUVILLE_MAN_GIDDY = 4 + +MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 + special ScrSpecial_GetCurrentMauvilleMan + switch RESULT + case MAUVILLE_MAN_BARD, speak_to_bard + case MAUVILLE_MAN_HIPSTER, speak_to_hipster + case MAUVILLE_MAN_TRADER, speak_to_trader + case MAUVILLE_MAN_STORYTELLER, speak_to_storyteller + case MAUVILLE_MAN_GIDDY, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB + end + +@------------------------------------------------------------------------------- +@ Bard +@------------------------------------------------------------------------------- + +speak_to_bard: + lock + faceplayer + msgbox gTextBard_HiImTheBard, MSGBOX_YESNO + compare RESULT, YES + jumpeq yes_hear_song + compare RESULT, NO + jumpeq dont_hear_song + end +yes_hear_song: + setvar 0x8004, 0 + special ScrSpecial_PlayBardSong + pause 60 + special ScrSpecial_HasBardSongBeenChanged + compare RESULT, FALSE + jumpeq prompt_write_lyrics @ Prompt new lyrics only if song hasn't been changed + msgbox gTextBard_OhWhatAMovingSong, 4 + release + end +dont_hear_song: + msgbox gTextBard_OhYouveLeftMe, 4 + release + end +prompt_write_lyrics: + msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO + compare RESULT, YES + jumpeq write_lyrics + compare RESULT, NO + jumpeq dont_write_lyrics + end +write_lyrics: + setvar 0x8004, 6 + call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 + lock + faceplayer + compare RESULT, NO + jumpeq dont_write_lyrics + msgbox gTextBard_ThankYouKindly, 4 + setvar 0x8004, 1 + special ScrSpecial_PlayBardSong + pause 60 + msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO + compare RESULT, NO + jumpeq write_lyrics @ Keep looping until player responds YES + special ScrSpecial_SaveBardSongLyrics + msgbox gTextBard_OkayThatsIt, 4 + release + end +dont_write_lyrics: + msgbox gTextBard_OhYouveLeftMe2, 4 + release + end + +@------------------------------------------------------------------------------- +@ Hipster +@------------------------------------------------------------------------------- + +speak_to_hipster:: @ 81AE845 + lock + faceplayer + setflag 2054 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4 + special sub_80F7C70 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4 + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A + special sub_80F7C90 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4 + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4 + special ScrSpecial_SetHipsterSpokenFlag + release + end + +@------------------------------------------------------------------------------- +@ Trader +@------------------------------------------------------------------------------- + + .include "data/text/trader.inc" + +speak_to_trader:: @ 81AEBAB + lock + faceplayer + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA + special sub_8109C44 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3 + message MauvilleCity_PokemonCenter_1F_Text_1AE910 + waittext + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA:: @ 81AEBDA + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8C6, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8DF, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC + special sub_8109E34 + waitstate + compare 0x8004, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D + compare 0x8004, 65535 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC36 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42 + special sub_8109C58 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D:: @ 81AEC2D + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE950, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC36:: @ 81AEC36 + message MauvilleCity_PokemonCenter_1F_Text_1AEB31 + waittext + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC42:: @ 81AEC42 + message MauvilleCity_PokemonCenter_1F_Text_1AE910 + waittext + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9B6, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4 + special sub_8109CF0 + waitstate + compare 0x8006, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6 + compare 0x8006, 65535 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF + 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 sub_8109DE0 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AECA6:: @ 81AECA6 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA2B, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AECAF:: @ 81AECAF + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAC3, 4 + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AECBD:: @ 81AECBD + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA57, 2 + end + +@------------------------------------------------------------------------------- +@ Storyteller +@------------------------------------------------------------------------------- + + .include "data/text/storyteller.inc" + +speak_to_storyteller:: @ 81B0816 + setvar 0x8008, 0 + setvar 0x8009, 0 + setvar 0x800a, 0 + setvar 0x800b, 0 + lock + faceplayer + msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + 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 sub_80F8874 + waitstate + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883 + setvar 0x8008, 1 + special sub_80F8888 + waittext + waitbutton + specialval RESULT, sub_80F88AC + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893 + jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909 + +MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 + compare 0x8008, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE + +MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, 5 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F + +MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE + specialval RESULT, sub_80F88E0 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F + specialval RESULT, sub_80F889C + compare RESULT, 4 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F + jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB + +MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 + +MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + specialval RESULT, sub_80F88FC + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4 + closebutton + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4 + closebutton + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4 + closebutton + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4 + closebutton + release + end + +@------------------------------------------------------------------------------- +@ Giddy +@------------------------------------------------------------------------------- + + .include "data/text/giddy.inc" + +MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB + lock + faceplayer + msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C + special sub_80F7CC8 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26 + special sub_80F7CC8 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4 + jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E + special ScrSpecial_GenerateGiddyLine + special ShowFieldMessageStringVar4 + waittext + yesnobox 20, 8 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F + msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4 + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4 + release + end + + .include "data/text/bard.inc" + .include "data/text/hipster.inc" \ No newline at end of file diff --git a/data/scripts/storyteller.inc b/data/scripts/storyteller.inc deleted file mode 100644 index eba94e698..000000000 --- a/data/scripts/storyteller.inc +++ /dev/null @@ -1,82 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventScript_1B0816:: @ 81B0816 - setvar 0x8008, 0 - setvar 0x8009, 0 - setvar 0x800a, 0 - setvar 0x800b, 0 - lock - faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 - 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 sub_80F8874 - waitstate - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883 - setvar 0x8008, 1 - special sub_80F8888 - waittext - waitbutton - specialval RESULT, sub_80F88AC - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909 - -MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 - compare 0x8008, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE - -MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, 5 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F - -MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE - specialval RESULT, sub_80F88E0 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - specialval RESULT, sub_80F889C - compare RESULT, 4 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB - -MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 - -MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 - specialval RESULT, sub_80F88FC - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4 - closebutton - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4 - closebutton - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4 - closebutton - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4 - closebutton - release - end diff --git a/data/scripts/trader.inc b/data/scripts/trader.inc deleted file mode 100644 index b52c8a2dc..000000000 --- a/data/scripts/trader.inc +++ /dev/null @@ -1,88 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB:: @ 81AEBAB - lock - faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA - special sub_8109C44 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3 - message MauvilleCity_PokemonCenter_1F_Text_1AE910 - waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA:: @ 81AEBDA - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8C6, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8DF, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC - special sub_8109E34 - waitstate - compare 0x8004, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D - compare 0x8004, 65535 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC36 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42 - special sub_8109C58 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D:: @ 81AEC2D - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE950, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC36:: @ 81AEC36 - message MauvilleCity_PokemonCenter_1F_Text_1AEB31 - waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC42:: @ 81AEC42 - message MauvilleCity_PokemonCenter_1F_Text_1AE910 - waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9B6, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4 - special sub_8109CF0 - waitstate - compare 0x8006, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6 - compare 0x8006, 65535 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF - 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 sub_8109DE0 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECA6:: @ 81AECA6 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA2B, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECAF:: @ 81AECAF - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAC3, 4 - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECBD:: @ 81AECBD - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA57, 2 - end diff --git a/data/specials.inc b/data/specials.inc index e588a29d3..06ba22a23 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -104,13 +104,13 @@ gSpecials:: 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 ScrSpecial_GetCurrentMauvilleMan + def_special ScrSpecial_HasBardSongBeenChanged + def_special ScrSpecial_SaveBardSongLyrics def_special sub_80F7C70 - def_special sub_80F7C84 + def_special ScrSpecial_SetHipsterSpokenFlag def_special sub_80F7C90 - def_special sub_80F7C54 + def_special ScrSpecial_PlayBardSong def_special sub_80F83D0 def_special ScrSpecial_GenerateGiddyLine def_special sub_80F7CC8 diff --git a/data/text/bard.inc b/data/text/bard.inc index edf4942f6..bd22c97a3 100644 --- a/data/text/bard.inc +++ b/data/text/bard.inc @@ -1,19 +1,19 @@ -UnknownString_81B0A83: @ 81B0A83 +gTextBard_BardTesting: @ 81B0A83 .string "BARD testing!$" -MauvilleCity_PokemonCenter_1F_Text_1B0A91:: @ 81B0A91 +gTextBard_HiImTheBard:: @ 81B0A91 .string "Hi, I’m the BARD.\n" .string "Would you like to hear my song?$" -MauvilleCity_PokemonCenter_1F_Text_1B0AC3:: @ 81B0AC3 +gTextBard_OhYouveLeftMe:: @ 81B0AC3 .string "Oh...\n" .string "You’ve left me feeling the blues...$" -MauvilleCity_PokemonCenter_1F_Text_1B0AED:: @ 81B0AED +gTextBard_OhWhatAMovingSong:: @ 81B0AED .string "Oh, what a moving song...\n" .string "I wish I could play it for others...$" -MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C +gTextBard_SoHowDoYouLikeMySong:: @ 81B0B2C .string "So?\n" .string "How do you like my song?\p" .string "But I’m none too happy about the\n" @@ -21,18 +21,18 @@ MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C .string "How would you like to write some new\n" .string "lyrics for me?$" -MauvilleCity_PokemonCenter_1F_Text_1B0BA6:: @ 81B0BA6 +gTextBard_OhYouveLeftMe2:: @ 81B0BA6 .string "Oh...\n" .string "You’ve left me feeling the blues...$" -MauvilleCity_PokemonCenter_1F_Text_1B0BD0:: @ 81B0BD0 +gTextBard_ThankYouKindly:: @ 81B0BD0 .string "Thank you kindly!\n" .string "Let me sing it for you.$" -MauvilleCity_PokemonCenter_1F_Text_1B0BFA:: @ 81B0BFA +gTextBard_WasThatHowYouWanted:: @ 81B0BFA .string "Was that how you wanted your song\n" .string "to go?$" -MauvilleCity_PokemonCenter_1F_Text_1B0C23:: @ 81B0C23 +gTextBard_OkayThatsIt:: @ 81B0C23 .string "Okay! That’s it, then.\n" .string "I’ll sing this song for a while.$" -- cgit v1.2.3 From 1b715eb7ba38ff408acf5e5e0a9ea88642f912bb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 16:52:49 -0500 Subject: more Mauville man labeling --- data/scripts/mauville_man.inc | 160 +++++++++++++++---------------- data/specials.inc | 16 ++-- data/text/hipster.inc | 8 +- data/text/storyteller.inc | 218 +++++++++++++++++++++--------------------- data/text/trader.inc | 28 +++--- 5 files changed, 210 insertions(+), 220 deletions(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index f406d33fe..780017442 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -32,11 +32,13 @@ speak_to_bard: end yes_hear_song: setvar 0x8004, 0 + @ Give the player ear rape special ScrSpecial_PlayBardSong pause 60 special ScrSpecial_HasBardSongBeenChanged compare RESULT, FALSE - jumpeq prompt_write_lyrics @ Prompt new lyrics only if song hasn't been changed + @ Prompt new lyrics only if song hasn't been changed + jumpeq prompt_write_lyrics msgbox gTextBard_OhWhatAMovingSong, 4 release end @@ -60,6 +62,7 @@ write_lyrics: jumpeq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 setvar 0x8004, 1 + @ Give the player ear rape again special ScrSpecial_PlayBardSong pause 60 msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO @@ -78,28 +81,26 @@ dont_write_lyrics: @ Hipster @------------------------------------------------------------------------------- -speak_to_hipster:: @ 81AE845 +speak_to_hipster: lock faceplayer setflag 2054 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4 - special sub_80F7C70 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4 + msgbox gTextHipster_TheyCallMeTheHipster, 4 + special ScrSpecial_GetHipsterSpokenFlag + compare RESULT, FALSE + jumpeq hipster_first_time + msgbox gTextHipster_TaughtYouAlready, 4 release end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A - special sub_80F7C90 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4 +hipster_first_time: + special ScrSpecial_HipsterTeachWord + compare RESULT, TRUE @ TRUE if player learned a new word + jumpeq teach_new_word + msgbox gTextHipster_YouAlreadyKnowALot, 4 release end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4 +teach_new_word: + msgbox gTextHipster_HaveYouHeardAbout, 4 special ScrSpecial_SetHipsterSpokenFlag release end @@ -110,93 +111,82 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 .include "data/text/trader.inc" -speak_to_trader:: @ 81AEBAB +speak_to_trader: lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA - special sub_8109C44 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3 - message MauvilleCity_PokemonCenter_1F_Text_1AE910 + msgbox gTextTrader_Introduction, MSGBOX_YESNO + compare RESULT, NO + jumpeq dont_want_to_trade + special ScrSpecial_GetTraderTradedFlag + compare RESULT, TRUE + jumpeq already_traded + message gTextTrader_MenuPrompt waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + jump do_trader_menu_get end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA:: @ 81AEBDA - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8C6, 2 +dont_want_to_trade: + msgbox gTextTrader_FeelUnwanted1, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8DF, 2 +already_traded: + msgbox gTextTrader_TradedAlready, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC - special sub_8109E34 +do_trader_menu_get: + special ScrSpecial_TraderMenuGetDecoration waitstate compare 0x8004, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D + jumpeq cancelled_get_menu compare 0x8004, 65535 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC36 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42 - special sub_8109C58 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + jumpeq rare_item_cant_trade_away + msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO + compare RESULT, NO + jumpeq dont_want_item + special ScrSpecial_DoesPlayerHaveNoDecorations + compare RESULT, TRUE + jumpeq player_has_no_decorations + jump do_trader_menu_give end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D:: @ 81AEC2D - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE950, 2 +cancelled_get_menu:: @ 81AEC2D + msgbox gTextTrader_DontWantAnything, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC36:: @ 81AEC36 - message MauvilleCity_PokemonCenter_1F_Text_1AEB31 +rare_item_cant_trade_away:: @ 81AEC36 + message gTextTrader_ICantTradeThatOneAway waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + jump do_trader_menu_get end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC42:: @ 81AEC42 - message MauvilleCity_PokemonCenter_1F_Text_1AE910 +dont_want_item: + message gTextTrader_MenuPrompt waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + jump do_trader_menu_get end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9B6, 2 +player_has_no_decorations:: @ 81AEC4E + msgbox gTextTrader_YouDontHaveDecorations, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4 - special sub_8109CF0 +do_trader_menu_give:: @ 81AEC57 + msgbox gTextTrader_PickDecorationYoullTrade, 4 + special ScrSpecial_TraderMenuGiveDecoration waitstate compare 0x8006, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6 + jumpeq cancelled_give_menu compare 0x8006, 65535 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF - special sub_8109C90 + jumpeq decoration_is_in_use + special ScrSpecial_IsDecorationFull 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 sub_8109DE0 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2 + jumpeq decorations_full + msgbox gTextTrader_SoWellTrade, MSGBOX_YESNO + compare RESULT, NO + jumpeq do_trader_menu_give + special ScrSpecial_TraderDoDecorationTrade + msgbox gTextTrader_ThenWellTrade, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECA6:: @ 81AECA6 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA2B, 2 +cancelled_give_menu:: @ 81AECA6 + msgbox gTextTrader_FeelUnwanted2, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECAF:: @ 81AECAF - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAC3, 4 - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 +decoration_is_in_use:: @ 81AECAF + msgbox gTextTrader_InUseYouCantTradeIt, 4 + jump do_trader_menu_give end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECBD:: @ 81AECBD - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA57, 2 +decorations_full:: @ 81AECBD + msgbox gTextTrader_NoRoomForThis, 2 end @------------------------------------------------------------------------------- @@ -212,8 +202,8 @@ speak_to_storyteller:: @ 81B0816 setvar 0x800b, 0 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5 - compare RESULT, 0 + msgbox gTextStoryteller_Introduction, MSGBOX_YESNO + compare RESULT, NO jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 specialval RESULT, sub_80F889C compare RESULT, 0 @@ -242,7 +232,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, MSGBOX_YESNO compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F @@ -259,7 +249,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, MSGBOX_YESNO compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 specialval RESULT, sub_80F88FC @@ -297,7 +287,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, MSGBOX_YESNO compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C compare RESULT, 0 diff --git a/data/specials.inc b/data/specials.inc index 06ba22a23..cff97f455 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -107,9 +107,9 @@ gSpecials:: def_special ScrSpecial_GetCurrentMauvilleMan def_special ScrSpecial_HasBardSongBeenChanged def_special ScrSpecial_SaveBardSongLyrics - def_special sub_80F7C70 + def_special ScrSpecial_GetHipsterSpokenFlag def_special ScrSpecial_SetHipsterSpokenFlag - def_special sub_80F7C90 + def_special ScrSpecial_HipsterTeachWord def_special ScrSpecial_PlayBardSong def_special sub_80F83D0 def_special ScrSpecial_GenerateGiddyLine @@ -120,12 +120,12 @@ gSpecials:: 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 ScrSpecial_TraderMenuGetDecoration + def_special ScrSpecial_GetTraderTradedFlag + def_special ScrSpecial_DoesPlayerHaveNoDecorations + def_special ScrSpecial_IsDecorationFull + def_special ScrSpecial_TraderMenuGiveDecoration + def_special ScrSpecial_TraderDoDecorationTrade def_special GetShroomishSizeRecordInfo def_special CompareShroomishSize def_special GetBarboachSizeRecordInfo diff --git a/data/text/hipster.inc b/data/text/hipster.inc index a30943d3a..630db02b2 100644 --- a/data/text/hipster.inc +++ b/data/text/hipster.inc @@ -1,19 +1,19 @@ -MauvilleCity_PokemonCenter_1F_Text_1B0C5B:: @ 81B0C5B +gTextHipster_TheyCallMeTheHipster:: @ 81B0C5B .string "Hey, yo! They call me the HIPSTER.\n" .string "I’ll teach you what’s hip and happening.$" -MauvilleCity_PokemonCenter_1F_Text_1B0CA7:: @ 81B0CA7 +gTextHipster_TaughtYouAlready:: @ 81B0CA7 .string "But, hey, I taught you what’s hip and\n" .string "happening already.\p" .string "I’d like to spread the good word to\n" .string "other folks.$" -MauvilleCity_PokemonCenter_1F_Text_1B0D11:: @ 81B0D11 +gTextHipster_YouAlreadyKnowALot:: @ 81B0D11 .string "But, hey, you already know a lot about\n" .string "what’s hip and happening.\p" .string "I’ve got nothing new to teach you!$" -MauvilleCity_PokemonCenter_1F_Text_1B0D75:: @ 81B0D75 +gTextHipster_HaveYouHeardAbout:: @ 81B0D75 .string "Hey, have you heard about\n" .string "“{STR_VAR_1}”?\p" .string "What’s it mean? Well...\n" diff --git a/data/text/storyteller.inc b/data/text/storyteller.inc index 3cfa8a698..ad131ec54 100644 --- a/data/text/storyteller.inc +++ b/data/text/storyteller.inc @@ -1,4 +1,4 @@ -MauvilleCity_PokemonCenter_1F_Text_1AECC6:: @ 81AECC6 +gTextStoryteller_Introduction:: @ 81AECC6 .string "I’m the STORYTELLER.\n" .string "I’ll tell you tales of legendary\l" .string "TRAINERS.\p" @@ -51,13 +51,13 @@ MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5 .string "in hearing my epic tales of legendary\l" .string "TRAINERS.$" -UnknownString_81AEFFC:: @ 81AEFFC +gTextStoryteller_Story1Title:: @ 81AEFFC .string "The Save-Happy TRAINER$" -UnknownString_81AF013:: @ 81AF013 +gTextStoryteller_Story1Action:: @ 81AF013 .string "Saved the game$" -UnknownString_81AF022:: @ 81AF022 +gTextStoryteller_Story1Text:: @ 81AF022 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER saved the game\n" @@ -65,13 +65,13 @@ UnknownString_81AF022:: @ 81AF022 .string "A more cautious TRAINER than\n" .string "{STR_VAR_3} one will never find!$" -UnknownString_81AF0A3:: @ 81AF0A3 +gTextStoryteller_Story2Title:: @ 81AF0A3 .string "The Trendsetter TRAINER$" -UnknownString_81AF0BB:: @ 81AF0BB +gTextStoryteller_Story2Action:: @ 81AF0BB .string "Started trends$" -UnknownString_81AF0CA:: @ 81AF0CA +gTextStoryteller_Story2Text:: @ 81AF0CA .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER started new trends\n" @@ -79,13 +79,13 @@ UnknownString_81AF0CA:: @ 81AF0CA .string "{STR_VAR_3} is setting trends for all\n" .string "the HOENN region!$" -UnknownString_81AF149:: @ 81AF149 +gTextStoryteller_Story3Title:: @ 81AF149 .string "The BERRY-Planting TRAINER$" -UnknownString_81AF164:: @ 81AF164 +gTextStoryteller_Story3Action:: @ 81AF164 .string "Planted BERRIES$" -UnknownString_81AF174:: @ 81AF174 +gTextStoryteller_Story3Text:: @ 81AF174 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER planted BERRIES\n" @@ -93,13 +93,13 @@ UnknownString_81AF174:: @ 81AF174 .string "{STR_VAR_3} is a legendary lover of\n" .string "BERRIES!$" -UnknownString_81AF1E5:: @ 81AF1E5 +gTextStoryteller_Story4Title:: @ 81AF1E5 .string "The BIKE-Loving TRAINER$" -UnknownString_81AF1FD:: @ 81AF1FD +gTextStoryteller_Story4Action:: @ 81AF1FD .string "Traded BIKES$" -UnknownString_81AF20A:: @ 81AF20A +gTextStoryteller_Story4Text:: @ 81AF20A .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER swapped BIKES\n" @@ -107,13 +107,13 @@ UnknownString_81AF20A:: @ 81AF20A .string "{STR_VAR_3} must love BIKES deeply\n" .string "and passionately!$" -UnknownString_81AF281:: @ 81AF281 +gTextStoryteller_Story5Title:: @ 81AF281 .string "The Interviewed TRAINER$" -UnknownString_81AF299:: @ 81AF299 +gTextStoryteller_Story5Action:: @ 81AF299 .string "Got interviewed$" -UnknownString_81AF2A9:: @ 81AF2A9 +gTextStoryteller_Story5Text:: @ 81AF2A9 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER got interviewed\n" @@ -121,26 +121,26 @@ UnknownString_81AF2A9:: @ 81AF2A9 .string "{STR_VAR_3} must be a TRAINER who’s\n" .string "attracting much attention!$" -UnknownString_81AF32C:: @ 81AF32C +gTextStoryteller_Story6Title:: @ 81AF32C .string "The Battle-Happy TRAINER$" -UnknownString_81AF345:: @ 81AF345 +gTextStoryteller_Story6Action:: @ 81AF345 .string "Battled$" -UnknownString_81AF34D:: @ 81AF34D +gTextStoryteller_Story6Text:: @ 81AF34D .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER battled {STR_VAR_1} times!\p" .string "{STR_VAR_3} must be a TRAINER who can\n" .string "never refuse a chance to battle!$" -UnknownString_81AF3D0:: @ 81AF3D0 +gTextStoryteller_Story7Title:: @ 81AF3D0 .string "The POKéMON-Catching TRAINER$" -UnknownString_81AF3ED:: @ 81AF3ED +gTextStoryteller_Story7Action:: @ 81AF3ED .string "Caught POKéMON$" -UnknownString_81AF3FC:: @ 81AF3FC +gTextStoryteller_Story7Text:: @ 81AF3FC .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER caught\n" @@ -148,13 +148,13 @@ UnknownString_81AF3FC:: @ 81AF3FC .string "{STR_VAR_3} is a legendary catcher of\n" .string "wild POKéMON!$" -UnknownString_81AF46D:: @ 81AF46D +gTextStoryteller_Story8Title:: @ 81AF46D .string "The Fishing TRAINER$" -UnknownString_81AF481:: @ 81AF481 +gTextStoryteller_Story8Action:: @ 81AF481 .string "Caught POKéMON with a ROD$" -UnknownString_81AF49B:: @ 81AF49B +gTextStoryteller_Story8Text:: @ 81AF49B .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER caught\n" @@ -162,13 +162,13 @@ UnknownString_81AF49B:: @ 81AF49B .string "{STR_VAR_3} is a legendary fishing\n" .string "expert!$" -UnknownString_81AF511:: @ 81AF511 +gTextStoryteller_Story9Title:: @ 81AF511 .string "The EGG-Warming TRAINER$" -UnknownString_81AF529:: @ 81AF529 +gTextStoryteller_Story9Action:: @ 81AF529 .string "Hatched EGGS$" -UnknownString_81AF536:: @ 81AF536 +gTextStoryteller_Story9Text:: @ 81AF536 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER hatched {STR_VAR_1} POKéMON\n" @@ -176,13 +176,13 @@ UnknownString_81AF536:: @ 81AF536 .string "{STR_VAR_3} is a legendary warmer\n" .string "of EGGS!$" -UnknownString_81AF5A9:: @ 81AF5A9 +gTextStoryteller_Story10Title:: @ 81AF5A9 .string "The Evolver TRAINER$" -UnknownString_81AF5BD:: @ 81AF5BD +gTextStoryteller_Story10Action:: @ 81AF5BD .string "Evolved POKéMON$" -UnknownString_81AF5CD:: @ 81AF5CD +gTextStoryteller_Story10Text:: @ 81AF5CD .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER made {STR_VAR_1} POKéMON\n" @@ -190,13 +190,13 @@ UnknownString_81AF5CD:: @ 81AF5CD .string "{STR_VAR_3} is the ultimate evolver\n" .string "of POKéMON!$" -UnknownString_81AF63F:: @ 81AF63F +gTextStoryteller_Story11Title:: @ 81AF63F .string "The POKéMON CENTER-Loving TRAINER$" -UnknownString_81AF661:: @ 81AF661 +gTextStoryteller_Story11Action:: @ 81AF661 .string "Used POKéMON CENTERS$" -UnknownString_81AF676:: @ 81AF676 +gTextStoryteller_Story11Text:: @ 81AF676 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER healed POKéMON\n" @@ -204,13 +204,13 @@ UnknownString_81AF676:: @ 81AF676 .string "There could be no greater lover of\n" .string "POKéMON CENTERS than {STR_VAR_3}!$" -UnknownString_81AF711:: @ 81AF711 +gTextStoryteller_Story12Title:: @ 81AF711 .string "The Homebody TRAINER$" -UnknownString_81AF726:: @ 81AF726 +gTextStoryteller_Story12Action:: @ 81AF726 .string "Rested POKéMON at home$" -UnknownString_81AF73D:: @ 81AF73D +gTextStoryteller_Story12Text:: @ 81AF73D .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER healed POKéMON\n" @@ -218,13 +218,13 @@ UnknownString_81AF73D:: @ 81AF73D .string "There could be no more of a homebody\n" .string "than {STR_VAR_3}!$" -UnknownString_81AF7BF:: @ 81AF7BF +gTextStoryteller_Story13Title:: @ 81AF7BF .string "The SAFARI-Loving TRAINER$" -UnknownString_81AF7D9:: @ 81AF7D9 +gTextStoryteller_Story13Action:: @ 81AF7D9 .string "Entered the SAFARI ZONE$" -UnknownString_81AF7F1:: @ 81AF7F1 +gTextStoryteller_Story13Text:: @ 81AF7F1 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER went into the SAFARI ZONE\n" @@ -232,13 +232,13 @@ UnknownString_81AF7F1:: @ 81AF7F1 .string "{STR_VAR_3} is a TRAINER whose wild side\n" .string "must come out in the SAFARI ZONE!$" -UnknownString_81AF88A:: @ 81AF88A +gTextStoryteller_Story14Title:: @ 81AF88A .string "The CUT-Frenzy TRAINER$" -UnknownString_81AF8A1:: @ 81AF8A1 +gTextStoryteller_Story14Action:: @ 81AF8A1 .string "Used CUT$" -UnknownString_81AF8AA:: @ 81AF8AA +gTextStoryteller_Story14Text:: @ 81AF8AA .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used CUT\n" @@ -246,13 +246,13 @@ UnknownString_81AF8AA:: @ 81AF8AA .string "{STR_VAR_3} is a TRAINER who just must\n" .string "love to CUT!$" -UnknownString_81AF91B:: @ 81AF91B +gTextStoryteller_Story15Title:: @ 81AF91B .string "The ROCK-SMASHING TRAINER$" -UnknownString_81AF935:: @ 81AF935 +gTextStoryteller_Story15Action:: @ 81AF935 .string "Smashed rocks$" -UnknownString_81AF943:: @ 81AF943 +gTextStoryteller_Story15Text:: @ 81AF943 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used ROCK SMASH\n" @@ -260,13 +260,13 @@ UnknownString_81AF943:: @ 81AF943 .string "{STR_VAR_3} must be a TRAINER who\n" .string "can’t leave a stone unsmashed!$" -UnknownString_81AF9C8:: @ 81AF9C8 +gTextStoryteller_Story16Title:: @ 81AF9C8 .string "The Move-Loving TRAINER$" -UnknownString_81AF9E0:: @ 81AF9E0 +gTextStoryteller_Story16Action:: @ 81AF9E0 .string "Moved the SECRET BASE$" -UnknownString_81AF9F6:: @ 81AF9F6 +gTextStoryteller_Story16Text:: @ 81AF9F6 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER moved the SECRET BASE\n" @@ -274,13 +274,13 @@ UnknownString_81AF9F6:: @ 81AF9F6 .string "{STR_VAR_3} is a TRAINER who loves\n" .string "to move houses often!$" -UnknownString_81AFA79:: @ 81AFA79 +gTextStoryteller_Story17Title:: @ 81AFA79 .string "The SPLASH-Happy TRAINER$" -UnknownString_81AFA92:: @ 81AFA92 +gTextStoryteller_Story17Action:: @ 81AFA92 .string "Used SPLASH$" -UnknownString_81AFA9E:: @ 81AFA9E +gTextStoryteller_Story17Text:: @ 81AFA9E .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used SPLASH\n" @@ -288,13 +288,13 @@ UnknownString_81AFA9E:: @ 81AFA9E .string "{STR_VAR_3} is a TRAINER who must love\n" .string "SPLASHING around!$" -UnknownString_81AFB17:: @ 81AFB17 +gTextStoryteller_Story18Title:: @ 81AFB17 .string "The Tenacious TRAINER$" -UnknownString_81AFB2D:: @ 81AFB2D +gTextStoryteller_Story18Action:: @ 81AFB2D .string "Resorted to using STRUGGLE$" -UnknownString_81AFB48:: @ 81AFB48 +gTextStoryteller_Story18Text:: @ 81AFB48 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER had to rely on STRUGGLE\n" @@ -302,13 +302,13 @@ UnknownString_81AFB48:: @ 81AFB48 .string "{STR_VAR_3} is a tenacious TRAINER\n" .string "who never gives in to adversity!$" -UnknownString_81AFBD8:: @ 81AFBD8 +gTextStoryteller_Story19Title:: @ 81AFBD8 .string "The SLOT Champ$" -UnknownString_81AFBE7:: @ 81AFBE7 +gTextStoryteller_Story19Action:: @ 81AFBE7 .string "Won the jackpot on the SLOTS$" -UnknownString_81AFC04:: @ 81AFC04 +gTextStoryteller_Story19Text:: @ 81AFC04 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won the jackpot on\n" @@ -316,13 +316,13 @@ UnknownString_81AFC04:: @ 81AFC04 .string "{STR_VAR_3} is a TRAINER who was lucky\n" .string "on the SLOTS!$" -UnknownString_81AFC8A:: @ 81AFC8A +gTextStoryteller_Story20Title:: @ 81AFC8A .string "The ROULETTE Champ$" -UnknownString_81AFC9D:: @ 81AFC9D +gTextStoryteller_Story20Action:: @ 81AFC9D .string "Had consecutive ROULETTE wins of$" -UnknownString_81AFCBE:: @ 81AFCBE +gTextStoryteller_Story20Text:: @ 81AFCBE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won in ROULETTE\n" @@ -330,13 +330,13 @@ UnknownString_81AFCBE:: @ 81AFCBE .string "{STR_VAR_3} was lucky when the ball\n" .string "bounced in ROULETTE!$" -UnknownString_81AFD44:: @ 81AFD44 +gTextStoryteller_Story21Title:: @ 81AFD44 .string "The BATTLE TOWER Challenger$" -UnknownString_81AFD60:: @ 81AFD60 +gTextStoryteller_Story21Action:: @ 81AFD60 .string "Took the BATTLE TOWER challenge$" -UnknownString_81AFD80:: @ 81AFD80 +gTextStoryteller_Story21Text:: @ 81AFD80 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER took the BATTLE TOWER\n" @@ -344,13 +344,13 @@ UnknownString_81AFD80:: @ 81AFD80 .string "{STR_VAR_3} is a TRAINER who aspires\n" .string "for excellence in the BATTLE TOWER!$" -UnknownString_81AFE1D:: @ 81AFE1D +gTextStoryteller_Story22Title:: @ 81AFE1D .string "The Blend-Loving TRAINER$" -UnknownString_81AFE36:: @ 81AFE36 +gTextStoryteller_Story22Action:: @ 81AFE36 .string "Made {POKEBLOCK}S$" -UnknownString_81AFE42:: @ 81AFE42 +gTextStoryteller_Story22Text:: @ 81AFE42 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER made {POKEBLOCK}S\n" @@ -358,13 +358,13 @@ UnknownString_81AFE42:: @ 81AFE42 .string "There is none better at using a BERRY\n" .string "BLENDER than {STR_VAR_3}!$" -UnknownString_81AFEC2:: @ 81AFEC2 +gTextStoryteller_Story23Title:: @ 81AFEC2 .string "The CONTEST-Loving TRAINER$" -UnknownString_81AFEDD:: @ 81AFEDD +gTextStoryteller_Story23Action:: @ 81AFEDD .string "Entered CONTESTS$" -UnknownString_81AFEEE:: @ 81AFEEE +gTextStoryteller_Story23Text:: @ 81AFEEE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER entered CONTESTS\n" @@ -372,13 +372,13 @@ UnknownString_81AFEEE:: @ 81AFEEE .string "{STR_VAR_3} must love showing off\n" .string "POKéMON to others!$" -UnknownString_81AFF68:: @ 81AFF68 +gTextStoryteller_Story24Title:: @ 81AFF68 .string "The CONTEST Master$" -UnknownString_81AFF7B:: @ 81AFF7B +gTextStoryteller_Story24Action:: @ 81AFF7B .string "Won CONTESTS$" -UnknownString_81AFF88:: @ 81AFF88 +gTextStoryteller_Story24Text:: @ 81AFF88 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won CONTESTS\n" @@ -386,13 +386,13 @@ UnknownString_81AFF88:: @ 81AFF88 .string "{STR_VAR_3} must be an incredible\n" .string "CONTEST master!$" -UnknownString_81AFFFB:: @ 81AFFFB +gTextStoryteller_Story25Title:: @ 81AFFFB .string "The Happy Shopper$" -UnknownString_81B000D:: @ 81B000D +gTextStoryteller_Story25Action:: @ 81B000D .string "Shopped$" -UnknownString_81B0015:: @ 81B0015 +gTextStoryteller_Story25Text:: @ 81B0015 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER bought items in shops\n" @@ -400,13 +400,13 @@ UnknownString_81B0015:: @ 81B0015 .string "{STR_VAR_3} must be one of those\n" .string "people who are born to shop.$" -UnknownString_81B009D:: @ 81B009D +gTextStoryteller_Story26Title:: @ 81B009D .string "The Item-Finding TRAINER$" -UnknownString_81B00B6:: @ 81B00B6 +gTextStoryteller_Story26Action:: @ 81B00B6 .string "Used an ITEMFINDER$" -UnknownString_81B00C9:: @ 81B00C9 +gTextStoryteller_Story26Text:: @ 81B00C9 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used an ITEMFINDER\n" @@ -414,13 +414,13 @@ UnknownString_81B00C9:: @ 81B00C9 .string "{STR_VAR_3} must enjoy scouring the\n" .string "ground for hidden items!$" -UnknownString_81B014D:: @ 81B014D +gTextStoryteller_Story27Title:: @ 81B014D .string "The Rain-Soaked TRAINER$" -UnknownString_81B0165:: @ 81B0165 +gTextStoryteller_Story27Action:: @ 81B0165 .string "Got rained on$" -UnknownString_81B0173:: @ 81B0173 +gTextStoryteller_Story27Text:: @ 81B0173 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER got soaked by rain\n" @@ -428,13 +428,13 @@ UnknownString_81B0173:: @ 81B0173 .string "{STR_VAR_3}’s charisma must even\n" .string "attract rain!$" -UnknownString_81B01E9:: @ 81B01E9 +gTextStoryteller_Story28Title:: @ 81B01E9 .string "The Avid POKéDEX Reader$" -UnknownString_81B0201:: @ 81B0201 +gTextStoryteller_Story28Action:: @ 81B0201 .string "Checked a POKéDEX$" -UnknownString_81B0213:: @ 81B0213 +gTextStoryteller_Story28Text:: @ 81B0213 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER checked a POKéDEX\n" @@ -442,13 +442,13 @@ UnknownString_81B0213:: @ 81B0213 .string "{STR_VAR_3} must love inspecting\n" .string "POKéMON in a POKéDEX!$" -UnknownString_81B0290:: @ 81B0290 +gTextStoryteller_Story29Title:: @ 81B0290 .string "The RIBBON Collector$" -UnknownString_81B02A5:: @ 81B02A5 +gTextStoryteller_Story29Action:: @ 81B02A5 .string "Received RIBBONS$" -UnknownString_81B02B6:: @ 81B02B6 +gTextStoryteller_Story29Text:: @ 81B02B6 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER received RIBBONS\n" @@ -456,13 +456,13 @@ UnknownString_81B02B6:: @ 81B02B6 .string "{STR_VAR_3} must be a TRAINER who\n" .string "loves to collect RIBBONS!$" -UnknownString_81B0337:: @ 81B0337 +gTextStoryteller_Story30Title:: @ 81B0337 .string "The Ledge-Jumping TRAINER$" -UnknownString_81B0351:: @ 81B0351 +gTextStoryteller_Story30Action:: @ 81B0351 .string "Jumped down ledges$" -UnknownString_81B0364:: @ 81B0364 +gTextStoryteller_Story30Text:: @ 81B0364 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER jumped down ledges\n" @@ -470,26 +470,26 @@ UnknownString_81B0364:: @ 81B0364 .string "If there’s a ledge to be jumped,\n" .string "{STR_VAR_3} can’t ignore it!$" -UnknownString_81B03E9:: @ 81B03E9 +gTextStoryteller_Story31Title:: @ 81B03E9 .string "The Legendary TV Viewer$" -UnknownString_81B0401:: @ 81B0401 +gTextStoryteller_Story31Action:: @ 81B0401 .string "Watched TV$" -UnknownString_81B040C:: @ 81B040C +gTextStoryteller_Story31Text:: @ 81B040C .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER watched TV\n" .string "{STR_VAR_1} times!\p" .string "{STR_VAR_3} must love watching TV!$" -UnknownString_81B046E:: @ 81B046E +gTextStoryteller_Story32Title:: @ 81B046E .string "The Time-Conscious TRAINER$" -UnknownString_81B0489:: @ 81B0489 +gTextStoryteller_Story32Action:: @ 81B0489 .string "Checked the time$" -UnknownString_81B049A:: @ 81B049A +gTextStoryteller_Story32Text:: @ 81B049A .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER checked the time\n" @@ -497,13 +497,13 @@ UnknownString_81B049A:: @ 81B049A .string "{STR_VAR_3} must be a punctual TRAINER\n" .string "who’s conscious of the time.$" -UnknownString_81B0523:: @ 81B0523 +gTextStoryteller_Story33Title:: @ 81B0523 .string "The POKéMON LOTTERY Wizard$" -UnknownString_81B053E:: @ 81B053E +gTextStoryteller_Story33Action:: @ 81B053E .string "Won POKéMON LOTTERIES$" -UnknownString_81B0554:: @ 81B0554 +gTextStoryteller_Story33Text:: @ 81B0554 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won POKéMON LOTTERIES\n" @@ -511,13 +511,13 @@ UnknownString_81B0554:: @ 81B0554 .string "{STR_VAR_3} must have many friends\n" .string "to trade POKéMON with!$" -UnknownString_81B05D8:: @ 81B05D8 +gTextStoryteller_Story34Title:: @ 81B05D8 .string "The DAY CARE-Using Trainer$" -UnknownString_81B05F3:: @ 81B05F3 +gTextStoryteller_Story34Action:: @ 81B05F3 .string "Left POKéMON at the DAY CARE$" -UnknownString_81B0610:: @ 81B0610 +gTextStoryteller_Story34Text:: @ 81B0610 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER left POKéMON with the\n" @@ -525,13 +525,13 @@ UnknownString_81B0610:: @ 81B0610 .string "{STR_VAR_3} must be a real go-getter\n" .string "who raises POKéMON aggressively!$" -UnknownString_81B06A9:: @ 81B06A9 +gTextStoryteller_Story35Title:: @ 81B06A9 .string "The CABLE CAR-Loving TRAINER$" -UnknownString_81B06C6:: @ 81B06C6 +gTextStoryteller_Story35Action:: @ 81B06C6 .string "Rode the CABLE CAR$" -UnknownString_81B06D9:: @ 81B06D9 +gTextStoryteller_Story35Text:: @ 81B06D9 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER rode the CABLE CAR\n" @@ -539,13 +539,13 @@ UnknownString_81B06D9:: @ 81B06D9 .string "{STR_VAR_3} must be a busy TRAINER\n" .string "who’s up and down all the time!$" -UnknownString_81B0763:: @ 81B0763 +gTextStoryteller_Story36Title:: @ 81B0763 .string "The Hot Spring-Loving TRAINER$" -UnknownString_81B0781:: @ 81B0781 +gTextStoryteller_Story36Action:: @ 81B0781 .string "Bathed in hot springs$" -UnknownString_81B0797:: @ 81B0797 +gTextStoryteller_Story36Text:: @ 81B0797 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER bathed in hot springs\n" diff --git a/data/text/trader.inc b/data/text/trader.inc index dba63bcf8..599344091 100644 --- a/data/text/trader.inc +++ b/data/text/trader.inc @@ -1,57 +1,57 @@ -MauvilleCity_PokemonCenter_1F_Text_1AE88F:: @ 81AE88F +gTextTrader_Introduction:: @ 81AE88F .string "Hi, I’m the TRADER.\n" .string "Want to trade decorations with me?$" -MauvilleCity_PokemonCenter_1F_Text_1AE8C6:: @ 81AE8C6 +gTextTrader_FeelUnwanted1:: @ 81AE8C6 .string "Oh...\n" .string "I feel unwanted...$" -MauvilleCity_PokemonCenter_1F_Text_1AE8DF:: @ 81AE8DF +gTextTrader_TradedAlready:: @ 81AE8DF .string "But we’ve traded decorations already,\n" .string "you and I.$" -MauvilleCity_PokemonCenter_1F_Text_1AE910:: @ 81AE910 +gTextTrader_MenuPrompt:: @ 81AE910 .string "If you see any decorative item that\n" .string "you want of mine, speak up.$" -MauvilleCity_PokemonCenter_1F_Text_1AE950:: @ 81AE950 +gTextTrader_DontWantAnything:: @ 81AE950 .string "You don’t want anything?\n" .string "I feel unwanted...$" -MauvilleCity_PokemonCenter_1F_Text_1AE97C:: @ 81AE97C +gTextTrader_ItemOnceBelongedTo:: @ 81AE97C .string "That decorative item once belonged\n" .string "to {STR_VAR_1}.\p" .string "Do you want it?$" -MauvilleCity_PokemonCenter_1F_Text_1AE9B6:: @ 81AE9B6 +gTextTrader_YouDontHaveDecorations:: @ 81AE9B6 .string "Uh... Wait a second. You don’t have a\n" .string "single piece of decoration!$" -MauvilleCity_PokemonCenter_1F_Text_1AE9F8:: @ 81AE9F8 +gTextTrader_PickDecorationYoullTrade:: @ 81AE9F8 .string "Okay, pick the decoration that you’ll\n" .string "trade to me.$" -MauvilleCity_PokemonCenter_1F_Text_1AEA2B:: @ 81AEA2B +gTextTrader_FeelUnwanted2:: @ 81AEA2B .string "You won’t trade with me?\n" .string "I feel unwanted...$" -MauvilleCity_PokemonCenter_1F_Text_1AEA57:: @ 81AEA57 +gTextTrader_NoRoomForThis:: @ 81AEA57 .string "You’ve got all the {STR_VAR_2}S that can\n" .string "be stored. You’ve no room for this.$" -MauvilleCity_PokemonCenter_1F_Text_1AEA9B:: @ 81AEA9B +gTextTrader_SoWellTrade:: @ 81AEA9B .string "Okay, so we’ll trade my {STR_VAR_3}\n" .string "for your {STR_VAR_2}?$" -MauvilleCity_PokemonCenter_1F_Text_1AEAC3:: @ 81AEAC3 +gTextTrader_InUseYouCantTradeIt:: @ 81AEAC3 .string "That piece of decoration is in use.\n" .string "You can’t trade it.$" -MauvilleCity_PokemonCenter_1F_Text_1AEAFB:: @ 81AEAFB +gTextTrader_ThenWellTrade:: @ 81AEAFB .string "Then we’ll trade!\n" .string "I’ll send my decoration to your PC.$" -MauvilleCity_PokemonCenter_1F_Text_1AEB31:: @ 81AEB31 +gTextTrader_ICantTradeThatOneAway:: @ 81AEB31 .string "Oops! Sorry!\n" .string "That’s a really rare piece of decoration.\l" .string "I can’t trade that one away!\p" -- cgit v1.2.3 From 19e06e09c9579c8230c66d6d0d267c5b722637e5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 19:37:36 -0500 Subject: actually fix build --- data/scripts/mauville_man.inc | 26 +++++++++++++------------- data/text/storyteller.inc | 18 +++++++++--------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 780017442..6a8f5f051 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -204,13 +204,13 @@ speak_to_storyteller:: @ 81B0816 faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO compare RESULT, NO - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jumpeq dont_hear_tale 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 + message gTextStoryteller_WhichTale waittext special sub_80F8874 waitstate @@ -227,12 +227,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 compare 0x8008, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jumpeq dont_hear_tale jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, MSGBOX_YESNO + msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 + msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F @@ -246,34 +246,34 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 + msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, MSGBOX_YESNO + msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jumpeq dont_hear_tale specialval RESULT, sub_80F88FC compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4 + msgbox gTextStoryteller_ImNotSatisfied, 4 closebutton release end MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4 + msgbox gTextStoryteller_BirthOfANewLegend, 4 closebutton release end -MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4 +dont_hear_tale:: @ 81B0914 + msgbox gTextStoryteller_OhIFeelStifled, 4 closebutton release end MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4 + msgbox gTextStoryteller_WishMorePeopleWould, 4 closebutton release end diff --git a/data/text/storyteller.inc b/data/text/storyteller.inc index ad131ec54..437a1fa21 100644 --- a/data/text/storyteller.inc +++ b/data/text/storyteller.inc @@ -4,21 +4,21 @@ gTextStoryteller_Introduction:: @ 81AECC6 .string "TRAINERS.\p" .string "Will you hear my tale?$" -MauvilleCity_PokemonCenter_1F_Text_1AED1D:: @ 81AED1D +gTextStoryteller_OhIFeelStifled:: @ 81AED1D .string "Oh...\n" .string "I feel stifled...$" -MauvilleCity_PokemonCenter_1F_Text_1AED35:: @ 81AED35 +gTextStoryteller_WhichTale:: @ 81AED35 .string "I know of these legends.\n" .string "Which tale will you have me tell?$" -MauvilleCity_PokemonCenter_1F_Text_1AED70:: @ 81AED70 +gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70 .string "But, I know of no legendary TRAINERS.\n" .string "Hence, I know no tales.\p" .string "Where does one find a TRAINER worthy\n" .string "of a legendary tale?$" -MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8 +gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8 .string "What’s that?!\n" .string "You... You...\p" .string "{STR_VAR_2}\n" @@ -26,27 +26,27 @@ MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8 .string "That is indeed magnificent!\n" .string "It’s the birth of a new legend!$" -MauvilleCity_PokemonCenter_1F_Text_1AEE50:: @ 81AEE50 +gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50 .string "It gets me thinking, could there be\n" .string "other TRAINERS with more impressive\l" .string "legends awaiting discovery?$" -MauvilleCity_PokemonCenter_1F_Text_1AEEB4:: @ 81AEEB4 +gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4 .string "Are you a TRAINER?\p" .string "Then tell me, have you any tales that\n" .string "are even remotely legendary?$" -MauvilleCity_PokemonCenter_1F_Text_1AEF0A:: @ 81AEF0A +gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A .string "Incidentally... Would you care to hear\n" .string "another legendary tale?$" -MauvilleCity_PokemonCenter_1F_Text_1AEF49:: @ 81AEF49 +gTextStoryteller_ImNotSatisfied:: @ 81AEF49 .string "Hmm...\n" .string "I’m not satisfied...\p" .string "I wish you would bring me news worthy\n" .string "of being called a legend.$" -MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5 +gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5 .string "I wish more people would be interested\n" .string "in hearing my epic tales of legendary\l" .string "TRAINERS.$" -- cgit v1.2.3 From 8c57ef0fad270bc795d0b64a75d96fafc0f63513 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 20:50:39 -0500 Subject: finish labeling script --- data/scripts/mauville_man.inc | 161 +++++++++++++++++++----------------------- data/specials.inc | 14 ++-- data/text/giddy.inc | 8 +-- 3 files changed, 84 insertions(+), 99 deletions(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 6a8f5f051..239c360dc 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -14,7 +14,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 case MAUVILLE_MAN_HIPSTER, speak_to_hipster case MAUVILLE_MAN_TRADER, speak_to_trader case MAUVILLE_MAN_STORYTELLER, speak_to_storyteller - case MAUVILLE_MAN_GIDDY, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB + case MAUVILLE_MAN_GIDDY, speak_to_giddy end @------------------------------------------------------------------------------- @@ -145,10 +145,10 @@ do_trader_menu_get: jumpeq player_has_no_decorations jump do_trader_menu_give end -cancelled_get_menu:: @ 81AEC2D +cancelled_get_menu: msgbox gTextTrader_DontWantAnything, 2 end -rare_item_cant_trade_away:: @ 81AEC36 +rare_item_cant_trade_away: message gTextTrader_ICantTradeThatOneAway waittext jump do_trader_menu_get @@ -158,10 +158,10 @@ dont_want_item: waittext jump do_trader_menu_get end -player_has_no_decorations:: @ 81AEC4E +player_has_no_decorations: msgbox gTextTrader_YouDontHaveDecorations, 2 end -do_trader_menu_give:: @ 81AEC57 +do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration waitstate @@ -178,14 +178,14 @@ do_trader_menu_give:: @ 81AEC57 special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 end -cancelled_give_menu:: @ 81AECA6 +cancelled_give_menu: msgbox gTextTrader_FeelUnwanted2, 2 end -decoration_is_in_use:: @ 81AECAF +decoration_is_in_use: msgbox gTextTrader_InUseYouCantTradeIt, 4 jump do_trader_menu_give end -decorations_full:: @ 81AECBD +decorations_full: msgbox gTextTrader_NoRoomForThis, 2 end @@ -195,7 +195,7 @@ decorations_full:: @ 81AECBD .include "data/text/storyteller.inc" -speak_to_storyteller:: @ 81B0816 +speak_to_storyteller: setvar 0x8008, 0 setvar 0x8009, 0 setvar 0x800a, 0 @@ -204,75 +204,66 @@ speak_to_storyteller:: @ 81B0816 faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO compare RESULT, NO - jumpeq dont_hear_tale - specialval RESULT, sub_80F889C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3 - -MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F + jumpeq dont_hear_story + specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot + compare RESULT, 0 @ If slot is 0, then the list is empty + jumpeq no_stories_recorded +choose_story: message gTextStoryteller_WhichTale waittext - special sub_80F8874 + special ScrSpecial_StorytellerStoryListMenu waitstate - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883 + compare RESULT, FALSE + jumpeq cancel_story_menu setvar 0x8008, 1 - special sub_80F8888 + special ScrSpecial_StorytellerDisplayStory waittext waitbutton - specialval RESULT, sub_80F88AC - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909 - -MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 + specialval RESULT, ScrSpecial_StorytellerUpdateStat + compare RESULT, FALSE + jumpeq no_stat_update + jump stat_update +cancel_story_menu: compare 0x8008, 0 - jumpeq dont_hear_tale - jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE - -MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 + jumpeq dont_hear_story + jump yes_hear_story +no_stat_update: msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F - -MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE - specialval RESULT, sub_80F88E0 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - specialval RESULT, sub_80F889C + compare RESULT, YES + jumpeq choose_story +yes_hear_story: + specialval RESULT, ScrSpecial_HasStorytellerAlreadyRecorded + compare RESULT, TRUE + jumpeq cant_record_story @ already recorded story + specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare RESULT, 4 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB - -MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 + jumpeq cant_record_story @ story list is full + jump prompt_record_story +no_stories_recorded: msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 - -MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB +prompt_record_story: msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO - compare RESULT, 0 - jumpeq dont_hear_tale - specialval RESULT, sub_80F88FC - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 + compare RESULT, NO + jumpeq dont_hear_story + specialval RESULT, ScrSpecial_StorytellerInitializeRandomStat + compare RESULT, TRUE + jumpeq stat_update msgbox gTextStoryteller_ImNotSatisfied, 4 closebutton release end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 +stat_update: msgbox gTextStoryteller_BirthOfANewLegend, 4 closebutton release end - -dont_hear_tale:: @ 81B0914 +dont_hear_story: msgbox gTextStoryteller_OhIFeelStifled, 4 closebutton release end - -MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F +cant_record_story: msgbox gTextStoryteller_WishMorePeopleWould, 4 closebutton release @@ -284,55 +275,49 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F .include "data/text/giddy.inc" -MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB +speak_to_giddy: lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, MSGBOX_YESNO - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F + msgbox gTextGiddy_Introduction, MSGBOX_YESNO + compare RESULT, YES + jumpeq yes_hear_giddy + compare RESULT, NO + jumpeq dont_hear_giddy end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C - special sub_80F7CC8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 +yes_hear_giddy: + special ScrSpecial_GiddyShouldTellAnotherTale + compare RESULT, TRUE + jumpeq tell_giddy_tale + compare RESULT, FALSE + jumpeq bye_bye end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26 - special sub_80F7CC8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 +tell_another_giddy_tale: + special ScrSpecial_GiddyShouldTellAnotherTale + compare RESULT, TRUE + jumpeq also_i_was_thinking + compare RESULT, FALSE + jumpeq bye_bye end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E +also_i_was_thinking: + msgbox gTextGiddy_AlsoIWasThinking, 4 + jump tell_giddy_tale end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E +tell_giddy_tale: special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 waittext yesnobox 20, 8 compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + jumpeq tell_another_giddy_tale compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + jumpeq tell_another_giddy_tale end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F - msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4 +dont_hear_giddy: + msgbox gTextGiddy_YouveDeflatedMe, 4 release end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4 +bye_bye: + msgbox gTextGiddy_ByeBye, 4 release end diff --git a/data/specials.inc b/data/specials.inc index cff97f455..a17bc943a 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -113,13 +113,13 @@ gSpecials:: def_special ScrSpecial_PlayBardSong def_special sub_80F83D0 def_special ScrSpecial_GenerateGiddyLine - 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 ScrSpecial_GiddyShouldTellAnotherTale + def_special ScrSpecial_StorytellerGetFreeStorySlot + def_special ScrSpecial_StorytellerDisplayStory + def_special ScrSpecial_StorytellerStoryListMenu + def_special ScrSpecial_StorytellerUpdateStat + def_special ScrSpecial_StorytellerInitializeRandomStat + def_special ScrSpecial_HasStorytellerAlreadyRecorded def_special ScrSpecial_TraderMenuGetDecoration def_special ScrSpecial_GetTraderTradedFlag def_special ScrSpecial_DoesPlayerHaveNoDecorations diff --git a/data/text/giddy.inc b/data/text/giddy.inc index 040ef2ae5..a763776bf 100644 --- a/data/text/giddy.inc +++ b/data/text/giddy.inc @@ -1,16 +1,16 @@ -MauvilleCity_PokemonCenter_1F_Text_1B092A:: @ 81B092A +gTextGiddy_Introduction:: @ 81B092A .string "I’m GIDDY!\n" .string "I have a scintillating story for you!\p" .string "Would you like to hear my story?$" -MauvilleCity_PokemonCenter_1F_Text_1B097C:: @ 81B097C +gTextGiddy_YouveDeflatedMe:: @ 81B097C .string "Oh...\n" .string "You’ve deflated me...$" -MauvilleCity_PokemonCenter_1F_Text_1B0998:: @ 81B0998 +gTextGiddy_AlsoIWasThinking:: @ 81B0998 .string "Also, I was thinking...$" -MauvilleCity_PokemonCenter_1F_Text_1B09B0:: @ 81B09B0 +gTextGiddy_ByeBye:: @ 81B09B0 .string "That’s about it, I think...\p" .string "We should chat again!\n" .string "Bye-bye!$" -- cgit v1.2.3 From b6ea4d9a77cdb6b416d3dd94eef68ce8a56cd4eb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 21:18:07 -0500 Subject: label more stuff in mauville_old_man.c --- data/scripts/mauville_man.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 239c360dc..159d729f6 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -322,4 +322,4 @@ bye_bye: end .include "data/text/bard.inc" - .include "data/text/hipster.inc" \ No newline at end of file + .include "data/text/hipster.inc" -- cgit v1.2.3 From 77ae82fc51c8c84e338b15e801f0a98dd5cbe1ef Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 27 Aug 2017 14:15:39 +0200 Subject: move data to C --- data/evolution_scene.s | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 data/evolution_scene.s (limited to 'data') diff --git a/data/evolution_scene.s b/data/evolution_scene.s deleted file mode 100644 index 24744a196..000000000 --- a/data/evolution_scene.s +++ /dev/null @@ -1,14 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_083F868C:: @ 83F868C - .string "ヌケニン$" - - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}$" - .string "▶\n $" - .string " \n▶$" - .string " \n $" - - .space 9 -- cgit v1.2.3 From c6e0f8cfd74c83165838e227efba27a8f9166133 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 28 Aug 2017 21:09:02 +0200 Subject: start decomp of pokemon menu --- data/pokemon_menu.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/pokemon_menu.s b/data/pokemon_menu.s index 9e2ce2864..477b33a4a 100644 --- a/data/pokemon_menu.s +++ b/data/pokemon_menu.s @@ -4,7 +4,7 @@ .section .rodata .align 2 -gPokemonMenuActions:: @ 839F494 +sPokemonMenuActions:: @ 839F494 .4byte OtherText_Summary, PokemonMenu_Summary .4byte OtherText_Switch2, PokemonMenu_Switch .4byte OtherText_Item, PokemonMenu_Item @@ -31,7 +31,7 @@ gPokemonMenuActions:: @ 839F494 .4byte gMoveNames + 13 * MOVE_SWEET_SCENT, PokemonMenu_FieldMove .align 1 -gUnknown_0839F554:: @ 839F554 +sPokeMenuFieldMoves:: @ 839F554 .2byte MOVE_CUT .2byte MOVE_FLASH .2byte MOVE_ROCK_SMASH -- cgit v1.2.3 From 2bc843ccbbf3baa9b69e544e4f23e1d02b597fd8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 28 Aug 2017 21:41:57 -0500 Subject: clean up mauville man script --- data/scripts/mauville_man.inc | 52 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 10 deletions(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 159d729f6..997b5a31c 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -10,18 +10,19 @@ MAUVILLE_MAN_GIDDY = 4 MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 special ScrSpecial_GetCurrentMauvilleMan switch RESULT - case MAUVILLE_MAN_BARD, speak_to_bard - case MAUVILLE_MAN_HIPSTER, speak_to_hipster - case MAUVILLE_MAN_TRADER, speak_to_trader - case MAUVILLE_MAN_STORYTELLER, speak_to_storyteller - case MAUVILLE_MAN_GIDDY, speak_to_giddy + case MAUVILLE_MAN_BARD, SpeakToBard + case MAUVILLE_MAN_HIPSTER, SpeakToHipster + case MAUVILLE_MAN_TRADER, SpeakToTrader + case MAUVILLE_MAN_STORYTELLER, SpeakToStoryteller + case MAUVILLE_MAN_GIDDY, SpeakToGiddy end + @------------------------------------------------------------------------------- @ Bard @------------------------------------------------------------------------------- -speak_to_bard: +SpeakToBard: lock faceplayer msgbox gTextBard_HiImTheBard, MSGBOX_YESNO @@ -30,6 +31,7 @@ speak_to_bard: compare RESULT, NO jumpeq dont_hear_song end + yes_hear_song: setvar 0x8004, 0 @ Give the player ear rape @@ -42,10 +44,12 @@ yes_hear_song: msgbox gTextBard_OhWhatAMovingSong, 4 release end + dont_hear_song: msgbox gTextBard_OhYouveLeftMe, 4 release end + prompt_write_lyrics: msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO compare RESULT, YES @@ -53,6 +57,7 @@ prompt_write_lyrics: compare RESULT, NO jumpeq dont_write_lyrics end + write_lyrics: setvar 0x8004, 6 call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 @@ -72,16 +77,18 @@ write_lyrics: msgbox gTextBard_OkayThatsIt, 4 release end + dont_write_lyrics: msgbox gTextBard_OhYouveLeftMe2, 4 release end + @------------------------------------------------------------------------------- @ Hipster @------------------------------------------------------------------------------- -speak_to_hipster: +SpeakToHipster: lock faceplayer setflag 2054 @@ -92,6 +99,7 @@ speak_to_hipster: msgbox gTextHipster_TaughtYouAlready, 4 release end + hipster_first_time: special ScrSpecial_HipsterTeachWord compare RESULT, TRUE @ TRUE if player learned a new word @@ -99,19 +107,21 @@ hipster_first_time: msgbox gTextHipster_YouAlreadyKnowALot, 4 release end + teach_new_word: msgbox gTextHipster_HaveYouHeardAbout, 4 special ScrSpecial_SetHipsterSpokenFlag release end + @------------------------------------------------------------------------------- @ Trader @------------------------------------------------------------------------------- .include "data/text/trader.inc" -speak_to_trader: +SpeakToTrader: lock faceplayer msgbox gTextTrader_Introduction, MSGBOX_YESNO @@ -124,12 +134,15 @@ speak_to_trader: waittext jump do_trader_menu_get end + dont_want_to_trade: msgbox gTextTrader_FeelUnwanted1, 2 end + already_traded: msgbox gTextTrader_TradedAlready, 2 end + do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate @@ -145,22 +158,27 @@ do_trader_menu_get: jumpeq player_has_no_decorations jump do_trader_menu_give end + cancelled_get_menu: msgbox gTextTrader_DontWantAnything, 2 end + rare_item_cant_trade_away: message gTextTrader_ICantTradeThatOneAway waittext jump do_trader_menu_get end + dont_want_item: message gTextTrader_MenuPrompt waittext jump do_trader_menu_get end + player_has_no_decorations: msgbox gTextTrader_YouDontHaveDecorations, 2 end + do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration @@ -178,24 +196,28 @@ do_trader_menu_give: special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 end + cancelled_give_menu: msgbox gTextTrader_FeelUnwanted2, 2 end + decoration_is_in_use: msgbox gTextTrader_InUseYouCantTradeIt, 4 jump do_trader_menu_give end + decorations_full: msgbox gTextTrader_NoRoomForThis, 2 end + @------------------------------------------------------------------------------- @ Storyteller @------------------------------------------------------------------------------- .include "data/text/storyteller.inc" -speak_to_storyteller: +SpeakToStoryteller: setvar 0x8008, 0 setvar 0x8009, 0 setvar 0x800a, 0 @@ -253,29 +275,33 @@ prompt_record_story: closebutton release end + stat_update: msgbox gTextStoryteller_BirthOfANewLegend, 4 closebutton release end + dont_hear_story: msgbox gTextStoryteller_OhIFeelStifled, 4 closebutton release end + cant_record_story: msgbox gTextStoryteller_WishMorePeopleWould, 4 closebutton release end + @------------------------------------------------------------------------------- @ Giddy @------------------------------------------------------------------------------- .include "data/text/giddy.inc" -speak_to_giddy: +SpeakToGiddy: lock faceplayer msgbox gTextGiddy_Introduction, MSGBOX_YESNO @@ -284,6 +310,7 @@ speak_to_giddy: compare RESULT, NO jumpeq dont_hear_giddy end + yes_hear_giddy: special ScrSpecial_GiddyShouldTellAnotherTale compare RESULT, TRUE @@ -291,6 +318,7 @@ yes_hear_giddy: compare RESULT, FALSE jumpeq bye_bye end + tell_another_giddy_tale: special ScrSpecial_GiddyShouldTellAnotherTale compare RESULT, TRUE @@ -298,10 +326,12 @@ tell_another_giddy_tale: compare RESULT, FALSE jumpeq bye_bye end + also_i_was_thinking: msgbox gTextGiddy_AlsoIWasThinking, 4 jump tell_giddy_tale end + tell_giddy_tale: special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 @@ -312,10 +342,12 @@ tell_giddy_tale: compare RESULT, 0 jumpeq tell_another_giddy_tale end + dont_hear_giddy: msgbox gTextGiddy_YouveDeflatedMe, 4 release end + bye_bye: msgbox gTextGiddy_ByeBye, 4 release -- cgit v1.2.3 From 0e382fbe2c5ed74708235737746420ab88a1e78f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 29 Aug 2017 23:18:35 +0200 Subject: decompile pokemon_menu --- data/pokemon_menu.s | 82 ----------------------------------------------------- 1 file changed, 82 deletions(-) delete mode 100644 data/pokemon_menu.s (limited to 'data') diff --git a/data/pokemon_menu.s b/data/pokemon_menu.s deleted file mode 100644 index 477b33a4a..000000000 --- a/data/pokemon_menu.s +++ /dev/null @@ -1,82 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -sPokemonMenuActions:: @ 839F494 - .4byte OtherText_Summary, PokemonMenu_Summary - .4byte OtherText_Switch2, PokemonMenu_Switch - .4byte OtherText_Item, PokemonMenu_Item - .4byte gOtherText_CancelNoTerminator, PokemonMenu_Cancel - .4byte OtherText_Give2, PokemonMenu_GiveItem - .4byte OtherText_Take2, PokemonMenu_TakeItem - .4byte OtherText_Take, PokemonMenu_TakeMail - .4byte OtherText_Mail, PokemonMenu_Mail - .4byte OtherText_Read2, PokemonMenu_ReadMail - .4byte gOtherText_CancelNoTerminator, PokemonMenu_CancelSubmenu - .4byte gMoveNames + 13 * MOVE_CUT, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_FLASH, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_ROCK_SMASH, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_STRENGTH, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_SURF, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_FLY, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_DIVE, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_WATERFALL, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_TELEPORT, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_DIG, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_SECRET_POWER, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_MILK_DRINK, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_SOFT_BOILED, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_SWEET_SCENT, PokemonMenu_FieldMove - - .align 1 -sPokeMenuFieldMoves:: @ 839F554 - .2byte MOVE_CUT - .2byte MOVE_FLASH - .2byte MOVE_ROCK_SMASH - .2byte MOVE_STRENGTH - .2byte MOVE_SURF - .2byte MOVE_FLY - .2byte MOVE_DIVE - .2byte MOVE_WATERFALL - .2byte MOVE_TELEPORT - .2byte MOVE_DIG - .2byte MOVE_SECRET_POWER - .2byte MOVE_MILK_DRINK - .2byte MOVE_SOFT_BOILED - .2byte MOVE_SWEET_SCENT - .2byte 0xFF - -Unknown_39F572: @ 839F572 - .byte 4, 5, 9, 0 - - .align 2 -gUnknown_0839F578:: @ 839F578 - .byte 3, 6, 0, 0 - .4byte Unknown_39F572 - -Unknown_39F580: @ 839F580 - .byte 8, 6, 9, 0 - - .align 2 -gUnknown_0839F584:: @ 839F584 - .byte 3, 9, 0, 0 - .4byte Unknown_39F580 - - .align 2 -gFieldMoveFuncs:: @ 839F58C - .4byte SetUpFieldMove_Cut, 0x6 - .4byte SetUpFieldMove_Flash, 0x9 - .4byte SetUpFieldMove_RockSmash, 0x9 - .4byte SetUpFieldMove_Strength, 0x9 - .4byte SetUpFieldMove_Surf, 0x7 - .4byte SetUpFieldMove_Fly, 0x9 - .4byte SetUpFieldMove_Dive, 0x9 - .4byte SetUpFieldMove_Waterfall, 0x9 - .4byte SetUpFieldMove_Teleport, 0x9 - .4byte SetUpFieldMove_Dig, 0x9 - .4byte SetUpFieldMove_SecretPower, 0x9 - .4byte SetUpFieldMove_SoftBoiled, 0x10 - .4byte SetUpFieldMove_SoftBoiled, 0x10 - .4byte SetUpFieldMove_SweetScent, 0x9 -- cgit v1.2.3 From 7755869cd2b521cb0a608f5f71c8a272e81cb214 Mon Sep 17 00:00:00 2001 From: scnorton Date: Wed, 30 Aug 2017 09:43:48 -0400 Subject: Convert egg moves and daycare strings/pointers to C objects --- data/daycare.s | 17 - data/egg_moves.inc | 1306 ---------------------------------------------------- 2 files changed, 1323 deletions(-) delete mode 100644 data/daycare.s delete mode 100644 data/egg_moves.inc (limited to 'data') diff --git a/data/daycare.s b/data/daycare.s deleted file mode 100644 index 92eb4637e..000000000 --- a/data/daycare.s +++ /dev/null @@ -1,17 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 82091DC - .include "data/egg_moves.inc" - - .align 2 -gUnknown_08209AC4:: @ 8209AC4 - .4byte DaycareText_GetAlongVeryWell - .4byte DaycareText_GetAlong - .4byte DaycareText_DontLikeOther - .4byte DaycareText_PlayOther - -gUnknown_08209AD4:: @ 8209AD4 - .string "タマゴ$" diff --git a/data/egg_moves.inc b/data/egg_moves.inc deleted file mode 100644 index e684e04ce..000000000 --- a/data/egg_moves.inc +++ /dev/null @@ -1,1306 +0,0 @@ - .align 2 -gEggMoves:: @ 82091DC - egg_moves_begin SPECIES_BULBASAUR - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_SKULL_BASH - .2byte MOVE_SAFEGUARD - .2byte MOVE_CHARM - .2byte MOVE_PETAL_DANCE - .2byte MOVE_MAGICAL_LEAF - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_CHARMANDER - .2byte MOVE_BELLY_DRUM - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_BITE - .2byte MOVE_OUTRAGE - .2byte MOVE_BEAT_UP - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_DRAGON_DANCE - - egg_moves_begin SPECIES_SQUIRTLE - .2byte MOVE_MIRROR_COAT - .2byte MOVE_HAZE - .2byte MOVE_MIST - .2byte MOVE_FORESIGHT - .2byte MOVE_FLAIL - .2byte MOVE_REFRESH - .2byte MOVE_MUD_SPORT - .2byte MOVE_YAWN - - egg_moves_begin SPECIES_PIDGEY - .2byte MOVE_PURSUIT - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_FORESIGHT - .2byte MOVE_STEEL_WING - .2byte MOVE_AIR_CUTTER - - egg_moves_begin SPECIES_RATTATA - .2byte MOVE_SCREECH - .2byte MOVE_FLAME_WHEEL - .2byte MOVE_FURY_SWIPES - .2byte MOVE_BITE - .2byte MOVE_COUNTER - .2byte MOVE_REVERSAL - .2byte MOVE_UPROAR - .2byte MOVE_SWAGGER - - egg_moves_begin SPECIES_SPEAROW - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_SCARY_FACE - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_TRI_ATTACK - .2byte MOVE_ASTONISH - .2byte MOVE_SKY_ATTACK - - egg_moves_begin SPECIES_EKANS - .2byte MOVE_PURSUIT - .2byte MOVE_SLAM - .2byte MOVE_SPITE - .2byte MOVE_BEAT_UP - .2byte MOVE_POISON_FANG - - egg_moves_begin SPECIES_SANDSHREW - .2byte MOVE_FLAIL - .2byte MOVE_SAFEGUARD - .2byte MOVE_COUNTER - .2byte MOVE_RAPID_SPIN - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_METAL_CLAW - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_CRUSH_CLAW - - egg_moves_begin SPECIES_NIDORAN_F - .2byte MOVE_SUPERSONIC - .2byte MOVE_DISABLE - .2byte MOVE_TAKE_DOWN - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_CHARM - .2byte MOVE_COUNTER - .2byte MOVE_BEAT_UP - - egg_moves_begin SPECIES_NIDORAN_M - .2byte MOVE_COUNTER - .2byte MOVE_DISABLE - .2byte MOVE_SUPERSONIC - .2byte MOVE_TAKE_DOWN - .2byte MOVE_AMNESIA - .2byte MOVE_CONFUSION - .2byte MOVE_BEAT_UP - - egg_moves_begin SPECIES_VULPIX - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_HYPNOSIS - .2byte MOVE_FLAIL - .2byte MOVE_SPITE - .2byte MOVE_DISABLE - .2byte MOVE_HOWL - .2byte MOVE_PSYCH_UP - .2byte MOVE_HEAT_WAVE - - egg_moves_begin SPECIES_ZUBAT - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_PURSUIT - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_GUST - .2byte MOVE_WHIRLWIND - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_ODDISH - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_RAZOR_LEAF - .2byte MOVE_FLAIL - .2byte MOVE_SYNTHESIS - .2byte MOVE_CHARM - .2byte MOVE_INGRAIN - - egg_moves_begin SPECIES_PARAS - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_SCREECH - .2byte MOVE_COUNTER - .2byte MOVE_PSYBEAM - .2byte MOVE_FLAIL - .2byte MOVE_SWEET_SCENT - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_PURSUIT - - egg_moves_begin SPECIES_VENONAT - .2byte MOVE_BATON_PASS - .2byte MOVE_SCREECH - .2byte MOVE_GIGA_DRAIN - .2byte MOVE_SIGNAL_BEAM - - egg_moves_begin SPECIES_DIGLETT - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_SCREECH - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_PURSUIT - .2byte MOVE_BEAT_UP - .2byte MOVE_UPROAR - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_MEOWTH - .2byte MOVE_SPITE - .2byte MOVE_CHARM - .2byte MOVE_HYPNOSIS - .2byte MOVE_AMNESIA - .2byte MOVE_PSYCH_UP - .2byte MOVE_ASSIST - - egg_moves_begin SPECIES_PSYDUCK - .2byte MOVE_HYPNOSIS - .2byte MOVE_PSYBEAM - .2byte MOVE_FORESIGHT - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_PSYCHIC - .2byte MOVE_CROSS_CHOP - .2byte MOVE_REFRESH - - egg_moves_begin SPECIES_MANKEY - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_FORESIGHT - .2byte MOVE_MEDITATE - .2byte MOVE_COUNTER - .2byte MOVE_REVERSAL - .2byte MOVE_BEAT_UP - .2byte MOVE_REVENGE - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_GROWLITHE - .2byte MOVE_BODY_SLAM - .2byte MOVE_SAFEGUARD - .2byte MOVE_CRUNCH - .2byte MOVE_THRASH - .2byte MOVE_FIRE_SPIN - .2byte MOVE_HOWL - .2byte MOVE_HEAT_WAVE - - egg_moves_begin SPECIES_POLIWAG - .2byte MOVE_MIST - .2byte MOVE_SPLASH - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_HAZE - .2byte MOVE_MIND_READER - .2byte MOVE_WATER_SPORT - .2byte MOVE_ICE_BALL - - egg_moves_begin SPECIES_ABRA - .2byte MOVE_ENCORE - .2byte MOVE_BARRIER - .2byte MOVE_KNOCK_OFF - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_THUNDER_PUNCH - .2byte MOVE_ICE_PUNCH - - egg_moves_begin SPECIES_MACHOP - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_MEDITATE - .2byte MOVE_ROLLING_KICK - .2byte MOVE_ENCORE - .2byte MOVE_SMELLING_SALT - .2byte MOVE_COUNTER - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_BELLSPROUT - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_ENCORE - .2byte MOVE_REFLECT - .2byte MOVE_SYNTHESIS - .2byte MOVE_LEECH_LIFE - .2byte MOVE_INGRAIN - .2byte MOVE_MAGICAL_LEAF - - egg_moves_begin SPECIES_TENTACOOL - .2byte MOVE_AURORA_BEAM - .2byte MOVE_MIRROR_COAT - .2byte MOVE_RAPID_SPIN - .2byte MOVE_HAZE - .2byte MOVE_SAFEGUARD - .2byte MOVE_CONFUSE_RAY - - egg_moves_begin SPECIES_GEODUDE - .2byte MOVE_MEGA_PUNCH - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_BLOCK - - egg_moves_begin SPECIES_PONYTA - .2byte MOVE_FLAME_WHEEL - .2byte MOVE_THRASH - .2byte MOVE_DOUBLE_KICK - .2byte MOVE_HYPNOSIS - .2byte MOVE_CHARM - .2byte MOVE_DOUBLE_EDGE - - egg_moves_begin SPECIES_SLOWPOKE - .2byte MOVE_SAFEGUARD - .2byte MOVE_BELLY_DRUM - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_STOMP - .2byte MOVE_MUD_SPORT - .2byte MOVE_SLEEP_TALK - .2byte MOVE_SNORE - - egg_moves_begin SPECIES_FARFETCHD - .2byte MOVE_STEEL_WING - .2byte MOVE_FORESIGHT - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_GUST - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_FLAIL - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_DODUO - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_SUPERSONIC - .2byte MOVE_HAZE - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_FLAIL - .2byte MOVE_ENDEAVOR - - egg_moves_begin SPECIES_SEEL - .2byte MOVE_LICK - .2byte MOVE_PERISH_SONG - .2byte MOVE_DISABLE - .2byte MOVE_HORN_DRILL - .2byte MOVE_SLAM - .2byte MOVE_ENCORE - .2byte MOVE_FAKE_OUT - .2byte MOVE_ICICLE_SPEAR - - egg_moves_begin SPECIES_GRIMER - .2byte MOVE_HAZE - .2byte MOVE_MEAN_LOOK - .2byte MOVE_LICK - .2byte MOVE_IMPRISON - .2byte MOVE_CURSE - .2byte MOVE_SHADOW_PUNCH - .2byte MOVE_EXPLOSION - - egg_moves_begin SPECIES_SHELLDER - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_TAKE_DOWN - .2byte MOVE_BARRIER - .2byte MOVE_RAPID_SPIN - .2byte MOVE_SCREECH - .2byte MOVE_ICICLE_SPEAR - - egg_moves_begin SPECIES_GASTLY - .2byte MOVE_PSYWAVE - .2byte MOVE_PERISH_SONG - .2byte MOVE_HAZE - .2byte MOVE_ASTONISH - .2byte MOVE_WILL_O_WISP - .2byte MOVE_GRUDGE - .2byte MOVE_EXPLOSION - - egg_moves_begin SPECIES_ONIX - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_FLAIL - .2byte MOVE_EXPLOSION - .2byte MOVE_BLOCK - - egg_moves_begin SPECIES_DROWZEE - .2byte MOVE_BARRIER - .2byte MOVE_ASSIST - .2byte MOVE_ROLE_PLAY - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_THUNDER_PUNCH - .2byte MOVE_ICE_PUNCH - - egg_moves_begin SPECIES_KRABBY - .2byte MOVE_DIG - .2byte MOVE_HAZE - .2byte MOVE_AMNESIA - .2byte MOVE_FLAIL - .2byte MOVE_SLAM - .2byte MOVE_KNOCK_OFF - .2byte MOVE_SWORDS_DANCE - - egg_moves_begin SPECIES_EXEGGCUTE - .2byte MOVE_SYNTHESIS - .2byte MOVE_MOONLIGHT - .2byte MOVE_REFLECT - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_PSYCH_UP - .2byte MOVE_INGRAIN - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_CUBONE - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_BELLY_DRUM - .2byte MOVE_SCREECH - .2byte MOVE_SKULL_BASH - .2byte MOVE_PERISH_SONG - .2byte MOVE_SWORDS_DANCE - - egg_moves_begin SPECIES_LICKITUNG - .2byte MOVE_BELLY_DRUM - .2byte MOVE_MAGNITUDE - .2byte MOVE_BODY_SLAM - .2byte MOVE_CURSE - .2byte MOVE_SMELLING_SALT - .2byte MOVE_SLEEP_TALK - .2byte MOVE_SNORE - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_KOFFING - .2byte MOVE_SCREECH - .2byte MOVE_PSYWAVE - .2byte MOVE_PSYBEAM - .2byte MOVE_DESTINY_BOND - .2byte MOVE_PAIN_SPLIT - .2byte MOVE_WILL_O_WISP - - egg_moves_begin SPECIES_RHYHORN - .2byte MOVE_CRUNCH - .2byte MOVE_REVERSAL - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_COUNTER - .2byte MOVE_MAGNITUDE - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_CURSE - .2byte MOVE_CRUSH_CLAW - - egg_moves_begin SPECIES_CHANSEY - .2byte MOVE_PRESENT - .2byte MOVE_METRONOME - .2byte MOVE_HEAL_BELL - .2byte MOVE_AROMATHERAPY - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_TANGELA - .2byte MOVE_FLAIL - .2byte MOVE_CONFUSION - .2byte MOVE_MEGA_DRAIN - .2byte MOVE_REFLECT - .2byte MOVE_AMNESIA - .2byte MOVE_LEECH_SEED - .2byte MOVE_NATURE_POWER - - egg_moves_begin SPECIES_KANGASKHAN - .2byte MOVE_STOMP - .2byte MOVE_FORESIGHT - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_SAFEGUARD - .2byte MOVE_DISABLE - .2byte MOVE_COUNTER - .2byte MOVE_CRUSH_CLAW - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_HORSEA - .2byte MOVE_FLAIL - .2byte MOVE_AURORA_BEAM - .2byte MOVE_OCTAZOOKA - .2byte MOVE_DISABLE - .2byte MOVE_SPLASH - .2byte MOVE_DRAGON_RAGE - .2byte MOVE_DRAGON_BREATH - - egg_moves_begin SPECIES_GOLDEEN - .2byte MOVE_PSYBEAM - .2byte MOVE_HAZE - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_SLEEP_TALK - .2byte MOVE_MUD_SPORT - - egg_moves_begin SPECIES_MR_MIME - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_HYPNOSIS - .2byte MOVE_MIMIC - .2byte MOVE_PSYCH_UP - .2byte MOVE_FAKE_OUT - .2byte MOVE_TRICK - - egg_moves_begin SPECIES_SCYTHER - .2byte MOVE_COUNTER - .2byte MOVE_SAFEGUARD - .2byte MOVE_BATON_PASS - .2byte MOVE_RAZOR_WIND - .2byte MOVE_REVERSAL - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_ENDURE - .2byte MOVE_SILVER_WIND - - egg_moves_begin SPECIES_PINSIR - .2byte MOVE_FURY_ATTACK - .2byte MOVE_FLAIL - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_FAINT_ATTACK - - egg_moves_begin SPECIES_LAPRAS - .2byte MOVE_FORESIGHT - .2byte MOVE_SUBSTITUTE - .2byte MOVE_TICKLE - .2byte MOVE_REFRESH - .2byte MOVE_DRAGON_DANCE - .2byte MOVE_CURSE - .2byte MOVE_SLEEP_TALK - .2byte MOVE_HORN_DRILL - - egg_moves_begin SPECIES_EEVEE - .2byte MOVE_CHARM - .2byte MOVE_FLAIL - .2byte MOVE_ENDURE - .2byte MOVE_CURSE - .2byte MOVE_TICKLE - .2byte MOVE_WISH - - egg_moves_begin SPECIES_OMANYTE - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_AURORA_BEAM - .2byte MOVE_SLAM - .2byte MOVE_SUPERSONIC - .2byte MOVE_HAZE - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_SPIKES - - egg_moves_begin SPECIES_KABUTO - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_AURORA_BEAM - .2byte MOVE_RAPID_SPIN - .2byte MOVE_DIG - .2byte MOVE_FLAIL - .2byte MOVE_KNOCK_OFF - .2byte MOVE_CONFUSE_RAY - - egg_moves_begin SPECIES_AERODACTYL - .2byte MOVE_WHIRLWIND - .2byte MOVE_PURSUIT - .2byte MOVE_FORESIGHT - .2byte MOVE_STEEL_WING - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_SNORLAX - .2byte MOVE_LICK - .2byte MOVE_CHARM - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_CURSE - .2byte MOVE_FISSURE - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_DRATINI - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_MIST - .2byte MOVE_HAZE - .2byte MOVE_SUPERSONIC - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_DRAGON_DANCE - - egg_moves_begin SPECIES_CHIKORITA - .2byte MOVE_VINE_WHIP - .2byte MOVE_LEECH_SEED - .2byte MOVE_COUNTER - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_FLAIL - .2byte MOVE_NATURE_POWER - .2byte MOVE_INGRAIN - .2byte MOVE_GRASS_WHISTLE - - egg_moves_begin SPECIES_CYNDAQUIL - .2byte MOVE_FURY_SWIPES - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_REVERSAL - .2byte MOVE_THRASH - .2byte MOVE_FORESIGHT - .2byte MOVE_COVET - .2byte MOVE_HOWL - .2byte MOVE_CRUSH_CLAW - - egg_moves_begin SPECIES_TOTODILE - .2byte MOVE_CRUNCH - .2byte MOVE_THRASH - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_MUD_SPORT - .2byte MOVE_WATER_SPORT - .2byte MOVE_DRAGON_CLAW - - egg_moves_begin SPECIES_SENTRET - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_PURSUIT - .2byte MOVE_SLASH - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_REVERSAL - .2byte MOVE_SUBSTITUTE - .2byte MOVE_TRICK - .2byte MOVE_ASSIST - - egg_moves_begin SPECIES_HOOTHOOT - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_SUPERSONIC - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_WING_ATTACK - .2byte MOVE_WHIRLWIND - .2byte MOVE_SKY_ATTACK - .2byte MOVE_FEATHER_DANCE - - egg_moves_begin SPECIES_LEDYBA - .2byte MOVE_PSYBEAM - .2byte MOVE_BIDE - .2byte MOVE_SILVER_WIND - - egg_moves_begin SPECIES_SPINARAK - .2byte MOVE_PSYBEAM - .2byte MOVE_DISABLE - .2byte MOVE_SONIC_BOOM - .2byte MOVE_BATON_PASS - .2byte MOVE_PURSUIT - .2byte MOVE_SIGNAL_BEAM - - egg_moves_begin SPECIES_CHINCHOU - .2byte MOVE_FLAIL - .2byte MOVE_SCREECH - .2byte MOVE_AMNESIA - - egg_moves_begin SPECIES_PICHU - .2byte MOVE_REVERSAL - .2byte MOVE_BIDE - .2byte MOVE_PRESENT - .2byte MOVE_ENCORE - .2byte MOVE_DOUBLE_SLAP - .2byte MOVE_WISH - .2byte MOVE_CHARGE - - egg_moves_begin SPECIES_CLEFFA - .2byte MOVE_PRESENT - .2byte MOVE_METRONOME - .2byte MOVE_AMNESIA - .2byte MOVE_BELLY_DRUM - .2byte MOVE_SPLASH - .2byte MOVE_MIMIC - .2byte MOVE_WISH - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_IGGLYBUFF - .2byte MOVE_PERISH_SONG - .2byte MOVE_PRESENT - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_WISH - .2byte MOVE_FAKE_TEARS - - egg_moves_begin SPECIES_TOGEPI - .2byte MOVE_PRESENT - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_PECK - .2byte MOVE_FORESIGHT - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_SUBSTITUTE - .2byte MOVE_PSYCH_UP - - egg_moves_begin SPECIES_NATU - .2byte MOVE_HAZE - .2byte MOVE_DRILL_PECK - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_STEEL_WING - .2byte MOVE_PSYCH_UP - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_REFRESH - - egg_moves_begin SPECIES_MAREEP - .2byte MOVE_TAKE_DOWN - .2byte MOVE_BODY_SLAM - .2byte MOVE_SAFEGUARD - .2byte MOVE_SCREECH - .2byte MOVE_REFLECT - .2byte MOVE_ODOR_SLEUTH - .2byte MOVE_CHARGE - - egg_moves_begin SPECIES_MARILL - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_PRESENT - .2byte MOVE_AMNESIA - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_BELLY_DRUM - .2byte MOVE_PERISH_SONG - .2byte MOVE_SUPERSONIC - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_SUDOWOODO - .2byte MOVE_SELF_DESTRUCT - - egg_moves_begin SPECIES_HOPPIP - .2byte MOVE_CONFUSION - .2byte MOVE_ENCORE - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_REFLECT - .2byte MOVE_AMNESIA - .2byte MOVE_HELPING_HAND - .2byte MOVE_PSYCH_UP - - egg_moves_begin SPECIES_AIPOM - .2byte MOVE_COUNTER - .2byte MOVE_SCREECH - .2byte MOVE_PURSUIT - .2byte MOVE_AGILITY - .2byte MOVE_SPITE - .2byte MOVE_SLAM - .2byte MOVE_DOUBLE_SLAP - .2byte MOVE_BEAT_UP - - egg_moves_begin SPECIES_SUNKERN - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_ENCORE - .2byte MOVE_LEECH_SEED - .2byte MOVE_NATURE_POWER - .2byte MOVE_CURSE - .2byte MOVE_HELPING_HAND - - egg_moves_begin SPECIES_YANMA - .2byte MOVE_WHIRLWIND - .2byte MOVE_REVERSAL - .2byte MOVE_LEECH_LIFE - .2byte MOVE_SIGNAL_BEAM - .2byte MOVE_SILVER_WIND - - egg_moves_begin SPECIES_WOOPER - .2byte MOVE_BODY_SLAM - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_SAFEGUARD - .2byte MOVE_CURSE - .2byte MOVE_MUD_SPORT - .2byte MOVE_STOCKPILE - .2byte MOVE_SWALLOW - .2byte MOVE_SPIT_UP - - egg_moves_begin SPECIES_MURKROW - .2byte MOVE_WHIRLWIND - .2byte MOVE_DRILL_PECK - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_WING_ATTACK - .2byte MOVE_SKY_ATTACK - .2byte MOVE_CONFUSE_RAY - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_PERISH_SONG - - egg_moves_begin SPECIES_MISDREAVUS - .2byte MOVE_SCREECH - .2byte MOVE_DESTINY_BOND - .2byte MOVE_PSYCH_UP - .2byte MOVE_IMPRISON - - egg_moves_begin SPECIES_GIRAFARIG - .2byte MOVE_TAKE_DOWN - .2byte MOVE_AMNESIA - .2byte MOVE_FORESIGHT - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_BEAT_UP - .2byte MOVE_PSYCH_UP - .2byte MOVE_WISH - .2byte MOVE_MAGIC_COAT - - egg_moves_begin SPECIES_PINECO - .2byte MOVE_REFLECT - .2byte MOVE_PIN_MISSILE - .2byte MOVE_FLAIL - .2byte MOVE_SWIFT - .2byte MOVE_COUNTER - .2byte MOVE_SAND_TOMB - - egg_moves_begin SPECIES_DUNSPARCE - .2byte MOVE_BIDE - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_BITE - .2byte MOVE_HEADBUTT - .2byte MOVE_ASTONISH - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_GLIGAR - .2byte MOVE_METAL_CLAW - .2byte MOVE_WING_ATTACK - .2byte MOVE_RAZOR_WIND - .2byte MOVE_COUNTER - .2byte MOVE_SAND_TOMB - - egg_moves_begin SPECIES_SNUBBULL - .2byte MOVE_METRONOME - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_REFLECT - .2byte MOVE_PRESENT - .2byte MOVE_CRUNCH - .2byte MOVE_HEAL_BELL - .2byte MOVE_SNORE - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_QWILFISH - .2byte MOVE_FLAIL - .2byte MOVE_HAZE - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_SUPERSONIC - .2byte MOVE_ASTONISH - - egg_moves_begin SPECIES_SHUCKLE - .2byte MOVE_SWEET_SCENT - - egg_moves_begin SPECIES_HERACROSS - .2byte MOVE_HARDEN - .2byte MOVE_BIDE - .2byte MOVE_FLAIL - .2byte MOVE_FALSE_SWIPE - - egg_moves_begin SPECIES_SNEASEL - .2byte MOVE_COUNTER - .2byte MOVE_SPITE - .2byte MOVE_FORESIGHT - .2byte MOVE_REFLECT - .2byte MOVE_BITE - .2byte MOVE_CRUSH_CLAW - .2byte MOVE_FAKE_OUT - - egg_moves_begin SPECIES_TEDDIURSA - .2byte MOVE_CRUNCH - .2byte MOVE_TAKE_DOWN - .2byte MOVE_SEISMIC_TOSS - .2byte MOVE_COUNTER - .2byte MOVE_METAL_CLAW - .2byte MOVE_FAKE_TEARS - .2byte MOVE_YAWN - .2byte MOVE_SLEEP_TALK - - egg_moves_begin SPECIES_SLUGMA - .2byte MOVE_ACID_ARMOR - .2byte MOVE_HEAT_WAVE - - egg_moves_begin SPECIES_SWINUB - .2byte MOVE_TAKE_DOWN - .2byte MOVE_BITE - .2byte MOVE_BODY_SLAM - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_MUD_SHOT - .2byte MOVE_ICICLE_SPEAR - .2byte MOVE_DOUBLE_EDGE - - egg_moves_begin SPECIES_CORSOLA - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_SCREECH - .2byte MOVE_MIST - .2byte MOVE_AMNESIA - .2byte MOVE_BARRIER - .2byte MOVE_INGRAIN - .2byte MOVE_CONFUSE_RAY - .2byte MOVE_ICICLE_SPEAR - - egg_moves_begin SPECIES_REMORAID - .2byte MOVE_AURORA_BEAM - .2byte MOVE_OCTAZOOKA - .2byte MOVE_SUPERSONIC - .2byte MOVE_HAZE - .2byte MOVE_SCREECH - .2byte MOVE_THUNDER_WAVE - .2byte MOVE_ROCK_BLAST - - egg_moves_begin SPECIES_DELIBIRD - .2byte MOVE_AURORA_BEAM - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_SPLASH - .2byte MOVE_RAPID_SPIN - .2byte MOVE_ICE_BALL - - egg_moves_begin SPECIES_MANTINE - .2byte MOVE_TWISTER - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_HAZE - .2byte MOVE_SLAM - .2byte MOVE_MUD_SPORT - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_SKARMORY - .2byte MOVE_DRILL_PECK - .2byte MOVE_PURSUIT - .2byte MOVE_WHIRLWIND - .2byte MOVE_SKY_ATTACK - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_HOUNDOUR - .2byte MOVE_FIRE_SPIN - .2byte MOVE_RAGE - .2byte MOVE_PURSUIT - .2byte MOVE_COUNTER - .2byte MOVE_SPITE - .2byte MOVE_REVERSAL - .2byte MOVE_BEAT_UP - .2byte MOVE_WILL_O_WISP - - egg_moves_begin SPECIES_PHANPY - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_BODY_SLAM - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_SNORE - .2byte MOVE_COUNTER - .2byte MOVE_FISSURE - - egg_moves_begin SPECIES_STANTLER - .2byte MOVE_SPITE - .2byte MOVE_DISABLE - .2byte MOVE_BITE - .2byte MOVE_SWAGGER - .2byte MOVE_PSYCH_UP - .2byte MOVE_EXTRASENSORY - - egg_moves_begin SPECIES_TYROGUE - .2byte MOVE_RAPID_SPIN - .2byte MOVE_HI_JUMP_KICK - .2byte MOVE_MACH_PUNCH - .2byte MOVE_MIND_READER - .2byte MOVE_HELPING_HAND - - egg_moves_begin SPECIES_SMOOCHUM - .2byte MOVE_MEDITATE - .2byte MOVE_PSYCH_UP - .2byte MOVE_FAKE_OUT - .2byte MOVE_WISH - .2byte MOVE_ICE_PUNCH - - egg_moves_begin SPECIES_ELEKID - .2byte MOVE_KARATE_CHOP - .2byte MOVE_BARRIER - .2byte MOVE_ROLLING_KICK - .2byte MOVE_MEDITATE - .2byte MOVE_CROSS_CHOP - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_ICE_PUNCH - - egg_moves_begin SPECIES_MAGBY - .2byte MOVE_KARATE_CHOP - .2byte MOVE_MEGA_PUNCH - .2byte MOVE_BARRIER - .2byte MOVE_SCREECH - .2byte MOVE_CROSS_CHOP - .2byte MOVE_THUNDER_PUNCH - - egg_moves_begin SPECIES_MILTANK - .2byte MOVE_PRESENT - .2byte MOVE_REVERSAL - .2byte MOVE_SEISMIC_TOSS - .2byte MOVE_ENDURE - .2byte MOVE_PSYCH_UP - .2byte MOVE_CURSE - .2byte MOVE_HELPING_HAND - .2byte MOVE_SLEEP_TALK - - egg_moves_begin SPECIES_LARVITAR - .2byte MOVE_PURSUIT - .2byte MOVE_STOMP - .2byte MOVE_OUTRAGE - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_DRAGON_DANCE - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_TREECKO - .2byte MOVE_CRUNCH - .2byte MOVE_MUD_SPORT - .2byte MOVE_ENDEAVOR - .2byte MOVE_LEECH_SEED - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_CRUSH_CLAW - - egg_moves_begin SPECIES_TORCHIC - .2byte MOVE_COUNTER - .2byte MOVE_REVERSAL - .2byte MOVE_ENDURE - .2byte MOVE_SWAGGER - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_MUDKIP - .2byte MOVE_REFRESH - .2byte MOVE_UPROAR - .2byte MOVE_CURSE - .2byte MOVE_STOMP - .2byte MOVE_ICE_BALL - .2byte MOVE_MIRROR_COAT - - egg_moves_begin SPECIES_POOCHYENA - .2byte MOVE_ASTONISH - .2byte MOVE_POISON_FANG - .2byte MOVE_COVET - .2byte MOVE_LEER - .2byte MOVE_YAWN - - egg_moves_begin SPECIES_ZIGZAGOON - .2byte MOVE_CHARM - .2byte MOVE_PURSUIT - .2byte MOVE_SUBSTITUTE - .2byte MOVE_TICKLE - .2byte MOVE_TRICK - - egg_moves_begin SPECIES_LOTAD - .2byte MOVE_SYNTHESIS - .2byte MOVE_RAZOR_LEAF - .2byte MOVE_SWEET_SCENT - .2byte MOVE_LEECH_SEED - .2byte MOVE_FLAIL - .2byte MOVE_WATER_GUN - - egg_moves_begin SPECIES_SEEDOT - .2byte MOVE_LEECH_SEED - .2byte MOVE_AMNESIA - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_RAZOR_WIND - .2byte MOVE_TAKE_DOWN - .2byte MOVE_FALSE_SWIPE - - egg_moves_begin SPECIES_NINCADA - .2byte MOVE_ENDURE - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_GUST - .2byte MOVE_SILVER_WIND - - egg_moves_begin SPECIES_TAILLOW - .2byte MOVE_PURSUIT - .2byte MOVE_SUPERSONIC - .2byte MOVE_REFRESH - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_RAGE - .2byte MOVE_SKY_ATTACK - - egg_moves_begin SPECIES_SHROOMISH - .2byte MOVE_FAKE_TEARS - .2byte MOVE_SWAGGER - .2byte MOVE_CHARM - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_HELPING_HAND - - egg_moves_begin SPECIES_SPINDA - .2byte MOVE_ENCORE - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_ASSIST - .2byte MOVE_DISABLE - .2byte MOVE_BATON_PASS - .2byte MOVE_WISH - .2byte MOVE_TRICK - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_WINGULL - .2byte MOVE_MIST - .2byte MOVE_TWISTER - .2byte MOVE_AGILITY - .2byte MOVE_GUST - .2byte MOVE_WATER_SPORT - - egg_moves_begin SPECIES_SURSKIT - .2byte MOVE_FORESIGHT - .2byte MOVE_MUD_SHOT - .2byte MOVE_PSYBEAM - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_MIND_READER - - egg_moves_begin SPECIES_WAILMER - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_THRASH - .2byte MOVE_SWAGGER - .2byte MOVE_SNORE - .2byte MOVE_SLEEP_TALK - .2byte MOVE_CURSE - .2byte MOVE_FISSURE - .2byte MOVE_TICKLE - - egg_moves_begin SPECIES_SKITTY - .2byte MOVE_HELPING_HAND - .2byte MOVE_PSYCH_UP - .2byte MOVE_UPROAR - .2byte MOVE_FAKE_TEARS - .2byte MOVE_WISH - .2byte MOVE_BATON_PASS - .2byte MOVE_SUBSTITUTE - .2byte MOVE_TICKLE - - egg_moves_begin SPECIES_KECLEON - .2byte MOVE_DISABLE - .2byte MOVE_MAGIC_COAT - .2byte MOVE_TRICK - - egg_moves_begin SPECIES_NOSEPASS - .2byte MOVE_MAGNITUDE - .2byte MOVE_ROLLOUT - .2byte MOVE_EXPLOSION - - egg_moves_begin SPECIES_TORKOAL - .2byte MOVE_ERUPTION - .2byte MOVE_ENDURE - .2byte MOVE_SLEEP_TALK - .2byte MOVE_YAWN - - egg_moves_begin SPECIES_SABLEYE - .2byte MOVE_PSYCH_UP - .2byte MOVE_RECOVER - .2byte MOVE_MOONLIGHT - - egg_moves_begin SPECIES_BARBOACH - .2byte MOVE_THRASH - .2byte MOVE_WHIRLPOOL - .2byte MOVE_SPARK - - egg_moves_begin SPECIES_LUVDISC - .2byte MOVE_SPLASH - .2byte MOVE_SUPERSONIC - .2byte MOVE_WATER_SPORT - .2byte MOVE_MUD_SPORT - - egg_moves_begin SPECIES_CORPHISH - .2byte MOVE_MUD_SPORT - .2byte MOVE_ENDEAVOR - .2byte MOVE_BODY_SLAM - .2byte MOVE_ANCIENT_POWER - - egg_moves_begin SPECIES_FEEBAS - .2byte MOVE_MIRROR_COAT - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_MUD_SPORT - .2byte MOVE_HYPNOSIS - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_CONFUSE_RAY - - egg_moves_begin SPECIES_CARVANHA - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_THRASH - - egg_moves_begin SPECIES_TRAPINCH - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_GUST - - egg_moves_begin SPECIES_MAKUHITA - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_DETECT - .2byte MOVE_FORESIGHT - .2byte MOVE_HELPING_HAND - .2byte MOVE_CROSS_CHOP - .2byte MOVE_REVENGE - .2byte MOVE_DYNAMIC_PUNCH - .2byte MOVE_COUNTER - - egg_moves_begin SPECIES_ELECTRIKE - .2byte MOVE_CRUNCH - .2byte MOVE_HEADBUTT - .2byte MOVE_UPROAR - .2byte MOVE_CURSE - .2byte MOVE_SWIFT - - egg_moves_begin SPECIES_NUMEL - .2byte MOVE_HOWL - .2byte MOVE_SCARY_FACE - .2byte MOVE_BODY_SLAM - .2byte MOVE_ROLLOUT - .2byte MOVE_DEFENSE_CURL - .2byte MOVE_STOMP - - egg_moves_begin SPECIES_SPHEAL - .2byte MOVE_WATER_SPORT - .2byte MOVE_STOCKPILE - .2byte MOVE_SWALLOW - .2byte MOVE_SPIT_UP - .2byte MOVE_YAWN - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_CURSE - .2byte MOVE_FISSURE - - egg_moves_begin SPECIES_CACNEA - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_ACID - .2byte MOVE_TEETER_DANCE - .2byte MOVE_DYNAMIC_PUNCH - .2byte MOVE_COUNTER - - egg_moves_begin SPECIES_SNORUNT - .2byte MOVE_BLOCK - .2byte MOVE_SPIKES - - egg_moves_begin SPECIES_AZURILL - .2byte MOVE_ENCORE - .2byte MOVE_SING - .2byte MOVE_REFRESH - .2byte MOVE_SLAM - .2byte MOVE_TICKLE - - egg_moves_begin SPECIES_SPOINK - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_EXTRASENSORY - .2byte MOVE_SUBSTITUTE - .2byte MOVE_TRICK - - egg_moves_begin SPECIES_PLUSLE - .2byte MOVE_SUBSTITUTE - .2byte MOVE_WISH - - egg_moves_begin SPECIES_MINUN - .2byte MOVE_SUBSTITUTE - .2byte MOVE_WISH - - egg_moves_begin SPECIES_MAWILE - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_POISON_FANG - .2byte MOVE_PSYCH_UP - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_TICKLE - - egg_moves_begin SPECIES_MEDITITE - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_THUNDER_PUNCH - .2byte MOVE_ICE_PUNCH - .2byte MOVE_FORESIGHT - .2byte MOVE_FAKE_OUT - .2byte MOVE_BATON_PASS - .2byte MOVE_DYNAMIC_PUNCH - - egg_moves_begin SPECIES_SWABLU - .2byte MOVE_AGILITY - .2byte MOVE_HAZE - .2byte MOVE_PURSUIT - .2byte MOVE_RAGE - - egg_moves_begin SPECIES_DUSKULL - .2byte MOVE_IMPRISON - .2byte MOVE_DESTINY_BOND - .2byte MOVE_PAIN_SPLIT - .2byte MOVE_GRUDGE - .2byte MOVE_MEMENTO - .2byte MOVE_FAINT_ATTACK - - egg_moves_begin SPECIES_ROSELIA - .2byte MOVE_SPIKES - .2byte MOVE_SYNTHESIS - .2byte MOVE_PIN_MISSILE - .2byte MOVE_COTTON_SPORE - - egg_moves_begin SPECIES_SLAKOTH - .2byte MOVE_PURSUIT - .2byte MOVE_SLASH - .2byte MOVE_BODY_SLAM - .2byte MOVE_SNORE - .2byte MOVE_CRUSH_CLAW - .2byte MOVE_CURSE - .2byte MOVE_SLEEP_TALK - - egg_moves_begin SPECIES_GULPIN - .2byte MOVE_DREAM_EATER - .2byte MOVE_ACID_ARMOR - .2byte MOVE_SMOG - .2byte MOVE_PAIN_SPLIT - - egg_moves_begin SPECIES_TROPIUS - .2byte MOVE_HEADBUTT - .2byte MOVE_SLAM - .2byte MOVE_RAZOR_WIND - .2byte MOVE_LEECH_SEED - .2byte MOVE_NATURE_POWER - - egg_moves_begin SPECIES_WHISMUR - .2byte MOVE_TAKE_DOWN - .2byte MOVE_SNORE - .2byte MOVE_SWAGGER - .2byte MOVE_EXTRASENSORY - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_CLAMPERL - .2byte MOVE_REFRESH - .2byte MOVE_MUD_SPORT - .2byte MOVE_BODY_SLAM - .2byte MOVE_SUPERSONIC - .2byte MOVE_BARRIER - .2byte MOVE_CONFUSE_RAY - - egg_moves_begin SPECIES_ABSOL - .2byte MOVE_BATON_PASS - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_MAGIC_COAT - .2byte MOVE_CURSE - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_SHUPPET - .2byte MOVE_DISABLE - .2byte MOVE_DESTINY_BOND - .2byte MOVE_FORESIGHT - .2byte MOVE_ASTONISH - .2byte MOVE_IMPRISON - - egg_moves_begin SPECIES_SEVIPER - .2byte MOVE_STOCKPILE - .2byte MOVE_SWALLOW - .2byte MOVE_SPIT_UP - .2byte MOVE_BODY_SLAM - - egg_moves_begin SPECIES_ZANGOOSE - .2byte MOVE_FLAIL - .2byte MOVE_DOUBLE_KICK - .2byte MOVE_RAZOR_WIND - .2byte MOVE_COUNTER - .2byte MOVE_ROAR - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_RELICANTH - .2byte MOVE_MAGNITUDE - .2byte MOVE_SKULL_BASH - .2byte MOVE_WATER_SPORT - .2byte MOVE_AMNESIA - .2byte MOVE_SLEEP_TALK - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_ARON - .2byte MOVE_ENDEAVOR - .2byte MOVE_BODY_SLAM - .2byte MOVE_STOMP - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_CASTFORM - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_PSYCH_UP - - egg_moves_begin SPECIES_VOLBEAT - .2byte MOVE_BATON_PASS - .2byte MOVE_SILVER_WIND - .2byte MOVE_TRICK - - egg_moves_begin SPECIES_ILLUMISE - .2byte MOVE_BATON_PASS - .2byte MOVE_SILVER_WIND - .2byte MOVE_GROWTH - - egg_moves_begin SPECIES_LILEEP - .2byte MOVE_BARRIER - .2byte MOVE_RECOVER - .2byte MOVE_MIRROR_COAT - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_ANORITH - .2byte MOVE_RAPID_SPIN - .2byte MOVE_KNOCK_OFF - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_RALTS - .2byte MOVE_DISABLE - .2byte MOVE_WILL_O_WISP - .2byte MOVE_MEAN_LOOK - .2byte MOVE_MEMENTO - .2byte MOVE_DESTINY_BOND - - egg_moves_begin SPECIES_BAGON - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_THRASH - .2byte MOVE_DRAGON_RAGE - .2byte MOVE_TWISTER - .2byte MOVE_DRAGON_DANCE - - egg_moves_begin SPECIES_CHIMECHO - .2byte MOVE_DISABLE - .2byte MOVE_CURSE - .2byte MOVE_HYPNOSIS - .2byte MOVE_DREAM_EATER - - .2byte -1 -- cgit v1.2.3 From 937428a19836f63897a5d8cfa283347e30f7342b Mon Sep 17 00:00:00 2001 From: scnorton Date: Thu, 31 Aug 2017 11:15:52 -0400 Subject: Resume decompiling trade.s --- data/trade.s | 113 ----------------------------------------------------------- 1 file changed, 113 deletions(-) (limited to 'data') diff --git a/data/trade.s b/data/trade.s index 8f96a72b1..d1b42b103 100644 --- a/data/trade.s +++ b/data/trade.s @@ -659,116 +659,3 @@ gSpriteAffineAnim_8215AB0:: @ 8215AB0 .align 2 gSpriteAffineAnimTable_8215AC0:: @ 8215AC0 .4byte gSpriteAffineAnim_8215AB0 - -@ 8215AC4 - .include "data/ingame_trades.inc" - -gTradeBallVerticalVelocityTable:: @ 8215BA0 - .byte 0 - .byte 0 - .byte 1 - .byte 0 - .byte 1 - .byte 0 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - .byte 3 - .byte 3 - .byte 3 - .byte 3 - .byte 4 - .byte 4 - .byte 4 - .byte 4 - .byte -4 - .byte -4 - .byte -4 - .byte -3 - .byte -3 - .byte -3 - .byte -3 - .byte -2 - .byte -2 - .byte -2 - .byte -2 - .byte -1 - .byte -1 - .byte -1 - .byte -1 - .byte 0 - .byte -1 - .byte 0 - .byte -1 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 1 - .byte 0 - .byte 1 - .byte 0 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - .byte 3 - .byte 3 - .byte 3 - .byte 3 - .byte 4 - .byte 4 - .byte 4 - .byte 4 - .byte -4 - .byte -3 - .byte -3 - .byte -2 - .byte -2 - .byte -1 - .byte -1 - .byte -1 - .byte 0 - .byte -1 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 1 - .byte 0 - .byte 1 - .byte 1 - .byte 1 - .byte 2 - .byte 2 - .byte 3 - .byte 3 - .byte 4 - .byte -4 - .byte -3 - .byte -2 - .byte -1 - .byte -1 - .byte -1 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 1 - .byte 0 - .byte 1 - .byte 1 - .byte 2 - .byte 3 -- cgit v1.2.3 From b636d3cafa2a1b3314fddb3c7bde2bdb94c1e2c2 Mon Sep 17 00:00:00 2001 From: scnorton Date: Thu, 31 Aug 2017 11:35:14 -0400 Subject: sub_8047CE8 --- data/ingame_trades.inc | 108 ------------------------------------------------- data/trade.s | 9 +---- 2 files changed, 1 insertion(+), 116 deletions(-) delete mode 100644 data/ingame_trades.inc (limited to 'data') diff --git a/data/ingame_trades.inc b/data/ingame_trades.inc deleted file mode 100644 index f5258e26c..000000000 --- a/data/ingame_trades.inc +++ /dev/null @@ -1,108 +0,0 @@ - .align 2 -gIngameTrades:: @ 8215AC4 - .string "MAKIT$", 11 @ nickname - .space 1 - .2byte SPECIES_MAKUHITA @ NPC mon species - .byte 5 @ HP IV - .byte 5 @ attack IV - .byte 4 @ defense IV - .byte 4 @ speed IV - .byte 4 @ sp. attack IV - .byte 4 @ sp. defense IV - .byte TRUE @ second ability - .space 3 - .4byte 49562 @ OT ID - .byte 5 @ cool - .byte 5 @ beauty - .byte 5 @ cute - .byte 5 @ smart - .byte 30 @ tough - .space 3 - .4byte 0x9C40 @ personality value - .2byte ITEM_X_ATTACK @ held item - .byte -1 @ mail num - .string "ELYSSA$", 11 @ OT name - .byte MALE @ OT gender - .byte 10 @ sheen - .2byte SPECIES_SLAKOTH @ player mon species - .space 2 - - .string "SKITIT$", 11 @ nickname - .space 1 - .2byte SPECIES_SKITTY @ NPC mon species - .byte 5 @ HP IV - .byte 4 @ attack IV - .byte 4 @ defense IV - .byte 5 @ speed IV - .byte 4 @ sp. attack IV - .byte 4 @ sp. defense IV - .byte FALSE @ second ability - .space 3 - .4byte 2259 @ OT ID - .byte 5 @ cool - .byte 5 @ beauty - .byte 30 @ cute - .byte 5 @ smart - .byte 5 @ tough - .space 3 - .4byte 0x498A2E17 @ personality value - .2byte ITEM_GLITTER_MAIL @ held item - .byte 0 @ mail num - .string "DARRELL$", 11 @ OT name - .byte FEMALE @ OT gender - .byte 10 @ sheen - .2byte SPECIES_PIKACHU @ player mon species - .space 2 - - .string "COROSO$", 11 @ nickname - .space 1 - .2byte SPECIES_CORSOLA @ NPC mon species - .byte 4 @ HP IV - .byte 4 @ attack IV - .byte 5 @ defense IV - .byte 4 @ speed IV - .byte 4 @ sp. attack IV - .byte 5 @ sp. defense IV - .byte TRUE @ second ability - .space 3 - .4byte 50183 @ OT ID - .byte 5 @ cool - .byte 30 @ beauty - .byte 5 @ cute - .byte 5 @ smart - .byte 5 @ tough - .space 3 - .4byte 0x4C970B7F @ personality value - .2byte ITEM_TROPIC_MAIL @ held item - .byte 1 @ mail num - .string "LANE$", 11 @ OT name - .byte FEMALE @ OT gender - .byte 10 @ sheen - .2byte SPECIES_BELLOSSOM @ player mon species - .space 2 - - .align 1 -gIngameTradeMail:: @ 8215B78 -@ 0 - ec_pokemon1 PIKACHU - ec_word THANK_YOU - ec_word EXCL - ec_word MY - ec_pokemon1 SKITTY - ec_word EATS - ec_word A_LOT - ec_word NOW - ec_word EXCL - .2byte 0 - -@ 1 - ec_word I - ec_word WANT - ec_word TO - ec_word SEE - ec_word A - ec_move2 PETAL_DANCE - ec_word IT_S - ec_word SO - ec_word PRETTY - .2byte 0 diff --git a/data/trade.s b/data/trade.s index d1b42b103..48919ca5f 100644 --- a/data/trade.s +++ b/data/trade.s @@ -135,14 +135,7 @@ gUnknown_0820C12C:: @ 820C12C gSpriteTemplate_820C134:: @ 820C134 spr_template 300, 2345, gOamData_820C104, gSpriteAnimTable_820C11C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - .align 2 -gUnknown_0820C14C:: @ 820C14C - .4byte TradeText_Cancel - .4byte TradeText_ChoosePoke - .4byte TradeText_Summary1 - .4byte TradeText_Trade1 - .4byte TradeText_CancelTradePrompt - .4byte TradeText_PressBToExit + .section .rodata.820C164 @ This is used to determine the next mon to select when the D-Pad is @ pressed in a given direction. -- cgit v1.2.3 From d3dca02924bc19bff355feb74a667707751bcc8f Mon Sep 17 00:00:00 2001 From: scnorton Date: Thu, 31 Aug 2017 13:46:14 -0400 Subject: Nonmatching sub_8047D58 --- data/trade.s | 263 ----------------------------------------------------------- 1 file changed, 263 deletions(-) (limited to 'data') diff --git a/data/trade.s b/data/trade.s index 48919ca5f..fcfbd8187 100644 --- a/data/trade.s +++ b/data/trade.s @@ -3,140 +3,6 @@ .section .rodata - .align 2 - .byte 0x90, 0x08, 0x00, 0x00 - .byte 0xC0, 0x3A, 0x00, 0x00 - .byte 0x1C, 0x00, 0x00, 0x00 - .byte 0x30, 0x05, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00 - .byte 0x64, 0x00, 0x00, 0x00 - .byte 0xD8, 0x04, 0x00, 0x00 - - .align 1 -gTradeMovesBoxTilemap:: @ 820ABF0 - .incbin "graphics/trade/moves_box_map.bin" - - .align 1 -gTradePartyBoxTilemap:: @ 820ADEE - .incbin "graphics/trade/party_box_map.bin" - - .align 2 -gTradeStripesBG2Tilemap:: @ 820AFEC - .incbin "graphics/trade/stripes_bg2_map.bin" - - .align 2 -gTradeStripesBG3Tilemap:: @ 820B7EC - .incbin "graphics/trade/stripes_bg3_map.bin" - - .align 2 -gOamData_820BFEC:: @ 820BFEC - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_820BFF4:: @ 820BFF4 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820BFFC:: @ 820BFFC - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820C004:: @ 820C004 - obj_image_anim_frame 16, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820C00C:: @ 820C00C - obj_image_anim_frame 24, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820C014:: @ 820C014 - obj_image_anim_frame 32, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820C01C:: @ 820C01C - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_820C024:: @ 820C024 - .4byte gSpriteAnim_820BFF4 - .4byte gSpriteAnim_820BFFC - .4byte gSpriteAnim_820C004 - .4byte gSpriteAnim_820C00C - .4byte gSpriteAnim_820C014 - .4byte gSpriteAnim_820C01C - - .align 2 -TradeScreenTextPalette: @ 820C03C - .incbin "graphics/trade/text1.gbapal" - .incbin "graphics/trade/text2.gbapal" @ unused? - - .align 2 -gUnknown_0820C07C:: @ 820C07C - obj_tiles 0x0201d000, 256, 0x00c8 - obj_tiles 0x0201d100, 256, 0x00c9 - obj_tiles 0x0201d200, 256, 0x00ca - obj_tiles 0x0201d300, 256, 0x00cb - obj_tiles 0x0201d400, 256, 0x00cc - obj_tiles 0x0201d500, 256, 0x00cd - obj_tiles 0x0201d600, 256, 0x00ce - obj_tiles 0x0201d700, 256, 0x00cf - obj_tiles 0x0201d800, 256, 0x00d0 - obj_tiles 0x0201d900, 256, 0x00d1 - obj_tiles 0x0201da00, 256, 0x00d2 - obj_tiles 0x0201db00, 256, 0x00d3 - obj_tiles 0x0201dc00, 256, 0x00d4 - - .align 2 -gSpritePalette_TradeScreenText:: @ 820C0E4 - obj_pal TradeScreenTextPalette, 4925 - - .align 2 -gSpriteTemplate_820C0EC:: @ 820C0EC - spr_template 200, 4925, gOamData_820BFEC, gSpriteAnimTable_820C024, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_820C104:: @ 820C104 - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_820C10C:: @ 820C10C - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_820C114:: @ 820C114 - obj_image_anim_frame 32, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_820C11C:: @ 820C11C - .4byte gSpriteAnim_820C10C - .4byte gSpriteAnim_820C114 - - .align 2 -gUnknown_0820C124:: @ 820C124 - obj_tiles gUnknown_08EA1DEC, 0x800, 300 - - .align 2 -gUnknown_0820C12C:: @ 820C12C - obj_pal gUnknown_08EA0328, 2345 - - .align 2 -gSpriteTemplate_820C134:: @ 820C134 - spr_template 300, 2345, gOamData_820C104, gSpriteAnimTable_820C11C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .section .rodata.820C164 - @ This is used to determine the next mon to select when the D-Pad is @ pressed in a given direction. @ Note that the mons are laid out like this. @@ -146,135 +12,6 @@ gSpriteTemplate_820C134:: @ 820C134 @ 2 3 8 9 @ 4 5 10 11 @ 12 -gTradeNextSelectedMonTable:: @ 820C164 - @ 0 - .byte 4, 2, 12, 12, 0, 0 @ up - .byte 2, 4, 12, 12, 0, 0 @ down - .byte 7, 6, 1, 0, 0, 0 @ left - .byte 1, 6, 7, 0, 0, 0 @ right - @ 1 - .byte 5, 3, 12, 12, 0, 0 @ up - .byte 3, 5, 12, 12, 0, 0 @ down - .byte 0, 7, 6, 1, 0, 0 @ left - .byte 6, 7, 0, 1, 0, 0 @ right - @ 2 - .byte 0, 0, 0, 0, 0, 0 @ up - .byte 4, 0, 0, 0, 0, 0 @ down - .byte 9, 8, 7, 6, 0, 0 @ left - .byte 3, 1, 0, 0, 0, 0 @ right - @ 3 - .byte 1, 1, 1, 1, 0, 0 @ up - .byte 5, 1, 1, 1, 0, 0 @ down - .byte 2, 9, 8, 7, 0, 0 @ left - .byte 8, 9, 6, 6, 0, 0 @ right - @ 4 - .byte 2, 2, 2, 2, 0, 0 @ up - .byte 0, 0, 0, 0, 0, 0 @ down - .byte 11, 10, 9, 8, 7, 6 @ left - .byte 5, 3, 1, 0, 0, 0 @ right - @ 5 - .byte 3, 3, 3, 3, 0, 0 @ up - .byte 1, 1, 1, 1, 0, 0 @ down - .byte 4, 4, 4, 4, 0, 0 @ left - .byte 10, 8, 6, 0, 0, 0 @ right - @ 6 - .byte 10, 8, 12, 0, 0, 0 @ up - .byte 8, 10, 12, 0, 0, 0 @ down - .byte 1, 0, 0, 0, 0, 0 @ left - .byte 7, 0, 1, 0, 0, 0 @ right - @ 7 - .byte 12, 0, 0, 0, 0, 0 @ up - .byte 9, 12, 0, 0, 0, 0 @ down - .byte 6, 0, 0, 0, 0, 0 @ left - .byte 0, 0, 0, 0, 0, 0 @ right - @ 8 - .byte 6, 0, 0, 0, 0, 0 @ up - .byte 10, 6, 0, 0, 0, 0 @ down - .byte 3, 2, 1, 0, 0, 0 @ left - .byte 9, 7, 0, 0, 0, 0 @ right - @ 9 - .byte 7, 0, 0, 0, 0, 0 @ up - .byte 11, 12, 0, 0, 0, 0 @ down - .byte 8, 0, 0, 0, 0, 0 @ left - .byte 2, 1, 0, 0, 0, 0 @ right - @ 10 - .byte 8, 0, 0, 0, 0, 0 @ up - .byte 6, 0, 0, 0, 0, 0 @ down - .byte 5, 4, 3, 2, 1, 0 @ left - .byte 11, 9, 7, 0, 0, 0 @ right - @ 11 - .byte 9, 0, 0, 0, 0, 0 @ up - .byte 12, 0, 0, 0, 0, 0 @ down - .byte 10, 0, 0, 0, 0, 0 @ left - .byte 4, 2, 0, 0, 0, 0 @ right - @ 12 - .byte 11, 9, 7, 6, 0, 0 @ up - .byte 7, 6, 0, 0, 0, 0 @ down - .byte 12, 0, 0, 0, 0, 0 @ left - .byte 12, 0, 0, 0, 0, 0 @ right - -@ The coordinates are in units of tiles. -@ These are used for both mon icons and the selected mon cursor, -@ but the origins of the coordinates differ. -gTradeMonSpriteCoords:: @ 820C29C - @ left-side party - .byte 1, 5 - .byte 8, 5 - .byte 1, 10 - .byte 8, 10 - .byte 1, 15 - .byte 8, 15 - - @ right-side party - .byte 16, 5 - .byte 23, 5 - .byte 16, 10 - .byte 23, 10 - .byte 16, 15 - .byte 23, 15 - - @ cancel button - .byte 23, 18 - -gTradeLevelDisplayCoords:: @ 820C2B6 - @ left-side party - .byte 5, 4 - .byte 12, 4 - .byte 5, 9 - .byte 12, 9 - .byte 5, 14 - .byte 12, 14 - - @ right-side party - .byte 20, 4 - .byte 27, 4 - .byte 20, 9 - .byte 27, 9 - .byte 20, 14 - .byte 27, 14 - -gTradeMonBoxCoords:: @ 820C2CE - @ left-side party - .byte 1, 3 - .byte 8, 3 - .byte 1, 8 - .byte 8, 8 - .byte 1, 13 - .byte 8, 13 - - @ right-side party - .byte 16, 3 - .byte 23, 3 - .byte 16, 8 - .byte 23, 8 - .byte 16, 13 - .byte 23, 13 - -gTradeUnknownSpriteCoords:: @ 820C2E6 - .byte 59, 10 - .byte 179, 10 - .byte 59, 10 - .byte 179, 10 .align 2 gUnknown_0820C2F0:: @ 820C2F0 -- cgit v1.2.3 From af86929d787ca449ab86b3bd8674cbd5c44fb7ea Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 2 Sep 2017 10:18:29 -0400 Subject: sub_8048D44 --- data/trade.s | 69 ------------------------------------------------------------ 1 file changed, 69 deletions(-) (limited to 'data') diff --git a/data/trade.s b/data/trade.s index fcfbd8187..9d224bf36 100644 --- a/data/trade.s +++ b/data/trade.s @@ -13,75 +13,6 @@ @ 4 5 10 11 @ 12 - .align 2 -gUnknown_0820C2F0:: @ 820C2F0 - .4byte TradeText_LinkStandby - .4byte TradeText_TradeCancelled - .4byte TradeText_OnlyPoke - .4byte TradeText_NonTradablePoke - .4byte TradeText_WaitingForFriend - .4byte TradeText_WantToTrade - -gTradeMessageWindowRects:: @ 820C308 - .byte 8, 7, 22, 12 - .byte 8, 7, 22, 12 - .byte 6, 7, 24, 12 - .byte 6, 7, 24, 12 - .byte 8, 7, 22, 12 - .byte 7, 7, 23, 12 - - .align 2 -gUnknown_0820C320:: @ 820C320 - .4byte TradeText_Summary2, sub_804A9F4 @unknown - .4byte TradeText_Trade2, sub_804AA00 - -gUnknown_0820C330:: @ 820C330 - .byte 0, 14 - .byte 15, 29 - -gUnknown_0820C334:: @ 820C334 - .byte 3, 5 - .byte 3, 7 - .byte 18, 5 - .byte 18, 7 - -gOtherText_Terminator:: - .string "$" - -gOtherText_MaleSymbol3:: @ 820C33D - .string "♂$" - -gOtherText_FemaleSymbol3:: @ 820C33F - .string "♀$" - -gOtherText_GenderlessSymbol:: @ 820C341 - .string "$$" - - .align 2 - .4byte gTileBuffer - -@ Unused debug strings? - .string "かいめの そうしん$", 13 - .string "かいめの じゅしん$", 13 - .string "ポケモンアイコンセット$", 13 - .string "OBJテキストセット$", 13 - .string "セルセット$", 13 - .string "OBJテキストADD$", 13 - .string "システムメッセージADD$", 13 - .string "はいけいセット$", 13 - -@ Shedinja's Japanese name -@ sub_8048D44 compares a pokemon name with this string -gUnknown_0820C3B0:: @ 820C3B0 - .string "ヌケニン$" - - .string "こうかんせいりつ $" @ trade completed - .string "だめだたらしいよ $" @ it's no good (trade failed maybe?) - -gUnknown_0820C3D1:: @ 820C3D1 - .byte 4, 3 - .byte 19, 3 - .align 2 gTradeBallPalette:: @ 820C3D8 .incbin "graphics/trade/ball.gbapal" -- cgit v1.2.3 From 9fe04d897f1c92ee9fb60d7ca526b54010464118 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 4 Sep 2017 15:02:00 -0400 Subject: sub_804C29C --- data/trade.s | 317 ----------------------------------------------------------- 1 file changed, 317 deletions(-) (limited to 'data') diff --git a/data/trade.s b/data/trade.s index 9d224bf36..508e86c63 100644 --- a/data/trade.s +++ b/data/trade.s @@ -3,320 +3,3 @@ .section .rodata -@ This is used to determine the next mon to select when the D-Pad is -@ pressed in a given direction. -@ Note that the mons are laid out like this. -@ 0-5 are the player's party and 6-11 are the trading partner's party. -@ 12 is the cancel button. -@ 0 1 6 7 -@ 2 3 8 9 -@ 4 5 10 11 -@ 12 - - .align 2 -gTradeBallPalette:: @ 820C3D8 - .incbin "graphics/trade/ball.gbapal" - - .align 2 -gTradeBallTiles:: @ 820C3F8 - .incbin "graphics/trade/ball.4bpp" - - .align 2 -gUnknown_0820C9F8:: @ 820C9F8 - .incbin "graphics/trade/unknown.gbapal" - .incbin "graphics/trade/gba.gbapal" - .incbin "graphics/trade/shadow.gbapal" - .space 32 - .incbin "graphics/trade/misc.gbapal" - - .align 2 -gUnknown_0820CA98:: @ 820CA98 - .incbin "graphics/trade/gba.4bpp" - .incbin "graphics/trade/shadow.4bpp" - - .align 2 -gUnknown_0820DD98:: @ 820DD98 - .incbin "graphics/trade/pokeball_symbol.8bpp" - - .align 2 -gUnknown_0820F798:: @ 820F798 - .incbin "graphics/trade/shadow_map.bin" - - .align 2 -gUnknown_08210798:: @ 8210798 - .incbin "graphics/trade/gba_map.bin" - - .align 2 -gUnknown_08211798:: @ 8211798 - .incbin "graphics/trade/cable_closeup_map.bin" - - .align 2 -gUnknown_08211F98:: @ 8211F98 - .incbin "graphics/trade/pokeball_symbol_map.bin" - - .incbin "graphics/unused/unknown/8212098.gbapal" - - .align 2 -gTradeCableEndPalette:: @ 82120B8 - .incbin "graphics/trade/cable_end.gbapal" - - .incbin "graphics/unused/unknown/82120D8.gbapal" - - .space 32 - - .align 2 -gTradeGlowPalette:: @ 8212118 - .incbin "graphics/trade/glow.gbapal" - - .align 2 -gTradeGlow1Tiles:: @ 8212138 - .incbin "graphics/trade/glow1.4bpp" - - .align 2 -gTradeGlow2Tiles:: @ 8212338 - .incbin "graphics/trade/glow2.4bpp" - - .align 2 -gTradeCableEndTiles:: @ 8212538 - .incbin "graphics/trade/cable_end.4bpp" - - .align 2 -gTradeGBAScreenTiles:: @ 8212738 - .incbin "graphics/trade/gba_screen.4bpp" - - .align 2 -gUnknown_08213738:: @ 8213738 - .incbin "graphics/trade/gba_affine.8bpp" - - .align 2 -gUnknown_08215778:: @ 8215778 - .incbin "graphics/trade/gba_affine_map.bin" - - .align 2 -gOamData_8215878:: @ 8215878 - .2byte 0x0100 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_8215880:: @ 8215880 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 4, 3 - obj_image_anim_frame 8, 3 - obj_image_anim_frame 12, 3 - obj_image_anim_frame 16, 3 - obj_image_anim_frame 20, 3 - obj_image_anim_frame 24, 3 - obj_image_anim_frame 28, 3 - obj_image_anim_frame 32, 3 - obj_image_anim_frame 36, 3 - obj_image_anim_frame 40, 3 - obj_image_anim_frame 44, 3 - obj_image_anim_loop 1 - obj_image_anim_frame 0, 3 - obj_image_anim_end - - .align 2 -gSpriteAnim_82158BC:: @ 82158BC - obj_image_anim_frame 0, 3 - obj_image_anim_frame 4, 3 - obj_image_anim_frame 8, 3 - obj_image_anim_frame 12, 3 - obj_image_anim_frame 16, 3 - obj_image_anim_frame 20, 3 - obj_image_anim_frame 24, 3 - obj_image_anim_frame 28, 3 - obj_image_anim_frame 32, 3 - obj_image_anim_frame 36, 3 - obj_image_anim_frame 40, 3 - obj_image_anim_frame 44, 3 - obj_image_anim_loop 2 - obj_image_anim_frame 0, 3 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_82158F8:: @ 82158F8 - .4byte gSpriteAnim_8215880 - .4byte gSpriteAnim_82158BC - - .align 2 -gSpriteAffineAnim_8215900:: @ 8215900 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8215910:: @ 8215910 - obj_rot_scal_anim_frame 0xFFF8, 0x0, 0, 20 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8215920:: @ 8215920 - obj_rot_scal_anim_frame 0x60, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 5 - obj_rot_scal_anim_frame 0x8, 0x0, 0, 20 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_8215940:: @ 8215940 - .4byte gSpriteAffineAnim_8215900 - .4byte gSpriteAffineAnim_8215910 - .4byte gSpriteAffineAnim_8215920 - - .align 2 -gUnknown_0821594C:: @ 821594C - obj_tiles gTradeBallTiles, 0x600, 5557 - - .align 2 -gUnknown_08215954:: @ 8215954 - obj_pal gTradeBallPalette, 5558 - - .align 2 -gSpriteTemplate_821595C:: @ 821595C - spr_template 5557, 5558, gOamData_8215878, gSpriteAnimTable_82158F8, NULL, gSpriteAffineAnimTable_8215940, sub_804D6BC - - .align 2 -gOamData_8215974:: @ 8215974 - .2byte 0x0500 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_821597C:: @ 821597C - obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8215984:: @ 8215984 - .4byte gSpriteAnim_821597C - - .align 2 -gSpriteAffineAnim_8215988:: @ 8215988 - obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, 0, 5 - obj_rot_scal_anim_frame 0xA, 0xA, 0, 5 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnimTable_82159A0:: @ 82159A0 - .4byte gSpriteAffineAnim_8215988 - - .align 2 -gUnknown_082159A4:: @ 82159A4 - obj_tiles gTradeGlow1Tiles, 0x200, 5550 - - .align 2 -gUnknown_082159AC:: @ 82159AC - obj_pal gTradeGlowPalette, 5551 - - .align 2 -gUnknown_082159B4:: @ 82159B4 - obj_pal gTradeCableEndPalette, 5555 - - .align 2 -gSpriteTemplate_82159BC:: @ 82159BC - spr_template 5550, 5551, gOamData_8215974, gSpriteAnimTable_8215984, NULL, gSpriteAffineAnimTable_82159A0, sub_804B058 - - .align 2 -gOamData_82159D4:: @ 82159D4 - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_82159DC:: @ 82159DC - obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_82159E4:: @ 82159E4 - obj_image_anim_frame 8, 5, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnimTable_82159EC:: @ 82159EC - .4byte gSpriteAnim_82159DC - .4byte gSpriteAnim_82159E4 - - .align 2 -gUnknown_082159F4:: @ 82159F4 - obj_tiles gTradeGlow2Tiles, 0x300, 5552 - - .align 2 -gSpriteTemplate_82159FC:: @ 82159FC - spr_template 5552, 5551, gOamData_82159D4, gSpriteAnimTable_82159EC, NULL, gDummySpriteAffineAnimTable, sub_804B07C - - .align 2 -gOamData_8215A14:: @ 8215A14 - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_8215A1C:: @ 8215A1C - obj_image_anim_frame 0, 10 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8215A24:: @ 8215A24 - .4byte gSpriteAnim_8215A1C - - .align 2 -gUnknown_08215A28:: @ 8215A28 - obj_tiles gTradeCableEndTiles, 0x100, 5554 - - .align 2 -gSpriteTemplate_8215A30:: @ 8215A30 - spr_template 5554, 5555, gOamData_8215A14, gSpriteAnimTable_8215A24, NULL, gDummySpriteAffineAnimTable, sub_804B0BC - - .align 2 -gOamData_8215A48:: @ 8215A48 - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_8215A50:: @ 8215A50 - obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 64, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 96, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 64, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 32, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_loop 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8215A74:: @ 8215A74 - .4byte gSpriteAnim_8215A50 - - .align 2 -gUnknown_08215A78:: @ 8215A78 - obj_tiles gTradeGBAScreenTiles, 0x1000, 5556 - - .align 2 -gSpriteTemplate_8215A80:: @ 8215A80 - spr_template 5556, 5555, gOamData_8215A48, gSpriteAnimTable_8215A74, NULL, gDummySpriteAffineAnimTable, sub_804B104 - - .align 1 -gTradeGlow2PaletteAnimTable:: @ 8215A98 - .2byte 0x7F12 - .2byte 0x7F12 - .2byte 0x7F12 - .2byte 0x7FFF - .2byte 0x7FFF - .2byte 0x7FFF - .2byte 0x7F12 - .2byte 0x7F12 - .2byte 0x7F12 - .2byte 0x7FFF - .2byte 0x7FFF - .2byte 0x7FFF - - .align 2 -gSpriteAffineAnim_8215AB0:: @ 8215AB0 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnimTable_8215AC0:: @ 8215AC0 - .4byte gSpriteAffineAnim_8215AB0 -- cgit v1.2.3 From 446a95451d059d7b824086c53595736a5ce68d8e Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 4 Sep 2017 15:14:24 -0400 Subject: sub_804C1A8 --- data/trade.s | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 data/trade.s (limited to 'data') diff --git a/data/trade.s b/data/trade.s deleted file mode 100644 index 508e86c63..000000000 --- a/data/trade.s +++ /dev/null @@ -1,5 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -- cgit v1.2.3 From add1b59b63bd00bd481333f6e68940cbc30208fc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 9 Sep 2017 14:59:57 -0400 Subject: npc_pal_op and all data --- data/field_effect_helpers.s | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 data/field_effect_helpers.s (limited to 'data') diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s deleted file mode 100644 index d22bd8dde..000000000 --- a/data/field_effect_helpers.s +++ /dev/null @@ -1,37 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ XXX: Unused? Probably aligned because it's at the beginning of an object file. - .align 2 - .string "タマゴ$" - - .align 1 -gUnknown_08401E2C:: @ 8401E2C - .2byte 0xC, 0x1C, 0x2C - -gUnknown_08401E32:: @ 8401E32 - .byte 0, 1, 2, 3 - - .align 1 -gUnknown_08401E36:: @ 8401E36 - .2byte 4, 4, 4, 16 - - .align 2 -gUnknown_08401E40:: @ 8401E40 - .4byte sub_81275A0 - .4byte sub_81275C4 - - .align 2 -gUnknown_08401E48:: @ 8401E48 - .4byte sub_8127DA0 - .4byte sub_8127DD0 - .4byte sub_8127E30 - -gUnknown_08401E54:: @ 8401E54 - .byte 0, 0, 1, 2, 3 - - .align 1 -gUnknown_08401E5A:: @ 8401E5A - .2byte 3, 7 -- cgit v1.2.3 From 95f856c39e81e2b723065e757b4dcf577441c558 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 9 Sep 2017 18:17:09 -0500 Subject: more script_menu refactoring --- data/event_scripts.s | 2 +- data/specials.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 33bb39308..6a95dd4a1 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1688,7 +1688,7 @@ gUnknown_081A0009:: @ 81A0009 EventScript_1A0023: message gPCText_WhichPCShouldBeAccessed waittext - special TryCreatePCMenu + special ScriptMenu_TryCreatePCMenu waitstate jump EventScript_1A0033 end diff --git a/data/specials.inc b/data/specials.inc index a17bc943a..051a84bdb 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -269,7 +269,7 @@ gSpecials:: def_special ShowBerryBlenderRecordWindow def_special ResetTrickHouseEndRoomFlag def_special SetTrickHouseEndRoomFlag - def_special TryCreatePCMenu + def_special ScriptMenu_TryCreatePCMenu def_special AccessHallOfFamePC def_special sub_810D6A4 def_special CheckLeadMonCool -- cgit v1.2.3 From 7309b13cb34400e0256c09fd54664a3f918b4e3d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 9 Sep 2017 19:29:05 -0500 Subject: fix German build --- data/event_scripts.s | 2 +- data/specials.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 6a95dd4a1..5e2763653 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1688,7 +1688,7 @@ gUnknown_081A0009:: @ 81A0009 EventScript_1A0023: message gPCText_WhichPCShouldBeAccessed waittext - special ScriptMenu_TryCreatePCMenu + special ScrSpecial_CreatePCMenu waitstate jump EventScript_1A0033 end diff --git a/data/specials.inc b/data/specials.inc index 051a84bdb..61670a867 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -269,7 +269,7 @@ gSpecials:: def_special ShowBerryBlenderRecordWindow def_special ResetTrickHouseEndRoomFlag def_special SetTrickHouseEndRoomFlag - def_special ScriptMenu_TryCreatePCMenu + def_special ScrSpecial_CreatePCMenu def_special AccessHallOfFamePC def_special sub_810D6A4 def_special CheckLeadMonCool -- cgit v1.2.3 From 5e9e52e3a95f4d7301565ad86084907f2d8a94e6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 9 Sep 2017 22:04:01 -0500 Subject: more renaming/refactoring --- data/scripts/maps/Route101.inc | 2 +- data/specials.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 8462603a6..1acd4b598 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -224,7 +224,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F movesprite 255, 6, 13 move 255, Route101_Movement_1A083F waitmove 0 - special ChooseStarter + special ScrSpecial_ChooseStarter waitstate move 2, Route101_Movement_14EAD7 waitmove 0 diff --git a/data/specials.inc b/data/specials.inc index 61670a867..891d2cfd7 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -163,7 +163,7 @@ gSpecials:: def_special sub_8053E90 def_special StartWallClock def_special sub_810D6B8 - def_special ChooseStarter + def_special ScrSpecial_ChooseStarter def_special StartBattle_WallyTutorial def_special sub_80BF9F8 def_special sub_80F9A0C -- cgit v1.2.3 From df71c1a803e49b93dfb19cdac6cf71621d82d89a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 10 Sep 2017 12:34:41 -0500 Subject: lots more renaming --- data/event_scripts.s | 2 +- data/specials.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 5e2763653..80f3cd40a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1040,7 +1040,7 @@ EventScript_19F8F2: waittext waitbutton reptrainerbattle - specialval RESULT, sub_8082558 + specialval RESULT, ScrSpecial_GetTrainerBattleMode compare RESULT, 0 jumpeq EventScript_19F934 compare RESULT, 2 diff --git a/data/specials.inc b/data/specials.inc index 891d2cfd7..ae2a4d8ef 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -58,7 +58,7 @@ gSpecials:: def_special FieldObjectInteractionWaterBerryTree def_special PlayerHasBerries def_special IsEnigmaBerryValid - def_special sub_8082558 + def_special ScrSpecial_GetTrainerBattleMode def_special sub_80826D8 def_special sub_8082718 def_special sub_8082564 -- cgit v1.2.3 From 6f9ad223a51eab0a2d39296c963486689392d0b5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 10 Sep 2017 16:21:30 -0500 Subject: stuff --- data/event_scripts.s | 24 ++++++++-------- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 2 +- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- data/specials.inc | 22 +++++++------- data/trainer_see.s | 41 --------------------------- 10 files changed, 30 insertions(+), 71 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 80f3cd40a..2d0b1b4fe 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -931,7 +931,7 @@ SecretBase_RedCave1_EventScript_19F806:: @ 819F806 gUnknown_0819F80B:: @ 819F80B lock special PlayTrainerEncounterMusic - special sub_80847C8 + special ScrSpecial_EndTrainerApproach waitstate jump EventScript_19F8F2 @@ -940,7 +940,7 @@ gUnknown_0819F818:: @ 819F818 faceplayer move LAST_TALKED, Movement_19F8F0 waitmove 0 - specialval RESULT, sub_8082564 + specialval RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 jumpif 5, EventScript_19F83F special PlayTrainerEncounterMusic @@ -954,7 +954,7 @@ gUnknown_0819F840:: @ 819F840 lock faceplayer call EventScript_19F8E5 - specialval RESULT, sub_8082564 + specialval RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 jumpif 5, EventScript_19F877 special CheckForAlivePartyMons @@ -965,7 +965,7 @@ gUnknown_0819F840:: @ 819F840 jump EventScript_19F8F2 EventScript_19F870: - special sub_8082718 + special ScrSpecial_ShowTrainerNonBattlingSpeech waittext waitbutton release @@ -983,15 +983,15 @@ gUnknown_0819F878:: @ 819F878 gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 - specialval RESULT, sub_8082C9C + specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare RESULT, 0 jumpeq EventScript_19F8AD special PlayTrainerEncounterMusic special sub_8082524 - special sub_80826D8 + special ScrSpecial_ShowTrainerIntroSpeech waittext waitbutton - special sub_80826B0 + special ScrSpecial_StartTrainerEyeRematch waitstate releaseall end @@ -1000,7 +1000,7 @@ EventScript_19F8AD: endtrainerbattle gUnknown_0819F8AE:: @ 819F8AE - specialval RESULT, sub_8082C9C + specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare RESULT, 0 jumpeq EventScript_19F8DD special CheckForAlivePartyMons @@ -1008,10 +1008,10 @@ gUnknown_0819F8AE:: @ 819F8AE jumpif 5, EventScript_19F8DE special PlayTrainerEncounterMusic special sub_8082524 - special sub_80826D8 + special ScrSpecial_ShowTrainerIntroSpeech waittext waitbutton - special sub_80826B0 + special ScrSpecial_StartTrainerEyeRematch waitstate releaseall end @@ -1020,7 +1020,7 @@ EventScript_19F8DD: endtrainerbattle EventScript_19F8DE: - special sub_8082718 + special ScrSpecial_ShowTrainerNonBattlingSpeech waittext waitbutton release @@ -1036,7 +1036,7 @@ Movement_19F8F0:: step_end EventScript_19F8F2: - special sub_80826D8 + special ScrSpecial_ShowTrainerIntroSpeech waittext waitbutton reptrainerbattle diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 7ba7540c4..bfc5b6a79 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 StartBattle_Regi + special ScrSpecial_StartRegiBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 023892d36..5517a9c7e 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -62,7 +62,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 pause 40 waitpokecry setflag 2145 - special StartBattle_GroudonKyogre + special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag 2145 specialval RESULT, sub_810E300 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index df40fc126..97a22bae3 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 StartBattle_Regi + special ScrSpecial_StartRegiBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index b16f386d8..8f2ce6dc1 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -84,7 +84,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag 936 setflag 2145 - special StartBattle_Regi + special ScrSpecial_StartRegiBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index dc5efe243..123b099fe 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -32,7 +32,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 move 255, PetalburgCity_Movement_14B7CC waitmove 0 msgbox PetalburgCity_Text_16D361, 4 - special StartBattle_WallyTutorial + special ScrSpecial_StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_16D3DE, 4 movecoords 2, PetalburgCity_Movement_1A083F, 0, 0 diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 23db6a8ea..d659a23c1 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 StartBattle_Rayquaza + special ScrSpecial_StartRayquazaBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 3adf3545f..e5eaadab5 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -67,7 +67,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag 911 setflag 2145 - special StartBattle_SouthernIsland + special ScrSpecial_StartSouthernIslandBattle waitstate clearflag 2145 releaseall diff --git a/data/specials.inc b/data/specials.inc index ae2a4d8ef..99a4a218c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -59,14 +59,14 @@ gSpecials:: def_special PlayerHasBerries def_special IsEnigmaBerryValid def_special ScrSpecial_GetTrainerBattleMode - def_special sub_80826D8 - def_special sub_8082718 - def_special sub_8082564 - def_special sub_80847C8 + def_special ScrSpecial_ShowTrainerIntroSpeech + def_special ScrSpecial_ShowTrainerNonBattlingSpeech + def_special ScrSpecial_HasTrainerBeenFought + def_special ScrSpecial_EndTrainerApproach def_special PlayTrainerEncounterMusic def_special sub_8082C68 - def_special sub_8082C9C - def_special sub_80826B0 + def_special ScrSpecial_GetTrainerEyeRematchFlag + def_special ScrSpecial_StartTrainerEyeRematch def_special ShowPokemonStorageSystem def_special CheckForAlivePartyMons def_special TurnOffTVScreen @@ -164,7 +164,7 @@ gSpecials:: def_special StartWallClock def_special sub_810D6B8 def_special ScrSpecial_ChooseStarter - def_special StartBattle_WallyTutorial + def_special ScrSpecial_StartWallyTutorialBattle def_special sub_80BF9F8 def_special sub_80F9A0C def_special sub_810CA00 @@ -318,9 +318,9 @@ gSpecials:: 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 ScrSpecial_StartGroudonKyogreBattle + def_special ScrSpecial_StartRayquazaBattle + def_special ScrSpecial_StartRegiBattle def_special sub_8082524 def_special DoSealedChamberShakingEffect2 def_special sub_810F828 @@ -330,7 +330,7 @@ gSpecials:: def_special ShowContestEntryMonPic def_special sub_80C5164 def_special sub_8134AB4 - def_special StartBattle_SouthernIsland + def_special ScrSpecial_StartSouthernIslandBattle def_special SetRoute119Weather def_special SetRoute123Weather def_special ScriptGetMultiplayerId diff --git a/data/trainer_see.s b/data/trainer_see.s index 57eeae061..04a787f0c 100644 --- a/data/trainer_see.s +++ b/data/trainer_see.s @@ -3,47 +3,6 @@ .section .rodata - .align 2 -gSpriteImage_839B308:: @ 839B308 - .incbin "graphics/unknown_sprites/839B4E0/0.4bpp" - - .align 2 -gSpriteImage_839B388:: @ 839B388 - .incbin "graphics/unknown_sprites/839B4E0/1.4bpp" - - .align 2 -gSpriteImage_839B408:: @ 839B408 - .incbin "graphics/unknown_sprites/839B408.4bpp" - - .align 2 -gIsTrainerInRange:: @ 839B488 - .4byte IsTrainerInRangeSouth - .4byte IsTrainerInRangeNorth - .4byte IsTrainerInRangeWest - .4byte IsTrainerInRangeEast - - .align 2 -gTrainerSeeFuncList:: @ 839B498 - .4byte sub_8084394 - .4byte sub_8084398 - .4byte sub_80843DC - .4byte sub_808441C - .4byte sub_8084478 - .4byte sub_8084534 - .4byte sub_8084578 - .4byte sub_80845AC - .4byte sub_80845C8 - .4byte sub_80845FC - .4byte sub_8084654 - .4byte sub_80846C8 - - .align 2 -gTrainerSeeFuncList2:: @ 839B4C8 - .4byte sub_80845C8 - .4byte sub_80845FC - .4byte sub_8084654 - .4byte sub_80846C8 - .align 2 gOamData_839B4D8:: @ 839B4D8 .2byte 0x0000 -- cgit v1.2.3 From a185f8a26dc5e5a04908c272ab54bede7af8a10c Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 16:53:04 -0500 Subject: lots more relabeling --- data/event_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 2d0b1b4fe..3ea5cee24 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1324,7 +1324,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70 setflag 2141 return -EventScript_LeagueWhiteOut:: @ 819FC74 +S_WhiteOut:: @ 819FC74 call EverGrandeCity_HallOfFame_EventScript_19FD09 call EventScript_19FC84 jump gUnknown_0819FC9F -- cgit v1.2.3 From 02104e52ddfcbd2a8a00af5d8b169b732e84a7cb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 17:26:13 -0500 Subject: move data to overworld.c --- data/rom4.s | 66 ------------------------------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 data/rom4.s (limited to 'data') diff --git a/data/rom4.s b/data/rom4.s deleted file mode 100644 index 6f883c64c..000000000 --- a/data/rom4.s +++ /dev/null @@ -1,66 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gDummyWarpData:: @ 8216624 - .byte -1 - .byte -1 - .byte -1 - .space 1 - .2byte -1 - .2byte -1 - -@ unused, unknown data - .byte 0xB0, 0x04, 0x00, 0x00 - .byte 0x10, 0x0E, 0x00, 0x00 - .byte 0xB0, 0x04, 0x00, 0x00 - .byte 0x60, 0x09, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00 - .byte 0x50, 0x00, 0x00, 0x00 - .byte 0xD4, 0xFF, 0xFF, 0xFF - .byte 0x2C, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_0821664C:: @ 821664C - .4byte 0, 0 - .4byte 0, 1 - .4byte 0, -1 - .4byte -1, 0 - .4byte 1, 0 - .4byte -1, 1 - .4byte 1, 1 - .4byte -1, -1 - .4byte 1, -1 - - .align 2 -gUnknown_08216694:: @ 8216694 - .4byte REG_WIN0H - .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 - .4byte 1 - - .align 2 -gUnknown_082166A0:: @ 82166A0 - .4byte sub_8055C68 - .4byte sub_8055C88 - .4byte sub_8055C8C - - .align 2 -gUnknown_082166AC:: @ 82166AC - .4byte sub_8055CAC - .4byte sub_8055CB0 - .4byte sub_8055CB0 - .4byte sub_8055CB0 - .4byte sub_8055CB0 - .4byte sub_8055CAC - .4byte sub_8055CAC - .4byte sub_8055D18 - .4byte sub_8055D18 - .4byte sub_8055D18 - .4byte sub_8055D18 - - .align 2 -gUnknown_082166D8:: @ 82166D8 - .4byte sub_8055D30 - .4byte sub_8055D38 -- cgit v1.2.3 From 2c87516ca3efa260b96b92ededb24d75edfe49e8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 20:23:23 -0500 Subject: more labels and fix build --- data/event_scripts.s | 59 +++++++++++------------- data/field_move_scripts.inc | 2 +- data/scripts/cable_club.inc | 6 +-- data/scripts/maps/BattleTower_Lobby.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 2 +- data/scripts/pokeblocks.inc | 2 +- data/specials.inc | 4 +- 8 files changed, 37 insertions(+), 42 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 3ea5cee24..171581dd9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -918,13 +918,8 @@ Std_5: @ 819F805 return -BattleTower_Lobby_EventScript_19F806:: @ 819F806 -FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806 -LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806 -MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806 -OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806 -SecretBase_RedCave1_EventScript_19F806:: @ 819F806 - special InitSaveDialog +S_DoSaveDialog:: @ 819F806 + special ScrSpecial_DoSaveDialog waitstate return @@ -1437,16 +1432,16 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B lock faceplayer - msgbox OldaleTown_PokemonCenter_1F_Text_1A0A7D, 5 + msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO compare RESULT, 1 - jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FD7C + jumpeq do_heal_party compare RESULT, 0 - jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDC7 + jumpeq dont_heal_party end -OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C +do_heal_party:: @ 819FD7C inccounter GAME_STAT_USED_POKECENTER - message OldaleTown_PokemonCenter_1F_Text_1A1245 + message gText_NurseJoy_OkayIllTakeYourPokemon waittext move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F waitmove 0 @@ -1461,16 +1456,16 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C end OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 - message OldaleTown_PokemonCenter_1F_Text_1A0B14 + message gText_NurseJoy_ThankYouForWaiting waittext move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4 waitmove 0 - message OldaleTown_PokemonCenter_1F_Text_1A0AFA + message gText_NurseJoy_WeHopeToSeeYouAgain waittext return -OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7 - message OldaleTown_PokemonCenter_1F_Text_1A0AFA +dont_heal_party:: @ 819FDC7 + message gText_NurseJoy_WeHopeToSeeYouAgain waittext return @@ -1483,7 +1478,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE end OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA - message OldaleTown_PokemonCenter_1F_Text_1A1275 + message gText_NurseJoy_Pokerus waittext setflag 273 return @@ -2985,17 +2980,17 @@ UnknownString_81A0A54: @ 81A0A54 UnknownString_81A0A66: @ 81A0A66 .string "Accessed LANETTE’s PC.$" -OldaleTown_PokemonCenter_1F_Text_1A0A7D:: @ 81A0A7D +gText_NurseJoy_Welcome:: @ 81A0A7D .string "Hello, and welcome to the POKéMON\n" .string "CENTER.\p" .string "We restore your tired POKéMON to\n" .string "full health.\p" .string "Would you like to rest your POKéMON?$" -OldaleTown_PokemonCenter_1F_Text_1A0AFA:: @ 81A0AFA +gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA .string "We hope to see you again!$" -OldaleTown_PokemonCenter_1F_Text_1A0B14:: @ 81A0B14 +gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14 .string "Thank you for waiting.\p" .string "We’ve restored your POKéMON to\n" .string "full health.$" @@ -3209,11 +3204,11 @@ SlateportCity_Text_1A116E:: @ 81A116E .string "We’ll accept you as a member and sell\n" .string "you good stuff in secrecy.$" -OldaleTown_PokemonCenter_1F_Text_1A1245:: @ 81A1245 +gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245 .string "Okay, I’ll take your POKéMON for a\n" .string "few seconds.$" -OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275 +gText_NurseJoy_Pokerus:: @ 81A1275 .string "Your POKéMON may be infected with\n" .string "POKéRUS.\p" .string "Little is known about the POKéRUS\n" @@ -3949,7 +3944,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 jumpeq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A308F hidebox 0, 0, 15, 10 @@ -3984,7 +3979,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE jumpeq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A310B hidebox 0, 0, 15, 10 @@ -4019,7 +4014,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A jumpeq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3187 hidebox 0, 0, 15, 10 @@ -4054,7 +4049,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 jumpeq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3203 hidebox 0, 0, 15, 10 @@ -4089,7 +4084,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 jumpeq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A327F hidebox 0, 0, 15, 10 @@ -4124,7 +4119,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E jumpeq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A32FB hidebox 0, 0, 15, 10 @@ -4159,7 +4154,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A jumpeq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3377 hidebox 0, 0, 15, 10 @@ -4194,7 +4189,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 jumpeq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A33F3 hidebox 0, 0, 15, 10 @@ -4229,7 +4224,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 jumpeq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A346F hidebox 0, 0, 15, 10 @@ -4264,7 +4259,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E jumpeq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A34EB hidebox 0, 0, 15, 10 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 315217055..acf5e9e17 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -90,7 +90,7 @@ DoRockSmashMovement: @ 81B0F0C specialval RESULT, sub_810F5BC compare RESULT, 1 jumpeq DoRockSmashMovement_Done - special RockSmashWildEncounter + special ScrSpecial_RockSmashWildEncounter compare RESULT, 0 jumpeq DoRockSmashMovement_Done waitstate diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 4a919c597..5728b52d8 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -191,7 +191,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4319 OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 - call OldaleTown_PokemonCenter_2F_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF @@ -361,7 +361,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA call OldaleTown_PokemonCenter_2F_EventScript_1A41BB compare RESULT, 0 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - call OldaleTown_PokemonCenter_2F_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C @@ -455,7 +455,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 - call OldaleTown_PokemonCenter_2F_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 8cd3639a5..a1570ac13 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -242,7 +242,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 special LoadPlayerParty closebutton pause 2 - call BattleTower_Lobby_EventScript_19F806 + call S_DoSaveDialog setvar 0x4000, 5 hidebox 0, 0, 15, 10 compare RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 3c8cc5bdf..6bdcf55e2 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -330,7 +330,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, 5 compare RESULT, 0 jumpeq LilycoveCity_ContestLobby_EventScript_158C35 - call LilycoveCity_ContestLobby_EventScript_19F806 + call S_DoSaveDialog hidebox 0, 0, 15, 9 compare RESULT, 0 jumpeq LilycoveCity_ContestLobby_EventScript_158C35 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 14836f3e0..59669596a 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -103,7 +103,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 compare RESULT, 0 callif 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty - call MossdeepCity_GameCorner_1F_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index e1add8734..852acd292 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -235,7 +235,7 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 end FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 - call FallarborTown_ContestLobby_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 diff --git a/data/specials.inc b/data/specials.inc index 99a4a218c..1baa55442 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -100,7 +100,7 @@ gSpecials:: def_special sub_80C5044 def_special GiveMonArtistRibbon def_special sub_808363C - def_special InitSaveDialog + def_special ScrSpecial_DoSaveDialog def_special DoWateringBerryTreeAnim def_special sub_80E60D8 def_special sub_80EB7C4 @@ -178,7 +178,7 @@ gSpecials:: def_special sub_810FF48 def_special sub_810FAA0 def_special sub_810FF60 - def_special RockSmashWildEncounter + def_special ScrSpecial_RockSmashWildEncounter def_special GabbyAndTyGetBattleNum def_special sub_80BDC14 def_special GabbyAndTyBeforeInterview -- cgit v1.2.3 From 270bd98d41a19c516a4be95f522deb26cc4300a9 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 13 Sep 2017 00:03:22 -0500 Subject: more labeling --- data/event_scripts.s | 14 ++++---- data/field_move_scripts.inc | 18 +++++----- data/maps/events/FieryPath.inc | 12 +++---- data/maps/events/GraniteCave_B2F.inc | 14 ++++---- data/maps/events/PetalburgWoods.inc | 4 +-- data/maps/events/Route102.inc | 4 +-- data/maps/events/Route103.inc | 10 +++--- data/maps/events/Route104.inc | 22 ++++++------ data/maps/events/Route110.inc | 6 ++-- data/maps/events/Route110_TrickHousePuzzle1.inc | 30 ++++++++-------- data/maps/events/Route110_TrickHousePuzzle3.inc | 12 +++---- data/maps/events/Route110_TrickHousePuzzle4.inc | 22 ++++++------ data/maps/events/Route111.inc | 14 ++++---- data/maps/events/Route112.inc | 8 ++--- data/maps/events/Route114.inc | 16 ++++----- data/maps/events/Route115.inc | 12 +++---- data/maps/events/Route116.inc | 16 ++++----- data/maps/events/Route117.inc | 8 ++--- data/maps/events/Route118.inc | 8 ++--- data/maps/events/Route119.inc | 14 ++++---- data/maps/events/Route120.inc | 26 +++++++------- data/maps/events/Route121.inc | 22 ++++++------ data/maps/events/Route123.inc | 42 +++++++++++----------- data/maps/events/Route130.inc | 2 +- data/maps/events/RusturfTunnel.inc | 4 +-- data/maps/events/SafariZone_Northeast.inc | 12 +++---- data/maps/events/SeafloorCavern_Room1.inc | 6 ++-- data/maps/events/SeafloorCavern_Room2.inc | 18 +++++----- data/maps/events/SeafloorCavern_Room3.inc | 18 +++++----- data/maps/events/SeafloorCavern_Room5.inc | 12 +++---- data/maps/events/SeafloorCavern_Room8.inc | 24 ++++++------- data/maps/events/ShoalCave_LowTideLowerRoom.inc | 2 +- data/maps/events/VictoryRoad_B1F.inc | 28 +++++++-------- data/scripts/berry_tree.inc | 2 +- data/scripts/cable_club.inc | 2 +- data/scripts/day_care.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 +-- data/scripts/maps/IslandCave.inc | 2 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- data/scripts/maps/LilycoveCity_Harbor.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 6 ++-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 2 +- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route110.inc | 2 +- data/scripts/maps/SlateportCity.inc | 2 +- data/scripts/players_house.inc | 2 +- data/specials.inc | 14 ++++---- 47 files changed, 263 insertions(+), 263 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 171581dd9..0a8390a8f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1449,7 +1449,7 @@ do_heal_party:: @ 819FD7C checkanimation 25 move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmove 0 - special HealPlayerParty + special ScrSpecial_HealPlayerParty checkflag 273 jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0 @@ -2106,7 +2106,7 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA fadescreen 1 fanfare 368 waitfanfare - special HealPlayerParty + special ScrSpecial_HealPlayerParty fadescreen 0 return @@ -4288,7 +4288,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A setvar 0x8005, 0 special sub_813556C waitstate - special HealPlayerParty + special ScrSpecial_HealPlayerParty release end @@ -4769,7 +4769,7 @@ gUnknown_081B694A:: @ 81B694A .include "data/scripts/players_house.inc" -Event_RunningShoesManual:: @ 81B6E5A +S_RunningShoesManual:: @ 81B6E5A msgbox UnknownString_81728E3, 3 end @@ -4778,7 +4778,7 @@ Event_RunningShoesManual:: @ 81B6E5A .include "data/text/trainers.inc" -Event_RepelWoreOff:: @ 81C33E6 +S_RepelWoreOff:: @ 81C33E6 msgbox Text_RepelWoreOff, 3 end @@ -4858,7 +4858,7 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5 SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5 SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5 - map_script_2 0x4022, 0, GraniteCave_B1F_EventScript_1C6BC5 + map_script_2 0x4022, 0, S_FallDownHole .2byte 0 GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF @@ -4868,7 +4868,7 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF copyvar 0x4022, 0x1 end -GraniteCave_B1F_EventScript_1C6BC5:: @ 81C6BC5 +S_FallDownHole:: @ 81C6BC5 lockall pause 20 move 255, GraniteCave_B1F_Movement_1C6BF7 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index acf5e9e17..9911dca3a 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,4 +1,4 @@ -CuttableTreeScript:: @ 81B0DCC +S_CuttableTree:: @ 81B0DCC lockall checkflag 2055 jumpif 0, CannotUseCut @@ -18,7 +18,7 @@ CuttableTreeScript:: @ 81B0DCC jump DoTreeCutMovement end -UseCutScript:: @ 81B0E16 +S_UseCut:: @ 81B0E16 lockall doanimation 2 waitstate @@ -56,7 +56,7 @@ UsedCutRockSmashText: @ 81B0E82 CannotUseCutText: @ 81B0E8E .string "This tree looks like it can be CUT down.$" -BreakableRockScript:: @ 81B0EB7 +S_BreakableRock:: @ 81B0EB7 lockall checkflag 2057 jumpif 0, CannotUseRockSmash @@ -76,7 +76,7 @@ BreakableRockScript:: @ 81B0EB7 jump DoRockSmashMovement end -UseRockSmashScript:: @ 81B0F01 +S_UseRockSmash:: @ 81B0F01 lockall doanimation 37 waitstate @@ -123,7 +123,7 @@ CannotUseRockSmashText: @ 81B0F90 .string "It’s a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" -PushableBoulderScript:: @ 81B0FCB +S_PushableBoulder:: @ 81B0FCB lockall checkflag 2058 jumpif 0, CannotUseStrength @@ -142,7 +142,7 @@ PushableBoulderScript:: @ 81B0FCB jump UsedStrength end -UseStrengthScript:: @ 81B100E +S_UseStrength:: @ 81B100E lockall doanimation 40 waitstate @@ -188,7 +188,7 @@ AlreadyUsedStrengthText: @ 81B1127 .string "STRENGTH made it possible to move\n" .string "boulders around.$" -UseWaterfallScript:: @ 81B115A +S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL compare RESULT, 6 @@ -202,7 +202,7 @@ UseWaterfallScript:: @ 81B115A doanimation 43 jump Waterfall_Done -CannotUseWaterfallScript:: @ 81B1194 +S_CannotUseWaterfall:: @ 81B1194 lockall Waterfall_NoMonKnows: @ 81B1195 msgbox CannotUseWaterfallText, 4 @@ -244,7 +244,7 @@ Dive_Done: @ 81B1267 releaseall end -UnderwaterUseDiveScript:: @ 81B1269 +S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE compare RESULT, 6 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index 01b7b3efe..a4ac688d8 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -1,11 +1,11 @@ FieryPath_MapObjects:: @ 838C718 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, 1091, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0 FieryPath_MapWarps:: @ 838C7D8 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index 49c0bace0..158577482 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -1,13 +1,13 @@ GraniteCave_B2F_MapObjects:: @ 838BFEC object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, 1053, 0, 0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, 1054, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 23, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 23, 0, 0 GraniteCave_B2F_MapWarps:: @ 838C0C4 warp_def 29, 13, 3, 2, GraniteCave_B1F diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 0ec69c1a2..cb0ff7ca1 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,6 +1,6 @@ PetalburgWoods_MapObjects:: @ 838C14C - object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0 diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc index 9cf97de4b..7ffa0e191 100644 --- a/data/maps/events/Route102.inc +++ b/data/maps/events/Route102.inc @@ -5,8 +5,8 @@ Route102_MapObjects:: @ 83811FC object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0 object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, 1000, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, BerryTreeScript, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0 Route102_MapBGEvents:: @ 83812D4 diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index 01640eb65..462fe1a3b 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -5,15 +5,15 @@ Route103_MapObjects:: @ 8381300 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0 object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 50, 0, 8, 0, 3, 26, 16, 0, 1, 0, 3, 0, Route103_EventScript_14EE37, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, BerryTreeScript, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, S_BerryTree, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0 object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, 898, 0, 0 object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0 object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 Route103_MapBGEvents:: @ 8381468 bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index da4b5ffc1..b4c8a2834 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -8,17 +8,17 @@ Route104_MapObjects:: @ 8381488 object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 742, 0, 0 object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 738, 0, 0 object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, BerryTreeScript, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, S_BerryTree, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, S_BerryTree, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, S_BerryTree, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, S_BerryTree, 0, 0, 0 object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 37, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EEC8, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, BerryTreeScript, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, BerryTreeScript, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, BerryTreeScript, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, S_BerryTree, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, 1002, 0, 0 object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, 906, 0, 0 object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0 @@ -28,7 +28,7 @@ Route104_MapObjects:: @ 8381488 object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, 1057, 0, 0 object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0 object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, 1115, 0, 0 - object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, 1135, 0, 0 object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 4ece25549..3db4ce8e8 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -14,9 +14,9 @@ Route110_MapObjects:: @ 8381D58 object_event 13, MAP_OBJ_GFX_LASS, 0, 33, 0, 15, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAA5, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MANIAC, 0, 23, 0, 40, 0, 3, 20, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FABC, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 10, 0, 19, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAFA, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, BerryTreeScript, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, BerryTreeScript, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, 1007, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, 1006, 0, 0 object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 7e282f0e8..3660e3c3f 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -2,22 +2,22 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0 object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0 object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0 - object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 23, 0, 0 - object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 22, 0, 0 - object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 21, 0, 0 - object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 25, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 26, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 28, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 27, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 29, 0, 0 - object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 30, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 + object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 23, 0, 0 + object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 22, 0, 0 + object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 21, 0, 0 + object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 25, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 24, 0, 0 + object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 26, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 28, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 27, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 29, 0, 0 + object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 30, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, 1060, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 31, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 31, 0, 0 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index b7a902a54..abccae1d4 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -2,14 +2,14 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0 object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, 1064, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, 1063, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index ac3e152a2..ef450800d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -3,17 +3,17 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, 1065, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0 - object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 26, 0, 0 - object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 27, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 + object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0 + object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index 9eeed5ede..e36cd7e74 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -4,8 +4,8 @@ Route111_MapObjects:: @ 83821A0 object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, 770, 0, 0 object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 771, 0, 0 object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, BerryTreeScript, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0 object_event 8, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 91, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_150395, 0, 0, 0 object_event 9, MAP_OBJ_GFX_CAMPER, 0, 24, 0, 60, 0, 3, 21, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503A7, 0, 0, 0 object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0 @@ -13,19 +13,19 @@ Route111_MapObjects:: @ 83821A0 object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0 object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, 796, 0, 0 object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, 796, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, BerryTreeScript, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, BerryTreeScript, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0 object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, 799, 0, 0 object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, 799, 0, 0 object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, 903, 0, 0 object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0 object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0 object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0 - object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0 object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0 object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index f6dfcfbe5..a4991a907 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -5,10 +5,10 @@ Route112_MapObjects:: @ 8382818 object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0 object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0 object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, 819, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, BerryTreeScript, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index a2d948d33..1f4d761e3 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -1,25 +1,25 @@ Route114_MapObjects:: @ 8382C48 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, S_BerryTree, 0, 0, 0 object_event 3, MAP_OBJ_GFX_HIKER, 0, 15, 0, 65, 0, 7, 10, 0, 0, 1, 0, 6, 0, Route114_EventScript_1507F1, 0, 0, 0 object_event 4, MAP_OBJ_GFX_HIKER, 0, 30, 0, 72, 0, 5, 15, 0, 0, 1, 0, 4, 0, Route114_EventScript_150808, 0, 0, 0 object_event 5, MAP_OBJ_GFX_CAMPER, 0, 22, 0, 50, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route114_EventScript_15081F, 0, 0, 0 object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0 object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, BerryTreeScript, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, 1014, 0, 0 object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, 1015, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0 object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0 object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0 object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 - object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 - object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 - object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 + object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 + object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 + object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 + object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0 object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index cba3c3e7d..ddca08fad 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -2,18 +2,18 @@ Route115_MapObjects:: @ 8382F2C object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 18, 0, 68, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route115_EventScript_15092E, 0, 0, 0 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 15, 0, 3, 10, 0, 0, 1, 0, 6, 0, Route115_EventScript_150949, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 27, 0, 53, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route115_EventScript_15099E, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, BerryTreeScript, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, S_BerryTree, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, S_BerryTree, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, S_BerryTree, 0, 0, 0 object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0 object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0 object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, 1016, 0, 0 object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, 1017, 0, 0 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, 1018, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0 Route115_MapWarps:: @ 83830AC diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 18717be4e..b5f922524 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -1,18 +1,18 @@ Route116_MapObjects:: @ 8383170 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0 object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, 1019, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, BerryTreeScript, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, 891, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, 1021, 0, 0 object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index b53e3de57..bf6aeb5d0 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -9,11 +9,11 @@ Route117_MapObjects:: @ 8383440 object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 0, 7, 0, 3, 28, 7, 0, 1, 0, 4, 0, Route117_EventScript_150E09, 0, 0, 0 object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 31, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route117_EventScript_150DCB, 0, 0, 0 object_event 10, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 9, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route117_EventScript_150D8D, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, BerryTreeScript, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0 object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, 1022, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, 1023, 0, 0 object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0 object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index f912b6fbd..df887ba1e 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -1,7 +1,7 @@ Route118_MapObjects:: @ 8383684 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0 object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, 797, 0, 0 object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, 797, 0, 0 @@ -10,7 +10,7 @@ Route118_MapObjects:: @ 8383684 object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, 901, 0, 0 object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0 object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0 object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 966ae6058..08e6e3649 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -1,7 +1,7 @@ Route119_MapObjects:: @ 8383914 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, S_BerryTree, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, S_BerryTree, 0, 0, 0 object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 12, 0, 123, 0, 3, 59, 0, 0, 1, 0, 1, 0, Route119_EventScript_151491, 0, 0, 0 object_event 5, MAP_OBJ_GFX_MANIAC, 0, 26, 0, 123, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151463, 0, 0, 0 object_event 6, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 125, 0, 3, 62, 0, 0, 1, 0, 1, 0, Route119_EventScript_15144C, 0, 0, 0 @@ -25,10 +25,10 @@ Route119_MapObjects:: @ 8383914 object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, 890, 0, 0 object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, 923, 0, 0 object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, BerryTreeScript, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, BerryTreeScript, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, BerryTreeScript, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, BerryTreeScript, 0, 0, 0 + object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0 + object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0 + object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0 + object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0 object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0 object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0 object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 43a67ee99..81fa21c7f 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -1,14 +1,14 @@ Route120_MapObjects:: @ 8383F30 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, S_BerryTree, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, S_BerryTree, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, S_BerryTree, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, S_BerryTree, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, S_BerryTree, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, S_BerryTree, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, S_BerryTree, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, S_BerryTree, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 22, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519B3, 0, 0, 0 object_event 12, MAP_OBJ_GFX_MAN_6, 0, 32, 0, 14, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519CA, 0, 0, 0 object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0 @@ -19,7 +19,7 @@ Route120_MapObjects:: @ 8383F30 object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, 798, 0, 0 object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0 object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0 - object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0 object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0 @@ -30,8 +30,8 @@ Route120_MapObjects:: @ 8383F30 object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0 object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, 970, 0, 0 object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, 972, 0, 0 - object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0 - object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 + object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0 object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0 object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index 514f51349..9961344a8 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -1,26 +1,26 @@ Route121_MapObjects:: @ 8384504 object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 29, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route121_EventScript_151B0A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, BerryTreeScript, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, S_BerryTree, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, S_BerryTree, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, S_BerryTree, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, S_BerryTree, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, S_BerryTree, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, S_BerryTree, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, S_BerryTree, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0 object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0 object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0 object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0 object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, 1103, 0, 0 - object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, Route121_SafariZoneEntrance diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index 6b97bafe5..dc5ac0fb4 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -1,30 +1,30 @@ Route123_MapObjects:: @ 83847F8 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, S_BerryTree, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, S_BerryTree, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, S_BerryTree, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, S_BerryTree, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, S_BerryTree, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, S_BerryTree, 0, 0, 0 object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 70, 0, 12, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route123_EventScript_151CD1, 0, 0, 0 object_event 9, MAP_OBJ_GFX_MAN_4, 0, 58, 0, 7, 0, 3, 17, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CE8, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, BerryTreeScript, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, BerryTreeScript, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 - object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, S_BerryTree, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, S_BerryTree, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, S_BerryTree, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, S_BerryTree, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, S_BerryTree, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, 1032, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, 1033, 0, 0 object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, BerryTreeScript, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, BerryTreeScript, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, BerryTreeScript, 0, 0, 0 + object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0 + object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0 + object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, S_BerryTree, 0, 0, 0 object_event 27, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 9, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CFF, 0, 0, 0 object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151DAD, 0, 0, 0 object_event 29, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151D92, 0, 0, 0 diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc index f2c72ef2d..009604d4b 100644 --- a/data/maps/events/Route130.inc +++ b/data/maps/events/Route130.inc @@ -1,7 +1,7 @@ Route130_MapObjects:: @ 838523C object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, BerryTreeScript, 17, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, 17, 0, 0 Route130_MapEvents:: @ 8385284 map_events Route130_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 490afda7b..ef1559687 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,12 +1,12 @@ RusturfTunnel_MapObjects:: @ 838BD2C object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, 807, 0, 0 - object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 931, 0, 0 + object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 931, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 879, 0, 0 object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, 878, 0, 0 object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, 880, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, BreakableRockScript, 932, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, 932, 0, 0 object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0 object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0 diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc index 30921f095..cea87fb14 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/events/SafariZone_Northeast.inc @@ -1,12 +1,12 @@ SafariZone_Northeast_MapObjects:: @ 8391A2C object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, 1119, 0, 0 SafariZone_Northeast_MapEvents:: @ 8391B04 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 1e791f884..093934481 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -1,7 +1,7 @@ SeafloorCavern_Room1_MapObjects:: @ 838D0B8 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, 946, 0, 0 object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index 3dbe5e8a7..86a0354e4 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room2_MapObjects:: @ 838D15C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 24, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 24, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 SeafloorCavern_Room2_MapWarps:: @ 838D234 warp_def 12, 19, 3, 2, SeafloorCavern_Room1 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index 98e6066f2..5c5c9c219 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room3_MapObjects:: @ 838D268 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0 SeafloorCavern_Room3_MapWarps:: @ 838D358 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index 0ebd46a56..37a501512 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -1,10 +1,10 @@ SeafloorCavern_Room5_MapObjects:: @ 838D3D0 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 SeafloorCavern_Room5_MapWarps:: @ 838D460 warp_def 4, 1, 3, 1, SeafloorCavern_Room1 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 610937753..2d7329aec 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -1,16 +1,16 @@ SeafloorCavern_Room8_MapObjects:: @ 838D4DC - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 26, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 27, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 28, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 28, 0, 0 SeafloorCavern_Room8_MapWarps:: @ 838D5FC warp_def 5, 2, 3, 0, SeafloorCavern_Room9 diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index a1770b5bb..858f919e0 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index a4f778c4d..b00074990 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -1,21 +1,21 @@ VictoryRoad_B1F_MapObjects:: @ 838DA04 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 30, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 26, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 27, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 28, 0, 0 - object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 29, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 31, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 30, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 26, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 27, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 28, 0, 0 + object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 29, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 31, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0 object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0 object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 32, 0, 0 + object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 32, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 1bbe7d355..f4707d8cb 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,4 +1,4 @@ -BerryTreeScript:: @ 81A14DD +S_BerryTree:: @ 81A14DD special FieldObjectInteractionGetBerryTreeData switch 0x8004 case 255, Route102_EventScript_1A1533 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 5728b52d8..6507677e0 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -215,7 +215,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E - special HealPlayerParty + special ScrSpecial_HealPlayerParty special SavePlayerParty special LoadPlayerBag copyvar 0x4087, 0x8004 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index b5b3d4670..dcc4b44e7 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -282,7 +282,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 release end -Event_EggHatch:: @ 81B25BC +S_EggHatch:: @ 81B25BC lockall msgbox UnknownString_81B2C68, 4 special EggHatch diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 176d8e8e8..2f0fb97b9 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -20,7 +20,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA msgbox 0x20234cc, 4 waittext closebutton - special HealPlayerParty + special ScrSpecial_HealPlayerParty setvar 0x8004, 0 setvar 0x8005, 0 special sub_813556C @@ -56,7 +56,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special sub_8135A14 fanfare 368 waitfanfare - special HealPlayerParty + special ScrSpecial_HealPlayerParty BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2 msgbox BattleTower_BattleRoom_Text_19AD09, 5 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 8f2ce6dc1..2f8ba2121 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -31,7 +31,7 @@ IslandCave_MapScript1_15EF15:: @ 815EF15 setflag 2133 end -gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19 +S_OpenRegiceChamber:: @ 815EF19 setmaptile 7, 19, 554, 1 setmaptile 8, 19, 555, 1 setmaptile 9, 19, 556, 1 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index dcf74b77c..09d19c1c5 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD message LilycoveCity_CoveLilyMotel_2F_Text_18708F waittext call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5 - special sub_810D6A4 + special ScrSpecial_ShowDiploma waitstate release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index f8ff8f9f3..aca6b16d4 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 HealPlayerParty + special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E warp SouthernIsland_Exterior, 255, 13, 22 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 6adea2eb2..2786c930c 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -21,7 +21,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE special sub_80FA148 compare RESULT, 1 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71 - special sub_80F9F3C + special ScrSpecial_CountPokemonMoves compare RESULT, 1 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 @@ -30,7 +30,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE fadescreen 0 compare 0x8005, 4 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE - special sub_80F9F84 + special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 switch RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53 @@ -47,7 +47,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 end LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64 - special sub_80F9F84 + special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4 releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index a5a013d5f..c7d1201fd 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -29,7 +29,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E compare RESULT, 2 callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton - special HealPlayerParty + special ScrSpecial_HealPlayerParty move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmove 0 special LoadPlayerParty diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 1acd4b598..d945aadfc 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -229,7 +229,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F move 2, Route101_Movement_14EAD7 waitmove 0 msgbox Route101_Text_16D191, 4 - special HealPlayerParty + special ScrSpecial_HealPlayerParty setflag 720 clearflag 721 setflag 700 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index d8c19d92c..a77feaa0f 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -25,7 +25,7 @@ Route110_MapScript2_14F933:: @ 814F933 .2byte 0 Route110_EventScript_14F93D:: @ 814F93D - special BeginCyclingRoadChallenge + special ScrSpecial_BeginCyclingRoadChallenge setvar 0x40a9, 2 return diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 48eb5c1df..e156f8948 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -69,7 +69,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 specialval RESULT, LeadMonHasEffortRibbon compare RESULT, 1 callif 1, SlateportCity_EventScript_14BB35 - specialval RESULT, GetLeadMonEVCount + specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare RESULT, 0 callif 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index ca4b2bdb9..e9f379b24 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -107,7 +107,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91 inccounter GAME_STAT_CHECKED_CLOCK fadescreen 1 - special sub_810D6B8 + special ScrSpecial_ViewWallClock waitstate releaseall end diff --git a/data/specials.inc b/data/specials.inc index 1baa55442..3545d1dff 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -7,7 +7,7 @@ .set __special__, 0 .align 2 gSpecials:: - def_special HealPlayerParty + def_special ScrSpecial_HealPlayerParty def_special SetCableClubWarp def_special DoCableClubWarp def_special sub_80810DC @@ -162,7 +162,7 @@ gSpecials:: def_special sub_8123218 def_special sub_8053E90 def_special StartWallClock - def_special sub_810D6B8 + def_special ScrSpecial_ViewWallClock def_special ScrSpecial_ChooseStarter def_special ScrSpecial_StartWallyTutorialBattle def_special sub_80BF9F8 @@ -229,11 +229,11 @@ gSpecials:: def_special sub_80F9A4C def_special sub_80F9EEC def_special sub_80FA0DC - def_special sub_80F9F84 - def_special sub_80F9F3C + def_special ScrSpecial_GetPokemonNicknameAndMoveName + def_special ScrSpecial_CountPokemonMoves def_special sub_8132670 def_special GetRecordedCyclingRoadResults - def_special BeginCyclingRoadChallenge + def_special ScrSpecial_BeginCyclingRoadChallenge def_special GetPlayerAvatarBike def_special FinishCyclingRoadChallenge def_special UpdateCyclingRoadState @@ -271,7 +271,7 @@ gSpecials:: def_special SetTrickHouseEndRoomFlag def_special ScrSpecial_CreatePCMenu def_special AccessHallOfFamePC - def_special sub_810D6A4 + def_special ScrSpecial_ShowDiploma def_special CheckLeadMonCool def_special CheckLeadMonBeauty def_special CheckLeadMonCute @@ -301,7 +301,7 @@ gSpecials:: def_special sub_810F4FC def_special LeadMonHasEffortRibbon def_special GivLeadMonEffortRibbon - def_special GetLeadMonEVCount + def_special ScrSpecial_AreLeadMonEVsMaxedOut def_special sub_8064EAC def_special sub_8064ED4 def_special InitRoamer -- cgit v1.2.3 From 61e8416b6e7d1b309b7382169c3fe47bc46f7c90 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 21 Sep 2017 15:24:12 -0500 Subject: decompile unref_sub_807DCB4 - sub_807E460 --- data/field_weather.s | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'data') diff --git a/data/field_weather.s b/data/field_weather.s index 836bfbe99..1b0076451 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -3,40 +3,6 @@ .section .rodata - .align 2 -DroughtPaletteData_0: @ 8393FE8 - .incbin "graphics/weather/drought0.bin.lz" - - .align 2 -DroughtPaletteData_1: @ 839480C - .incbin "graphics/weather/drought1.bin.lz" - - .align 2 -DroughtPaletteData_2: @ 8395004 - .incbin "graphics/weather/drought2.bin.lz" - - .align 2 -DroughtPaletteData_3: @ 83957A0 - .incbin "graphics/weather/drought3.bin.lz" - - .align 2 -DroughtPaletteData_4: @ 8395FBC - .incbin "graphics/weather/drought4.bin.lz" - - .align 2 -DroughtPaletteData_5: @ 8396784 - .incbin "graphics/weather/drought5.bin.lz" - - .align 2 -gUnknown_08396FA8:: @ 8396FA8 - .4byte DroughtPaletteData_0 - .4byte DroughtPaletteData_1 - .4byte DroughtPaletteData_2 - .4byte DroughtPaletteData_3 - .4byte DroughtPaletteData_4 - .4byte DroughtPaletteData_5 - .4byte 0x2000000 - .align 2 gUnknown_08396FC4:: @ 8396FC4 .4byte gUnknown_0202F7E8 -- cgit v1.2.3 From c3792f2bd4c6ee3fecea548f45b2a54a9b468ab1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Sep 2017 15:08:32 -0700 Subject: Decompile HeldItemIcon funcs in party_menu --- data/party_menu.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/party_menu.s b/data/party_menu.s index 5596ff2ed..0911ac987 100644 --- a/data/party_menu.s +++ b/data/party_menu.s @@ -102,7 +102,7 @@ gSpriteAnimTable_8376604:: @ 8376604 .align 2 gSpriteTemplate_837660C:: @ 837660C - spr_template 55120, 55120, gOamData_83765EC, gSpriteAnimTable_8376604, NULL, gDummySpriteAffineAnimTable, SpriteCB_HeldItemIcon_806DD7C + spr_template 55120, 55120, gOamData_83765EC, gSpriteAnimTable_8376604, NULL, gDummySpriteAffineAnimTable, SpriteCB_UpdateHeldItemIconPosition .align 2 gUnknown_08376624:: @ 8376624 -- cgit v1.2.3 From 0c234d0929a6f7bb41277275f06abae1b3d7e823 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 12:12:53 -0500 Subject: more renaming --- data/specials.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/specials.inc b/data/specials.inc index 3545d1dff..6ce9b5b1e 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -160,7 +160,7 @@ gSpecials:: def_special SetFlagInVar def_special CableCarWarp def_special sub_8123218 - def_special sub_8053E90 + def_special Overworld_PlaySpecialMapMusic def_special StartWallClock def_special ScrSpecial_ViewWallClock def_special ScrSpecial_ChooseStarter -- cgit v1.2.3 From ae5ec7f5b05218ba21c53ef632590a5243a7f647 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 14:17:14 -0500 Subject: Replace script commands: snop -> nop, snop1 -> nop1, jump -> goto --- data/event_scripts.s | 118 ++++++++++----------- data/field_move_scripts.inc | 20 ++-- data/scripts/berry_tree.inc | 8 +- data/scripts/cable_club.inc | 16 +-- data/scripts/contest_hall.inc | 18 ++-- data/scripts/day_care.inc | 12 +-- data/scripts/gabby_and_ty.inc | 14 +-- data/scripts/maps/BattleTower_BattleRoom.inc | 2 +- data/scripts/maps/BattleTower_Corridor.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 8 +- data/scripts/maps/BattleTower_Outside.inc | 4 +- data/scripts/maps/DewfordTown.inc | 6 +- data/scripts/maps/DewfordTown_Gym.inc | 10 +- data/scripts/maps/DewfordTown_Hall.inc | 4 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown_House2.inc | 12 +-- .../maps/FallarborTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/FortreeCity_Gym.inc | 6 +- data/scripts/maps/IslandCave.inc | 4 +- data/scripts/maps/LavaridgeTown.inc | 4 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 6 +- data/scripts/maps/LilycoveCity.inc | 16 +-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 20 ++-- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 10 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 22 ++-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 6 +- data/scripts/maps/LilycoveCity_Harbor.inc | 6 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 18 ++-- data/scripts/maps/LittlerootTown.inc | 16 +-- .../maps/LittlerootTown_BrendansHouse_1F.inc | 6 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 6 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/scripts/maps/MauvilleCity.inc | 8 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 26 ++--- data/scripts/maps/MauvilleCity_GameCorner.inc | 86 +++++++-------- data/scripts/maps/MauvilleCity_Gym.inc | 18 ++-- data/scripts/maps/MauvilleCity_House2.inc | 2 +- .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 34 +++--- data/scripts/maps/MtChimney.inc | 4 +- data/scripts/maps/MtPyre_Summit.inc | 12 +-- data/scripts/maps/OldaleTown.inc | 18 ++-- data/scripts/maps/PacifidlogTown_House2.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 8 +- data/scripts/maps/PetalburgCity_Gym.inc | 14 +-- data/scripts/maps/PetalburgCity_WallysHouse.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 8 +- data/scripts/maps/Route103.inc | 20 ++-- data/scripts/maps/Route104.inc | 2 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 8 +- data/scripts/maps/Route109.inc | 12 +-- data/scripts/maps/Route109_SeashoreHouse.inc | 4 +- data/scripts/maps/Route110.inc | 32 +++--- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 20 ++-- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 74 ++++++------- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 4 +- data/scripts/maps/Route111.inc | 8 +- .../maps/Route111_WinstrateFamilysHouse.inc | 12 +-- data/scripts/maps/Route113_GlassWorkshop.inc | 34 +++--- data/scripts/maps/Route116.inc | 8 +- data/scripts/maps/Route118.inc | 6 +- data/scripts/maps/Route119.inc | 20 ++-- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/Route120.inc | 18 ++-- data/scripts/maps/Route121_SafariZoneEntrance.inc | 12 +-- data/scripts/maps/Route123_BerryMastersHouse.inc | 12 +-- .../maps/Route124_DivingTreasureHuntersHouse.inc | 50 ++++----- data/scripts/maps/RustboroCity.inc | 28 ++--- data/scripts/maps/RustboroCity_Gym.inc | 6 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 12 +-- data/scripts/maps/SSTidalCorridor.inc | 2 +- data/scripts/maps/SafariZone_Southeast.inc | 4 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 2 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 12 +-- data/scripts/maps/SlateportCity_Harbor.inc | 20 ++-- .../maps/SlateportCity_OceanicMuseum_1F.inc | 8 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 4 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 6 +- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 6 +- data/scripts/mauville_man.inc | 18 ++-- data/scripts/mystery_event_club.inc | 8 +- data/scripts/players_house.inc | 10 +- data/scripts/pokeblocks.inc | 42 ++++---- data/scripts/safari_zone.inc | 6 +- data/scripts/tv.inc | 10 +- 97 files changed, 629 insertions(+), 629 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 0a8390a8f..0fc33c9ba 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -393,7 +393,7 @@ gUnknown_0815F36C:: @ 815F36C waittext waitbutton playsfx 5 - jump EventScript_15F384 + goto EventScript_15F384 end EventScript_15F384: @@ -401,12 +401,12 @@ EventScript_15F384: waittext checkflag 268 jumpeq EventScript_15F3A0 - jump EventScript_15F3E2 + goto EventScript_15F3E2 end gUnknown_0815F399:: @ 815F399 lockall - jump EventScript_15F384 + goto EventScript_15F384 end EventScript_15F3A0: @@ -454,7 +454,7 @@ gUnknown_0815F43A:: @ 815F43A waittext waitbutton playsfx 5 - jump EventScript_15F452 + goto EventScript_15F452 end EventScript_15F452: @@ -471,7 +471,7 @@ EventScript_15F452: gUnknown_0815F49A:: @ 815F49A lockall - jump EventScript_15F452 + goto EventScript_15F452 end EventScript_15F4A1: @@ -510,7 +510,7 @@ EventScript_15F503: EventScript_15F511: message UnknownString_81A3AA2 waittext - jump EventScript_15F452 + goto EventScript_15F452 end EventScript_15F51D: @@ -928,7 +928,7 @@ gUnknown_0819F80B:: @ 819F80B special PlayTrainerEncounterMusic special ScrSpecial_EndTrainerApproach waitstate - jump EventScript_19F8F2 + goto EventScript_19F8F2 gUnknown_0819F818:: @ 819F818 lock @@ -940,7 +940,7 @@ gUnknown_0819F818:: @ 819F818 jumpif 5, EventScript_19F83F special PlayTrainerEncounterMusic special sub_8082524 - jump EventScript_19F8F2 + goto EventScript_19F8F2 EventScript_19F83F: endtrainerbattle @@ -957,7 +957,7 @@ gUnknown_0819F840:: @ 819F840 jumpif 5, EventScript_19F870 special PlayTrainerEncounterMusic special sub_8082524 - jump EventScript_19F8F2 + goto EventScript_19F8F2 EventScript_19F870: special ScrSpecial_ShowTrainerNonBattlingSpeech @@ -1322,7 +1322,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70 S_WhiteOut:: @ 819FC74 call EverGrandeCity_HallOfFame_EventScript_19FD09 call EventScript_19FC84 - jump gUnknown_0819FC9F + goto gUnknown_0819FC9F end EventScript_19FC84: @@ -1452,7 +1452,7 @@ do_heal_party:: @ 819FD7C special ScrSpecial_HealPlayerParty checkflag 273 jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE - jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0 + goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 @@ -1658,7 +1658,7 @@ UnusedMixRecordsScript: @ 819FFD5 jumpeq UnusedMixRecordsScript_Yes compare RESULT, 0 jumpeq UnusedMixRecordsScript_Done - jump UnusedMixRecordsScript_Done + goto UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA special sub_80B929C waitstate @@ -1677,7 +1677,7 @@ gUnknown_081A0009:: @ 81A0009 special DoPCTurnOnEffect playsfx 4 msgbox UnknownString_81A09EC, 4 - jump EventScript_1A0023 + goto EventScript_1A0023 end EventScript_1A0023: @@ -1685,7 +1685,7 @@ EventScript_1A0023: waittext special ScrSpecial_CreatePCMenu waitstate - jump EventScript_1A0033 + goto EventScript_1A0033 end EventScript_1A0033: @@ -1702,7 +1702,7 @@ EventScript_1A0070: msgbox UnknownString_81A0A54, 4 special PlayerPC waitstate - jump EventScript_1A0023 + goto EventScript_1A0023 end EventScript_1A0085: @@ -1714,7 +1714,7 @@ EventScript_1A0085: msgbox UnknownString_81A0A35, 4 special ShowPokemonStorageSystem waitstate - jump EventScript_1A0023 + goto EventScript_1A0023 end EventScript_1A00AC: @@ -1738,7 +1738,7 @@ EventScript_1A00CB: playsfx 2 special AccessHallOfFamePC waitstate - jump EventScript_1A0033 + goto EventScript_1A0033 end FallarborTown_EventScript_1A00E1:: @ 81A00E1 @@ -2303,20 +2303,20 @@ CaveOfOrigin_B2F_EventScript_1A04AF:: @ 81A04AF CaveOfOrigin_B3F_EventScript_1A04AF:: @ 81A04AF lockall setvar 0x4001, 1 - jump CaveOfOrigin_1F_EventScript_1A04D3 + goto CaveOfOrigin_1F_EventScript_1A04D3 end CaveOfOrigin_B2F_EventScript_1A04BB:: @ 81A04BB CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB lockall setvar 0x4002, 1 - jump CaveOfOrigin_B2F_EventScript_1A04D3 + goto CaveOfOrigin_B2F_EventScript_1A04D3 end @ 81A04C7 lockall setvar 0x4003, 1 - jump CaveOfOrigin_B2F_EventScript_1A04D3 + goto CaveOfOrigin_B2F_EventScript_1A04D3 end CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3 @@ -2376,49 +2376,49 @@ Route120_EventScript_1A0539:: @ 81A0539 lock faceplayer setvar 0x8004, 1 - jump Route120_EventScript_1A0594 + goto Route120_EventScript_1A0594 end Route120_EventScript_1A0546:: @ 81A0546 lock faceplayer setvar 0x8004, 2 - jump Route120_EventScript_1A0594 + goto Route120_EventScript_1A0594 end Route120_EventScript_1A0553:: @ 81A0553 lock faceplayer setvar 0x8004, 3 - jump Route120_EventScript_1A0594 + goto Route120_EventScript_1A0594 end Route120_EventScript_1A0560:: @ 81A0560 lock faceplayer setvar 0x8004, 4 - jump Route120_EventScript_1A0594 + goto Route120_EventScript_1A0594 end Route120_EventScript_1A056D:: @ 81A056D lock faceplayer setvar 0x8004, 5 - jump Route120_EventScript_1A0594 + goto Route120_EventScript_1A0594 end Route119_EventScript_1A057A:: @ 81A057A lock faceplayer setvar 0x8004, 6 - jump Route119_EventScript_1A0594 + goto Route119_EventScript_1A0594 end Route119_EventScript_1A0587:: @ 81A0587 lock faceplayer setvar 0x8004, 7 - jump Route119_EventScript_1A0594 + goto Route119_EventScript_1A0594 end Route119_EventScript_1A0594:: @ 81A0594 @@ -3628,14 +3628,14 @@ EventScript_1A2CB0: closebutton doanimation 11 waitstate - jump EventScript_1A2CFA + goto EventScript_1A2CFA end gUnknown_081A2CE6:: @ 81A2CE6 lockall doanimation 11 waitstate - jump EventScript_1A2CFA + goto EventScript_1A2CFA end EventScript_1A2CF1: @@ -3644,7 +3644,7 @@ EventScript_1A2CF1: EventScript_1A2CFA: msgbox UnknownString_8198F6E, 4 - jump EventScript_1A2DB8 + goto EventScript_1A2DB8 end EventScript_1A2D08: @@ -3659,14 +3659,14 @@ EventScript_1A2D08: closebutton doanimation 26 waitstate - jump EventScript_1A2D52 + goto EventScript_1A2D52 end gUnknown_081A2D3E:: @ 81A2D3E lockall doanimation 26 waitstate - jump EventScript_1A2D52 + goto EventScript_1A2D52 end EventScript_1A2D49: @@ -3675,7 +3675,7 @@ EventScript_1A2D49: EventScript_1A2D52: msgbox UnknownString_81A19C4, 4 - jump EventScript_1A2DB8 + goto EventScript_1A2DB8 end EventScript_1A2D60: @@ -3690,14 +3690,14 @@ EventScript_1A2D60: closebutton doanimation 27 waitstate - jump EventScript_1A2DAA + goto EventScript_1A2DAA end gUnknown_081A2D96:: @ 81A2D96 lockall doanimation 27 waitstate - jump EventScript_1A2DAA + goto EventScript_1A2DAA end EventScript_1A2DA1: @@ -3706,7 +3706,7 @@ EventScript_1A2DA1: EventScript_1A2DAA: msgbox UnknownString_81A1AA9, 4 - jump EventScript_1A2DB8 + goto EventScript_1A2DB8 end EventScript_1A2DB8: @@ -3858,7 +3858,7 @@ SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 gUnknown_081A2F7B:: @ 81A2F7B setvar 0x8005, 0 - jump EventScript_1A2F86 + goto EventScript_1A2F86 end EventScript_1A2F86: @@ -3867,7 +3867,7 @@ EventScript_1A2F86: gUnknown_081A2F8A:: @ 81A2F8A setvar 0x8004, 0 - jump EventScript_1A2F95 + goto EventScript_1A2F95 end EventScript_1A2F95: @@ -3879,7 +3879,7 @@ EventScript_1A2F95: jumpeq EventScript_1A2F95 disappear 0x8006 setflag 0x8005 - jump EventScript_1A2F95 + goto EventScript_1A2F95 end EventScript_1A2FBF: @@ -3949,7 +3949,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 jumpeq SecretBase_RedCave1_EventScript_1A308F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1B83, 4 - jump SecretBase_RedCave1_EventScript_1A350A + goto SecretBase_RedCave1_EventScript_1A350A end SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086 @@ -3984,7 +3984,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE jumpeq SecretBase_RedCave1_EventScript_1A310B hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1F04, 4 - jump SecretBase_RedCave1_EventScript_1A350A + goto SecretBase_RedCave1_EventScript_1A350A end SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102 @@ -4019,7 +4019,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A jumpeq SecretBase_RedCave1_EventScript_1A3187 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2220, 4 - jump SecretBase_RedCave1_EventScript_1A350A + goto SecretBase_RedCave1_EventScript_1A350A end SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E @@ -4054,7 +4054,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 jumpeq SecretBase_RedCave1_EventScript_1A3203 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A256F, 4 - jump SecretBase_RedCave1_EventScript_1A350A + goto SecretBase_RedCave1_EventScript_1A350A end SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA @@ -4089,7 +4089,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 jumpeq SecretBase_RedCave1_EventScript_1A327F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A28D7, 4 - jump SecretBase_RedCave1_EventScript_1A350A + goto SecretBase_RedCave1_EventScript_1A350A end SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276 @@ -4124,7 +4124,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E jumpeq SecretBase_RedCave1_EventScript_1A32FB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1D48, 4 - jump SecretBase_RedCave1_EventScript_1A350A + goto SecretBase_RedCave1_EventScript_1A350A end SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2 @@ -4159,7 +4159,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A jumpeq SecretBase_RedCave1_EventScript_1A3377 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2095, 4 - jump SecretBase_RedCave1_EventScript_1A350A + goto SecretBase_RedCave1_EventScript_1A350A end SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E @@ -4194,7 +4194,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 jumpeq SecretBase_RedCave1_EventScript_1A33F3 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2405, 4 - jump SecretBase_RedCave1_EventScript_1A350A + goto SecretBase_RedCave1_EventScript_1A350A end SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA @@ -4229,7 +4229,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 jumpeq SecretBase_RedCave1_EventScript_1A346F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2710, 4 - jump SecretBase_RedCave1_EventScript_1A350A + goto SecretBase_RedCave1_EventScript_1A350A end SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466 @@ -4264,7 +4264,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E jumpeq SecretBase_RedCave1_EventScript_1A34EB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2AE2, 4 - jump SecretBase_RedCave1_EventScript_1A350A + goto SecretBase_RedCave1_EventScript_1A350A end SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2 @@ -4413,7 +4413,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9 SlateportCity_PokemonFanClub_EventScript_1ADEC3:: @ 81ADEC3 msgbox SlateportCity_PokemonFanClub_Text_1A8818, 4 setvar 0x8005, 1 - jump SlateportCity_PokemonFanClub_EventScript_1ADE46 + goto SlateportCity_PokemonFanClub_EventScript_1ADE46 end SlateportCity_PokemonFanClub_EventScript_1ADED6:: @ 81ADED6 @@ -4469,7 +4469,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79 SlateportCity_OceanicMuseum_1F_EventScript_1ADF83:: @ 81ADF83 msgbox SlateportCity_OceanicMuseum_1F_Text_1A949A, 4 setvar 0x8005, 2 - jump SlateportCity_OceanicMuseum_1F_EventScript_1ADE46 + goto SlateportCity_OceanicMuseum_1F_EventScript_1ADE46 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96 @@ -4507,17 +4507,17 @@ SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9 SlateportCity_PokemonFanClub_EventScript_1AE020:: @ 81AE020 msgbox SlateportCity_PokemonFanClub_Text_1A8414, 4 - jump SlateportCity_PokemonFanClub_EventScript_1AE04A + goto SlateportCity_PokemonFanClub_EventScript_1AE04A end SlateportCity_PokemonFanClub_EventScript_1AE02E:: @ 81AE02E msgbox SlateportCity_PokemonFanClub_Text_1A8470, 4 - jump SlateportCity_PokemonFanClub_EventScript_1AE04A + goto SlateportCity_PokemonFanClub_EventScript_1AE04A end SlateportCity_PokemonFanClub_EventScript_1AE03C:: @ 81AE03C msgbox SlateportCity_PokemonFanClub_Text_1A84D5, 4 - jump SlateportCity_PokemonFanClub_EventScript_1AE04A + goto SlateportCity_PokemonFanClub_EventScript_1AE04A end SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A @@ -4539,7 +4539,7 @@ SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4 copyvar 0x8007, 0x800a setvar 0x8005, 3 - jump SlateportCity_PokemonFanClub_EventScript_1ADE46 + goto SlateportCity_PokemonFanClub_EventScript_1ADE46 end SlateportCity_PokemonFanClub_EventScript_1AE0A2:: @ 81AE0A2 @@ -4606,7 +4606,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 msgbox FallarborTown_ContestLobby_Text_1A7153, 4 setflag 2 setvar 0x8005, 6 - jump FallarborTown_ContestLobby_EventScript_1ADE46 + goto FallarborTown_ContestLobby_EventScript_1ADE46 end FallarborTown_ContestLobby_EventScript_1AE17E:: @ 81AE17E @@ -4710,7 +4710,7 @@ BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 setflag 2 copyvar 0x8004, 0x8008 setvar 0x8005, 7 - jump BattleTower_Lobby_EventScript_1ADE46 + goto BattleTower_Lobby_EventScript_1ADE46 end BattleTower_Lobby_EventScript_1AE2D9:: @ 81AE2D9 @@ -4797,7 +4797,7 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 - jump MauvilleCity_GameCorner_EventScript_1C40DA + goto MauvilleCity_GameCorner_EventScript_1C40DA end MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC @@ -4809,7 +4809,7 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC compare RESULT, 0 jumpeq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 - jump MauvilleCity_GameCorner_EventScript_1C40DA + goto MauvilleCity_GameCorner_EventScript_1C40DA end MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 9911dca3a..cdda2edcc 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -15,14 +15,14 @@ S_CuttableTree:: @ 81B0DCC closebutton doanimation 2 waitstate - jump DoTreeCutMovement + goto DoTreeCutMovement end S_UseCut:: @ 81B0E16 lockall doanimation 2 waitstate - jump DoTreeCutMovement + goto DoTreeCutMovement end DoTreeCutMovement: @ 81B0E21 @@ -73,14 +73,14 @@ S_BreakableRock:: @ 81B0EB7 closebutton doanimation 37 waitstate - jump DoRockSmashMovement + goto DoRockSmashMovement end S_UseRockSmash:: @ 81B0F01 lockall doanimation 37 waitstate - jump DoRockSmashMovement + goto DoRockSmashMovement end DoRockSmashMovement: @ 81B0F0C @@ -139,14 +139,14 @@ S_PushableBoulder:: @ 81B0FCB closebutton doanimation 40 waitstate - jump UsedStrength + goto UsedStrength end S_UseStrength:: @ 81B100E lockall doanimation 40 waitstate - jump UsedStrength + goto UsedStrength end UsedStrength: @ 81B1019 @@ -200,7 +200,7 @@ S_UseWaterfall:: @ 81B115A jumpeq Waterfall_Done msgbox UsedWaterfallText, 4 doanimation 43 - jump Waterfall_Done + goto Waterfall_Done S_CannotUseWaterfall:: @ 81B1194 lockall @@ -234,7 +234,7 @@ UseDiveScript:: @ 81B1220 jumpeq Dive_Done msgbox UsedDiveText, 4 doanimation 44 - jump Dive_Done + goto Dive_Done lockall CannotUseDive: @ 81B125F @@ -257,12 +257,12 @@ S_UseDiveUnderwater:: @ 81B1269 jumpeq UnderwaterDive_Done msgbox UsedDiveText, 4 doanimation 44 - jump UnderwaterDive_Done + goto UnderwaterDive_Done UnderwaterCannotUseDive: @ 81B12A7 lockall msgbox UnderwaterCannotUseDiveText, 4 - jump UnderwaterDive_Done + goto UnderwaterDive_Done @ not used SurfacingBlocked: @ 81B12B5 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index f4707d8cb..6c74fcca4 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -57,21 +57,21 @@ Route102_EventScript_1A1595:: @ 81A1595 message Route102_Text_1A172C waittext waitbutton - jump Route102_EventScript_1A165F + goto Route102_EventScript_1A165F Route102_EventScript_1A15A2:: @ 81A15A2 lockall message Route102_Text_1A174B waittext waitbutton - jump Route102_EventScript_1A165F + goto Route102_EventScript_1A165F Route102_EventScript_1A15AF:: @ 81A15AF lockall message Route102_Text_1A175C waittext waitbutton - jump Route102_EventScript_1A165F + goto Route102_EventScript_1A165F Route102_EventScript_1A15BC:: @ 81A15BC call Route102_EventScript_1A15CE @@ -79,7 +79,7 @@ Route102_EventScript_1A15BC:: @ 81A15BC message Route102_Text_1A177D waittext waitbutton - jump Route102_EventScript_1A165F + goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE compare 0x8005, 0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 6507677e0..372ac5eb8 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -258,7 +258,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FDD:: @ 81A3FDD waitbutton message OldaleTown_PokemonCenter_2F_Text_1A4826 waittext - jump OldaleTown_PokemonCenter_2F_EventScript_1A3EBC + goto OldaleTown_PokemonCenter_2F_EventScript_1A3EBC OldaleTown_PokemonCenter_2F_EventScript_1A3FEF:: @ 81A3FEF message OldaleTown_PokemonCenter_2F_Text_1A4840 @@ -290,7 +290,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 message OldaleTown_PokemonCenter_2F_Text_1A486A waittext waitbutton - jump OldaleTown_PokemonCenter_2F_EventScript_1A3FEF + goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF OldaleTown_PokemonCenter_2F_EventScript_1A4062:: @ 81A4062 setvar 0x8004, 1 @@ -301,28 +301,28 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4068:: @ 81A4068 case 1, OldaleTown_PokemonCenter_2F_EventScript_1A40B1 case 2, OldaleTown_PokemonCenter_2F_EventScript_1A40A2 case 5, OldaleTown_PokemonCenter_2F_EventScript_1A4093 - jump OldaleTown_PokemonCenter_2F_EventScript_1A432D + goto OldaleTown_PokemonCenter_2F_EventScript_1A432D OldaleTown_PokemonCenter_2F_EventScript_1A4093:: @ 81A4093 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C03 waittext waitbutton - jump OldaleTown_PokemonCenter_2F_EventScript_1A40C0 + goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40A2:: @ 81A40A2 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4BCC waittext waitbutton - jump OldaleTown_PokemonCenter_2F_EventScript_1A40C0 + goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40B1:: @ 81A40B1 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B95 waittext waitbutton - jump OldaleTown_PokemonCenter_2F_EventScript_1A40C0 + goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40C0:: @ 81A40C0 special CloseLink @@ -402,7 +402,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 setdoorclosed 8, 1 doorchange release - jump OldaleTown_PokemonCenter_2F_EventScript_1A4325 + goto OldaleTown_PokemonCenter_2F_EventScript_1A4325 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB specialval RESULT, CalculatePlayerPartyCount @@ -500,7 +500,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 setdoorclosed 11, 1 doorchange release - jump OldaleTown_PokemonCenter_2F_EventScript_1A4325 + goto OldaleTown_PokemonCenter_2F_EventScript_1A4325 OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9 special CloseLink diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 1952264d2..484607165 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -17,7 +17,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 compare RESULT, 0 jumpeq FallarborTown_ContestLobby_EventScript_1A4EE1 setflag 1 - jump FallarborTown_ContestLobby_EventScript_1A4F8F + goto FallarborTown_ContestLobby_EventScript_1A4F8F end FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD @@ -47,7 +47,7 @@ FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 setflag 150 setflag 1 msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 - jump FallarborTown_ContestLobby_EventScript_1A4F8F + goto FallarborTown_ContestLobby_EventScript_1A4F8F end FallarborTown_ContestLobby_EventScript_1A4F44:: @ 81A4F44 @@ -99,17 +99,17 @@ FallarborTown_ContestLobby_EventScript_1A4FCC:: @ 81A4FCC FallarborTown_ContestLobby_EventScript_1A5014:: @ 81A5014 msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 - jump FallarborTown_ContestLobby_EventScript_1A4FCC + goto FallarborTown_ContestLobby_EventScript_1A4FCC end FallarborTown_ContestLobby_EventScript_1A5022:: @ 81A5022 msgbox FallarborTown_ContestLobby_Text_1A609B, 4 - jump FallarborTown_ContestLobby_EventScript_1A4FCC + goto FallarborTown_ContestLobby_EventScript_1A4FCC end FallarborTown_ContestLobby_EventScript_1A5030:: @ 81A5030 msgbox FallarborTown_ContestLobby_Text_1A613F, 4 - jump FallarborTown_ContestLobby_EventScript_1A4FCC + goto FallarborTown_ContestLobby_EventScript_1A4FCC end FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E @@ -143,12 +143,12 @@ FallarborTown_ContestLobby_EventScript_1A5097:: @ 81A5097 case 5, FallarborTown_ContestLobby_EventScript_1A503E case 127, FallarborTown_ContestLobby_EventScript_1A503E copyvar CONTEST_CATEGORY, RESULT - jump FallarborTown_ContestLobby_EventScript_1A5048 + goto FallarborTown_ContestLobby_EventScript_1A5048 end FallarborTown_ContestLobby_EventScript_1A50C8:: @ 81A50C8 msgbox FallarborTown_ContestLobby_Text_1A664A, 4 - jump FallarborTown_ContestLobby_EventScript_1A5048 + goto FallarborTown_ContestLobby_EventScript_1A5048 release end @@ -168,13 +168,13 @@ FallarborTown_ContestLobby_EventScript_1A50FB:: @ 81A50FB FallarborTown_ContestLobby_EventScript_1A511F:: @ 81A511F msgbox FallarborTown_ContestLobby_Text_1A669F, 4 - jump FallarborTown_ContestLobby_EventScript_1A5048 + goto FallarborTown_ContestLobby_EventScript_1A5048 release end FallarborTown_ContestLobby_EventScript_1A512E:: @ 81A512E msgbox FallarborTown_ContestLobby_Text_1A66DC, 4 - jump FallarborTown_ContestLobby_EventScript_1A5048 + goto FallarborTown_ContestLobby_EventScript_1A5048 release end diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index dcc4b44e7..d0e35203e 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -130,7 +130,7 @@ Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA msgbox Route117_PokemonDayCare_Text_1B29AD, 5 compare RESULT, 1 jumpeq Route117_PokemonDayCare_EventScript_1B236C - jump Route117_PokemonDayCare_EventScript_1B23D0 + goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B23F3:: @ 81B23F3 @@ -168,7 +168,7 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 compare RESULT, 1 jumpeq Route117_PokemonDayCare_EventScript_1B2469 - jump Route117_PokemonDayCare_EventScript_1B23D0 + goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 @@ -184,7 +184,7 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 copyvar 0x8004, RESULT compare RESULT, 2 jumpeq Route117_PokemonDayCare_EventScript_1B23D0 - jump Route117_PokemonDayCare_EventScript_1B24A8 + goto Route117_PokemonDayCare_EventScript_1B24A8 end Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 @@ -192,7 +192,7 @@ Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 msgbox Route117_PokemonDayCare_Text_1B2B49, 5 compare RESULT, 1 jumpeq Route117_PokemonDayCare_EventScript_1B24C4 - jump Route117_PokemonDayCare_EventScript_1B23D0 + goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 @@ -217,14 +217,14 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE specialval RESULT, sp0B6_daycare compare RESULT, 2 jumpeq Route117_PokemonDayCare_EventScript_1B2520 - jump Route117_PokemonDayCare_EventScript_1B23D0 + goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520 msgbox Route117_PokemonDayCare_Text_1B2A4F, 5 compare RESULT, 1 jumpeq Route117_PokemonDayCare_EventScript_1B2469 - jump Route117_PokemonDayCare_EventScript_1B23D0 + goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2539:: @ 81B2539 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 67a0920fa..c88733bea 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -211,7 +211,7 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 checkflag 1 jumpeq Route111_EventScript_1AE73A msgbox Route111_Text_1AC015, 5 - jump Route111_EventScript_1AE6F3 + goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE5E0:: @ 81AE5E0 @@ -271,32 +271,32 @@ Route111_Movement_1AE69D:: @ 81AE69D Route111_EventScript_1AE69F:: @ 81AE69F msgbox Route111_Text_1AC60B, 5 - jump Route111_EventScript_1AE6F3 + goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6AD:: @ 81AE6AD msgbox Route111_Text_1AC3CF, 5 - jump Route111_EventScript_1AE6F3 + goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6BB:: @ 81AE6BB msgbox Route111_Text_1AC18D, 5 - jump Route111_EventScript_1AE6F3 + goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6C9:: @ 81AE6C9 msgbox Route111_Text_1AC219, 5 - jump Route111_EventScript_1AE6F3 + goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6D7:: @ 81AE6D7 msgbox Route111_Text_1AC2D6, 5 - jump Route111_EventScript_1AE6F3 + goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6E5:: @ 81AE6E5 msgbox Route111_Text_1AC355, 5 - jump Route111_EventScript_1AE6F3 + goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6F3:: @ 81AE6F3 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 2f0fb97b9..750c64b74 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -85,7 +85,7 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C waitmove 0 move 2, BattleTower_BattleRoom_Movement_160AD0 waitmove 0 - jump BattleTower_BattleRoom_EventScript_1608FA + goto BattleTower_BattleRoom_EventScript_1608FA BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 4ccf2028c..f4f50d90b 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -26,7 +26,7 @@ BattleTower_Corridor_EventScript_16088B:: @ 816088B move 1, BattleTower_Corridor_Movement_1608D5 move 255, BattleTower_Corridor_Movement_1608D4 waitmove 0 - jump BattleTower_Corridor_EventScript_1608C2 + goto BattleTower_Corridor_EventScript_1608C2 BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 move 1, BattleTower_Corridor_Movement_1608D2 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index a1570ac13..50c9c9152 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -260,7 +260,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 BattleTower_Lobby_EventScript_160600:: @ 8160600 msgbox BattleTower_Lobby_Text_19A0D1, 4 - jump BattleTower_Lobby_EventScript_1604BE + goto BattleTower_Lobby_EventScript_1604BE BattleTower_Lobby_EventScript_16060D:: @ 816060D switch RESULT @@ -269,16 +269,16 @@ BattleTower_Lobby_EventScript_16060D:: @ 816060D BattleTower_Lobby_EventScript_160628:: @ 8160628 msgbox BattleTower_Lobby_Text_19A249, 4 - jump BattleTower_Lobby_EventScript_160662 + goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160635:: @ 8160635 msgbox BattleTower_Lobby_Text_19A32D, 4 - jump BattleTower_Lobby_EventScript_160662 + goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160642:: @ 8160642 setvar 0x8004, 12 special sub_8135668 - jump BattleTower_Lobby_EventScript_160652 + goto BattleTower_Lobby_EventScript_160652 BattleTower_Lobby_EventScript_16064F:: @ 816064F special LoadPlayerParty diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 02c4e0c6f..01e10ebd3 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -17,7 +17,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 jumpeq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D waittext - jump BattleTower_Outside_EventScript_16018E + goto BattleTower_Outside_EventScript_16018E end BattleTower_Outside_EventScript_16018E:: @ 816018E @@ -59,7 +59,7 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB BattleTower_Outside_EventScript_160226:: @ 8160226 message BattleTower_Outside_Text_199E7A waittext - jump BattleTower_Outside_EventScript_16018E + goto BattleTower_Outside_EventScript_16018E end BattleTower_Outside_EventScript_160232:: @ 8160232 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 8ca2eb3df..9a914fcd8 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -24,14 +24,14 @@ DewfordTown_EventScript_14E002:: @ 814E002 DewfordTown_EventScript_14E04B:: @ 814E04B msgbox DewfordTown_Text_16B57D, 4 closebutton - jump DewfordTown_EventScript_14E151 + goto DewfordTown_EventScript_14E151 release end DewfordTown_EventScript_14E05B:: @ 814E05B msgbox DewfordTown_Text_16B5D2, 4 closebutton - jump DewfordTown_EventScript_14E1D8 + goto DewfordTown_EventScript_14E1D8 release end @@ -52,7 +52,7 @@ DewfordTown_EventScript_14E076:: @ 814E076 DewfordTown_EventScript_14E093:: @ 814E093 msgbox DewfordTown_Text_16B417, 4 closebutton - jump DewfordTown_EventScript_14E151 + goto DewfordTown_EventScript_14E151 end DewfordTown_EventScript_14E0A2:: @ 814E0A2 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 51d4f44ba..457f510f0 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -17,7 +17,7 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 jumpeq DewfordTown_Gym_EventScript_1530B6 compare 0x8000, 2 jumpeq DewfordTown_Gym_EventScript_1530B2 - jump DewfordTown_Gym_EventScript_1530AE + goto DewfordTown_Gym_EventScript_1530AE DewfordTown_Gym_EventScript_1530AA:: @ 81530AA darken 0 @@ -41,7 +41,7 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 - snop1 + nop1 comparevars 0x8000, 0x8001 jumpeq DewfordTown_Gym_EventScript_1530F5 copyvar 0x8001, 0x8000 @@ -119,7 +119,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 callif 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 - jump DewfordTown_Gym_EventScript_1531B5 + goto DewfordTown_Gym_EventScript_1531B5 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 @@ -179,14 +179,14 @@ DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall checkflag 2056 jumpeq DewfordTown_Gym_EventScript_15327E - jump DewfordTown_Gym_EventScript_153288 + goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall checkflag 2056 jumpeq DewfordTown_Gym_EventScript_15327E - jump DewfordTown_Gym_EventScript_153288 + goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15327E:: @ 815327E diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 28d396a3e..70689f7ac 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -122,13 +122,13 @@ DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 lockall setvar 0x8008, 0 - jump DewfordTown_Hall_EventScript_15340A + goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_1533FE:: @ 81533FE lockall setvar 0x8008, 1 - jump DewfordTown_Hall_EventScript_15340A + goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_15340A:: @ 815340A diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index bddcfa74b..4d2179cc1 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -28,7 +28,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE move 255, EverGrandeCity_ChampionsRoom_Movement_15B802 waitmove 0 setvar 0x4001, 1 - jump EverGrandeCity_ChampionsRoom_EventScript_15B805 + goto EverGrandeCity_ChampionsRoom_EventScript_15B805 releaseall end @@ -41,7 +41,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playmusic 454, 0 msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 - jump EverGrandeCity_ChampionsRoom_EventScript_15B821 + goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 @@ -84,7 +84,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 waitmove 0 call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 msgbox EverGrandeCity_ChampionsRoom_Text_191268, 4 - jump EverGrandeCity_ChampionsRoom_EventScript_15B8F0 + goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 end EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB @@ -97,7 +97,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB waitmove 0 call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 msgbox EverGrandeCity_ChampionsRoom_Text_191305, 4 - jump EverGrandeCity_ChampionsRoom_EventScript_15B8F0 + goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 end EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index d10957a8e..55e38da15 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -46,7 +46,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 playmusic 450, 0 msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 - jump EverGrandeCity_DrakesRoom_EventScript_15B795 + goto EverGrandeCity_DrakesRoom_EventScript_15B795 end EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 039b2a772..9271f3da9 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -46,7 +46,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA playmusic 450, 0 msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 - jump EverGrandeCity_GlaciasRoom_EventScript_15B6FB + goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB end EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 7e8ee131a..9b693c227 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -46,7 +46,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 playmusic 450, 0 msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C - jump EverGrandeCity_PhoebesRoom_EventScript_15B661 + goto EverGrandeCity_PhoebesRoom_EventScript_15B661 end EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657 diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 84a6c3fdc..bbb95e0ad 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 playmusic 450, 0 msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 - jump EverGrandeCity_SidneysRoom_EventScript_15B5C7 + goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 end EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 1351b96d3..c36036ce3 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -9,7 +9,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 jumpeq FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 setflag 1 - jump FallarborTown_House2_EventScript_153CB6 + goto FallarborTown_House2_EventScript_153CB6 end FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 @@ -19,7 +19,7 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 msgbox FallarborTown_House2_Text_177BDB, 5 switch RESULT case 0, FallarborTown_House2_EventScript_153D60 - jump FallarborTown_House2_EventScript_153CE4 + goto FallarborTown_House2_EventScript_153CE4 end FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 @@ -33,7 +33,7 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 jumpeq FallarborTown_House2_EventScript_153D52 compare 0x8005, 0 jumpeq FallarborTown_House2_EventScript_153D44 - jump FallarborTown_House2_EventScript_153D1A + goto FallarborTown_House2_EventScript_153D1A end FallarborTown_House2_EventScript_153D1A:: @ 8153D1A @@ -44,17 +44,17 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A jumpeq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 removeitem ITEM_HEART_SCALE, 1 - jump FallarborTown_House2_EventScript_153D60 + goto FallarborTown_House2_EventScript_153D60 end FallarborTown_House2_EventScript_153D44:: @ 8153D44 msgbox FallarborTown_House2_Text_177C78, 4 - jump FallarborTown_House2_EventScript_153CE4 + goto FallarborTown_House2_EventScript_153CE4 end FallarborTown_House2_EventScript_153D52:: @ 8153D52 msgbox FallarborTown_House2_Text_177D33, 4 - jump FallarborTown_House2_EventScript_153CE4 + goto FallarborTown_House2_EventScript_153CE4 end FallarborTown_House2_EventScript_153D60:: @ 8153D60 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 636cac8f1..bb924026c 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -36,13 +36,13 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49 move 4, FallarborTown_PokemonCenter_1F_Movement_153B74 waitmove 0 - jump FallarborTown_PokemonCenter_1F_EventScript_153B69 + goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 move 4, FallarborTown_PokemonCenter_1F_Movement_153B81 waitmove 0 - jump FallarborTown_PokemonCenter_1F_EventScript_153B69 + goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 44f5890a2..971b05f1b 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -32,7 +32,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 setflag 2060 setvar 0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 - jump FortreeCity_Gym_EventScript_157F3E + goto FortreeCity_Gym_EventScript_157F3E end FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E @@ -82,14 +82,14 @@ FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall checkflag 2060 jumpeq FortreeCity_Gym_EventScript_157FFD - jump FortreeCity_Gym_EventScript_158007 + goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall checkflag 2060 jumpeq FortreeCity_Gym_EventScript_157FFD - jump FortreeCity_Gym_EventScript_158007 + goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FFD:: @ 8157FFD diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 2f8ba2121..e706914d7 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -50,7 +50,7 @@ IslandCave_EventScript_15EF59:: @ 815EF59 braillemsg IslandCave_Braille_1C54FC special DoBrailleWait waitstate - jump IslandCave_EventScript_15EF95 + goto IslandCave_EventScript_15EF95 end IslandCave_EventScript_15EF72:: @ 815EF72 @@ -65,7 +65,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C jumpeq IslandCave_EventScript_15EF95 special DoBrailleWait waitstate - jump IslandCave_EventScript_15EF95 + goto IslandCave_EventScript_15EF95 end IslandCave_EventScript_15EF95:: @ 815EF95 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 685e44d58..125b2d42b 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -86,7 +86,7 @@ LavaridgeTown_EventScript_14E5AB:: @ 814E5AB giveitem ITEM_GO_GOGGLES setflag 221 msgbox LavaridgeTown_Text_16BE7D, 4 - jump LavaridgeTown_EventScript_14E5F5 + goto LavaridgeTown_EventScript_14E5F5 end LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 @@ -94,7 +94,7 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 giveitem ITEM_GO_GOGGLES setflag 221 msgbox LavaridgeTown_Text_16C020, 4 - jump LavaridgeTown_EventScript_14E5F5 + goto LavaridgeTown_EventScript_14E5F5 end LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 57506bdb6..1f5810e7f 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -90,7 +90,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag 806 setvar 0x4053, 1 - jump LavaridgeTown_Gym_1F_EventScript_1537A7 + goto LavaridgeTown_Gym_1F_EventScript_1537A7 end LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 @@ -150,14 +150,14 @@ LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall checkflag 2058 jumpeq LavaridgeTown_Gym_1F_EventScript_153898 - jump LavaridgeTown_Gym_1F_EventScript_1538A2 + goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall checkflag 2058 jumpeq LavaridgeTown_Gym_1F_EventScript_153898 - jump LavaridgeTown_Gym_1F_EventScript_1538A2 + goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153898:: @ 8153898 diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b688107ce..082e88bd5 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -318,32 +318,32 @@ LilycoveCity_EventScript_14CE35:: @ 814CE35 LilycoveCity_EventScript_14CE46:: @ 814CE46 trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5 - jump LilycoveCity_EventScript_14CEA6 + goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE56:: @ 814CE56 trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5 - jump LilycoveCity_EventScript_14CEA6 + goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE66:: @ 814CE66 trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5 - jump LilycoveCity_EventScript_14CEA6 + goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE76:: @ 814CE76 trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4 - jump LilycoveCity_EventScript_14CF12 + goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE86:: @ 814CE86 trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4 - jump LilycoveCity_EventScript_14CF12 + goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE96:: @ 814CE96 trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4 - jump LilycoveCity_EventScript_14CF12 + goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CEA6:: @ 814CEA6 @@ -357,7 +357,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 callif 1, LilycoveCity_EventScript_14CEF7 clearflag 722 clearflag 849 - jump LilycoveCity_EventScript_14CF6B + goto LilycoveCity_EventScript_14CF6B end LilycoveCity_EventScript_14CEDE:: @ 814CEDE @@ -393,7 +393,7 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 compare RESULT, 1 callif 1, LilycoveCity_EventScript_14CF50 clearflag 760 - jump LilycoveCity_EventScript_14CF6B + goto LilycoveCity_EventScript_14CF6B end LilycoveCity_EventScript_14CF47:: @ 814CF47 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 6bdcf55e2..ebd59cd91 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -312,13 +312,13 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 message LilycoveCity_ContestLobby_Text_18848C waittext setflag 2 - jump LilycoveCity_ContestLobby_EventScript_158BF0 + goto LilycoveCity_ContestLobby_EventScript_158BF0 end LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE message LilycoveCity_ContestLobby_Text_188584 waittext - jump LilycoveCity_ContestLobby_EventScript_158BF0 + goto LilycoveCity_ContestLobby_EventScript_158BF0 end LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA @@ -348,7 +348,7 @@ LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0 LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27 msgbox LilycoveCity_ContestLobby_Text_1885A7, 4 - jump LilycoveCity_ContestLobby_EventScript_158B85 + goto LilycoveCity_ContestLobby_EventScript_158B85 end LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35 @@ -378,17 +378,17 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 LilycoveCity_ContestLobby_EventScript_158C96:: @ 8158C96 msgbox LilycoveCity_ContestLobby_Text_1A664A, 4 - jump LilycoveCity_ContestLobby_EventScript_158C42 + goto LilycoveCity_ContestLobby_EventScript_158C42 end LilycoveCity_ContestLobby_EventScript_158CA4:: @ 8158CA4 msgbox LilycoveCity_ContestLobby_Text_1A669F, 4 - jump LilycoveCity_ContestLobby_EventScript_158C42 + goto LilycoveCity_ContestLobby_EventScript_158C42 end LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 msgbox LilycoveCity_ContestLobby_Text_1A66DC, 4 - jump LilycoveCity_ContestLobby_EventScript_158C42 + goto LilycoveCity_ContestLobby_EventScript_158C42 end LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 @@ -411,7 +411,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA case 5, LilycoveCity_ContestLobby_EventScript_158C35 case 127, LilycoveCity_ContestLobby_EventScript_158C35 copyvar CONTEST_CATEGORY, RESULT - jump LilycoveCity_ContestLobby_EventScript_158C42 + goto LilycoveCity_ContestLobby_EventScript_158C42 end LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 @@ -437,7 +437,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82 msgbox LilycoveCity_ContestLobby_Text_188750, 4 - jump LilycoveCity_ContestLobby_EventScript_158CEA + goto LilycoveCity_ContestLobby_EventScript_158CEA end LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 @@ -466,7 +466,7 @@ LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 msgbox LilycoveCity_ContestLobby_Text_18873A, 4 - jump LilycoveCity_ContestLobby_EventScript_158CEA + goto LilycoveCity_ContestLobby_EventScript_158CEA end LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 @@ -476,7 +476,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 message2 LilycoveCity_ContestLobby_Text_188845 waittext addvar 0x8004, 65535 - jump LilycoveCity_ContestLobby_EventScript_158DEE + goto LilycoveCity_ContestLobby_EventScript_158DEE end LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 09d19c1c5..48758ac5c 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -22,7 +22,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag 2 fanfare 370 waitfanfare - jump LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 74b746633..b28fe3a47 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -26,7 +26,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 0 - jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 @@ -35,7 +35,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 1 - jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 @@ -44,7 +44,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 2 - jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B @@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 3 - jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E @@ -62,7 +62,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 4 - jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index f84c84201..c1be4bbe7 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -72,8 +72,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD message LilycoveCity_DepartmentStoreRooftop_Text_18C72B waittext showmoney 0, 0 - snop - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE + nop + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE @@ -84,22 +84,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A227 case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_15A232 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7C3, 4 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C setvar 0x4000, 26 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 setvar 0x4000, 27 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 setvar 0x4000, 28 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D:: @ 815A23D @@ -145,7 +145,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 compare 0x4001, 2 callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 - snop + nop bufferitem 0, 0x4000 playsfx 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 @@ -177,23 +177,23 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferitem 1, 0x4000 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E end LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E:: @ 815A36E message LilycoveCity_DepartmentStoreRooftop_Text_18C72B waittext - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A:: @ 815A37A msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7AF, 4 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A388:: @ 815A388 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C79, 4 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A396:: @ 815A396 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index feff49c42..ac1198aee 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -52,7 +52,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E giveitem 0x8005 compare RESULT, 0 jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159E9C - jump LilycoveCity_DepartmentStore_1F_EventScript_159E6E + goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end LilycoveCity_DepartmentStore_1F_EventScript_159E3A:: @ 8159E3A @@ -75,7 +75,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E56:: @ 8159E56 LilycoveCity_DepartmentStore_1F_EventScript_159E60:: @ 8159E60 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E27, 4 - jump LilycoveCity_DepartmentStore_1F_EventScript_159E6E + goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end LilycoveCity_DepartmentStore_1F_EventScript_159E6E:: @ 8159E6E @@ -101,7 +101,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C copyvar 0x4045, 0x8005 - jump LilycoveCity_DepartmentStore_1F_EventScript_159EA7 + goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index aca6b16d4..471d1f8b5 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -12,7 +12,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 checkitem ITEM_EON_TICKET, 1 compare RESULT, 1 jumpeq LilycoveCity_Harbor_EventScript_1599EE - jump LilycoveCity_Harbor_EventScript_1598BA + goto LilycoveCity_Harbor_EventScript_1598BA end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA @@ -29,7 +29,7 @@ LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD jumpeq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 waittext - jump LilycoveCity_Harbor_EventScript_1598F1 + goto LilycoveCity_Harbor_EventScript_1598F1 end LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1 @@ -70,7 +70,7 @@ LilycoveCity_Harbor_EventScript_15995B:: @ 815995B LilycoveCity_Harbor_EventScript_15997E:: @ 815997E message LilycoveCity_Harbor_Text_18B4E2 waittext - jump LilycoveCity_Harbor_EventScript_1598F1 + goto LilycoveCity_Harbor_EventScript_1598F1 end LilycoveCity_Harbor_EventScript_15998A:: @ 815998A diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index b3564ebf5..06a3ae4ca 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -6,25 +6,25 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 checkflag 160 jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 checkflag 161 jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 checkflag 162 jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 checkflag 163 jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 @@ -35,25 +35,25 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD setmaptile 10, 6, 606, 1 setmaptile 11, 6, 607, 1 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615 setmaptile 18, 6, 604, 1 setmaptile 19, 6, 605, 1 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D setmaptile 14, 10, 608, 1 setmaptile 15, 10, 609, 1 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645 setmaptile 6, 10, 602, 1 setmaptile 7, 10, 603, 1 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D @@ -118,7 +118,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, 4 move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188041, 4 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_15875C + goto LilycoveCity_LilycoveMuseum_2F_EventScript_15875C end LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 2a4f77529..2da725de7 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -371,38 +371,38 @@ LittlerootTown_EventScript_14D860:: @ 814D860 lockall setvar 0x8008, 0 movesprite 4, 10, 9 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall setvar 0x8008, 1 movesprite 4, 11, 9 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D886:: @ 814D886 lockall setvar 0x8008, 2 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D892:: @ 814D892 lockall setvar 0x8008, 3 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D89E:: @ 814D89E lockall setvar 0x8008, 4 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8AA:: @ 814D8AA lockall setvar 0x8008, 5 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8B6:: @ 814D8B6 @@ -429,7 +429,7 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6 callif 1, LittlerootTown_EventScript_14DAAA compare RESULT, 1 callif 1, LittlerootTown_EventScript_14DAED - jump LittlerootTown_EventScript_14DD2B + goto LittlerootTown_EventScript_14DD2B end LittlerootTown_EventScript_14D926:: @ 814D926 @@ -856,7 +856,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange - jump LittlerootTown_EventScript_14DD2B + goto LittlerootTown_EventScript_14DD2B end LittlerootTown_EventScript_14DD2B:: @ 814DD2B diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 69206566a..849115390 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -78,14 +78,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall setvar 0x8004, 1 setvar 0x8005, 0 - jump LittlerootTown_BrendansHouse_1F_EventScript_1B6956 + goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 end LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 lockall setvar 0x8004, 0 setvar 0x8005, 1 - jump LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF + goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF end LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 @@ -120,5 +120,5 @@ LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 setvar 0x8005, 0 move 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F waitmove 0 - jump LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 + goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 5f7f20d63..b70dc0687 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -78,14 +78,14 @@ LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall setvar 0x8004, 1 setvar 0x8005, 1 - jump LittlerootTown_MaysHouse_1F_EventScript_1B6956 + goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 end LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 lockall setvar 0x8004, 1 setvar 0x8005, 1 - jump LittlerootTown_MaysHouse_1F_EventScript_1B6B2E + goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E end LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 @@ -167,5 +167,5 @@ LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 setvar 0x8005, 1 move 0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 waitmove 0 - jump LittlerootTown_MaysHouse_1F_EventScript_1B69B7 + goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 94aeadfa6..80148ce08 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -39,7 +39,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA setvar 0x8004, 0 call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678 - jump LittlerootTown_ProfessorBirchsLab_EventScript_152CFA + goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA @@ -69,7 +69,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A lockall move 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B waitmove 0 - jump LittlerootTown_ProfessorBirchsLab_EventScript_152DBA + goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA end LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 1b2827f2a..78d1961e5 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -101,7 +101,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 move 6, MauvilleCity_Movement_1A0835 waitmove 0 msgbox MauvilleCity_Text_165D50, 5 - jump MauvilleCity_EventScript_14C154 + goto MauvilleCity_EventScript_14C154 end MauvilleCity_EventScript_14C154:: @ 814C154 @@ -131,7 +131,7 @@ MauvilleCity_EventScript_14C187:: @ 814C187 move 6, MauvilleCity_Movement_14C2B6 move 7, MauvilleCity_Movement_14C2DF waitmove 0 - jump MauvilleCity_EventScript_14C22B + goto MauvilleCity_EventScript_14C22B end MauvilleCity_EventScript_14C1D9:: @ 814C1D9 @@ -150,7 +150,7 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 move 6, MauvilleCity_Movement_14C2C1 move 7, MauvilleCity_Movement_14C2E8 waitmove 0 - jump MauvilleCity_EventScript_14C22B + goto MauvilleCity_EventScript_14C22B end MauvilleCity_EventScript_14C22B:: @ 814C22B @@ -186,7 +186,7 @@ MauvilleCity_EventScript_14C292:: @ 814C292 move 6, MauvilleCity_Movement_1A0839 waitmove 0 msgbox MauvilleCity_Text_165EE2, 5 - jump MauvilleCity_EventScript_14C154 + goto MauvilleCity_EventScript_14C154 end MauvilleCity_Movement_14C2AA:: @ 814C2AA diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 5436bf38a..e0faf85a0 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -41,19 +41,19 @@ MauvilleCity_BikeShop_EventScript_156817:: @ 8156817 MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 setflag 90 - jump MauvilleCity_BikeShop_EventScript_1567F0 + goto MauvilleCity_BikeShop_EventScript_1567F0 end MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D msgbox MauvilleCity_BikeShop_Text_181332, 4 giveitem ITEM_MACH_BIKE - jump MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_156847:: @ 8156847 msgbox MauvilleCity_BikeShop_Text_18134A, 4 giveitem ITEM_ACRO_BIKE - jump MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 @@ -92,7 +92,7 @@ MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 msgbox MauvilleCity_BikeShop_Text_181439, 4 removeitem ITEM_ACRO_BIKE, 1 giveitem ITEM_MACH_BIKE - jump MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA @@ -100,7 +100,7 @@ MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA msgbox MauvilleCity_BikeShop_Text_181408, 4 removeitem ITEM_MACH_BIKE, 1 giveitem ITEM_ACRO_BIKE - jump MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_15690B:: @ 815690B @@ -110,7 +110,7 @@ MauvilleCity_BikeShop_EventScript_15690B:: @ 815690B MauvilleCity_BikeShop_EventScript_156914:: @ 8156914 message MauvilleCity_BikeShop_Text_1815EA waittext - jump MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_156920:: @ 8156920 @@ -126,19 +126,19 @@ MauvilleCity_BikeShop_EventScript_156920:: @ 8156920 MauvilleCity_BikeShop_EventScript_156962:: @ 8156962 message MauvilleCity_BikeShop_Text_18162C waittext - jump MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_15696E:: @ 815696E message MauvilleCity_BikeShop_Text_1816F5 waittext - jump MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_15697A:: @ 815697A message MauvilleCity_BikeShop_Text_1817BF waittext - jump MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_156986:: @ 8156986 @@ -148,7 +148,7 @@ MauvilleCity_BikeShop_EventScript_156986:: @ 8156986 MauvilleCity_BikeShop_EventScript_156988:: @ 8156988 message MauvilleCity_BikeShop_Text_181892 waittext - jump MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_156994:: @ 8156994 @@ -164,19 +164,19 @@ MauvilleCity_BikeShop_EventScript_156994:: @ 8156994 MauvilleCity_BikeShop_EventScript_1569D6:: @ 81569D6 message MauvilleCity_BikeShop_Text_1818D4 waittext - jump MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_1569E2:: @ 81569E2 message MauvilleCity_BikeShop_Text_18199A waittext - jump MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_1569EE:: @ 81569EE message MauvilleCity_BikeShop_Text_181A3D waittext - jump MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_1569FA:: @ 81569FA diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index f20a7dacd..fa5b58885 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -11,16 +11,16 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 message MauvilleCity_GameCorner_Text_181CB4 waittext showmoney 0, 0 - snop + nop showcoins 0, 5 - jump MauvilleCity_GameCorner_EventScript_156A60 + goto MauvilleCity_GameCorner_EventScript_156A60 MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 multichoicedef 15, 0, 49, 0, 0 switch RESULT case 0, MauvilleCity_GameCorner_EventScript_156AAE case 1, MauvilleCity_GameCorner_EventScript_156AF0 - jump MauvilleCity_GameCorner_EventScript_156B4C + goto MauvilleCity_GameCorner_EventScript_156B4C end @ 8156A87 @@ -28,7 +28,7 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 switch RESULT case 0, MauvilleCity_GameCorner_EventScript_156AAE case 1, MauvilleCity_GameCorner_EventScript_156AF0 - jump MauvilleCity_GameCorner_EventScript_156B4C + goto MauvilleCity_GameCorner_EventScript_156B4C end MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE @@ -41,7 +41,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE givecoins 50 paymoney 0x3e8, 0 updatemoney 0, 0 - snop + nop updatecoins 0, 5 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 @@ -60,7 +60,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 givecoins 500 paymoney 0x2710, 0 updatemoney 0, 0 - snop + nop updatecoins 0, 5 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 @@ -110,12 +110,12 @@ MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 waittext showcoins 0, 0 setvar 0x4001, 0 - jump MauvilleCity_GameCorner_EventScript_156BA6 + goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B message MauvilleCity_GameCorner_Text_181E17 waittext - jump MauvilleCity_GameCorner_EventScript_156BA6 + goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 multichoice 12, 0, 48, 0 @@ -124,23 +124,23 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 case 1, MauvilleCity_GameCorner_EventScript_156BF0 case 2, MauvilleCity_GameCorner_EventScript_156BFE case 3, MauvilleCity_GameCorner_EventScript_156D0D - jump MauvilleCity_GameCorner_EventScript_156D0D + goto MauvilleCity_GameCorner_EventScript_156D0D end MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 setvar 0x4001, 1 bufferdecor 0, 88 - jump MauvilleCity_GameCorner_EventScript_156C0C + goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 setvar 0x4001, 2 bufferdecor 0, 89 - jump MauvilleCity_GameCorner_EventScript_156C0C + goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE setvar 0x4001, 3 bufferdecor 0, 90 - jump MauvilleCity_GameCorner_EventScript_156C0C + goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 @@ -165,7 +165,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 - jump MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_156B9B end MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 @@ -181,7 +181,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 - jump MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_156B9B end MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA @@ -197,17 +197,17 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 - jump MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_156B9B end MauvilleCity_GameCorner_EventScript_156CF4:: @ 8156CF4 msgbox MauvilleCity_GameCorner_Text_181E76, 4 - jump MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_156B9B end MauvilleCity_GameCorner_EventScript_156D02:: @ 8156D02 call MauvilleCity_GameCorner_EventScript_1A02B8 - jump MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_156B9B end MauvilleCity_GameCorner_EventScript_156D0D:: @ 8156D0D @@ -231,12 +231,12 @@ MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 waittext showcoins 0, 0 setvar 0x4001, 0 - jump MauvilleCity_GameCorner_EventScript_156D54 + goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 message MauvilleCity_GameCorner_Text_181E17 waittext - jump MauvilleCity_GameCorner_EventScript_156D54 + goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 multichoice 12, 0, 55, 0 @@ -247,33 +247,33 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 case 3, MauvilleCity_GameCorner_EventScript_156DD0 case 4, MauvilleCity_GameCorner_EventScript_156DDE case 5, MauvilleCity_GameCorner_EventScript_156F77 - jump MauvilleCity_GameCorner_EventScript_156F77 + goto MauvilleCity_GameCorner_EventScript_156F77 end MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar 0x4001, 1 bufferitem 0, ITEM_TM32 - jump MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar 0x4001, 2 bufferitem 0, ITEM_TM29 - jump MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar 0x4001, 3 bufferitem 0, ITEM_TM35 - jump MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar 0x4001, 4 bufferitem 0, ITEM_TM24 - jump MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar 0x4001, 5 bufferitem 0, ITEM_TM13 - jump MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 @@ -299,7 +299,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 @@ -314,7 +314,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 @@ -329,7 +329,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA @@ -344,7 +344,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 @@ -359,17 +359,17 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156F5E:: @ 8156F5E msgbox MauvilleCity_GameCorner_Text_181E76, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156F6C:: @ 8156F6C call MauvilleCity_GameCorner_EventScript_1A02A5 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156F77:: @ 8156F77 @@ -408,7 +408,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 88 setflag 226 - jump MauvilleCity_GameCorner_EventScript_157072 + goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 @@ -419,7 +419,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 89 setflag 226 - jump MauvilleCity_GameCorner_EventScript_157072 + goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F @@ -430,7 +430,7 @@ MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 90 setflag 226 - jump MauvilleCity_GameCorner_EventScript_157072 + goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_157059:: @ 8157059 @@ -456,7 +456,7 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C compare RESULT, 1 jumpeq MauvilleCity_GameCorner_EventScript_15709C msgbox MauvilleCity_GameCorner_Text_18201E, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C @@ -469,33 +469,33 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 playsfx 95 - jump MauvilleCity_GameCorner_EventScript_1570CA + goto MauvilleCity_GameCorner_EventScript_1570CA end MauvilleCity_GameCorner_EventScript_1570CA:: @ 81570CA msgbox MauvilleCity_GameCorner_Text_1820DD, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_1570D8:: @ 81570D8 lock faceplayer msgbox MauvilleCity_GameCorner_Text_182120, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_1570E8:: @ 81570E8 lock faceplayer msgbox MauvilleCity_GameCorner_Text_18217C, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8 lock faceplayer msgbox MauvilleCity_GameCorner_Text_182241, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_157108:: @ 8157108 @@ -509,14 +509,14 @@ MauvilleCity_GameCorner_EventScript_157115:: @ 8157115 lock faceplayer msgbox MauvilleCity_GameCorner_Text_182272, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_157125:: @ 8157125 lock faceplayer msgbox MauvilleCity_GameCorner_Text_1822F4, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index bd5c119f3..75136dcef 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -48,19 +48,19 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B MauvilleCity_Gym_EventScript_15657D:: @ 815657D setvar 0x8004, 0 special MauvilleGymSpecial1 - jump MauvilleCity_Gym_EventScript_156491 + goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B setvar 0x8004, 1 special MauvilleGymSpecial1 - jump MauvilleCity_Gym_EventScript_156491 + goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 setvar 0x8004, 2 special MauvilleGymSpecial1 - jump MauvilleCity_Gym_EventScript_156491 + goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 @@ -92,7 +92,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB special MauvilleGymSpecial3 special DrawWholeMapView playsfx 44 - jump MauvilleCity_Gym_EventScript_15661D + goto MauvilleCity_Gym_EventScript_15661D end MauvilleCity_Gym_EventScript_15661D:: @ 815661D @@ -117,7 +117,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B jumpeq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 1 setvar 0x8004, 0 - jump MauvilleCity_Gym_EventScript_1566BA + goto MauvilleCity_Gym_EventScript_1566BA end MauvilleCity_Gym_EventScript_156670:: @ 8156670 @@ -128,7 +128,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 jumpeq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 2 setvar 0x8004, 1 - jump MauvilleCity_Gym_EventScript_1566BA + goto MauvilleCity_Gym_EventScript_1566BA end MauvilleCity_Gym_EventScript_156695:: @ 8156695 @@ -139,7 +139,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 jumpeq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 3 setvar 0x8004, 2 - jump MauvilleCity_Gym_EventScript_1566BA + goto MauvilleCity_Gym_EventScript_1566BA end MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA @@ -206,14 +206,14 @@ MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall checkflag 2057 jumpeq MauvilleCity_Gym_EventScript_156781 - jump MauvilleCity_Gym_EventScript_15678B + goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall checkflag 2057 jumpeq MauvilleCity_Gym_EventScript_156781 - jump MauvilleCity_Gym_EventScript_15678B + goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156781:: @ 8156781 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 8a73af034..edb74f9f9 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -31,7 +31,7 @@ MauvilleCity_House2_EventScript_15731B:: @ 815731B removeitem ITEM_HARBOR_MAIL, 1 giveitem ITEM_COIN_CASE setflag 258 - jump MauvilleCity_House2_EventScript_15733D + goto MauvilleCity_House2_EventScript_15733D end MauvilleCity_House2_EventScript_15733D:: @ 815733D diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index b2b5dabd4..0e9ba15ef 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 sethealplace 5 call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B - jump MauvilleCity_PokemonCenter_1F_EventScript_157365 + goto MauvilleCity_PokemonCenter_1F_EventScript_157365 end MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 20f43a150..733f6816e 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -5,19 +5,19 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 checkflag 100 jumpeq MossdeepCity_Gym_EventScript_15A510 - jump MossdeepCity_Gym_EventScript_15A4E8 + goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 checkflag 101 jumpeq MossdeepCity_Gym_EventScript_15A528 - jump MossdeepCity_Gym_EventScript_15A4F7 + goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 checkflag 102 jumpeq MossdeepCity_Gym_EventScript_15A540 - jump MossdeepCity_Gym_EventScript_15A506 + goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 @@ -28,19 +28,19 @@ MossdeepCity_Gym_EventScript_15A506:: @ 815A506 MossdeepCity_Gym_EventScript_15A510:: @ 815A510 setmaptile 5, 5, 516, 0 setmaptile 2, 7, 569, 1 - jump MossdeepCity_Gym_EventScript_15A4E8 + goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A528:: @ 815A528 setmaptile 8, 14, 516, 0 setmaptile 8, 10, 569, 1 - jump MossdeepCity_Gym_EventScript_15A4F7 + goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A540:: @ 815A540 setmaptile 15, 17, 524, 0 setmaptile 17, 15, 569, 1 - jump MossdeepCity_Gym_EventScript_15A506 + goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A558:: @ 815A558 @@ -68,7 +68,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setvar 0x8008, 7 call MossdeepCity_Gym_EventScript_1A01C0 clearflag 905 - jump MossdeepCity_Gym_EventScript_15A5C6 + goto MossdeepCity_Gym_EventScript_15A5C6 end MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 @@ -89,7 +89,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA waitmove 0 setmaptile 5, 5, 516, 0 setmaptile 2, 7, 569, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A619:: @ 815A619 @@ -104,7 +104,7 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 waitmove 0 setmaptile 5, 5, 524, 0 setmaptile 2, 7, 568, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A646:: @ 815A646 @@ -116,7 +116,7 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 waitmove 0 setmaptile 8, 14, 516, 0 setmaptile 8, 10, 569, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A675:: @ 815A675 @@ -125,7 +125,7 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 waitmove 0 setmaptile 8, 14, 517, 0 setmaptile 8, 10, 568, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A @@ -137,7 +137,7 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A waitmove 0 setmaptile 15, 17, 524, 0 setmaptile 17, 15, 569, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 @@ -146,7 +146,7 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 waitmove 0 setmaptile 15, 17, 516, 0 setmaptile 17, 15, 568, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE @@ -158,7 +158,7 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE waitmove 0 setmaptile 1, 23, 525, 0 setmaptile 5, 24, 569, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D @@ -167,7 +167,7 @@ MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D waitmove 0 setmaptile 1, 23, 516, 0 setmaptile 5, 24, 568, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A742:: @ 815A742 @@ -230,14 +230,14 @@ MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall checkflag 2061 jumpeq MossdeepCity_Gym_EventScript_15A81A - jump MossdeepCity_Gym_EventScript_15A824 + goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall checkflag 2061 jumpeq MossdeepCity_Gym_EventScript_15A81A - jump MossdeepCity_Gym_EventScript_15A824 + goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A81A:: @ 815A81A diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index fdebcf102..0134adbdf 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -16,7 +16,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 lock faceplayer showmoney 0, 0 - snop + nop msgbox MtChimney_Text_195760, 5 compare RESULT, 0 jumpeq MtChimney_EventScript_15D00B @@ -43,7 +43,7 @@ MtChimney_EventScript_15CFF3:: @ 815CFF3 MtChimney_EventScript_15D000:: @ 815D000 paymoney 0xc8, 0 updatemoney 0, 0 - snop + nop return MtChimney_EventScript_15D00B:: @ 815D00B diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e352ac30e..f30b6fb9e 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -9,19 +9,19 @@ MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD lockall setvar 0x8008, 0 - jump MtPyre_Summit_EventScript_15D4E1 + goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall setvar 0x8008, 1 - jump MtPyre_Summit_EventScript_15D4E1 + goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall setvar 0x8008, 2 - jump MtPyre_Summit_EventScript_15D4E1 + goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 @@ -247,19 +247,19 @@ MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE lockall setvar 0x8008, 0 - jump MtPyre_Summit_EventScript_15D6F2 + goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall setvar 0x8008, 1 - jump MtPyre_Summit_EventScript_15D6F2 + goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall setvar 0x8008, 2 - jump MtPyre_Summit_EventScript_15D6F2 + goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 68ed80949..f1d554d87 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -56,21 +56,21 @@ OldaleTown_EventScript_14DE07:: @ 814DE07 move 2, OldaleTown_Movement_14DE97 move 255, OldaleTown_Movement_14DEC1 waitmove 0 - jump OldaleTown_EventScript_14DE4C + goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE1E:: @ 814DE1E move 2, OldaleTown_Movement_14DEA2 move 255, OldaleTown_Movement_14DECB waitmove 0 - jump OldaleTown_EventScript_14DE4C + goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE35:: @ 814DE35 move 255, OldaleTown_Movement_14DEB9 move 2, OldaleTown_Movement_14DE8E waitmove 0 - jump OldaleTown_EventScript_14DE4C + goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE4C:: @ 814DE4C @@ -225,7 +225,7 @@ OldaleTown_EventScript_14DF30:: @ 814DF30 lockall move 4, OldaleTown_Movement_1A0839 waitmove 0 - jump OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF41:: @ 814DF41 @@ -234,7 +234,7 @@ OldaleTown_EventScript_14DF41:: @ 814DF41 waitmove 0 move 255, OldaleTown_Movement_1A0843 waitmove 0 - jump OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF5C:: @ 814DF5C @@ -243,7 +243,7 @@ OldaleTown_EventScript_14DF5C:: @ 814DF5C waitmove 0 move 255, OldaleTown_Movement_1A0843 waitmove 0 - jump OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF77:: @ 814DF77 @@ -252,7 +252,7 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 waitmove 0 move 255, OldaleTown_Movement_1A0843 waitmove 0 - jump OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF92:: @ 814DF92 @@ -265,12 +265,12 @@ OldaleTown_EventScript_14DF92:: @ 814DF92 OldaleTown_EventScript_14DFAA:: @ 814DFAA msgbox OldaleTown_Text_16B196, 4 - jump OldaleTown_EventScript_14DFC6 + goto OldaleTown_EventScript_14DFC6 end OldaleTown_EventScript_14DFB8:: @ 814DFB8 msgbox OldaleTown_Text_16B1BE, 4 - jump OldaleTown_EventScript_14DFC6 + goto OldaleTown_EventScript_14DFC6 end OldaleTown_EventScript_14DFC6:: @ 814DFC6 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index e45f09de4..f2174441f 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -19,7 +19,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 2 jumpif 4, PacifidlogTown_House2_EventScript_15421B - jump PacifidlogTown_House2_EventScript_154225 + goto PacifidlogTown_House2_EventScript_154225 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 123b099fe..ed575844c 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -157,25 +157,25 @@ PetalburgCity_EventScript_14B82D:: @ 814B82D PetalburgCity_EventScript_14B836:: @ 814B836 lockall setvar 0x8008, 0 - jump PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B842:: @ 814B842 lockall setvar 0x8008, 1 - jump PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B84E:: @ 814B84E lockall setvar 0x8008, 2 - jump PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B85A:: @ 814B85A lockall setvar 0x8008, 3 - jump PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B866:: @ 814B866 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index c534cb538..f8dfb0a39 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -123,22 +123,22 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 PetalburgCity_Gym_EventScript_15463D:: @ 815463D setvar 0x8008, 0 - jump PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154648:: @ 8154648 setvar 0x8008, 1 - jump PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154653:: @ 8154653 setvar 0x8008, 2 - jump PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_15465E:: @ 815465E setvar 0x8008, 3 - jump PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154669:: @ 8154669 @@ -408,7 +408,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 clearflag 940 call PetalburgCity_Gym_EventScript_1544ED special DrawWholeMapView - jump PetalburgCity_Gym_EventScript_154A2C + goto PetalburgCity_Gym_EventScript_154A2C end PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C @@ -1036,14 +1036,14 @@ PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall checkflag 2059 jumpeq PetalburgCity_Gym_EventScript_1551CA - jump PetalburgCity_Gym_EventScript_1551D4 + goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall checkflag 2059 jumpeq PetalburgCity_Gym_EventScript_1551CA - jump PetalburgCity_Gym_EventScript_1551D4 + goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551CA:: @ 81551CA diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index e8ac407dc..fb521aa46 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -20,7 +20,7 @@ PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 checkflag 122 jumpeq PetalburgCity_WallysHouse_EventScript_154431 - jump PetalburgCity_WallysHouse_EventScript_154406 + goto PetalburgCity_WallysHouse_EventScript_154406 end PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index c24f7c195..463fbec3c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -36,7 +36,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 call PetalburgWoods_EventScript_15CDFA move 4, PetalburgWoods_Movement_15CE80 waitmove 0 - jump PetalburgWoods_EventScript_15CE69 + goto PetalburgWoods_EventScript_15CE69 end PetalburgWoods_EventScript_15CD42:: @ 815CD42 @@ -71,7 +71,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 call PetalburgWoods_EventScript_15CDFA move 4, PetalburgWoods_Movement_15CE95 waitmove 0 - jump PetalburgWoods_EventScript_15CE69 + goto PetalburgWoods_EventScript_15CE69 end PetalburgWoods_EventScript_15CDE6:: @ 815CDE6 @@ -93,12 +93,12 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA giveitem ITEM_GREAT_BALL compare RESULT, 0 jumpeq PetalburgWoods_EventScript_15CE3F - jump PetalburgWoods_EventScript_15CE4D + goto PetalburgWoods_EventScript_15CE4D end PetalburgWoods_EventScript_15CE3F:: @ 815CE3F msgbox PetalburgWoods_Text_195182, 4 - jump PetalburgWoods_EventScript_15CE4D + goto PetalburgWoods_EventScript_15CE4D end PetalburgWoods_EventScript_15CE4D:: @ 815CE4D diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 4c7da3d0d..2d0c1c921 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -50,42 +50,42 @@ Route103_EventScript_14EC04:: @ 814EC04 Route103_EventScript_14EC5D:: @ 814EC5D trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B - jump Route103_EventScript_14ECBD + goto Route103_EventScript_14ECBD end Route103_EventScript_14EC6D:: @ 814EC6D trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B - jump Route103_EventScript_14ECBD + goto Route103_EventScript_14ECBD end Route103_EventScript_14EC7D:: @ 814EC7D trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B - jump Route103_EventScript_14ECBD + goto Route103_EventScript_14ECBD end Route103_EventScript_14EC8D:: @ 814EC8D trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836 - jump Route103_EventScript_14ECCB + goto Route103_EventScript_14ECCB end Route103_EventScript_14EC9D:: @ 814EC9D trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836 - jump Route103_EventScript_14ECCB + goto Route103_EventScript_14ECCB end Route103_EventScript_14ECAD:: @ 814ECAD trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836 - jump Route103_EventScript_14ECCB + goto Route103_EventScript_14ECCB end Route103_EventScript_14ECBD:: @ 814ECBD msgbox Route103_Text_16D688, 4 - jump Route103_EventScript_14ECD9 + goto Route103_EventScript_14ECD9 end Route103_EventScript_14ECCB:: @ 814ECCB msgbox Route103_Text_16D856, 4 - jump Route103_EventScript_14ECD9 + goto Route103_EventScript_14ECD9 end Route103_EventScript_14ECD9:: @ 814ECD9 @@ -103,7 +103,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C playsfx 10 move 2, Route103_Movement_14ED6B waitmove 0 - jump Route103_EventScript_14ED46 + goto Route103_EventScript_14ED46 end Route103_EventScript_14ED29:: @ 814ED29 @@ -112,7 +112,7 @@ Route103_EventScript_14ED29:: @ 814ED29 playsfx 10 move 2, Route103_Movement_14ED74 waitmove 0 - jump Route103_EventScript_14ED46 + goto Route103_EventScript_14ED46 end Route103_EventScript_14ED46:: @ 814ED46 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b617767bf..d829c6a93 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -9,7 +9,7 @@ Route104_MapScript2_14EE97:: @ 814EE97 Route104_EventScript_14EEA1:: @ 814EEA1 lockall - jump Route104_EventScript_14EFD5 + goto Route104_EventScript_14EFD5 end Route104_MapScript1_14EEA8:: @ 814EEA8 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 5c6704e67..693939cf4 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -30,7 +30,7 @@ Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB jumpif 0, Route104_MrBrineysHouse_EventScript_15BD65 checkflag 149 jumpif 0, Route104_MrBrineysHouse_EventScript_15BD7E - jump Route104_MrBrineysHouse_EventScript_15BD32 + goto Route104_MrBrineysHouse_EventScript_15BD32 end Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E @@ -39,7 +39,7 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E msgbox Route104_MrBrineysHouse_Text_191AAD, 5 compare RESULT, 0 jumpeq Route104_MrBrineysHouse_EventScript_15BD97 - jump Route104_MrBrineysHouse_EventScript_15BDAB + goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 @@ -56,14 +56,14 @@ Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 msgbox Route104_MrBrineysHouse_Text_191CC3, 5 compare RESULT, 0 jumpeq Route104_MrBrineysHouse_EventScript_15BD97 - jump Route104_MrBrineysHouse_EventScript_15BDAB + goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E msgbox Route104_MrBrineysHouse_Text_191DA6, 5 compare RESULT, 0 jumpeq Route104_MrBrineysHouse_EventScript_15BD97 - jump Route104_MrBrineysHouse_EventScript_15BDAB + goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD97:: @ 815BD97 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 58c38173e..6e9d4adff 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -17,19 +17,19 @@ Route109_EventScript_14F4D3:: @ 814F4D3 Route109_EventScript_14F518:: @ 814F518 move 255, Route109_Movement_14F66D waitmove 0 - jump Route109_EventScript_14F548 + goto Route109_EventScript_14F548 end Route109_EventScript_14F528:: @ 814F528 move 255, Route109_Movement_14F675 waitmove 0 - jump Route109_EventScript_14F548 + goto Route109_EventScript_14F548 end Route109_EventScript_14F538:: @ 814F538 move 255, Route109_Movement_14F678 waitmove 0 - jump Route109_EventScript_14F548 + goto Route109_EventScript_14F548 end Route109_EventScript_14F548:: @ 814F548 @@ -273,7 +273,7 @@ Route109_EventScript_14F680:: @ 814F680 faceplayer checkflag 149 jumpif 0, Route109_EventScript_14F691 - jump Route109_EventScript_14F6AF + goto Route109_EventScript_14F6AF end Route109_EventScript_14F691:: @ 814F691 @@ -281,7 +281,7 @@ Route109_EventScript_14F691:: @ 814F691 msgbox Route109_Text_16E0F9, 5 compare RESULT, 0 jumpeq Route109_EventScript_14F6F1 - jump Route109_EventScript_14F6E2 + goto Route109_EventScript_14F6E2 end Route109_EventScript_14F6AF:: @ 814F6AF @@ -297,7 +297,7 @@ Route109_EventScript_14F6AF:: @ 814F6AF Route109_EventScript_14F6E2:: @ 814F6E2 msgbox Route109_Text_16E159, 4 closebutton - jump Route109_EventScript_14F4D3 + goto Route109_EventScript_14F4D3 end Route109_EventScript_14F6F1:: @ 814F6F1 diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index e1d9c380b..e8afb54fb 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -41,7 +41,7 @@ Route109_SeashoreHouse_EventScript_160E2C:: @ 8160E2C Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoney 0, 0 - snop + nop msgbox Route109_SeashoreHouse_Text_19B702, 5 compare RESULT, 1 jumpeq Route109_SeashoreHouse_EventScript_160E5A @@ -60,7 +60,7 @@ Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A msgbox Route109_SeashoreHouse_Text_19B74C, 4 paymoney 0x12c, 0 updatemoney 0, 0 - snop + nop giveitem ITEM_SODA_POP hidemoney 0, 0 release diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index a77feaa0f..745faaddf 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -279,27 +279,27 @@ Route110_EventScript_14FC39:: @ 814FC39 Route110_EventScript_14FCC3:: @ 814FCC3 msgbox Route110_Text_16EF9F, 4 - jump Route110_EventScript_14FD09 + goto Route110_EventScript_14FD09 end Route110_EventScript_14FCD1:: @ 814FCD1 msgbox Route110_Text_16F012, 4 - jump Route110_EventScript_14FD09 + goto Route110_EventScript_14FD09 end Route110_EventScript_14FCDF:: @ 814FCDF msgbox Route110_Text_16F069, 4 - jump Route110_EventScript_14FD09 + goto Route110_EventScript_14FD09 end Route110_EventScript_14FCED:: @ 814FCED msgbox Route110_Text_16F0D0, 4 - jump Route110_EventScript_14FD09 + goto Route110_EventScript_14FD09 end Route110_EventScript_14FCFB:: @ 814FCFB msgbox Route110_Text_16F139, 4 - jump Route110_EventScript_14FD09 + goto Route110_EventScript_14FD09 end Route110_EventScript_14FD09:: @ 814FD09 @@ -310,17 +310,17 @@ Route110_EventScript_14FD09:: @ 814FD09 Route110_EventScript_14FD13:: @ 814FD13 setvar 0x8008, 1 - jump Route110_EventScript_14FD34 + goto Route110_EventScript_14FD34 end Route110_EventScript_14FD1E:: @ 814FD1E setvar 0x8008, 2 - jump Route110_EventScript_14FD34 + goto Route110_EventScript_14FD34 end Route110_EventScript_14FD29:: @ 814FD29 setvar 0x8008, 3 - jump Route110_EventScript_14FD34 + goto Route110_EventScript_14FD34 end Route110_EventScript_14FD34:: @ 814FD34 @@ -369,24 +369,24 @@ Route110_EventScript_14FDB1:: @ 814FDB1 Route110_EventScript_14FDE0:: @ 814FDE0 trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826 - jump Route110_EventScript_14FE10 + goto Route110_EventScript_14FE10 end Route110_EventScript_14FDF0:: @ 814FDF0 trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826 - jump Route110_EventScript_14FE10 + goto Route110_EventScript_14FE10 end Route110_EventScript_14FE00:: @ 814FE00 trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826 - jump Route110_EventScript_14FE10 + goto Route110_EventScript_14FE10 end Route110_EventScript_14FE10:: @ 814FE10 msgbox Route110_Text_16E84C, 4 call Route110_EventScript_14FEA5 msgbox Route110_Text_16E8B3, 4 - jump Route110_EventScript_14FEB2 + goto Route110_EventScript_14FEB2 end Route110_EventScript_14FE2B:: @ 814FE2B @@ -399,24 +399,24 @@ Route110_EventScript_14FE2B:: @ 814FE2B Route110_EventScript_14FE5A:: @ 814FE5A trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F - jump Route110_EventScript_14FE8A + goto Route110_EventScript_14FE8A end Route110_EventScript_14FE6A:: @ 814FE6A trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F - jump Route110_EventScript_14FE8A + goto Route110_EventScript_14FE8A end Route110_EventScript_14FE7A:: @ 814FE7A trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F - jump Route110_EventScript_14FE8A + goto Route110_EventScript_14FE8A end Route110_EventScript_14FE8A:: @ 814FE8A msgbox Route110_Text_16EA2A, 4 call Route110_EventScript_14FEA5 msgbox Route110_Text_16EA7B, 4 - jump Route110_EventScript_14FEB2 + goto Route110_EventScript_14FEB2 end Route110_EventScript_14FEA5:: @ 814FEA5 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 6b6d45af2..b4f800876 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -15,12 +15,12 @@ Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall compare 0x40ab, 0 jumpeq Route110_TrickHousePuzzle1_EventScript_161D26 - jump Route110_TrickHousePuzzle1_EventScript_161892 + goto Route110_TrickHousePuzzle1_EventScript_161892 end Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 setvar 0x40ab, 1 - jump Route110_TrickHousePuzzle1_EventScript_16189C + goto Route110_TrickHousePuzzle1_EventScript_16189C end Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 27ffad50d..96e9d8143 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -25,12 +25,12 @@ Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall compare 0x40ac, 0 jumpeq Route110_TrickHousePuzzle2_EventScript_161DD5 - jump Route110_TrickHousePuzzle2_EventScript_161892 + goto Route110_TrickHousePuzzle2_EventScript_161892 end Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 setvar 0x40ac, 1 - jump Route110_TrickHousePuzzle2_EventScript_16189C + goto Route110_TrickHousePuzzle2_EventScript_16189C end Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index efd96ec44..c81c5dd1c 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -248,50 +248,50 @@ Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB lockall setvar 0x4008, 1 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625B7:: @ 81625B7 lockall setvar 0x4008, 2 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625C3:: @ 81625C3 lockall setvar 0x4008, 3 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625CF:: @ 81625CF lockall setvar 0x4008, 4 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625DB:: @ 81625DB lockall setvar 0x4008, 5 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625E7:: @ 81625E7 lockall setvar 0x4008, 6 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 lockall setvar 0x4008, 7 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF call Route110_TrickHousePuzzle3_EventScript_162612 playsfx 21 call Route110_TrickHousePuzzle3_EventScript_161F12 - jump Route110_TrickHousePuzzle3_EventScript_1626AD + goto Route110_TrickHousePuzzle3_EventScript_1626AD end Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 @@ -372,12 +372,12 @@ Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall compare 0x40ad, 0 jumpeq Route110_TrickHousePuzzle3_EventScript_1626FD - jump Route110_TrickHousePuzzle3_EventScript_161892 + goto Route110_TrickHousePuzzle3_EventScript_161892 end Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD setvar 0x40ad, 1 - jump Route110_TrickHousePuzzle3_EventScript_16189C + goto Route110_TrickHousePuzzle3_EventScript_16189C end Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 89d5e45c3..11c0074d9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -5,12 +5,12 @@ Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall compare 0x40ae, 0 jumpeq Route110_TrickHousePuzzle4_EventScript_162760 - jump Route110_TrickHousePuzzle4_EventScript_161892 + goto Route110_TrickHousePuzzle4_EventScript_161892 end Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 setvar 0x40ae, 1 - jump Route110_TrickHousePuzzle4_EventScript_16189C + goto Route110_TrickHousePuzzle4_EventScript_16189C end Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index cd5d2fbb9..be416e326 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -15,12 +15,12 @@ Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall compare 0x40af, 0 jumpeq Route110_TrickHousePuzzle5_EventScript_1627E7 - jump Route110_TrickHousePuzzle5_EventScript_161892 + goto Route110_TrickHousePuzzle5_EventScript_161892 end Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7 setvar 0x40af, 1 - jump Route110_TrickHousePuzzle5_EventScript_16189C + goto Route110_TrickHousePuzzle5_EventScript_16189C end Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 @@ -30,7 +30,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 compare 0x4001, 1 jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 @@ -40,7 +40,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 compare 0x4002, 1 jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_1629B3 + goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 @@ -50,7 +50,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 compare 0x4003, 1 jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 @@ -60,7 +60,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 compare 0x4004, 1 jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162A9B + goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 @@ -70,91 +70,91 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 compare 0x4005, 1 jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162897:: @ 8162897 lockall setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628A3:: @ 81628A3 lockall setvar 0x4009, 1 - jump Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628AF:: @ 81628AF lockall setvar 0x4009, 2 - jump Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628BB:: @ 81628BB lockall setvar 0x4009, 3 - jump Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628C7:: @ 81628C7 lockall setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_1629B3 + goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628D3:: @ 81628D3 lockall setvar 0x4009, 1 - jump Route110_TrickHousePuzzle5_EventScript_1629B3 + goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628DF:: @ 81628DF lockall setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628EB:: @ 81628EB lockall setvar 0x4009, 1 - jump Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628F7:: @ 81628F7 lockall setvar 0x4009, 2 - jump Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_162903:: @ 8162903 lockall setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162A9B + goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16290F:: @ 816290F lockall setvar 0x4009, 1 - jump Route110_TrickHousePuzzle5_EventScript_162A9B + goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16291B:: @ 816291B lockall setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162927:: @ 8162927 lockall setvar 0x4009, 1 - jump Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 lockall setvar 0x4009, 2 - jump Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F @@ -272,7 +272,7 @@ Route110_TrickHousePuzzle5_EventScript_162B83:: @ 8162B83 multichoice 0, 0, 25, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6 @@ -280,7 +280,7 @@ Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6 multichoice 0, 0, 26, 1 switch RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9 @@ -288,7 +288,7 @@ Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9 multichoice 0, 0, 27, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC @@ -296,7 +296,7 @@ Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC multichoice 0, 0, 28, 1 switch RESULT case 2, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F @@ -304,7 +304,7 @@ Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F multichoice 0, 0, 29, 1 switch RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32 @@ -312,7 +312,7 @@ Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32 multichoice 0, 0, 30, 1 switch RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55 @@ -320,7 +320,7 @@ Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55 multichoice 0, 0, 31, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78 @@ -328,7 +328,7 @@ Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78 multichoice 0, 0, 32, 1 switch RESULT case 2, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B @@ -336,7 +336,7 @@ Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B multichoice 0, 0, 33, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE @@ -344,7 +344,7 @@ Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE multichoice 0, 0, 34, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1 @@ -352,7 +352,7 @@ Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1 multichoice 0, 0, 35, 1 switch RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04 @@ -360,7 +360,7 @@ Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04 multichoice 0, 0, 36, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27 @@ -368,7 +368,7 @@ Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27 multichoice 0, 0, 37, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A @@ -376,7 +376,7 @@ Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A multichoice 0, 0, 38, 1 switch RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D @@ -384,7 +384,7 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D multichoice 0, 0, 39, 1 switch RESULT case 2, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 @@ -409,7 +409,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF checksound playsfx 31 - jump Route110_TrickHousePuzzle5_EventScript_162DE9 + goto Route110_TrickHousePuzzle5_EventScript_162DE9 end Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index 1e47bbd83..bd0a7c8d8 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -19,12 +19,12 @@ Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall compare 0x40b0, 0 jumpeq Route110_TrickHousePuzzle6_EventScript_1630FC - jump Route110_TrickHousePuzzle6_EventScript_161892 + goto Route110_TrickHousePuzzle6_EventScript_161892 end Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC setvar 0x40b0, 1 - jump Route110_TrickHousePuzzle6_EventScript_16189C + goto Route110_TrickHousePuzzle6_EventScript_16189C end Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 7f965b467..a4093c546 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -102,12 +102,12 @@ Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall compare 0x40b1, 0 jumpeq Route110_TrickHousePuzzle7_EventScript_16329D - jump Route110_TrickHousePuzzle7_EventScript_161892 + goto Route110_TrickHousePuzzle7_EventScript_161892 end Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D setvar 0x40b1, 1 - jump Route110_TrickHousePuzzle7_EventScript_16189C + goto Route110_TrickHousePuzzle7_EventScript_16189C end Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index a31c868be..d4afab4ea 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -5,12 +5,12 @@ Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall compare 0x40b2, 0 jumpeq Route110_TrickHousePuzzle8_EventScript_16342E - jump Route110_TrickHousePuzzle8_EventScript_161892 + goto Route110_TrickHousePuzzle8_EventScript_161892 end Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E setvar 0x40b2, 1 - jump Route110_TrickHousePuzzle8_EventScript_16189C + goto Route110_TrickHousePuzzle8_EventScript_16189C end Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 1358a44be..68be7e7d2 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -141,25 +141,25 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall setvar 0x8004, 0 - jump Route111_EventScript_15013A + goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall setvar 0x8004, 1 - jump Route111_EventScript_15013A + goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall setvar 0x8004, 2 - jump Route111_EventScript_15013A + goto Route111_EventScript_15013A end @ 815012E lockall setvar 0x8004, 3 - jump Route111_EventScript_15013A + goto Route111_EventScript_15013A end Route111_EventScript_15013A:: @ 815013A diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 3eb514ad2..3fbaf7958 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -6,7 +6,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 faceplayer setvar 0x8008, 2 msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A @@ -20,12 +20,12 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A compare RESULT, 0 jumpeq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag 277 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72 msgbox Route111_WinstrateFamilysHouse_Text_19214D, 4 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 @@ -33,7 +33,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 faceplayer setvar 0x8008, 1 msgbox Route111_WinstrateFamilysHouse_Text_192190, 4 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 @@ -44,12 +44,12 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 jumpeq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 setflag 4 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192334, 4 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 83983f9bb..24f4803b2 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -42,7 +42,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 jumpif 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waittext - jump Route113_GlassWorkshop_EventScript_1635EE + goto Route113_GlassWorkshop_EventScript_1635EE end Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 @@ -77,7 +77,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 10 subvar 0x4048, 250 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C @@ -91,7 +91,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 11 subvar 0x4048, 500 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 @@ -105,7 +105,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 12 subvar 0x4048, 500 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 @@ -119,7 +119,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 13 subvar 0x4048, 1000 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 @@ -133,7 +133,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 14 subvar 0x4048, 1000 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_16378C:: @ 816378C @@ -148,7 +148,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 15 subvar 0x4048, 6000 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD @@ -163,7 +163,7 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 16 subvar 0x4048, 8000 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_16380E:: @ 816380E @@ -184,13 +184,13 @@ Route113_GlassWorkshop_EventScript_163830:: @ 8163830 buffernum 1, 32778 message Route113_GlassWorkshop_Text_19E890 waittext - jump Route113_GlassWorkshop_EventScript_1635EE + goto Route113_GlassWorkshop_EventScript_1635EE end Route113_GlassWorkshop_EventScript_163845:: @ 8163845 message Route113_GlassWorkshop_Text_19E802 waittext - jump Route113_GlassWorkshop_EventScript_1635EE + goto Route113_GlassWorkshop_EventScript_1635EE end Route113_GlassWorkshop_EventScript_163851:: @ 8163851 @@ -248,49 +248,49 @@ Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar 0x8009, 0 setvar 0x8008, 39 bufferitem 0, 0x8008 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar 0x8009, 0 setvar 0x8008, 40 bufferitem 0, 0x8008 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar 0x8009, 0 setvar 0x8008, 41 bufferitem 0, 0x8008 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar 0x8009, 0 setvar 0x8008, 43 bufferitem 0, 0x8008 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar 0x8009, 0 setvar 0x8008, 42 bufferitem 0, 0x8008 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar 0x8009, 1 setvar 0x8008, 13 bufferdecor 0, 13 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar 0x8009, 1 setvar 0x8008, 6 bufferdecor 0, 6 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index f5ef82f8b..7b9a5162f 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -38,7 +38,7 @@ Route116_EventScript_150A7B:: @ 8150A7B checkflag 287 jumpeq Route116_EventScript_150B04 msgbox Route116_Text_1705AE, 4 - jump Route116_EventScript_150A94 + goto Route116_EventScript_150A94 end Route116_EventScript_150A94:: @ 8150A94 @@ -74,7 +74,7 @@ Route116_EventScript_150AF9:: @ 8150AF9 Route116_EventScript_150B04:: @ 8150B04 msgbox Route116_Text_170865, 4 - jump Route116_EventScript_150A94 + goto Route116_EventScript_150A94 end Route116_EventScript_150B12:: @ 8150B12 @@ -160,7 +160,7 @@ Route116_EventScript_150B8F:: @ 8150B8F Route116_EventScript_150BBB:: @ 8150BBB msgbox Route116_Text_1709B7, 4 closebutton - jump Route116_EventScript_150C03 + goto Route116_EventScript_150C03 end Route116_EventScript_150BCA:: @ 8150BCA @@ -176,7 +176,7 @@ Route116_EventScript_150BCA:: @ 8150BCA Route116_EventScript_150BF4:: @ 8150BF4 msgbox Route116_Text_17094D, 4 closebutton - jump Route116_EventScript_150C03 + goto Route116_EventScript_150C03 end Route116_EventScript_150C03:: @ 8150C03 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 0b5b4748e..a28352c94 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -55,7 +55,7 @@ Route118_EventScript_150FAE:: @ 8150FAE waitmove 0 move 19, Route118_Movement_151069 waitmove 0 - jump Route118_EventScript_151004 + goto Route118_EventScript_151004 end Route118_EventScript_150FCE:: @ 8150FCE @@ -63,7 +63,7 @@ Route118_EventScript_150FCE:: @ 8150FCE setvar 0x8008, 1 move 255, Route118_Movement_1A0841 waitmove 0 - jump Route118_EventScript_151004 + goto Route118_EventScript_151004 end Route118_EventScript_150FE4:: @ 8150FE4 @@ -73,7 +73,7 @@ Route118_EventScript_150FE4:: @ 8150FE4 waitmove 0 move 19, Route118_Movement_15106B waitmove 0 - jump Route118_EventScript_151004 + goto Route118_EventScript_151004 end Route118_EventScript_151004:: @ 8151004 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 55a3fb1dc..bd73bbf31 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -40,12 +40,12 @@ Route119_EventScript_1511B9:: @ 81511B9 Route119_EventScript_1511C5:: @ 81511C5 setvar 0x4001, 1 - jump Route119_EventScript_1511DB + goto Route119_EventScript_1511DB end Route119_EventScript_1511D0:: @ 81511D0 setvar 0x4001, 2 - jump Route119_EventScript_1511DB + goto Route119_EventScript_1511DB end Route119_EventScript_1511DB:: @ 81511DB @@ -97,24 +97,24 @@ Route119_EventScript_15125E:: @ 815125E Route119_EventScript_15128D:: @ 815128D trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156 - jump Route119_EventScript_1512BD + goto Route119_EventScript_1512BD end Route119_EventScript_15129D:: @ 815129D trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156 - jump Route119_EventScript_1512BD + goto Route119_EventScript_1512BD end Route119_EventScript_1512AD:: @ 81512AD trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156 - jump Route119_EventScript_1512BD + goto Route119_EventScript_1512BD end Route119_EventScript_1512BD:: @ 81512BD msgbox Route119_Text_1711B1, 4 call Route119_EventScript_151352 msgbox Route119_Text_171214, 4 - jump Route119_EventScript_151362 + goto Route119_EventScript_151362 end Route119_EventScript_1512D8:: @ 81512D8 @@ -127,24 +127,24 @@ Route119_EventScript_1512D8:: @ 81512D8 Route119_EventScript_151307:: @ 8151307 trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2 - jump Route119_EventScript_151337 + goto Route119_EventScript_151337 end Route119_EventScript_151317:: @ 8151317 trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2 - jump Route119_EventScript_151337 + goto Route119_EventScript_151337 end Route119_EventScript_151327:: @ 8151327 trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2 - jump Route119_EventScript_151337 + goto Route119_EventScript_151337 end Route119_EventScript_151337:: @ 8151337 msgbox Route119_Text_17140B, 4 call Route119_EventScript_151352 msgbox Route119_Text_171475, 4 - jump Route119_EventScript_151362 + goto Route119_EventScript_151362 end Route119_EventScript_151352:: @ 8151352 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 37f8e9ec6..f88b97cfe 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -50,7 +50,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 move 5, Route119_WeatherInstitute_2F_Movement_163DC8 waitmove 0 moveoffscreen 5 - jump Route119_WeatherInstitute_2F_EventScript_163D7A + goto Route119_WeatherInstitute_2F_EventScript_163D7A end Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A @@ -89,5 +89,5 @@ Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC faceplayer checkflag 151 jumpeq Route119_WeatherInstitute_2F_EventScript_163DBE - jump Route119_WeatherInstitute_2F_EventScript_163D7A + goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 75385fe8f..74250fd0f 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -102,7 +102,7 @@ Route120_EventScript_151719:: @ 8151719 jumpif 3, Route120_EventScript_151735 compare 0x4000, 19 jumpif 3, Route120_EventScript_151715 - jump Route120_EventScript_151735 + goto Route120_EventScript_151735 end Route120_EventScript_151735:: @ 8151735 @@ -136,27 +136,27 @@ Route120_EventScript_151739:: @ 8151739 Route120_EventScript_1517DC:: @ 81517DC setvar 0x8004, 143 - jump Route120_EventScript_151813 + goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 setvar 0x8004, 144 - jump Route120_EventScript_151813 + goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 setvar 0x8004, 145 - jump Route120_EventScript_151813 + goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD setvar 0x8004, 146 - jump Route120_EventScript_151813 + goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 setvar 0x8004, 147 - jump Route120_EventScript_151813 + goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 @@ -189,7 +189,7 @@ Route120_EventScript_151853:: @ 8151853 msgbox Route120_Text_171827, 5 compare RESULT, 0 jumpeq Route120_EventScript_151877 - jump Route120_EventScript_15189D + goto Route120_EventScript_15189D end Route120_EventScript_151877:: @ 8151877 @@ -202,7 +202,7 @@ Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, 5 compare RESULT, 0 jumpeq Route120_EventScript_151877 - jump Route120_EventScript_15189D + goto Route120_EventScript_15189D end Route120_EventScript_15189D:: @ 815189D @@ -230,7 +230,7 @@ Route120_EventScript_15189D:: @ 815189D setflag 2145 dowildbattle clearflag 2145 - jump Route120_EventScript_151908 + goto Route120_EventScript_151908 end Route120_EventScript_151908:: @ 8151908 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 251b09c73..6850cdeb2 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -50,12 +50,12 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 move 255, Route121_SafariZoneEntrance_Movement_1A0841 waitmove 0 showmoney 0, 0 - snop + nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 compare RESULT, 1 jumpeq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 - jump Route121_SafariZoneEntrance_EventScript_15C46C + goto Route121_SafariZoneEntrance_EventScript_15C46C end Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 @@ -69,7 +69,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 paymoney 0x1f4, 0 updatemoney 0, 0 - snop + nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 fanfare 370 message Route121_SafariZoneEntrance_Text_1C3910 @@ -94,7 +94,7 @@ Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 compare RESULT, 1 jumpeq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 - jump Route121_SafariZoneEntrance_EventScript_15C46C + goto Route121_SafariZoneEntrance_EventScript_15C46C end Route121_SafariZoneEntrance_EventScript_15C44F:: @ 815C44F @@ -102,12 +102,12 @@ Route121_SafariZoneEntrance_EventScript_15C44F:: @ 815C44F Route121_SafariZoneEntrance_EventScript_15C450:: @ 815C450 msgbox Route121_SafariZoneEntrance_Text_1C39C3, 4 - jump Route121_SafariZoneEntrance_EventScript_15C46C + goto Route121_SafariZoneEntrance_EventScript_15C46C end Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E msgbox Route121_SafariZoneEntrance_Text_1C38B5, 4 - jump Route121_SafariZoneEntrance_EventScript_15C46C + goto Route121_SafariZoneEntrance_EventScript_15C46C end Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 9290f845d..18e94034d 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -81,7 +81,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 giveitem RESULT compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D release end @@ -93,7 +93,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B setflag 248 - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F @@ -104,7 +104,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B setflag 249 - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 @@ -115,7 +115,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B setflag 250 - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 @@ -126,7 +126,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B setflag 251 - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 @@ -137,7 +137,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B setflag 252 - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13 diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index e1049c8be..2d0d624c0 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -13,19 +13,19 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 jumpeq Route124_DivingTreasureHuntersHouse_EventScript_163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 setflag 217 - jump Route124_DivingTreasureHuntersHouse_EventScript_163E2E + goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E end Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F48F, 4 - jump Route124_DivingTreasureHuntersHouse_EventScript_163E2E + goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E end Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare 0x4001, 0 jumpeq Route124_DivingTreasureHuntersHouse_EventScript_164329 - jump Route124_DivingTreasureHuntersHouse_EventScript_163EA2 + goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 @@ -62,7 +62,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E9C:: @ 8163E9C Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 msgbox Route124_DivingTreasureHuntersHouse_Text_19F544, 4 - jump Route124_DivingTreasureHuntersHouse_EventScript_163EB0 + goto Route124_DivingTreasureHuntersHouse_EventScript_163EB0 end Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0 @@ -91,7 +91,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163F61:: @ 8163F61 switch RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_163F87:: @ 8163F87 @@ -99,7 +99,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163F87:: @ 8163F87 switch RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_163FAD:: @ 8163FAD @@ -108,7 +108,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163FAD:: @ 8163FAD case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_163FDE:: @ 8163FDE @@ -116,7 +116,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163FDE:: @ 8163FDE switch RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164004:: @ 8164004 @@ -125,7 +125,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164004:: @ 8164004 case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164035:: @ 8164035 @@ -134,7 +134,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164035:: @ 8164035 case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164066:: @ 8164066 @@ -144,7 +144,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164066:: @ 8164066 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_1640A2:: @ 81640A2 @@ -152,7 +152,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1640A2:: @ 81640A2 switch RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_1640C8:: @ 81640C8 @@ -161,7 +161,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1640C8:: @ 81640C8 case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_1640F9:: @ 81640F9 @@ -170,7 +170,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1640F9:: @ 81640F9 case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_16412A:: @ 816412A @@ -180,7 +180,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_16412A:: @ 816412A case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164166:: @ 8164166 @@ -189,7 +189,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164166:: @ 8164166 case 0, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164197:: @ 8164197 @@ -199,7 +199,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164197:: @ 8164197 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_1641D3:: @ 81641D3 @@ -209,7 +209,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1641D3:: @ 81641D3 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F @@ -220,28 +220,28 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F case 2, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 3, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 4, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 setvar 0x8008, 48 setvar 0x8009, 95 - jump Route124_DivingTreasureHuntersHouse_EventScript_164292 + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 setvar 0x8008, 50 setvar 0x8009, 96 - jump Route124_DivingTreasureHuntersHouse_EventScript_164292 + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 setvar 0x8008, 49 setvar 0x8009, 97 - jump Route124_DivingTreasureHuntersHouse_EventScript_164292 + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 setvar 0x8008, 51 setvar 0x8009, 98 - jump Route124_DivingTreasureHuntersHouse_EventScript_164292 + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitem 0, 0x8008 @@ -255,7 +255,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 checkitem 0x8008, 2 compare RESULT, 0 jumpeq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 - jump Route124_DivingTreasureHuntersHouse_EventScript_164315 + goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 @@ -268,7 +268,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 compare RESULT, 1 jumpeq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164315:: @ 8164315 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c338e8b67..77f0a5f6f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -127,7 +127,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 0 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C498:: @ 814C498 @@ -135,7 +135,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 1 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4AF:: @ 814C4AF @@ -143,7 +143,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 2 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4C6:: @ 814C4C6 @@ -151,7 +151,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 3 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4DD:: @ 814C4DD @@ -159,7 +159,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 4 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4F4:: @ 814C4F4 @@ -335,31 +335,31 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF RustboroCity_EventScript_14C614:: @ 814C614 checksound setvar 0x4001, 4 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C620:: @ 814C620 lockall setvar 0x4001, 0 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C62C:: @ 814C62C lockall setvar 0x4001, 1 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C638:: @ 814C638 lockall setvar 0x4001, 2 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C644:: @ 814C644 lockall setvar 0x4001, 3 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C650:: @ 814C650 @@ -435,25 +435,25 @@ RustboroCity_Movement_14C74B:: @ 814C74B RustboroCity_EventScript_14C74D:: @ 814C74D lockall setvar 0x4001, 0 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C759:: @ 814C759 lockall setvar 0x4001, 1 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C765:: @ 814C765 lockall setvar 0x4001, 2 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C771:: @ 814C771 lockall setvar 0x4001, 3 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C77D:: @ 814C77D diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index e4f91f82e..776cb5c0a 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -22,7 +22,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE call RustboroCity_Gym_EventScript_1A01C0 compare 0x4085, 6 callif 1, RustboroCity_Gym_EventScript_1A00FB - jump RustboroCity_Gym_EventScript_15793C + goto RustboroCity_Gym_EventScript_15793C end RustboroCity_Gym_EventScript_15793C:: @ 815793C @@ -62,14 +62,14 @@ RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall checkflag 2055 jumpeq RustboroCity_Gym_EventScript_1579CD - jump RustboroCity_Gym_EventScript_1579D7 + goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall checkflag 2055 jumpeq RustboroCity_Gym_EventScript_1579CD - jump RustboroCity_Gym_EventScript_1579D7 + goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579CD:: @ 81579CD diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 8b037a3e7..168c0aaa2 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -4,7 +4,7 @@ RustboroCity_PokemonSchool_MapScripts:: @ 81579E1 RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2 lockall msgbox RustboroCity_PokemonSchool_Text_184321, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 @@ -23,27 +23,27 @@ RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 RustboroCity_PokemonSchool_EventScript_157A50:: @ 8157A50 msgbox RustboroCity_PokemonSchool_Text_184389, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A5E:: @ 8157A5E msgbox RustboroCity_PokemonSchool_Text_184447, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A6C:: @ 8157A6C msgbox RustboroCity_PokemonSchool_Text_1844EC, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A7A:: @ 8157A7A msgbox RustboroCity_PokemonSchool_Text_1845A5, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A88:: @ 8157A88 msgbox RustboroCity_PokemonSchool_Text_184627, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A96:: @ 8157A96 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 58cfbec47..a301bb6fe 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -193,7 +193,7 @@ SSTidalCorridor_EventScript_15FE84:: @ 815FE84 checktrainerflag OPPONENT_ANETTE jumpif 0, SSTidalCorridor_EventScript_15FED5 setflag 247 - jump SSTidalCorridor_EventScript_15FE7A + goto SSTidalCorridor_EventScript_15FE7A return SSTidalCorridor_EventScript_15FED5:: @ 815FED5 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 22fd5ec56..f0529fbec 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -80,7 +80,7 @@ SafariZone_Southeast_EventScript_160105:: @ 8160105 waitmove 0 move 255, SafariZone_Southeast_Movement_16014B waitmove 0 - jump SafariZone_Southeast_EventScript_160139 + goto SafariZone_Southeast_EventScript_160139 end SafariZone_Southeast_EventScript_16011F:: @ 816011F @@ -88,7 +88,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F waitmove 0 move 255, SafariZone_Southeast_Movement_16014D waitmove 0 - jump SafariZone_Southeast_EventScript_160139 + goto SafariZone_Southeast_EventScript_160139 end SafariZone_Southeast_EventScript_160139:: @ 8160139 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 38a1c9a74..6238e7f4a 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -6,7 +6,7 @@ ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag checkflag 2106 jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E06E - jump ShoalCave_LowTideEntranceRoom_EventScript_15E072 + goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E setmapfooter 169 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 3078b4625..bed2d7b21 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -6,7 +6,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D checkflag 2106 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1AB - jump ShoalCave_LowTideInnerRoom_EventScript_15E1AF + goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB setmapfooter 170 @@ -26,7 +26,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 checkflag 2106 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmaptile 31, 8, 856, 1 - jump ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA @@ -35,28 +35,28 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA checkflag 2106 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmaptile 14, 26, 856, 1 - jump ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB checkflag 956 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E213 setmaptile 41, 20, 857, 1 - jump ShoalCave_LowTideInnerRoom_EventScript_15E213 + goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 checkflag 957 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E22B setmaptile 41, 10, 857, 1 - jump ShoalCave_LowTideInnerRoom_EventScript_15E22B + goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B checkflag 958 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E243 setmaptile 6, 9, 857, 1 - jump ShoalCave_LowTideInnerRoom_EventScript_15E243 + goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index d65d28877..d7769eb81 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -25,19 +25,19 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B lockall setvar 0x8008, 0 - jump SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 lockall setvar 0x8008, 1 - jump SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 lockall setvar 0x8008, 2 - jump SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF @@ -45,7 +45,7 @@ SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF setvar 0x8008, 3 move 255, SlateportCity_Harbor_Movement_1560C2 waitmove 0 - jump SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 @@ -172,7 +172,7 @@ SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 jumpeq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A waittext - jump SlateportCity_Harbor_EventScript_1560FD + goto SlateportCity_Harbor_EventScript_1560FD end SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD @@ -213,7 +213,7 @@ SlateportCity_Harbor_EventScript_156167:: @ 8156167 SlateportCity_Harbor_EventScript_15618A:: @ 815618A message SlateportCity_Harbor_Text_17FBE5 waittext - jump SlateportCity_Harbor_EventScript_1560FD + goto SlateportCity_Harbor_EventScript_1560FD end SlateportCity_Harbor_EventScript_156196:: @ 8156196 @@ -319,7 +319,7 @@ SlateportCity_Harbor_EventScript_15629D:: @ 815629D SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7 message SlateportCity_Harbor_Text_18028B waittext - jump SlateportCity_Harbor_EventScript_1562B3 + goto SlateportCity_Harbor_EventScript_1562B3 end SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 @@ -341,7 +341,7 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag 294 - jump SlateportCity_Harbor_EventScript_156380 + goto SlateportCity_Harbor_EventScript_156380 end SlateportCity_Harbor_EventScript_15632A:: @ 815632A @@ -354,7 +354,7 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag 294 - jump SlateportCity_Harbor_EventScript_156380 + goto SlateportCity_Harbor_EventScript_156380 end SlateportCity_Harbor_EventScript_15636A:: @ 815636A @@ -365,7 +365,7 @@ SlateportCity_Harbor_EventScript_15636A:: @ 815636A SlateportCity_Harbor_EventScript_156374:: @ 8156374 message SlateportCity_Harbor_Text_180447 waittext - jump SlateportCity_Harbor_EventScript_1562B3 + goto SlateportCity_Harbor_EventScript_1562B3 end SlateportCity_Harbor_EventScript_156380:: @ 8156380 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index e84f8ccc6..83cac24ef 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -20,19 +20,19 @@ SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4 lockall move 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F waitmove 0 - jump SlateportCity_OceanicMuseum_1F_EventScript_155B06 + goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 lockall move 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843 waitmove 0 - jump SlateportCity_OceanicMuseum_1F_EventScript_155B06 + goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoney 0, 0 - snop + nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 compare RESULT, 1 jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155B2D @@ -49,7 +49,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155B5A paymoney 0x32, 0 updatemoney 0, 0 - snop + nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4 setvar 0x40aa, 1 hidemoney 0, 0 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 0a7466a3b..fa2aae4ab 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -18,7 +18,7 @@ SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 setvar 0x40b7, 1 msgbox SlateportCity_PokemonFanClub_Text_17D773, 4 - jump SlateportCity_PokemonFanClub_EventScript_155808 + goto SlateportCity_PokemonFanClub_EventScript_155808 end SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 @@ -38,7 +38,7 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 compare 0x40b7, 2 jumpeq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 - jump SlateportCity_PokemonFanClub_EventScript_155808 + goto SlateportCity_PokemonFanClub_EventScript_155808 end SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 32bf4d619..9fe6da43d 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -104,7 +104,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D setflag 2062 setvar 0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 - jump SootopolisCity_Gym_1F_EventScript_15B056 + goto SootopolisCity_Gym_1F_EventScript_15B056 end SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 @@ -139,14 +139,14 @@ SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall checkflag 2062 jumpeq SootopolisCity_Gym_1F_EventScript_15B0C3 - jump SootopolisCity_Gym_1F_EventScript_15B0CD + goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall checkflag 2062 jumpeq SootopolisCity_Gym_1F_EventScript_15B0C3 - jump SootopolisCity_Gym_1F_EventScript_15B0CD + goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0C3:: @ 815B0C3 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index e5eaadab5..f341f5aeb 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -40,7 +40,7 @@ SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B lockall setvar 0x8008, 12 - jump SouthernIsland_Interior_EventScript_160BA7 + goto SouthernIsland_Interior_EventScript_160BA7 end SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index d7e7aabcb..bbd0db9d9 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -8,7 +8,7 @@ Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 jumpif 5, Underwater_SealedChamber_EventScript_15F0A6 compare 0x8005, 44 jumpif 5, Underwater_SealedChamber_EventScript_15F0A6 - jump Underwater_SealedChamber_EventScript_15F0AF + goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 warp4 Route134, 255, 60, 31 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index f64ca20ab..3eae03f37 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -16,7 +16,7 @@ VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 reappear 4 move 4, VictoryRoad_1F_Movement_15DF07 waitmove 0 - jump VictoryRoad_1F_EventScript_15DED3 + goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB @@ -24,7 +24,7 @@ VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB reappear 4 move 4, VictoryRoad_1F_Movement_15DF13 waitmove 0 - jump VictoryRoad_1F_EventScript_15DED3 + goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF @@ -32,7 +32,7 @@ VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF reappear 4 move 4, VictoryRoad_1F_Movement_15DF1E waitmove 0 - jump VictoryRoad_1F_EventScript_15DED3 + goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 997b5a31c..38378eb2e 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -132,7 +132,7 @@ SpeakToTrader: jumpeq already_traded message gTextTrader_MenuPrompt waittext - jump do_trader_menu_get + goto do_trader_menu_get end dont_want_to_trade: @@ -156,7 +156,7 @@ do_trader_menu_get: special ScrSpecial_DoesPlayerHaveNoDecorations compare RESULT, TRUE jumpeq player_has_no_decorations - jump do_trader_menu_give + goto do_trader_menu_give end cancelled_get_menu: @@ -166,13 +166,13 @@ cancelled_get_menu: rare_item_cant_trade_away: message gTextTrader_ICantTradeThatOneAway waittext - jump do_trader_menu_get + goto do_trader_menu_get end dont_want_item: message gTextTrader_MenuPrompt waittext - jump do_trader_menu_get + goto do_trader_menu_get end player_has_no_decorations: @@ -203,7 +203,7 @@ cancelled_give_menu: decoration_is_in_use: msgbox gTextTrader_InUseYouCantTradeIt, 4 - jump do_trader_menu_give + goto do_trader_menu_give end decorations_full: @@ -244,11 +244,11 @@ choose_story: specialval RESULT, ScrSpecial_StorytellerUpdateStat compare RESULT, FALSE jumpeq no_stat_update - jump stat_update + goto stat_update cancel_story_menu: compare 0x8008, 0 jumpeq dont_hear_story - jump yes_hear_story + goto yes_hear_story no_stat_update: msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO @@ -261,7 +261,7 @@ yes_hear_story: specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare RESULT, 4 jumpeq cant_record_story @ story list is full - jump prompt_record_story + goto prompt_record_story no_stories_recorded: msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 prompt_record_story: @@ -329,7 +329,7 @@ tell_another_giddy_tale: also_i_was_thinking: msgbox gTextGiddy_AlsoIWasThinking, 4 - jump tell_giddy_tale + goto tell_giddy_tale end tell_giddy_tale: diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 5fd68beca..e3577debf 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -4,7 +4,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 checkflag 2053 jumpeq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4 - jump PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D + goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D end PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D:: @ 81B1B2D @@ -19,7 +19,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D:: @ 81B1B2D PetalburgCity_PokemonCenter_1F_EventScript_1B1B6C:: @ 81B1B6C msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D3A, 4 - jump PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D + goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D end PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A @@ -58,7 +58,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BD1:: @ 81B1BD1 PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB:: @ 81B1BDB msgbox PetalburgCity_PokemonCenter_1F_Text_1B202F, 4 - jump PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9 + goto PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9 end PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9:: @ 81B1BE9 @@ -73,7 +73,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9:: @ 81B1BE9 PetalburgCity_PokemonCenter_1F_EventScript_1B1C28:: @ 81B1C28 msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D3A, 4 - jump PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9 + goto PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9 end PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index e9f379b24..776ba0a8b 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -48,13 +48,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_BrendansHouse_2F_EventScript_1B69D3:: @ 81B69D3 lockall setvar 0x8004, 0 - jump LittlerootTown_BrendansHouse_2F_EventScript_1B69EB + goto LittlerootTown_BrendansHouse_2F_EventScript_1B69EB end LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF lockall setvar 0x8004, 1 - jump LittlerootTown_MaysHouse_2F_EventScript_1B69EB + goto LittlerootTown_MaysHouse_2F_EventScript_1B69EB end LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB @@ -176,7 +176,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF setvar 0x4001, 1 move 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 waitmove 0 - jump LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8 + goto LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8 end LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E @@ -201,7 +201,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E setvar 0x4001, 1 move 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 waitmove 0 - jump LittlerootTown_MaysHouse_1F_EventScript_1B6AB8 + goto LittlerootTown_MaysHouse_1F_EventScript_1B6AB8 end LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D @@ -287,7 +287,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D LittlerootTown_BrendansHouse_1F_EventScript_1B6C72:: @ 81B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172717, 4 - jump LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A + goto LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A end LittlerootTown_BrendansHouse_1F_EventScript_1B6C80:: @ 81B6C80 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 852acd292..05f91a3aa 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -3,7 +3,7 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 setvar 0x8009, 1 move 0x8008, FallarborTown_ContestLobby_Movement_1B7821 waitmove 0 - jump FallarborTown_ContestLobby_EventScript_1B7681 + goto FallarborTown_ContestLobby_EventScript_1B7681 end SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E @@ -12,7 +12,7 @@ SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E move 6, SlateportCity_ContestLobby_Movement_1A083D move 0x8008, SlateportCity_ContestLobby_Movement_1B7821 waitmove 0 - jump SlateportCity_ContestLobby_EventScript_1B7681 + goto SlateportCity_ContestLobby_EventScript_1B7681 end VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F @@ -20,7 +20,7 @@ VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F setvar 0x8009, 1 move 0x8008, VerdanturfTown_ContestLobby_Movement_1B7821 waitmove 0 - jump VerdanturfTown_ContestLobby_EventScript_1B7681 + goto VerdanturfTown_ContestLobby_EventScript_1B7681 end LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 @@ -30,7 +30,7 @@ LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 move 10, LilycoveCity_ContestLobby_Movement_1A083D move 0x8008, LilycoveCity_ContestLobby_Movement_1B7821 waitmove 0 - jump LilycoveCity_ContestLobby_EventScript_1B7681 + goto LilycoveCity_ContestLobby_EventScript_1B7681 end FallarborTown_ContestLobby_EventScript_1B7681:: @ 81B7681 @@ -78,17 +78,17 @@ FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E checkdailyflags checkflag 2241 jumpeq FallarborTown_ContestLobby_EventScript_1B774F - jump FallarborTown_ContestLobby_EventScript_1B7759 + goto FallarborTown_ContestLobby_EventScript_1B7759 end FallarborTown_ContestLobby_EventScript_1B7726:: @ 81B7726 msgbox FallarborTown_ContestLobby_Text_1B6F1F, 4 - jump FallarborTown_ContestLobby_EventScript_1B7734 + goto FallarborTown_ContestLobby_EventScript_1B7734 end FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 msgbox FallarborTown_ContestLobby_Text_1B6EF1, 4 - jump FallarborTown_ContestLobby_EventScript_1B7742 + goto FallarborTown_ContestLobby_EventScript_1B7742 end FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 @@ -108,7 +108,7 @@ FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 msgbox FallarborTown_ContestLobby_Text_1B704A, 4 giveitem ITEM_PECHA_BERRY setflag 2241 - jump FallarborTown_ContestLobby_EventScript_1B76EF + goto FallarborTown_ContestLobby_EventScript_1B76EF end FallarborTown_ContestLobby_EventScript_1B7776:: @ 81B7776 @@ -123,22 +123,22 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A setvar 0x8008, 4 - jump FallarborTown_ContestLobby_EventScript_1B77B6 + goto FallarborTown_ContestLobby_EventScript_1B77B6 end SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 setvar 0x8008, 2 - jump SlateportCity_ContestLobby_EventScript_1B77B6 + goto SlateportCity_ContestLobby_EventScript_1B77B6 end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 setvar 0x8008, 2 - jump VerdanturfTown_ContestLobby_EventScript_1B77B6 + goto VerdanturfTown_ContestLobby_EventScript_1B77B6 end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB setvar 0x8008, 3 - jump LilycoveCity_ContestLobby_EventScript_1B77B6 + goto LilycoveCity_ContestLobby_EventScript_1B77B6 end FallarborTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 @@ -164,7 +164,7 @@ FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 checkdailyflags checkflag 2241 jumpeq FallarborTown_ContestLobby_EventScript_1B77F6 - jump FallarborTown_ContestLobby_EventScript_1B7800 + goto FallarborTown_ContestLobby_EventScript_1B7800 end FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 @@ -188,19 +188,19 @@ VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821 step_end FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823 - jump FallarborTown_ContestLobby_EventScript_1B783B + goto FallarborTown_ContestLobby_EventScript_1B783B end SlateportCity_ContestLobby_EventScript_1B7829:: @ 81B7829 - jump SlateportCity_ContestLobby_EventScript_1B783B + goto SlateportCity_ContestLobby_EventScript_1B783B end VerdanturfTown_ContestLobby_EventScript_1B782F:: @ 81B782F - jump VerdanturfTown_ContestLobby_EventScript_1B783B + goto VerdanturfTown_ContestLobby_EventScript_1B783B end LilycoveCity_ContestLobby_EventScript_1B7835:: @ 81B7835 - jump LilycoveCity_ContestLobby_EventScript_1B783B + goto LilycoveCity_ContestLobby_EventScript_1B783B end FallarborTown_ContestLobby_EventScript_1B783B:: @ 81B783B @@ -256,17 +256,17 @@ FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 FallarborTown_ContestLobby_EventScript_1B78F3:: @ 81B78F3 msgbox FallarborTown_ContestLobby_Text_1B733B, 4 - jump FallarborTown_ContestLobby_EventScript_1B791D + goto FallarborTown_ContestLobby_EventScript_1B791D end FallarborTown_ContestLobby_EventScript_1B7901:: @ 81B7901 msgbox FallarborTown_ContestLobby_Text_1B7347, 4 - jump FallarborTown_ContestLobby_EventScript_1B791D + goto FallarborTown_ContestLobby_EventScript_1B791D end FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F msgbox FallarborTown_ContestLobby_Text_1B735A, 4 - jump FallarborTown_ContestLobby_EventScript_1B791D + goto FallarborTown_ContestLobby_EventScript_1B791D end FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D @@ -325,7 +325,7 @@ FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 copyvar 0x8008, RESULT copyvar 0x8004, 0x8008 special SpawnBerryBlenderLinkPlayerSprites - jump FallarborTown_ContestLobby_EventScript_1B799A + goto FallarborTown_ContestLobby_EventScript_1B799A end FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 03293115b..0394329ee 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -20,7 +20,7 @@ gUnknown_081C342D:: @ 81C342D end EventScript_1C3443: - jump EventScript_1C341B + goto EventScript_1C341B gUnknown_081C3448:: @ 81C3448 lockall @@ -29,7 +29,7 @@ gUnknown_081C3448:: @ 81C3448 waittext waitbutton releaseall - jump EventScript_1C341B + goto EventScript_1C341B gUnknown_081C3459:: @ 81C3459 lockall @@ -38,7 +38,7 @@ gUnknown_081C3459:: @ 81C3459 waittext waitbutton releaseall - jump EventScript_1C341B + goto EventScript_1C341B gUnknown_081C346A:: @ 81C346A lockall diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 1f8956811..f91295e49 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -14,7 +14,7 @@ Event_TV:: @ 81A6E72 specialval RESULT, IsTVShowInSearchOfTrainersAiring compare RESULT, 1 jumpeq EventScript_1A6F66 - jump EventScript_1A6F50 + goto EventScript_1A6F50 end EventScript_1A6EBB: @@ -61,7 +61,7 @@ EventScript_1A6F21: waitbutton compare RESULT, 1 jumpif 5, EventScript_1A6F21 - jump EventScript_1A6F37 + goto EventScript_1A6F37 end EventScript_1A6F37: @@ -73,7 +73,7 @@ EventScript_1A6F37: EventScript_1A6F3F: special GetMomOrDadStringForTVMessage msgbox UnknownString_81A0E68, 4 - jump EventScript_1A6F37 + goto EventScript_1A6F37 end EventScript_1A6F50: @@ -82,7 +82,7 @@ EventScript_1A6F50: jumpeq EventScript_1A6EBB waittext waitbutton - jump EventScript_1A6F37 + goto EventScript_1A6F37 end EventScript_1A6F66: @@ -91,5 +91,5 @@ EventScript_1A6F66: waitbutton compare RESULT, 0 jumpeq EventScript_1A6F66 - jump EventScript_1A6F37 + goto EventScript_1A6F37 end -- cgit v1.2.3 From 86e7bf1fd61b151011038cdb281db3de0a1d9e6a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 14:28:51 -0500 Subject: Replace more script commands and fix German build --- data/event_scripts.s | 426 ++++++++++----------- data/field_move_scripts.inc | 36 +- data/scripts/berry_tree.inc | 24 +- data/scripts/cable_club.inc | 106 ++--- data/scripts/contest_hall.inc | 216 +++++------ data/scripts/day_care.inc | 56 +-- data/scripts/gabby_and_ty.inc | 22 +- data/scripts/magma_chimney.inc | 12 +- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 6 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 8 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 32 +- .../maps/AbandonedShip_HiddenFloorRooms.inc | 16 +- data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 4 +- data/scripts/maps/AncientTomb.inc | 6 +- data/scripts/maps/AquaHideout_1F.inc | 4 +- data/scripts/maps/AquaHideout_B1F.inc | 2 +- data/scripts/maps/BattleTower_Corridor.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 38 +- data/scripts/maps/BattleTower_Outside.inc | 6 +- data/scripts/maps/CaveOfOrigin_1F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B1F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B2F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B3F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 6 +- data/scripts/maps/DesertRuins.inc | 6 +- data/scripts/maps/DewfordTown.inc | 28 +- data/scripts/maps/DewfordTown_Gym.inc | 34 +- data/scripts/maps/DewfordTown_Hall.inc | 26 +- data/scripts/maps/DewfordTown_House2.inc | 4 +- data/scripts/maps/EverGrandeCity.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 12 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 4 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 10 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 6 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 16 +- data/scripts/maps/FallarborTown_House2.inc | 12 +- data/scripts/maps/FortreeCity.inc | 6 +- data/scripts/maps/FortreeCity_Gym.inc | 10 +- data/scripts/maps/FortreeCity_House1.inc | 8 +- data/scripts/maps/FortreeCity_House2.inc | 6 +- data/scripts/maps/FortreeCity_House4.inc | 8 +- data/scripts/maps/GraniteCave_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 10 +- data/scripts/maps/InsideOfTruck.inc | 4 +- data/scripts/maps/IslandCave.inc | 8 +- data/scripts/maps/JaggedPass.inc | 6 +- data/scripts/maps/LavaridgeTown.inc | 56 +-- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 32 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 4 +- data/scripts/maps/LilycoveCity.inc | 56 +-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 52 +-- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 4 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 6 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 12 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 30 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 24 +- data/scripts/maps/LilycoveCity_Harbor.inc | 26 +- data/scripts/maps/LilycoveCity_House2.inc | 4 +- data/scripts/maps/LilycoveCity_House3.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 8 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 24 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 8 +- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 76 ++-- data/scripts/maps/LittlerootTown.inc | 102 ++--- .../maps/LittlerootTown_BrendansHouse_1F.inc | 12 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 14 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 22 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 36 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 32 +- data/scripts/maps/MagmaHideout_B1F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 20 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 20 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 90 ++--- data/scripts/maps/MauvilleCity_Gym.inc | 34 +- data/scripts/maps/MauvilleCity_House1.inc | 2 +- data/scripts/maps/MauvilleCity_House2.inc | 8 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 2 +- data/scripts/maps/MeteorFalls_1F_2R.inc | 6 +- data/scripts/maps/MossdeepCity.inc | 8 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 28 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 26 +- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 4 +- data/scripts/maps/MossdeepCity_House4.inc | 4 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 8 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 12 +- data/scripts/maps/MtChimney.inc | 16 +- data/scripts/maps/MtChimney_CableCarStation.inc | 6 +- data/scripts/maps/MtPyre_1F.inc | 4 +- data/scripts/maps/MtPyre_6F.inc | 2 +- data/scripts/maps/MtPyre_Exterior.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 42 +- data/scripts/maps/NewMauville_Entrance.inc | 6 +- data/scripts/maps/NewMauville_Inside.inc | 10 +- data/scripts/maps/OldaleTown.inc | 18 +- data/scripts/maps/OldaleTown_Mart.inc | 4 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PacifidlogTown_House2.inc | 18 +- data/scripts/maps/PacifidlogTown_House3.inc | 8 +- data/scripts/maps/PacifidlogTown_House4.inc | 4 +- data/scripts/maps/PacifidlogTown_House5.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 20 +- data/scripts/maps/PetalburgCity_Gym.inc | 230 +++++------ data/scripts/maps/PetalburgCity_Mart.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_1F.inc | 8 +- data/scripts/maps/PetalburgCity_WallysHouse.inc | 14 +- data/scripts/maps/PetalburgWoods.inc | 8 +- data/scripts/maps/Route102.inc | 2 +- data/scripts/maps/Route103.inc | 10 +- data/scripts/maps/Route104.inc | 26 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 16 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 22 +- data/scripts/maps/Route104_Prototype.inc | 28 +- data/scripts/maps/Route105.inc | 2 +- data/scripts/maps/Route106.inc | 2 +- data/scripts/maps/Route107.inc | 2 +- data/scripts/maps/Route109.inc | 12 +- data/scripts/maps/Route109_SeashoreHouse.inc | 20 +- data/scripts/maps/Route110.inc | 42 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 8 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 26 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 134 +++---- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 10 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 42 +- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 102 ++--- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 56 +-- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 2 +- data/scripts/maps/Route111.inc | 40 +- data/scripts/maps/Route111_OldLadysRestStop.inc | 8 +- .../maps/Route111_WinstrateFamilysHouse.inc | 6 +- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 6 +- data/scripts/maps/Route113.inc | 8 +- data/scripts/maps/Route113_GlassWorkshop.inc | 52 +-- data/scripts/maps/Route114.inc | 12 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 4 +- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 6 +- data/scripts/maps/Route114_LanettesHouse.inc | 8 +- data/scripts/maps/Route115.inc | 6 +- data/scripts/maps/Route116.inc | 36 +- data/scripts/maps/Route116_TunnelersRestHouse.inc | 2 +- data/scripts/maps/Route117.inc | 14 +- data/scripts/maps/Route118.inc | 16 +- data/scripts/maps/Route119.inc | 36 +- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 8 +- data/scripts/maps/Route120.inc | 52 +-- data/scripts/maps/Route121.inc | 4 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 12 +- data/scripts/maps/Route123.inc | 10 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 46 +-- data/scripts/maps/Route124.inc | 8 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 22 +- data/scripts/maps/Route125.inc | 4 +- data/scripts/maps/Route126.inc | 2 +- data/scripts/maps/Route127.inc | 2 +- data/scripts/maps/Route128.inc | 6 +- data/scripts/maps/Route130.inc | 2 +- data/scripts/maps/Route131.inc | 2 +- data/scripts/maps/RustboroCity.inc | 38 +- data/scripts/maps/RustboroCity_CuttersHouse.inc | 2 +- data/scripts/maps/RustboroCity_DevonCorp_1F.inc | 18 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 38 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 10 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 4 +- data/scripts/maps/RustboroCity_Gym.inc | 12 +- data/scripts/maps/RustboroCity_House1.inc | 8 +- data/scripts/maps/RustboroCity_Mart.inc | 4 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 8 +- data/scripts/maps/RusturfTunnel.inc | 26 +- data/scripts/maps/SSTidalCorridor.inc | 34 +- data/scripts/maps/SSTidalRooms.inc | 4 +- data/scripts/maps/SafariZone_Southeast.inc | 6 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 4 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 4 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 24 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 42 +- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 10 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 6 +- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SlateportCity.inc | 38 +- data/scripts/maps/SlateportCity_ContestHall.inc | 4 +- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 46 +-- data/scripts/maps/SlateportCity_House1.inc | 20 +- data/scripts/maps/SlateportCity_House2.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 12 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 50 +-- .../maps/SlateportCity_SternsShipyard_1F.inc | 8 +- data/scripts/maps/SootopolisCity.inc | 38 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 18 +- data/scripts/maps/SootopolisCity_House1.inc | 2 +- data/scripts/maps/SootopolisCity_House2.inc | 4 +- data/scripts/maps/SootopolisCity_House3.inc | 2 +- data/scripts/maps/SootopolisCity_House6.inc | 6 +- data/scripts/maps/SootopolisCity_House8.inc | 20 +- data/scripts/maps/SootopolisCity_Mart.inc | 8 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 8 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 10 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 4 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 18 +- data/scripts/maps/VerdanturfTown.inc | 4 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 4 +- data/scripts/maps/VerdanturfTown_WandasHouse.inc | 16 +- data/scripts/maps/VictoryRoad_1F.inc | 4 +- data/scripts/mauville_man.inc | 74 ++-- data/scripts/mystery_event_club.inc | 18 +- data/scripts/players_house.inc | 46 +-- data/scripts/pokeblocks.inc | 48 +-- data/scripts/safari_zone.inc | 8 +- data/scripts/secret_power_tm.inc | 10 +- data/scripts/tv.inc | 22 +- 227 files changed, 2279 insertions(+), 2279 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 0fc33c9ba..037e8a1b0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -400,7 +400,7 @@ EventScript_15F384: message UnknownString_81A3A87 waittext checkflag 268 - jumpeq EventScript_15F3A0 + goto_if_eq EventScript_15F3A0 goto EventScript_15F3E2 end @@ -431,7 +431,7 @@ EventScript_15F3E2: EventScript_15F419: msgbox UnknownString_81A38FB, 5 compare RESULT, 0 - jumpeq EventScript_15F384 + goto_if_eq EventScript_15F384 closebutton special SecretBasePC_PackUp releaseall @@ -477,13 +477,13 @@ gUnknown_0815F49A:: @ 815F49A EventScript_15F4A1: special sub_80BC56C compare RESULT, 1 - jumpeq EventScript_15F4E0 + goto_if_eq EventScript_15F4E0 compare RESULT, 2 - jumpeq EventScript_15F503 + goto_if_eq EventScript_15F503 special sub_80BC224 msgbox UnknownString_81A3958, 5 compare RESULT, 0 - jumpeq EventScript_15F452 + goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A22, 3 special sub_80BC5BC special sub_80C683C @@ -493,7 +493,7 @@ EventScript_15F4A1: EventScript_15F4E0: msgbox UnknownString_81A3982, 5 compare RESULT, 0 - jumpeq EventScript_15F452 + goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 special sub_80BC5BC special sub_80C683C @@ -527,13 +527,13 @@ gUnknown_0815F523:: @ 815F523 gUnknown_0815F528:: @ 815F528 special GetShieldToyTVDecorationInfo compare RESULT, 0 - jumpeq EventScript_15F558 + goto_if_eq EventScript_15F558 compare RESULT, 1 - jumpeq EventScript_15F561 + goto_if_eq EventScript_15F561 compare RESULT, 2 - jumpeq EventScript_15F56A + goto_if_eq EventScript_15F56A compare RESULT, 3 - jumpeq EventScript_15F573 + goto_if_eq EventScript_15F573 end EventScript_15F558: @@ -937,7 +937,7 @@ gUnknown_0819F818:: @ 819F818 waitmove 0 specialval RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 - jumpif 5, EventScript_19F83F + goto_if 5, EventScript_19F83F special PlayTrainerEncounterMusic special sub_8082524 goto EventScript_19F8F2 @@ -951,10 +951,10 @@ gUnknown_0819F840:: @ 819F840 call EventScript_19F8E5 specialval RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 - jumpif 5, EventScript_19F877 + goto_if 5, EventScript_19F877 special CheckForAlivePartyMons compare RESULT, 0 - jumpif 5, EventScript_19F870 + goto_if 5, EventScript_19F870 special PlayTrainerEncounterMusic special sub_8082524 goto EventScript_19F8F2 @@ -980,7 +980,7 @@ gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare RESULT, 0 - jumpeq EventScript_19F8AD + goto_if_eq EventScript_19F8AD special PlayTrainerEncounterMusic special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech @@ -997,10 +997,10 @@ EventScript_19F8AD: gUnknown_0819F8AE:: @ 819F8AE specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare RESULT, 0 - jumpeq EventScript_19F8DD + goto_if_eq EventScript_19F8DD special CheckForAlivePartyMons compare RESULT, 0 - jumpif 5, EventScript_19F8DE + goto_if 5, EventScript_19F8DE special PlayTrainerEncounterMusic special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech @@ -1037,15 +1037,15 @@ EventScript_19F8F2: reptrainerbattle specialval RESULT, ScrSpecial_GetTrainerBattleMode compare RESULT, 0 - jumpeq EventScript_19F934 + goto_if_eq EventScript_19F934 compare RESULT, 2 - jumpeq EventScript_19F936 + goto_if_eq EventScript_19F936 compare RESULT, 1 - jumpeq EventScript_19F936 + goto_if_eq EventScript_19F936 compare RESULT, 6 - jumpeq EventScript_19F936 + goto_if_eq EventScript_19F936 compare RESULT, 8 - jumpeq EventScript_19F936 + goto_if_eq EventScript_19F936 EventScript_19F934: releaseall @@ -1292,13 +1292,13 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 clearflag 861 special sub_810FAA0 checkflag 291 - callif 0, EverGrandeCity_HallOfFame_EventScript_19FC62 + call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62 checkflag 255 - callif 0, EverGrandeCity_HallOfFame_EventScript_19FC70 + call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70 checkflag 298 - callif 0, EverGrandeCity_HallOfFame_EventScript_19FC5A + call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A checkflag 123 - callif 0, EverGrandeCity_HallOfFame_EventScript_19FC5E + call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E return EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A @@ -1327,20 +1327,20 @@ S_WhiteOut:: @ 819FC74 EventScript_19FC84: checkflag 221 - jumpeq Route101_EventScript_1A14DC + goto_if_eq Route101_EventScript_1A14DC checkflag 1213 - jumpif 0, Route101_EventScript_1A14DC + goto_if 0, Route101_EventScript_1A14DC clearflag 929 setvar 0x4053, 2 return gUnknown_0819FC9F:: @ 819FC9F compare 0x4096, 1 - jumpeq EventScript_19FCC1 + goto_if_eq EventScript_19FCC1 compare 0x4096, 2 - jumpeq EventScript_19FCD7 + goto_if_eq EventScript_19FCD7 compare 0x4096, 3 - jumpeq EventScript_19FCF0 + goto_if_eq EventScript_19FCF0 end EventScript_19FCC1: @@ -1393,15 +1393,15 @@ RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B checkflag 188 - jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC + goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC checkflag 1217 - jumpeq OldaleTown_PokemonCenter_1F_EventScript_1A14DC + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC checkflag 742 - jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49 + goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49 checkflag 740 - jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F + goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F checkflag 741 - jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55 + goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55 return OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49 @@ -1434,9 +1434,9 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B faceplayer msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO compare RESULT, 1 - jumpeq do_heal_party + goto_if_eq do_heal_party compare RESULT, 0 - jumpeq dont_heal_party + goto_if_eq dont_heal_party end do_heal_party:: @ 819FD7C @@ -1451,7 +1451,7 @@ do_heal_party:: @ 819FD7C waitmove 0 special ScrSpecial_HealPlayerParty checkflag 273 - jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE + goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1472,9 +1472,9 @@ dont_heal_party:: @ 819FDC7 OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE specialval RESULT, IsPokerusInParty compare RESULT, 1 - jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDEA + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDEA compare RESULT, 0 - jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDB0 + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA @@ -1499,9 +1499,9 @@ Std_ObtainItem_: @ 819FE07 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 0x1 - callif 1, Std_ObtainItem_Success + call_if 1, Std_ObtainItem_Success compare 0x8007, 0x0 - callif 1, Std_ObtainItem_Fail + call_if 1, Std_ObtainItem_Fail return GetItem_HandlePocket: @@ -1516,31 +1516,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstd 2, 0xE compare 0x8007, 1 - callif 1, PlayGetItemFanfare + call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstd 2, 0xF compare 0x8007, 1 - callif 1, PlayGetItemFanfare + call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstd 2, 0x10 compare 0x8007, 1 - callif 1, PlayGetItemFanfare + call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstd 2, 0x11 compare 0x8007, 1 - callif 1, PlayGetTMHMFanfare + call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstd 2, 0x12 compare 0x8007, 1 - callif 1, PlayGetItemFanfare + call_if 1, PlayGetItemFanfare return Std_ObtainItem_Success: @ 819FEB7 @@ -1572,9 +1572,9 @@ Std_ObtainDecoration: @ 819FEDA Std_ObtainDecoration_: @ 819FEE8 bufferdecor 1, 0x8000 compare 0x8007, 1 - callif 1, Std_ObtainDecoration_Success + call_if 1, Std_ObtainDecoration_Success compare 0x8007, 0 - callif 1, Std_ObtainDecoration_Fail + call_if 1, Std_ObtainDecoration_Fail return Std_ObtainDecoration_Success: @ 819FF03 @@ -1600,9 +1600,9 @@ Std_FindItem: @ 819FF21 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 1 - callif 1, Std_FindItem_Success + call_if 1, Std_FindItem_Success compare 0x8007, 0 - callif 1, Std_FindItem_Fail + call_if 1, Std_FindItem_Fail release return @@ -1629,9 +1629,9 @@ HiddenItemScript:: @ 819FF7B checkitemtype 0x8005 call GetItem_HandlePocket compare 0x8007, 1 - jumpeq HiddenItemScript_Success + goto_if_eq HiddenItemScript_Success compare 0x8007, 0 - jumpeq HiddenItemScript_Fail + goto_if_eq HiddenItemScript_Fail end HiddenItemScript_Success: @@ -1655,9 +1655,9 @@ UnusedMixRecordsScript: @ 819FFD5 faceplayer msgbox UnusedMixRecordsPromptText, 5 compare RESULT, 1 - jumpeq UnusedMixRecordsScript_Yes + goto_if_eq UnusedMixRecordsScript_Yes compare RESULT, 0 - jumpeq UnusedMixRecordsScript_Done + goto_if_eq UnusedMixRecordsScript_Done goto UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA special sub_80B929C @@ -1708,9 +1708,9 @@ EventScript_1A0070: EventScript_1A0085: playsfx 2 checkflag 2123 - callif 0, EventScript_1A00AC + call_if 0, EventScript_1A00AC checkflag 2123 - callif 1, EventScript_1A00B5 + call_if 1, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 special ShowPokemonStorageSystem waitstate @@ -1734,7 +1734,7 @@ EventScript_1A00BE: EventScript_1A00CB: checkflag 2052 - jumpif 0, EventScript_1A00BE + goto_if 0, EventScript_1A00BE playsfx 2 special AccessHallOfFamePC waitstate @@ -1812,13 +1812,13 @@ Route109_EventScript_1A010C:: @ 81A010C UseSurfScript:: @ 81A0117 checkattack MOVE_SURF compare RESULT, 6 - jumpeq UseSurfScript_NoMon + goto_if_eq UseSurfScript_NoMon bufferpartypoke 0, RESULT setanimation 0, RESULT lockall msgbox UseSurfPromptText, 5 compare RESULT, 0 - jumpeq UseSurfScript_No + goto_if_eq UseSurfScript_No msgbox UsedSurfText, 4 doanimation 9 UseSurfScript_No: @ 81A014C @@ -1837,9 +1837,9 @@ Route119_EventScript_1A014E:: @ 81A014E RustboroCity_EventScript_1A014E:: @ 81A014E checkgender compare RESULT, 0 - jumpeq RustboroCity_EventScript_1A0166 + goto_if_eq RustboroCity_EventScript_1A0166 compare RESULT, 1 - jumpeq RustboroCity_EventScript_1A016C + goto_if_eq RustboroCity_EventScript_1A016C end RustboroCity_EventScript_1A0166:: @ 81A0166 @@ -1855,9 +1855,9 @@ Route110_EventScript_1A0172:: @ 81A0172 Route119_EventScript_1A0172:: @ 81A0172 checkgender compare RESULT, 0 - jumpeq LavaridgeTown_EventScript_1A018A + goto_if_eq LavaridgeTown_EventScript_1A018A compare RESULT, 1 - jumpeq LavaridgeTown_EventScript_1A0190 + goto_if_eq LavaridgeTown_EventScript_1A0190 end LavaridgeTown_EventScript_1A018A:: @ 81A018A @@ -2137,23 +2137,23 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A02F4:: @ 81A02F4 Route103_EventScript_1A02F4:: @ 81A02F4 compare 0x4085, 0 - jumpeq Route101_EventScript_1A14DC + goto_if_eq Route101_EventScript_1A14DC compare 0x4049, 0 - callif 1, Route101_EventScript_1A0358 + call_if 1, Route101_EventScript_1A0358 compare 0x4049, 1 - callif 1, Route101_EventScript_1A0358 + call_if 1, Route101_EventScript_1A0358 compare 0x4049, 2 - callif 1, Route101_EventScript_1A0365 + call_if 1, Route101_EventScript_1A0365 compare 0x4049, 3 - callif 1, Route101_EventScript_1A0365 + call_if 1, Route101_EventScript_1A0365 compare 0x4049, 4 - callif 1, Route101_EventScript_1A0372 + call_if 1, Route101_EventScript_1A0372 compare 0x4049, 5 - callif 1, Route101_EventScript_1A0372 + call_if 1, Route101_EventScript_1A0372 compare 0x4049, 6 - callif 1, Route101_EventScript_1A0358 + call_if 1, Route101_EventScript_1A0358 compare 0x4049, 7 - callif 1, Route101_EventScript_1A0358 + call_if 1, Route101_EventScript_1A0358 return Route101_EventScript_1A0358:: @ 81A0358 @@ -2184,7 +2184,7 @@ Route103_EventScript_1A037F:: @ 81A037F faceplayer msgbox Route101_Text_1C4449, 5 compare RESULT, 0 - jumpeq Route101_EventScript_1A039B + goto_if_eq Route101_EventScript_1A039B call Route101_EventScript_1A03B0 release end @@ -2213,7 +2213,7 @@ Route101_EventScript_1A03B0:: @ 81A03B0 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 compare 0x800a, 0 - jumpeq Route101_EventScript_1A14DC + goto_if_eq Route101_EventScript_1A14DC setvar 0x8004, 1 specialval RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 @@ -2280,9 +2280,9 @@ Movement_1A047A: BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare FACING, 1 - callif 1, BattleTower_Outside_EventScript_160B2F + call_if 1, BattleTower_Outside_EventScript_160B2F compare FACING, 3 - callif 1, BattleTower_Outside_EventScript_160B3A + call_if 1, BattleTower_Outside_EventScript_160B3A pause 30 spriteinvisible 255, 0, 0 call BattleTower_Outside_EventScript_1A040E @@ -2425,7 +2425,7 @@ Route119_EventScript_1A0594:: @ 81A0594 Route120_EventScript_1A0594:: @ 81A0594 checkitem ITEM_DEVON_SCOPE, 1 compare RESULT, 1 - jumpeq Route119_EventScript_1A05AE + goto_if_eq Route119_EventScript_1A05AE msgbox Route119_Text_171B93, 4 release end @@ -2433,7 +2433,7 @@ Route120_EventScript_1A0594:: @ 81A0594 Route119_EventScript_1A05AE:: @ 81A05AE msgbox Route119_Text_171BB6, 5 compare RESULT, 1 - jumpeq Route119_EventScript_1A05C3 + goto_if_eq Route119_EventScript_1A05C3 release end @@ -2450,19 +2450,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE compare 0x8004, 1 - callif 1, Route119_EventScript_1A0646 + call_if 1, Route119_EventScript_1A0646 compare 0x8004, 2 - callif 1, Route119_EventScript_1A064A + call_if 1, Route119_EventScript_1A064A compare 0x8004, 3 - callif 1, Route119_EventScript_1A064E + call_if 1, Route119_EventScript_1A064E compare 0x8004, 4 - callif 1, Route119_EventScript_1A0652 + call_if 1, Route119_EventScript_1A0652 compare 0x8004, 5 - callif 1, Route119_EventScript_1A0656 + call_if 1, Route119_EventScript_1A0656 compare 0x8004, 6 - callif 1, Route119_EventScript_1A065A + call_if 1, Route119_EventScript_1A065A compare 0x8004, 7 - callif 1, Route119_EventScript_1A065E + call_if 1, Route119_EventScript_1A065E setflag 2145 dowildbattle clearflag 2145 @@ -3254,7 +3254,7 @@ gUnknown_081A14B8:: @ 81A14B8 special ExecuteWhiteOut waitstate compare RESULT, 1 - jumpeq EventScript_1A14CA + goto_if_eq EventScript_1A14CA releaseall end @@ -3598,32 +3598,32 @@ gUnknown_081A2C51:: @ 81A2C51 special sub_80BB70C special sub_80BB63C compare RESULT, 1 - jumpeq EventScript_1A2E45 + goto_if_eq EventScript_1A2E45 checkattack MOVE_SECRET_POWER setanimation 0, RESULT bufferattack 1, MOVE_SECRET_POWER compare 0x8007, 1 - jumpeq EventScript_1A2CB0 + goto_if_eq EventScript_1A2CB0 compare 0x8007, 2 - jumpeq EventScript_1A2CB0 + goto_if_eq EventScript_1A2CB0 compare 0x8007, 3 - jumpeq EventScript_1A2CB0 + goto_if_eq EventScript_1A2CB0 compare 0x8007, 4 - jumpeq EventScript_1A2CB0 + goto_if_eq EventScript_1A2CB0 compare 0x8007, 5 - jumpeq EventScript_1A2D08 + goto_if_eq EventScript_1A2D08 compare 0x8007, 6 - jumpeq EventScript_1A2D60 + goto_if_eq EventScript_1A2D60 end EventScript_1A2CB0: lockall compare RESULT, 6 - jumpeq EventScript_1A2CF1 + goto_if_eq EventScript_1A2CF1 bufferpartypoke 0, RESULT msgbox UnknownString_8198F34, 5 compare RESULT, 0 - jumpeq EventScript_1A2F3A + goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton doanimation 11 @@ -3650,11 +3650,11 @@ EventScript_1A2CFA: EventScript_1A2D08: lockall compare RESULT, 6 - jumpeq EventScript_1A2D49 + goto_if_eq EventScript_1A2D49 bufferpartypoke 0, RESULT msgbox UnknownString_81A197B, 5 compare RESULT, 0 - jumpeq EventScript_1A2F3A + goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton doanimation 26 @@ -3681,11 +3681,11 @@ EventScript_1A2D52: EventScript_1A2D60: lockall compare RESULT, 6 - jumpeq EventScript_1A2DA1 + goto_if_eq EventScript_1A2DA1 bufferpartypoke 0, RESULT msgbox UnknownString_81A1A4B, 5 compare RESULT, 0 - jumpeq EventScript_1A2F3A + goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton doanimation 27 @@ -3729,7 +3729,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE setvar 0x4097, 1 msgbox SecretBase_RedCave1_Text_198F89, 5 compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A2E08 + goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closebutton playsfx 9 special sub_80BC440 @@ -3753,7 +3753,7 @@ gUnknown_081A2E14:: @ 81A2E14 playsfx 9 special sub_80BC114 compare RESULT, 0 - jumpeq EventScript_1A2E38 + goto_if_eq EventScript_1A2E38 clearflag 173 special sub_80BBAF0 setvar 0x4089, 0 @@ -3770,57 +3770,57 @@ EventScript_1A2E38: EventScript_1A2E45: checkattack MOVE_SECRET_POWER compare RESULT, 6 - jumpeq EventScript_1A2EF7 + goto_if_eq EventScript_1A2EF7 setanimation 0, RESULT setorcopyvar 0x8004, RESULT lockall special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 compare RESULT, 0 - jumpeq EventScript_1A2F3A + goto_if_eq EventScript_1A2F3A msgbox UnknownString_81A38FB, 5 compare RESULT, 0 - jumpeq EventScript_1A2F3A + goto_if_eq EventScript_1A2F3A fadescreen 1 special sub_80BC50C closebutton fadescreen 0 msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 - jumpeq EventScript_1A2F3A + goto_if_eq EventScript_1A2F3A bufferpartypoke 0, 0x8004 bufferattack 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closebutton closebutton compare 0x8007, 1 - jumpeq gUnknown_081A2CE6 + goto_if_eq gUnknown_081A2CE6 compare 0x8007, 2 - jumpeq gUnknown_081A2CE6 + goto_if_eq gUnknown_081A2CE6 compare 0x8007, 3 - jumpeq gUnknown_081A2CE6 + goto_if_eq gUnknown_081A2CE6 compare 0x8007, 4 - jumpeq gUnknown_081A2CE6 + goto_if_eq gUnknown_081A2CE6 compare 0x8007, 5 - jumpeq gUnknown_081A2D3E + goto_if_eq gUnknown_081A2D3E compare 0x8007, 6 - jumpeq gUnknown_081A2D96 + goto_if_eq gUnknown_081A2D96 releaseall end EventScript_1A2EF7:: compare 0x8007, 1 - jumpeq EventScript_1A2CF1 + goto_if_eq EventScript_1A2CF1 compare 0x8007, 2 - jumpeq EventScript_1A2CF1 + goto_if_eq EventScript_1A2CF1 compare 0x8007, 3 - jumpeq EventScript_1A2CF1 + goto_if_eq EventScript_1A2CF1 compare 0x8007, 4 - jumpeq EventScript_1A2CF1 + goto_if_eq EventScript_1A2CF1 compare 0x8007, 5 - jumpeq EventScript_1A2D49 + goto_if_eq EventScript_1A2D49 compare 0x8007, 6 - jumpeq EventScript_1A2DA1 + goto_if_eq EventScript_1A2DA1 end EventScript_1A2F3A:: @@ -3873,10 +3873,10 @@ gUnknown_081A2F8A:: @ 81A2F8A EventScript_1A2F95: special sub_8100A7C compare RESULT, 1 - jumpeq EventScript_1A2FBF + goto_if_eq EventScript_1A2FBF addvar 0x8004, 1 compare 0x8005, 0 - jumpeq EventScript_1A2F95 + goto_if_eq EventScript_1A2F95 disappear 0x8006 setflag 0x8005 goto EventScript_1A2F95 @@ -3911,42 +3911,42 @@ SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 special sub_80BCE90 compare 0x8004, 0 - jumpeq SecretBase_RedCave1_EventScript_1A3032 + goto_if_eq SecretBase_RedCave1_EventScript_1A3032 compare 0x8004, 1 - jumpeq SecretBase_RedCave1_EventScript_1A30AE + goto_if_eq SecretBase_RedCave1_EventScript_1A30AE compare 0x8004, 2 - jumpeq SecretBase_RedCave1_EventScript_1A312A + goto_if_eq SecretBase_RedCave1_EventScript_1A312A compare 0x8004, 3 - jumpeq SecretBase_RedCave1_EventScript_1A31A6 + goto_if_eq SecretBase_RedCave1_EventScript_1A31A6 compare 0x8004, 4 - jumpeq SecretBase_RedCave1_EventScript_1A3222 + goto_if_eq SecretBase_RedCave1_EventScript_1A3222 compare 0x8004, 5 - jumpeq SecretBase_RedCave1_EventScript_1A329E + goto_if_eq SecretBase_RedCave1_EventScript_1A329E compare 0x8004, 6 - jumpeq SecretBase_RedCave1_EventScript_1A331A + goto_if_eq SecretBase_RedCave1_EventScript_1A331A compare 0x8004, 7 - jumpeq SecretBase_RedCave1_EventScript_1A3396 + goto_if_eq SecretBase_RedCave1_EventScript_1A3396 compare 0x8004, 8 - jumpeq SecretBase_RedCave1_EventScript_1A3412 + goto_if_eq SecretBase_RedCave1_EventScript_1A3412 compare 0x8004, 9 - jumpeq SecretBase_RedCave1_EventScript_1A348E + goto_if_eq SecretBase_RedCave1_EventScript_1A348E end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 checkflag 2052 - jumpif 0, SecretBase_RedCave1_EventScript_1A3086 + goto_if 0, SecretBase_RedCave1_EventScript_1A3086 compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A30A5 + goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1AEA, 5 compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A308F + goto_if_eq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A308F + goto_if_eq SecretBase_RedCave1_EventScript_1A308F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1B83, 4 goto SecretBase_RedCave1_EventScript_1A350A @@ -3969,19 +3969,19 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE checkflag 2052 - jumpif 0, SecretBase_RedCave1_EventScript_1A3102 + goto_if 0, SecretBase_RedCave1_EventScript_1A3102 compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A3121 + goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1E67, 5 compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A310B + goto_if_eq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A310B + goto_if_eq SecretBase_RedCave1_EventScript_1A310B hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1F04, 4 goto SecretBase_RedCave1_EventScript_1A350A @@ -4004,19 +4004,19 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A checkflag 2052 - jumpif 0, SecretBase_RedCave1_EventScript_1A317E + goto_if 0, SecretBase_RedCave1_EventScript_1A317E compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A319D + goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock faceplayer msgbox SecretBase_RedCave1_Text_1A218F, 5 compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A3187 + goto_if_eq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A3187 + goto_if_eq SecretBase_RedCave1_EventScript_1A3187 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2220, 4 goto SecretBase_RedCave1_EventScript_1A350A @@ -4039,19 +4039,19 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 checkflag 2052 - jumpif 0, SecretBase_RedCave1_EventScript_1A31FA + goto_if 0, SecretBase_RedCave1_EventScript_1A31FA compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A3219 + goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock faceplayer msgbox SecretBase_RedCave1_Text_1A24E1, 5 compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A3203 + goto_if_eq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A3203 + goto_if_eq SecretBase_RedCave1_EventScript_1A3203 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A256F, 4 goto SecretBase_RedCave1_EventScript_1A350A @@ -4074,19 +4074,19 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 checkflag 2052 - jumpif 0, SecretBase_RedCave1_EventScript_1A3276 + goto_if 0, SecretBase_RedCave1_EventScript_1A3276 compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A3295 + goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2830, 5 compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A327F + goto_if_eq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A327F + goto_if_eq SecretBase_RedCave1_EventScript_1A327F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A28D7, 4 goto SecretBase_RedCave1_EventScript_1A350A @@ -4109,19 +4109,19 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E checkflag 2052 - jumpif 0, SecretBase_RedCave1_EventScript_1A32F2 + goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A3311 + goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1CB2, 5 compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A32FB + goto_if_eq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A32FB + goto_if_eq SecretBase_RedCave1_EventScript_1A32FB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1D48, 4 goto SecretBase_RedCave1_EventScript_1A350A @@ -4144,19 +4144,19 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A checkflag 2052 - jumpif 0, SecretBase_RedCave1_EventScript_1A336E + goto_if 0, SecretBase_RedCave1_EventScript_1A336E compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A338D + goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock faceplayer msgbox SecretBase_RedCave1_Text_1A2026, 5 compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A3377 + goto_if_eq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A3377 + goto_if_eq SecretBase_RedCave1_EventScript_1A3377 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2095, 4 goto SecretBase_RedCave1_EventScript_1A350A @@ -4179,19 +4179,19 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 checkflag 2052 - jumpif 0, SecretBase_RedCave1_EventScript_1A33EA + goto_if 0, SecretBase_RedCave1_EventScript_1A33EA compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A3409 + goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock faceplayer msgbox SecretBase_RedCave1_Text_1A236A, 5 compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A33F3 + goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A33F3 + goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2405, 4 goto SecretBase_RedCave1_EventScript_1A350A @@ -4214,19 +4214,19 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 checkflag 2052 - jumpif 0, SecretBase_RedCave1_EventScript_1A3466 + goto_if 0, SecretBase_RedCave1_EventScript_1A3466 compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A3485 + goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2663, 5 compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A346F + goto_if_eq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A346F + goto_if_eq SecretBase_RedCave1_EventScript_1A346F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2710, 4 goto SecretBase_RedCave1_EventScript_1A350A @@ -4249,19 +4249,19 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E checkflag 2052 - jumpif 0, SecretBase_RedCave1_EventScript_1A34E2 + goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 compare RESULT, 1 - jumpeq SecretBase_RedCave1_EventScript_1A3501 + goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2A13, 5 compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A34EB + goto_if_eq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog compare RESULT, 0 - jumpeq SecretBase_RedCave1_EventScript_1A34EB + goto_if_eq SecretBase_RedCave1_EventScript_1A34EB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2AE2, 4 goto SecretBase_RedCave1_EventScript_1A350A @@ -4382,13 +4382,13 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar 0x8005, 1 special sub_80BF2C4 compare RESULT, 1 - jumpeq SlateportCity_PokemonFanClub_EventScript_1ADED6 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar 0x8009, 0x8006 msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 compare RESULT, 1 - jumpeq SlateportCity_PokemonFanClub_EventScript_1ADE84 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_1ADEB9 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 @@ -4400,9 +4400,9 @@ SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 lock faceplayer compare RESULT, 1 - jumpeq SlateportCity_PokemonFanClub_EventScript_1ADEC3 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEC3 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_1ADEB9 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9 @@ -4427,24 +4427,24 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 setvar 0x8005, 2 special sub_80BF2C4 compare RESULT, 1 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 checkflag 105 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag 105 msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 compare RESULT, 1 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 compare RESULT, 0 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5 compare RESULT, 1 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 compare RESULT, 0 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 @@ -4456,9 +4456,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 lock faceplayer compare RESULT, 1 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF83 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF83 compare RESULT, 0 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79 @@ -4482,17 +4482,17 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 faceplayer specialval RESULT, sub_80BF544 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_1ADE4D + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar 0x8005, 3 special sub_80BF2C4 compare RESULT, 1 - jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0AC + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar 0x8009, 0x8006 msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 compare RESULT, 1 - jumpeq SlateportCity_PokemonFanClub_EventScript_1ADFE9 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0A2 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 end SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9 @@ -4528,14 +4528,14 @@ SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A lock faceplayer compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0A2 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4 setvar 0x8006, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_1AE0A2 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4 copyvar 0x8007, 0x800a setvar 0x8005, 3 @@ -4559,17 +4559,17 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 lock faceplayer checkflag 2 - jumpeq FallarborTown_ContestLobby_EventScript_1AE17E + goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar 0x8005, 6 special sub_80BF2C4 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1AE17E + goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar 0x8009, 0x8006 msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1AE0F8 + goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1AE12D + goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 @@ -4581,9 +4581,9 @@ FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 lock faceplayer compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1AE137 + goto_if_eq FallarborTown_ContestLobby_EventScript_1AE137 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1AE12D + goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D @@ -4602,7 +4602,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 lock faceplayer compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1AE12D + goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 setflag 2 setvar 0x8005, 6 @@ -4619,11 +4619,11 @@ LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare 0x4086, 2 - jumpif 5, FallarborTown_ContestLobby_EventScript_1AE1FE + goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar 0x8005, 6 special sub_80BF2C4 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1AE1FE + goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE switch 0x4088 case 0, FallarborTown_ContestLobby_EventScript_1AE1FE case 2, FallarborTown_ContestLobby_EventScript_1AE1EE @@ -4656,17 +4656,17 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF lock faceplayer checkflag 2 - jumpeq BattleTower_Lobby_EventScript_1AE2E3 + goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar 0x8005, 7 special sub_80BF2C4 compare RESULT, 1 - jumpeq BattleTower_Lobby_EventScript_1AE2E3 + goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar 0x8009, 0x8006 msgbox BattleTower_Lobby_Text_1A776D, 5 compare RESULT, 1 - jumpeq BattleTower_Lobby_EventScript_1AE241 + goto_if_eq BattleTower_Lobby_EventScript_1AE241 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_1AE297 + goto_if_eq BattleTower_Lobby_EventScript_1AE297 end BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 @@ -4675,9 +4675,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 multichoice 19, 8, 45, 1 copyvar 0x8008, RESULT compare RESULT, 0 - callif 1, BattleTower_Lobby_EventScript_1AE2A1 + call_if 1, BattleTower_Lobby_EventScript_1AE2A1 compare RESULT, 1 - callif 1, BattleTower_Lobby_EventScript_1AE2AA + call_if 1, BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 setvar 0x8004, 12 copyvar 0x8005, 0x8009 @@ -4685,9 +4685,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 lock faceplayer compare RESULT, 1 - jumpeq BattleTower_Lobby_EventScript_1AE2B3 + goto_if_eq BattleTower_Lobby_EventScript_1AE2B3 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_1AE2D9 + goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 end BattleTower_Lobby_EventScript_1AE297:: @ 81AE297 @@ -4705,7 +4705,7 @@ BattleTower_Lobby_EventScript_1AE2AA:: @ 81AE2AA BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_1AE2D9 + goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 setflag 2 copyvar 0x8004, 0x8008 @@ -4725,11 +4725,11 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare 0x40bc, 0 - jumpeq BattleTower_Lobby_EventScript_1AE30F + goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar 0x8005, 7 special sub_80BF2C4 compare RESULT, 1 - jumpeq BattleTower_Lobby_EventScript_1AE30F + goto_if_eq BattleTower_Lobby_EventScript_1AE30F clearflag 918 return @@ -4791,11 +4791,11 @@ Text_RepelWoreOff: @ 81C33EF MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 event_96 2 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1C40DA + goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA end @@ -4803,11 +4803,11 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 event_96 2 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1C40DA + goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index cdda2edcc..c3aeeab7a 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,16 +1,16 @@ S_CuttableTree:: @ 81B0DCC lockall checkflag 2055 - jumpif 0, CannotUseCut + goto_if 0, CannotUseCut checkattack MOVE_CUT compare RESULT, 6 - jumpeq CannotUseCut + goto_if_eq CannotUseCut setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_CUT msgbox UseCutPromptText, 5 compare RESULT, 0 - jumpeq Cut_ChoseNo + goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton doanimation 2 @@ -59,16 +59,16 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall checkflag 2057 - jumpif 0, CannotUseRockSmash + goto_if 0, CannotUseRockSmash checkattack MOVE_ROCK_SMASH compare RESULT, 6 - jumpeq CannotUseRockSmash + goto_if_eq CannotUseRockSmash setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 compare RESULT, 0 - jumpeq RockSmash_ChoseNo + goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton doanimation 37 @@ -89,10 +89,10 @@ DoRockSmashMovement: @ 81B0F0C disappear LAST_TALKED specialval RESULT, sub_810F5BC compare RESULT, 1 - jumpeq DoRockSmashMovement_Done + goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter compare RESULT, 0 - jumpeq DoRockSmashMovement_Done + goto_if_eq DoRockSmashMovement_Done waitstate releaseall end @@ -126,16 +126,16 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall checkflag 2058 - jumpif 0, CannotUseStrength + goto_if 0, CannotUseStrength checkflag 2089 - jumpeq AlreadyUsedStrength + goto_if_eq AlreadyUsedStrength checkattack 70 compare RESULT, 6 - jumpeq CannotUseStrength + goto_if_eq CannotUseStrength setanimation 0, RESULT msgbox UseStrengthPromptText, 5 compare RESULT, 0 - jumpeq Strength_ChoseNo + goto_if_eq Strength_ChoseNo closebutton doanimation 40 waitstate @@ -192,12 +192,12 @@ S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL compare RESULT, 6 - jumpeq Waterfall_NoMonKnows + goto_if_eq Waterfall_NoMonKnows bufferpartypoke 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 - jumpeq Waterfall_Done + goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 doanimation 43 goto Waterfall_Done @@ -225,13 +225,13 @@ UseDiveScript:: @ 81B1220 lockall checkattack MOVE_DIVE compare RESULT, 6 - jumpeq CannotUseDive + goto_if_eq CannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 compare RESULT, 0 - jumpeq Dive_Done + goto_if_eq Dive_Done msgbox UsedDiveText, 4 doanimation 44 goto Dive_Done @@ -248,13 +248,13 @@ S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE compare RESULT, 6 - jumpeq UnderwaterCannotUseDive + goto_if_eq UnderwaterCannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 compare RESULT, 0 - jumpeq UnderwaterDive_Done + goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 doanimation 44 goto UnderwaterDive_Done diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 6c74fcca4..64d5f9b79 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -23,7 +23,7 @@ Route102_EventScript_1A153D:: @ 81A153D faceplayer specialval RESULT, PlayerHasBerries compare RESULT, 1 - jumpeq Route102_EventScript_1A1558 + goto_if_eq Route102_EventScript_1A1558 message Route102_Text_1A16B6 waittext waitbutton @@ -33,9 +33,9 @@ Route102_EventScript_1A153D:: @ 81A153D Route102_EventScript_1A1558:: @ 81A1558 msgbox Route102_Text_1A16CD, 5 compare RESULT, 1 - jumpeq Route102_EventScript_1A1577 + goto_if_eq Route102_EventScript_1A1577 compare RESULT, 0 - jumpeq Route102_EventScript_1A1593 + goto_if_eq Route102_EventScript_1A1593 end Route102_EventScript_1A1577:: @ 81A1577 @@ -44,7 +44,7 @@ Route102_EventScript_1A1577:: @ 81A1577 special sub_80B4EE4 waitstate compare ITEM_ID, 0 - jumpeq Route102_EventScript_1A1593 + goto_if_eq Route102_EventScript_1A1593 removeitem ITEM_ID, 1 call Route102_EventScript_1A16A9 @@ -83,9 +83,9 @@ Route102_EventScript_1A15BC:: @ 81A15BC Route102_EventScript_1A15CE:: @ 81A15CE compare 0x8005, 0 - jumpeq Route102_EventScript_1A15F2 + goto_if_eq Route102_EventScript_1A15F2 compare 0x8005, 4 - jumpeq Route102_EventScript_1A15EB + goto_if_eq Route102_EventScript_1A15EB buffertext 1, Route102_Text_1A17B7 return @@ -103,14 +103,14 @@ Route102_EventScript_1A15F9:: @ 81A15F9 faceplayer msgbox Route102_Text_1A17C0, 5 compare RESULT, 1 - jumpeq Route102_EventScript_1A161D + goto_if_eq Route102_EventScript_1A161D compare RESULT, 0 - jumpeq Route102_EventScript_1A164B + goto_if_eq Route102_EventScript_1A164B Route102_EventScript_1A161D:: @ 81A161D special FieldObjectInteractionPickBerryTree compare 0x8004, 0 - jumpeq Route102_EventScript_1A1642 + goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD fanfare 387 @@ -147,12 +147,12 @@ gUnknown_081A1654:: @ 81A1654 Route102_EventScript_1A165F:: @ 81A165F checkitem ITEM_WAILMER_PAIL, 1 compare RESULT, 0 - jumpeq Route102_EventScript_1A168D + goto_if_eq Route102_EventScript_1A168D msgbox Route102_Text_1A18E6, 5 compare RESULT, 1 - jumpeq Route102_EventScript_1A1693 + goto_if_eq Route102_EventScript_1A1693 compare RESULT, 0 - jumpeq Route102_EventScript_1A168D + goto_if_eq Route102_EventScript_1A168D Route102_EventScript_1A168D:: @ 81A168D releaseall diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 372ac5eb8..da3277ee3 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -40,15 +40,15 @@ SlateportCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 compare 0x4087, 1 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A compare 0x4087, 2 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A compare 0x4087, 5 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A compare 0x4087, 3 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3D74 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D74 compare 0x4087, 4 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3D7E + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D7E end OldaleTown_PokemonCenter_2F_EventScript_1A3D6A:: @ 81A3D6A @@ -91,7 +91,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 move 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmove 0 compare 0x8007, 0 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 move 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmove 0 @@ -102,7 +102,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA special CloseLink setvar 0x4087, 0 compare 0x8007, 0 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C move 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmove 0 move 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 @@ -129,7 +129,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 special CloseLink setvar 0x4087, 0 compare 0x8007, 0 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C move 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 waitmove 0 move 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -175,7 +175,7 @@ SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 checkflag 2049 - jumpif 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 + goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 copyvar 0x8007, LAST_TALKED lock faceplayer @@ -193,26 +193,26 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 call S_DoSaveDialog compare RESULT, 0 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF compare 0x8004, 0 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext special sub_808347C waitstate compare RESULT, 1 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3F5E + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3F5E compare RESULT, 2 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4301 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 compare RESULT, 3 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A430D + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D compare RESULT, 4 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4068 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4068 compare RESULT, 5 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 compare RESULT, 6 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E special ScrSpecial_HealPlayerParty @@ -238,7 +238,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E doorchange release compare 0x8004, 5 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp warp SingleBattleColosseum, 255, 6, 8 special DoCableClubWarp @@ -282,7 +282,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons compare RESULT, 0 - jumpif 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 + goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 setvar 0x8004, 2 return @@ -347,39 +347,39 @@ SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC checkflag 2049 - jumpif 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 + goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 copyvar 0x8007, LAST_TALKED lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, 5 compare RESULT, 0 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 compare RESULT, 1 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A40FA + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A40FA OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA call OldaleTown_PokemonCenter_2F_EventScript_1A41BB compare RESULT, 0 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call S_DoSaveDialog compare RESULT, 0 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext special sub_80834E4 waitstate compare RESULT, 1 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4166 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4166 compare RESULT, 2 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4301 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 compare RESULT, 3 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A430D + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D compare RESULT, 4 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A432D + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A432D compare RESULT, 5 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 compare RESULT, 6 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 setvar 0x8004, 3 @@ -407,10 +407,10 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB specialval RESULT, CalculatePlayerPartyCount compare RESULT, 2 - jumpif 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1 + goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1 specialval RESULT, GetNameOfEnigmaBerryInPlayerParty compare RESULT, 1 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A41EE + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A41EE setvar RESULT, 1 return @@ -444,20 +444,20 @@ SlateportCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB checkflag 2072 - jumpif 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B + goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B copyvar 0x8007, LAST_TALKED lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, 5 compare RESULT, 0 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 compare RESULT, 1 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4229 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 call S_DoSaveDialog compare RESULT, 0 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext special sub_808350C @@ -465,19 +465,19 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 special sub_80835D8 waitstate compare RESULT, 1 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4294 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4294 compare RESULT, 2 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4301 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 compare RESULT, 3 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A430D + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D compare RESULT, 4 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A432D + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A432D compare RESULT, 5 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 compare RESULT, 6 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 compare RESULT, 7 - jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42E9 + goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42E9 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 setvar 0x8004, 4 @@ -620,7 +620,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 special sub_80C5568 waitstate compare RESULT, 0 - jumpeq DoubleBattleColosseum_EventScript_1A43EF + goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 0 special sub_8083B90 waitstate @@ -631,7 +631,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E special sub_80C5568 waitstate compare RESULT, 0 - jumpeq DoubleBattleColosseum_EventScript_1A43EF + goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 1 special sub_8083B90 waitstate @@ -642,7 +642,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 special sub_80C5568 waitstate compare RESULT, 0 - jumpeq DoubleBattleColosseum_EventScript_1A43EF + goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 2 special sub_8083B90 waitstate @@ -653,7 +653,7 @@ DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4 special sub_80C5568 waitstate compare RESULT, 0 - jumpeq DoubleBattleColosseum_EventScript_1A43EF + goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 3 special sub_8083B90 waitstate @@ -691,7 +691,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 special sub_80B929C waitstate compare 0x4001, 0 - jumpif 5, RecordCorner_EventScript_1A446C + goto_if 5, RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A442D:: @ 81A442D @@ -699,7 +699,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D special sub_80B929C waitstate compare 0x4001, 0 - jumpif 5, RecordCorner_EventScript_1A446C + goto_if 5, RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A4442:: @ 81A4442 @@ -707,7 +707,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 special sub_80B929C waitstate compare 0x4001, 0 - jumpif 5, RecordCorner_EventScript_1A446C + goto_if 5, RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A4457:: @ 81A4457 @@ -715,7 +715,7 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 special sub_80B929C waitstate compare 0x4001, 0 - jumpif 5, RecordCorner_EventScript_1A446C + goto_if 5, RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A446C:: @ 81A446C @@ -771,7 +771,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD RecordCorner_EventScript_1A44BC:: @ 81A44BC compare 0x4000, 0 - jumpif 5, RecordCorner_EventScript_1A44D6 + goto_if 5, RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 waittext @@ -792,7 +792,7 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6 TradeRoom_PromptToCancelLink:: @ 81A44E5 msgbox TradeRoom_WillLinkBeTerminated, 5 compare RESULT, 1 - jumpeq TradeRoom_TerminateLink + goto_if_eq TradeRoom_TerminateLink hidebox 0, 0, 29, 19 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 484607165..b41a40e14 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -6,16 +6,16 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 faceplayer checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 - callif 1, FallarborTown_ContestLobby_EventScript_1A4EDD + call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD compare 0x408a, 0 - jumpif 5, FallarborTown_ContestLobby_EventScript_1A4F4E + goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag 1 - jumpeq FallarborTown_ContestLobby_EventScript_1A4F8F + goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F bufferstd 0, 0x800b msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1A4EE1 + goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1 setflag 1 goto FallarborTown_ContestLobby_EventScript_1A4F8F end @@ -26,7 +26,7 @@ FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 compare CONTEST_RANK, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1A4EF6 + goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EF6 msgbox FallarborTown_ContestLobby_Text_1A6340, 4 releaseall end @@ -34,14 +34,14 @@ FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 msgbox FallarborTown_ContestLobby_Text_1A64F4, 5 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1A4F13 + goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F13 msgbox FallarborTown_ContestLobby_Text_1A65EA, 4 releaseall end FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 checkflag 150 - jumpeq FallarborTown_ContestLobby_EventScript_1A4F44 + goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44 msgbox FallarborTown_ContestLobby_Text_1A6583, 4 giveitem ITEM_CONTEST_PASS setflag 150 @@ -64,7 +64,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 giveitem ITEM_LUXURY_BALL compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1A4F86 + goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 setvar 0x408a, 0 closebutton release @@ -121,18 +121,18 @@ FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 choosecontestpkmn compare 0x8004, 255 - jumpeq FallarborTown_ContestLobby_EventScript_1A5097 + goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1A50C8 + goto_if_eq FallarborTown_ContestLobby_EventScript_1A50C8 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1A50D7 + goto_if_eq FallarborTown_ContestLobby_EventScript_1A50D7 compare RESULT, 2 - jumpeq FallarborTown_ContestLobby_EventScript_1A50FB + goto_if_eq FallarborTown_ContestLobby_EventScript_1A50FB compare RESULT, 3 - jumpeq FallarborTown_ContestLobby_EventScript_1A511F + goto_if_eq FallarborTown_ContestLobby_EventScript_1A511F compare RESULT, 4 - jumpeq FallarborTown_ContestLobby_EventScript_1A512E + goto_if_eq FallarborTown_ContestLobby_EventScript_1A512E end FallarborTown_ContestLobby_EventScript_1A5097:: @ 81A5097 @@ -271,7 +271,7 @@ LinkContestRoom1_EventScript_1A5245:: @ 81A5245 LinkContestRoom1_EventScript_1A525F:: @ 81A525F compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A5273 + goto_if_eq LinkContestRoom1_EventScript_1A5273 msgbox LinkContestRoom1_Text_1A68F0, 3 return @@ -288,20 +288,20 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A5880 addvar 0x8006, 1 compare 0x8006, 4 - jumpif 5, LinkContestRoom1_EventScript_1A527A + goto_if 5, LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 setvar 0x4001, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE compare 0x8006, 0 - jumpeq LinkContestRoom1_EventScript_1A52DB + goto_if_eq LinkContestRoom1_EventScript_1A52DB compare 0x8006, 1 - jumpeq LinkContestRoom1_EventScript_1A52ED + goto_if_eq LinkContestRoom1_EventScript_1A52ED compare 0x8006, 2 - jumpeq LinkContestRoom1_EventScript_1A52FF + goto_if_eq LinkContestRoom1_EventScript_1A52FF compare 0x8006, 3 - jumpeq LinkContestRoom1_EventScript_1A5311 + goto_if_eq LinkContestRoom1_EventScript_1A5311 return LinkContestRoom1_EventScript_1A52DB:: @ 81A52DB @@ -358,7 +358,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 LinkContestRoom1_EventScript_1A535E:: @ 81A535E compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A5370 + goto_if_eq LinkContestRoom1_EventScript_1A5370 message LinkContestRoom1_Text_1A6A04 waittext return @@ -386,7 +386,7 @@ LinkContestRoom1_EventScript_1A5377:: @ 81A5377 LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3 compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A53C7 + goto_if_eq LinkContestRoom1_EventScript_1A53C7 msgbox LinkContestRoom1_Text_1A6A1F, 4 return @@ -397,7 +397,7 @@ LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7 LinkContestRoom1_EventScript_1A53CE:: @ 81A53CE compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A53DF + goto_if_eq LinkContestRoom1_EventScript_1A53DF message LinkContestRoom1_Text_1A6AE1 return @@ -432,15 +432,15 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 LinkContestRoom1_EventScript_1A5455:: @ 81A5455 special sub_80C47A0 compare 0x4088, 1 - callif 1, LinkContestRoom1_EventScript_1A555A + call_if 1, LinkContestRoom1_EventScript_1A555A compare 0x4088, 2 - callif 1, LinkContestRoom1_EventScript_1A55B8 + call_if 1, LinkContestRoom1_EventScript_1A55B8 compare 0x4088, 3 - callif 1, LinkContestRoom1_EventScript_1A5616 + call_if 1, LinkContestRoom1_EventScript_1A5616 compare 0x4088, 4 - callif 1, LinkContestRoom1_EventScript_1A5674 + call_if 1, LinkContestRoom1_EventScript_1A5674 compare 0x4088, 5 - callif 1, LinkContestRoom1_EventScript_1A56D2 + call_if 1, LinkContestRoom1_EventScript_1A56D2 setvar 0x4001, 9 setvar 0x4002, 9 setvar 0x4003, 9 @@ -450,7 +450,7 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 setvar 0x4007, 9 setvar 0x4008, 9 compare 0x4000, 0 - callif 2, LinkContestRoom1_EventScript_1A54EB + call_if 2, LinkContestRoom1_EventScript_1A54EB setvar 0x4001, 0 setvar 0x4002, 0 setvar 0x4003, 0 @@ -465,123 +465,123 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB setvar RESULT, 8 special ScriptRandom compare RESULT, 0 - callif 1, LinkContestRoom1_EventScript_1A5760 + call_if 1, LinkContestRoom1_EventScript_1A5760 compare RESULT, 1 - callif 1, LinkContestRoom1_EventScript_1A5784 + call_if 1, LinkContestRoom1_EventScript_1A5784 compare RESULT, 2 - callif 1, LinkContestRoom1_EventScript_1A57A8 + call_if 1, LinkContestRoom1_EventScript_1A57A8 compare RESULT, 3 - callif 1, LinkContestRoom1_EventScript_1A57CC + call_if 1, LinkContestRoom1_EventScript_1A57CC compare RESULT, 4 - callif 1, LinkContestRoom1_EventScript_1A57F0 + call_if 1, LinkContestRoom1_EventScript_1A57F0 compare RESULT, 5 - callif 1, LinkContestRoom1_EventScript_1A5814 + call_if 1, LinkContestRoom1_EventScript_1A5814 compare RESULT, 6 - callif 1, LinkContestRoom1_EventScript_1A5838 + call_if 1, LinkContestRoom1_EventScript_1A5838 compare RESULT, 7 - callif 1, LinkContestRoom1_EventScript_1A585C + call_if 1, LinkContestRoom1_EventScript_1A585C compare 0x4000, 0 - jumpif 2, LinkContestRoom1_EventScript_1A54EB + goto_if 2, LinkContestRoom1_EventScript_1A54EB waitmove 0 return LinkContestRoom1_EventScript_1A555A:: @ 81A555A compare 0x8004, 80 - jumpif 2, LinkContestRoom1_EventScript_1A575A + goto_if 2, LinkContestRoom1_EventScript_1A575A compare 0x8004, 70 - jumpif 2, LinkContestRoom1_EventScript_1A5754 + goto_if 2, LinkContestRoom1_EventScript_1A5754 compare 0x8004, 60 - jumpif 2, LinkContestRoom1_EventScript_1A574E + goto_if 2, LinkContestRoom1_EventScript_1A574E compare 0x8004, 50 - jumpif 2, LinkContestRoom1_EventScript_1A5748 + goto_if 2, LinkContestRoom1_EventScript_1A5748 compare 0x8004, 40 - jumpif 2, LinkContestRoom1_EventScript_1A5742 + goto_if 2, LinkContestRoom1_EventScript_1A5742 compare 0x8004, 30 - jumpif 2, LinkContestRoom1_EventScript_1A573C + goto_if 2, LinkContestRoom1_EventScript_1A573C compare 0x8004, 20 - jumpif 2, LinkContestRoom1_EventScript_1A5736 + goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 10 - jumpif 2, LinkContestRoom1_EventScript_1A5730 + goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 compare 0x8004, 230 - jumpif 2, LinkContestRoom1_EventScript_1A575A + goto_if 2, LinkContestRoom1_EventScript_1A575A compare 0x8004, 210 - jumpif 2, LinkContestRoom1_EventScript_1A5754 + goto_if 2, LinkContestRoom1_EventScript_1A5754 compare 0x8004, 190 - jumpif 2, LinkContestRoom1_EventScript_1A574E + goto_if 2, LinkContestRoom1_EventScript_1A574E compare 0x8004, 170 - jumpif 2, LinkContestRoom1_EventScript_1A5748 + goto_if 2, LinkContestRoom1_EventScript_1A5748 compare 0x8004, 150 - jumpif 2, LinkContestRoom1_EventScript_1A5742 + goto_if 2, LinkContestRoom1_EventScript_1A5742 compare 0x8004, 130 - jumpif 2, LinkContestRoom1_EventScript_1A573C + goto_if 2, LinkContestRoom1_EventScript_1A573C compare 0x8004, 110 - jumpif 2, LinkContestRoom1_EventScript_1A5736 + goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 90 - jumpif 2, LinkContestRoom1_EventScript_1A5730 + goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 compare 0x8004, 380 - jumpif 2, LinkContestRoom1_EventScript_1A575A + goto_if 2, LinkContestRoom1_EventScript_1A575A compare 0x8004, 350 - jumpif 2, LinkContestRoom1_EventScript_1A5754 + goto_if 2, LinkContestRoom1_EventScript_1A5754 compare 0x8004, 320 - jumpif 2, LinkContestRoom1_EventScript_1A574E + goto_if 2, LinkContestRoom1_EventScript_1A574E compare 0x8004, 290 - jumpif 2, LinkContestRoom1_EventScript_1A5748 + goto_if 2, LinkContestRoom1_EventScript_1A5748 compare 0x8004, 260 - jumpif 2, LinkContestRoom1_EventScript_1A5742 + goto_if 2, LinkContestRoom1_EventScript_1A5742 compare 0x8004, 230 - jumpif 2, LinkContestRoom1_EventScript_1A573C + goto_if 2, LinkContestRoom1_EventScript_1A573C compare 0x8004, 200 - jumpif 2, LinkContestRoom1_EventScript_1A5736 + goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 170 - jumpif 2, LinkContestRoom1_EventScript_1A5730 + goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 compare 0x8004, 600 - jumpif 2, LinkContestRoom1_EventScript_1A575A + goto_if 2, LinkContestRoom1_EventScript_1A575A compare 0x8004, 560 - jumpif 2, LinkContestRoom1_EventScript_1A5754 + goto_if 2, LinkContestRoom1_EventScript_1A5754 compare 0x8004, 520 - jumpif 2, LinkContestRoom1_EventScript_1A574E + goto_if 2, LinkContestRoom1_EventScript_1A574E compare 0x8004, 480 - jumpif 2, LinkContestRoom1_EventScript_1A5748 + goto_if 2, LinkContestRoom1_EventScript_1A5748 compare 0x8004, 440 - jumpif 2, LinkContestRoom1_EventScript_1A5742 + goto_if 2, LinkContestRoom1_EventScript_1A5742 compare 0x8004, 400 - jumpif 2, LinkContestRoom1_EventScript_1A573C + goto_if 2, LinkContestRoom1_EventScript_1A573C compare 0x8004, 360 - jumpif 2, LinkContestRoom1_EventScript_1A5736 + goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 320 - jumpif 2, LinkContestRoom1_EventScript_1A5730 + goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 compare 0x8004, 600 - jumpif 2, LinkContestRoom1_EventScript_1A575A + goto_if 2, LinkContestRoom1_EventScript_1A575A compare 0x8004, 550 - jumpif 2, LinkContestRoom1_EventScript_1A5754 + goto_if 2, LinkContestRoom1_EventScript_1A5754 compare 0x8004, 500 - jumpif 2, LinkContestRoom1_EventScript_1A574E + goto_if 2, LinkContestRoom1_EventScript_1A574E compare 0x8004, 450 - jumpif 2, LinkContestRoom1_EventScript_1A5748 + goto_if 2, LinkContestRoom1_EventScript_1A5748 compare 0x8004, 400 - jumpif 2, LinkContestRoom1_EventScript_1A5742 + goto_if 2, LinkContestRoom1_EventScript_1A5742 compare 0x8004, 300 - jumpif 2, LinkContestRoom1_EventScript_1A573C + goto_if 2, LinkContestRoom1_EventScript_1A573C compare 0x8004, 200 - jumpif 2, LinkContestRoom1_EventScript_1A5736 + goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 100 - jumpif 2, LinkContestRoom1_EventScript_1A5730 + goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return @@ -619,7 +619,7 @@ LinkContestRoom1_EventScript_1A575A:: @ 81A575A LinkContestRoom1_EventScript_1A5760:: @ 81A5760 compare 0x4001, 1 - jumpeq LinkContestRoom1_EventScript_1A5783 + goto_if_eq LinkContestRoom1_EventScript_1A5783 move 6, LinkContestRoom1_Movement_1A5D8D playsfx 21 pause 14 @@ -632,7 +632,7 @@ LinkContestRoom1_EventScript_1A5783:: @ 81A5783 LinkContestRoom1_EventScript_1A5784:: @ 81A5784 compare 0x4002, 1 - jumpeq LinkContestRoom1_EventScript_1A57A7 + goto_if_eq LinkContestRoom1_EventScript_1A57A7 move 12, LinkContestRoom1_Movement_1A5D8D playsfx 21 pause 14 @@ -645,7 +645,7 @@ LinkContestRoom1_EventScript_1A57A7:: @ 81A57A7 LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 compare 0x4003, 1 - jumpeq LinkContestRoom1_EventScript_1A57CB + goto_if_eq LinkContestRoom1_EventScript_1A57CB move 7, LinkContestRoom1_Movement_1A5D8D playsfx 21 pause 14 @@ -658,7 +658,7 @@ LinkContestRoom1_EventScript_1A57CB:: @ 81A57CB LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC compare 0x4004, 1 - jumpeq LinkContestRoom1_EventScript_1A57EF + goto_if_eq LinkContestRoom1_EventScript_1A57EF move 8, LinkContestRoom1_Movement_1A5D8D playsfx 21 pause 14 @@ -671,7 +671,7 @@ LinkContestRoom1_EventScript_1A57EF:: @ 81A57EF LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 compare 0x4005, 1 - jumpeq LinkContestRoom1_EventScript_1A5813 + goto_if_eq LinkContestRoom1_EventScript_1A5813 move 9, LinkContestRoom1_Movement_1A5D8D playsfx 21 pause 14 @@ -684,7 +684,7 @@ LinkContestRoom1_EventScript_1A5813:: @ 81A5813 LinkContestRoom1_EventScript_1A5814:: @ 81A5814 compare 0x4006, 1 - jumpeq LinkContestRoom1_EventScript_1A5837 + goto_if_eq LinkContestRoom1_EventScript_1A5837 move 10, LinkContestRoom1_Movement_1A5D8D playsfx 21 pause 14 @@ -697,7 +697,7 @@ LinkContestRoom1_EventScript_1A5837:: @ 81A5837 LinkContestRoom1_EventScript_1A5838:: @ 81A5838 compare 0x4007, 1 - jumpeq LinkContestRoom1_EventScript_1A585B + goto_if_eq LinkContestRoom1_EventScript_1A585B move 11, LinkContestRoom1_Movement_1A5D8D playsfx 21 pause 14 @@ -710,7 +710,7 @@ LinkContestRoom1_EventScript_1A585B:: @ 81A585B LinkContestRoom1_EventScript_1A585C:: @ 81A585C compare 0x4008, 1 - jumpeq LinkContestRoom1_EventScript_1A587F + goto_if_eq LinkContestRoom1_EventScript_1A587F move 15, LinkContestRoom1_Movement_1A5D8D playsfx 21 pause 14 @@ -783,7 +783,7 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE LinkContestRoom1_EventScript_1A5930:: @ 81A5930 compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A5944 + goto_if_eq LinkContestRoom1_EventScript_1A5944 msgbox LinkContestRoom1_Text_1A6AF5, 3 return @@ -810,7 +810,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A LinkContestRoom1_EventScript_1A5984:: @ 81A5984 compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A5998 + goto_if_eq LinkContestRoom1_EventScript_1A5998 msgbox LinkContestRoom1_Text_1A6C06, 4 return @@ -822,7 +822,7 @@ LinkContestRoom1_EventScript_1A5998:: @ 81A5998 LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A59B6 + goto_if_eq LinkContestRoom1_EventScript_1A59B6 msgbox LinkContestRoom1_Text_1A6C21, 4 return @@ -834,7 +834,7 @@ LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A59D4 + goto_if_eq LinkContestRoom1_EventScript_1A59D4 msgbox LinkContestRoom1_Text_1A6C9D, 4 return @@ -846,7 +846,7 @@ LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A59F2 + goto_if_eq LinkContestRoom1_EventScript_1A59F2 msgbox LinkContestRoom1_Text_1A6D16, 4 return @@ -896,7 +896,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A5A89 + goto_if_eq LinkContestRoom1_EventScript_1A5A89 msgbox LinkContestRoom1_Text_1A6D3C, 4 return @@ -909,7 +909,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 addvar 0x4001, 1 lockall compare 0x4088, 1 - callif 2, LinkContestRoom1_EventScript_1A5AE4 + call_if 2, LinkContestRoom1_EventScript_1A5AE4 move 9, LinkContestRoom1_Movement_1A5DB7 move 12, LinkContestRoom1_Movement_1A5DBB move 7, LinkContestRoom1_Movement_1A5DB7 @@ -919,7 +919,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 move 6, LinkContestRoom1_Movement_1A5DB3 move 8, LinkContestRoom1_Movement_1A5DAF compare 0x4001, 4 - jumpif 5, LinkContestRoom1_EventScript_1A5A90 + goto_if 5, LinkContestRoom1_EventScript_1A5A90 pause 30 return @@ -994,10 +994,10 @@ LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB compare 0x4088, 5 - jumpeq LinkContestRoom1_EventScript_1A5C4C + goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 checkflag 2 - jumpeq LinkContestRoom1_EventScript_1A5BF6 + goto_if_eq LinkContestRoom1_EventScript_1A5BF6 msgbox LinkContestRoom1_Text_1A6DC5, 3 waittext call LinkContestRoom1_EventScript_1A5C7F @@ -1008,7 +1008,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB pause 30 special sub_80C4CF8 compare 0x8004, 1 - jumpeq LinkContestRoom1_EventScript_1A5C46 + goto_if_eq LinkContestRoom1_EventScript_1A5C46 return LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 @@ -1017,24 +1017,24 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 pause 90 special sub_80C4CF8 compare 0x8004, 1 - jumpeq LinkContestRoom1_EventScript_1A5C46 + goto_if_eq LinkContestRoom1_EventScript_1A5C46 return LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 specialval RESULT, sub_80C4440 compare RESULT, 1 - jumpeq LinkContestRoom1_EventScript_1A5C23 + goto_if_eq LinkContestRoom1_EventScript_1A5C23 return LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 special sub_80C47C0 compare 0x8005, 3 - jumpeq LinkContestRoom1_EventScript_1A5C32 + goto_if_eq LinkContestRoom1_EventScript_1A5C32 return LinkContestRoom1_EventScript_1A5C32:: @ 81A5C32 compare CONTEST_RANK, 3 - jumpeq LinkContestRoom1_EventScript_1A5C41 + goto_if_eq LinkContestRoom1_EventScript_1A5C41 setflag 2 return @@ -1054,7 +1054,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C call LinkContestRoom1_EventScript_1A5C6A special sub_80C4CF8 compare 0x8004, 1 - jumpeq LinkContestRoom1_EventScript_1A5C64 + goto_if_eq LinkContestRoom1_EventScript_1A5C64 closebutton return @@ -1066,7 +1066,7 @@ LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A special sub_80C496C special sub_80C47C0 comparevars 0x8004, 0x8005 - jumpeq LinkContestRoom1_EventScript_1A5C7C + goto_if_eq LinkContestRoom1_EventScript_1A5C7C return LinkContestRoom1_EventScript_1A5C7C:: @ 81A5C7C @@ -1112,19 +1112,19 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 special sub_80C47C0 compare 0x8005, 3 - jumpeq LinkContestRoom1_EventScript_1A5CFC + goto_if_eq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 return LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC compare 0x4088, 2 - callif 1, LinkContestRoom1_EventScript_1A5C42 + call_if 1, LinkContestRoom1_EventScript_1A5C42 inccounter GAME_STAT_WON_CONTEST specialval RESULT, sub_80C4440 compare RESULT, 0 - jumpeq LinkContestRoom1_EventScript_1A5D5B + goto_if_eq LinkContestRoom1_EventScript_1A5D5B compare CONTEST_RANK, 3 - jumpeq LinkContestRoom1_EventScript_1A5D3B + goto_if_eq LinkContestRoom1_EventScript_1A5D3B msgbox LinkContestRoom1_Text_1A6DF1, 3 return @@ -1136,7 +1136,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B giveitem ITEM_LUXURY_BALL compare RESULT, 0 - jumpeq LinkContestRoom1_EventScript_1A5D2D + goto_if_eq LinkContestRoom1_EventScript_1A5D2D msgbox LinkContestRoom1_Text_1A6DF1, 3 return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index d0e35203e..4c57e0b9f 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -4,11 +4,11 @@ Route117_EventScript_1B222D:: @ 81B222D special sp0B5_daycare specialval RESULT, sp0B6_daycare compare RESULT, 1 - jumpeq Route117_EventScript_1B2262 + goto_if_eq Route117_EventScript_1B2262 compare RESULT, 2 - jumpeq Route117_EventScript_1B22E7 + goto_if_eq Route117_EventScript_1B22E7 compare RESULT, 3 - jumpeq Route117_EventScript_1B22FE + goto_if_eq Route117_EventScript_1B22FE msgbox Route117_Text_1B25CB, 4 release end @@ -16,10 +16,10 @@ Route117_EventScript_1B222D:: @ 81B222D Route117_EventScript_1B2262:: @ 81B2262 msgbox Route117_Text_1B2659, 5 compare RESULT, 1 - jumpeq Route117_EventScript_1B2298 + goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B28C4, 5 compare RESULT, 1 - jumpeq Route117_EventScript_1B2298 + goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 clearflag 134 special sub_8041E7C @@ -29,7 +29,7 @@ Route117_EventScript_1B2262:: @ 81B2262 Route117_EventScript_1B2298:: @ 81B2298 specialval RESULT, CalculatePlayerPartyCount compare RESULT, 6 - jumpif 5, Route117_EventScript_1B22B2 + goto_if 5, Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 release end @@ -49,7 +49,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 Route117_EventScript_1B22CD:: @ 81B22CD specialval RESULT, sub_8042B4C compare RESULT, 1 - callif 1, Route117_EventScript_1B22DE + call_if 1, Route117_EventScript_1B22DE return Route117_EventScript_1B22DE:: @ 81B22DE @@ -83,14 +83,14 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 faceplayer specialval RESULT, sp0B6_daycare compare RESULT, 1 - jumpeq Route117_PokemonDayCare_EventScript_1B2407 + goto_if_eq Route117_PokemonDayCare_EventScript_1B2407 compare RESULT, 2 - jumpeq Route117_PokemonDayCare_EventScript_1B242B + goto_if_eq Route117_PokemonDayCare_EventScript_1B242B compare RESULT, 3 - jumpeq Route117_PokemonDayCare_EventScript_1B2558 + goto_if_eq Route117_PokemonDayCare_EventScript_1B2558 msgbox Route117_PokemonDayCare_Text_1B28F2, 5 compare RESULT, 1 - jumpeq Route117_PokemonDayCare_EventScript_1B236C + goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2A14, 4 release end @@ -98,16 +98,16 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C specialval RESULT, sub_8095B6C compare RESULT, 1 - jumpeq Route117_PokemonDayCare_EventScript_1B23F3 + goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 fadescreen 1 special ChooseSendDaycareMon waitstate compare 0x8004, 255 - jumpeq Route117_PokemonDayCare_EventScript_1B23D0 + goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 specialval RESULT, sub_8095C10 compare RESULT, 0 - jumpeq Route117_PokemonDayCare_EventScript_1B23FD + goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialval 0x8005, sub_8042328 checksound pokecry 0x8005, 0 @@ -117,7 +117,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C inccounter GAME_STAT_USED_DAYCARE specialval RESULT, sp0B6_daycare compare RESULT, 2 - jumpeq Route117_PokemonDayCare_EventScript_1B23DA + goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA release end @@ -129,7 +129,7 @@ Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0 Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA msgbox Route117_PokemonDayCare_Text_1B29AD, 5 compare RESULT, 1 - jumpeq Route117_PokemonDayCare_EventScript_1B236C + goto_if_eq Route117_PokemonDayCare_EventScript_1B236C goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -155,7 +155,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A specialval RESULT, sub_80417B8 compare RESULT, 0 - callif 5, Route117_PokemonDayCare_EventScript_1B2411 + call_if 5, Route117_PokemonDayCare_EventScript_1B2411 return Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B @@ -164,26 +164,26 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B29AD, 5 compare RESULT, 1 - jumpeq Route117_PokemonDayCare_EventScript_1B236C + goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 compare RESULT, 1 - jumpeq Route117_PokemonDayCare_EventScript_1B2469 + goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 specialval RESULT, CalculatePlayerPartyCount compare RESULT, 6 - jumpeq Route117_PokemonDayCare_EventScript_1B2539 + goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 specialval RESULT, sp0B6_daycare setvar 0x8004, 0 compare RESULT, 2 - jumpeq Route117_PokemonDayCare_EventScript_1B24A8 + goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 special ShowDaycareLevelMenu waitstate copyvar 0x8004, RESULT compare RESULT, 2 - jumpeq Route117_PokemonDayCare_EventScript_1B23D0 + goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 goto Route117_PokemonDayCare_EventScript_1B24A8 end @@ -191,14 +191,14 @@ Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 special sub_8041770 msgbox Route117_PokemonDayCare_Text_1B2B49, 5 compare RESULT, 1 - jumpeq Route117_PokemonDayCare_EventScript_1B24C4 + goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 specialval RESULT, sub_80B7CE8 compare RESULT, 1 - jumpeq Route117_PokemonDayCare_EventScript_1B24DE + goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 release end @@ -216,14 +216,14 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE waitpokecry specialval RESULT, sp0B6_daycare compare RESULT, 2 - jumpeq Route117_PokemonDayCare_EventScript_1B2520 + goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520 msgbox Route117_PokemonDayCare_Text_1B2A4F, 5 compare RESULT, 1 - jumpeq Route117_PokemonDayCare_EventScript_1B2469 + goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -265,7 +265,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 compare RESULT, 1 - jumpeq Route117_PokemonDayCare_EventScript_1B2469 + goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release end @@ -274,7 +274,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 special ShowDaycareLevelMenu waitstate compare RESULT, 2 - jumpeq Route117_PokemonDayCare_EventScript_1B23D0 + goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 copyvar 0x8004, RESULT specialval RESULT, sub_8041648 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index c88733bea..2625ff573 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -203,13 +203,13 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds compare FACING, 2 - callif 1, Route111_EventScript_1AE5E0 + call_if 1, Route111_EventScript_1AE5E0 compare FACING, 1 - callif 1, Route111_EventScript_1AE5EB + call_if 1, Route111_EventScript_1AE5EB compare FACING, 4 - callif 1, Route111_EventScript_1AE5FD + call_if 1, Route111_EventScript_1AE5FD checkflag 1 - jumpeq Route111_EventScript_1AE73A + goto_if_eq Route111_EventScript_1AE73A msgbox Route111_Text_1AC015, 5 goto Route111_EventScript_1AE6F3 end @@ -237,16 +237,16 @@ Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds compare FACING, 2 - callif 1, Route111_EventScript_1AE5E0 + call_if 1, Route111_EventScript_1AE5E0 compare FACING, 1 - callif 1, Route111_EventScript_1AE5EB + call_if 1, Route111_EventScript_1AE5EB compare FACING, 4 - callif 1, Route111_EventScript_1AE5FD + call_if 1, Route111_EventScript_1AE5FD checkflag 1 - jumpeq Route111_EventScript_1AE73A + goto_if_eq Route111_EventScript_1AE73A specialval RESULT, GabbyAndTyGetLastQuote compare RESULT, 0 - jumpeq Route111_EventScript_1AE69F + goto_if_eq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 specialval RESULT, sub_80BDD18 switch RESULT @@ -301,14 +301,14 @@ Route111_EventScript_1AE6E5:: @ 81AE6E5 Route111_EventScript_1AE6F3:: @ 81AE6F3 compare RESULT, 0 - jumpeq Route111_EventScript_1AE72D + goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 setvar 0x8004, 10 call Route111_EventScript_1A00F3 lock faceplayer compare RESULT, 0 - jumpeq Route111_EventScript_1AE72D + goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 special sub_80BDC14 setflag 1 diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index a2f4f67b7..18bd1d53b 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -2,9 +2,9 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 lock faceplayer checkflag 219 - callif 0, MtChimney_EventScript_1B2CB9 + call_if 0, MtChimney_EventScript_1B2CB9 checkflag 219 - callif 1, MtChimney_EventScript_1B2CC2 + call_if 1, MtChimney_EventScript_1B2CC2 closebutton move 1, MtChimney_Movement_1A083D waitmove 0 @@ -68,9 +68,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB movespriteperm 1, 10, 12 reappear 1 compare FACING, 4 - callif 1, MtChimney_EventScript_1B2D7D + call_if 1, MtChimney_EventScript_1B2D7D compare FACING, 2 - callif 1, MtChimney_EventScript_1B2D88 + call_if 1, MtChimney_EventScript_1B2D88 move 255, MtChimney_Movement_1A083F waitmove 0 .ifdef SAPPHIRE @@ -80,9 +80,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .endif closebutton compare FACING, 4 - callif 1, MtChimney_EventScript_1B2D93 + call_if 1, MtChimney_EventScript_1B2D93 compare FACING, 2 - callif 1, MtChimney_EventScript_1B2D9E + call_if 1, MtChimney_EventScript_1B2D9E disappear 1 setflag 927 setflag 139 diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index cf525003e..eb912028a 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -5,12 +5,12 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 lock faceplayer checkflag 294 - jumpeq AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 compare RESULT, 1 - jumpeq AbandonedShip_CaptainsOffice_EventScript_15EB23 + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 checkflag 1078 - jumpeq AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4 release end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index b0ae966ad..212d80416 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -9,9 +9,9 @@ AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 checkflag 239 - callif 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6 + call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6 checkflag 239 - callif 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0 + call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0 end AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 @@ -29,10 +29,10 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 lockall checkflag 239 - jumpeq AbandonedShip_Corridors_B1F_EventScript_15EA14 + goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 compare RESULT, 0 - jumpeq AbandonedShip_Corridors_B1F_EventScript_15EA0A + goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playsfx 21 removeitem ITEM_STORAGE_KEY, 1 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 8cb2aed22..9f0b5ca85 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -9,21 +9,21 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A checkflag 240 - callif 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB checkflag 241 - callif 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 checkflag 242 - callif 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF checkflag 243 - callif 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 checkflag 240 - callif 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 checkflag 241 - callif 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD checkflag 242 - callif 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 checkflag 243 - callif 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 end AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 @@ -61,10 +61,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 lockall checkflag 240 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 compare RESULT, 0 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 removeitem ITEM_ROOM_1_KEY, 1 @@ -77,10 +77,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A lockall checkflag 241 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 compare RESULT, 0 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 removeitem ITEM_ROOM_2_KEY, 1 @@ -93,10 +93,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 lockall checkflag 242 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 compare RESULT, 0 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 removeitem ITEM_ROOM_4_KEY, 1 @@ -109,10 +109,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 lockall checkflag 243 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 compare RESULT, 0 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 removeitem ITEM_ROOM_6_KEY, 1 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 5c4c050a0..d8ed3fe07 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -11,11 +11,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 getplayerxy 0x4002, 0x4003 setvar 0x4004, 1 compare 0x4002, 21 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 compare 0x4002, 36 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F compare 0x4003, 2 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 switch 0x4004 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 @@ -45,7 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B doanimation 54 specialval RESULT, sub_810F4D4 compare RESULT, 0 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B checkanimation 54 pause 10 end @@ -56,10 +56,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 specialval RESULT, sub_810F488 compare RESULT, 1 - jumpeq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA + goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA pause 20 compare RESULT, 0 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B checkanimation 54 pause 10 end @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB doanimation 54 specialval RESULT, sub_810F4FC compare RESULT, 0 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B checkanimation 54 pause 10 end @@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 doanimation 54 specialval RESULT, sub_810F4B0 compare RESULT, 0 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B checkanimation 54 pause 10 end diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index a6ccdc43c..b7fe34b81 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -5,7 +5,7 @@ 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, sub_8082C68 compare RESULT, 1 - jumpeq AbandonedShip_Rooms2_1F_EventScript_15EA93 + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 end @@ -18,7 +18,7 @@ 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, sub_8082C68 compare RESULT, 1 - jumpeq AbandonedShip_Rooms2_1F_EventScript_15EAD9 + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index bfc5b6a79..deed30c5b 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -6,7 +6,7 @@ AncientTomb_MapScripts:: @ 815EFBE AncientTomb_MapScript1_15EFCE:: @ 815EFCE checkflag 2145 - callif 1, AncientTomb_EventScript_15EFD8 + call_if 1, AncientTomb_EventScript_15EFD8 end AncientTomb_EventScript_15EFD8:: @ 815EFD8 @@ -19,7 +19,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC AncientTomb_MapScript1_15EFE0:: @ 815EFE0 checkflag 2130 - callif 0, AncientTomb_EventScript_15EFEA + call_if 0, AncientTomb_EventScript_15EFEA end AncientTomb_EventScript_15EFEA:: @ 815EFEA @@ -34,7 +34,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall checkflag 2130 - jumpeq AncientTomb_EventScript_15F038 + goto_if_eq AncientTomb_EventScript_15F038 braillemsg AncientTomb_Braille_1C552E waitbutton hidebox 0, 0, 29, 19 diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc index cc1ad33b1..2eb2ae7e9 100644 --- a/data/scripts/maps/AquaHideout_1F.inc +++ b/data/scripts/maps/AquaHideout_1F.inc @@ -11,7 +11,7 @@ MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE lock faceplayer checkflag 111 - jumpeq AquaHideout_1F_EventScript_15D7E3 + goto_if_eq AquaHideout_1F_EventScript_15D7E3 msgbox AquaHideout_1F_Text_196AFD, 4 release end @@ -26,7 +26,7 @@ MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED lock faceplayer checkflag 111 - jumpeq AquaHideout_1F_EventScript_15D802 + goto_if_eq AquaHideout_1F_EventScript_15D802 msgbox AquaHideout_1F_Text_196C83, 4 release end diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 969d590e3..cad8e7481 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -5,7 +5,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C checkflag 2145 - callif 1, AquaHideout_B1F_EventScript_15D846 + call_if 1, AquaHideout_B1F_EventScript_15D846 end AquaHideout_B1F_EventScript_15D846:: @ 815D846 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index f4f50d90b..cfb4ba855 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -5,7 +5,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 BattleTower_Corridor_MapScript1_160850:: @ 8160850 compare 0x8006, 1 - jumpeq BattleTower_Corridor_EventScript_16086E + goto_if_eq BattleTower_Corridor_EventScript_16086E setmaptile 12, 0, 519, 0 setmaptile 12, 1, 527, 0 end @@ -22,7 +22,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar 0x4000, 1 compare 0x8006, 1 - jumpeq BattleTower_Corridor_EventScript_1608B1 + goto_if_eq BattleTower_Corridor_EventScript_1608B1 move 1, BattleTower_Corridor_Movement_1608D5 move 255, BattleTower_Corridor_Movement_1608D4 waitmove 0 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 50c9c9152..fc5cee29a 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -14,12 +14,12 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar 0x8004, 10 special sub_8135668 checkflag 238 - jumpeq BattleTower_Lobby_EventScript_1602E4 + goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag 237 - jumpeq BattleTower_Lobby_EventScript_1602CD + goto_if_eq BattleTower_Lobby_EventScript_1602CD specialval 0x8007, sub_810F404 compare 0x8007, 50 - jumpif 0, BattleTower_Lobby_EventScript_1602E4 + goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC return @@ -27,7 +27,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialval 0x8007, sub_810F404 compare 0x8007, 100 - jumpif 0, BattleTower_Lobby_EventScript_1602E4 + goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC return @@ -78,10 +78,10 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 setvar 0x8004, 0 special sub_81358A4 compare RESULT, 6 - jumpeq BattleTower_Lobby_EventScript_16037D + goto_if_eq BattleTower_Lobby_EventScript_16037D special sub_8135E50 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_16037D + goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waittext fanfare 370 @@ -92,7 +92,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar 0x8004, 8 special sub_81358A4 compare RESULT, 1 - jumpeq BattleTower_Lobby_EventScript_1603AD + goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waittext setvar 0x8004, 13 @@ -119,7 +119,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar 0x8004, 9 special sub_81358A4 compare RESULT, 49 - jumpif 5, BattleTower_Lobby_EventScript_1603F8 + goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 @@ -187,7 +187,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E setvar 0x8004, 0 special sub_81358A4 compare RESULT, 6 - jumpeq BattleTower_Lobby_EventScript_160342 + goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty msgbox BattleTower_Lobby_Text_199F2C, 4 @@ -210,7 +210,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist compare 0x8004, 1 - jumpeq BattleTower_Lobby_EventScript_16060D + goto_if_eq BattleTower_Lobby_EventScript_16060D setvar 0x8004, 1 copyvar 0x8005, RESULT copyvar 0x8006, RESULT @@ -220,7 +220,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA special ChooseBattleTowerPlayerParty waitstate compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_16064F + goto_if_eq BattleTower_Lobby_EventScript_16064F msgbox BattleTower_Lobby_Text_199FDA, 5 switch RESULT case 0, BattleTower_Lobby_EventScript_16064F @@ -246,7 +246,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar 0x4000, 5 hidebox 0, 0, 15, 10 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_160642 + goto_if_eq BattleTower_Lobby_EventScript_160642 inccounter GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty special sub_8135A14 @@ -348,9 +348,9 @@ BattleTower_Lobby_EventScript_1606CC:: @ 81606CC lock faceplayer compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_160701 + goto_if_eq BattleTower_Lobby_EventScript_160701 compare RESULT, 1 - jumpeq BattleTower_Lobby_EventScript_16070B + goto_if_eq BattleTower_Lobby_EventScript_16070B end BattleTower_Lobby_EventScript_1606F7:: @ 81606F7 @@ -388,14 +388,14 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 lock faceplayer checkflag 238 - jumpeq BattleTower_Lobby_EventScript_1607C5 + goto_if_eq BattleTower_Lobby_EventScript_1607C5 checkflag 237 - jumpeq BattleTower_Lobby_EventScript_160773 + goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar 0x8008, 42 givedecoration 42 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_1607AF + goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 237 msgbox BattleTower_Lobby_Text_19ABAA, 4 release @@ -404,12 +404,12 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 BattleTower_Lobby_EventScript_160773:: @ 8160773 specialval RESULT, sub_810F404 compare RESULT, 100 - jumpif 0, BattleTower_Lobby_EventScript_1607C5 + goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar 0x8008, 43 givedecoration 43 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_1607AF + goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 238 msgbox BattleTower_Lobby_Text_19ABAA, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 01e10ebd3..77f8b39b6 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -14,7 +14,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 msgbox BattleTower_Outside_Text_199D06, 4 checkitem ITEM_SS_TICKET, 1 compare RESULT, 0 - jumpeq BattleTower_Outside_EventScript_1601C6 + goto_if_eq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D waittext goto BattleTower_Outside_EventScript_16018E @@ -37,7 +37,7 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 BattleTower_Outside_EventScript_1601D0:: @ 81601D0 msgbox BattleTower_Outside_Text_199DF2, 5 compare RESULT, 0 - jumpeq BattleTower_Outside_EventScript_160226 + goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 warp SlateportCity_Harbor, 255, 8, 11 @@ -48,7 +48,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 BattleTower_Outside_EventScript_1601FB:: @ 81601FB msgbox BattleTower_Outside_Text_199E0E, 5 compare RESULT, 0 - jumpeq BattleTower_Outside_EventScript_160226 + goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 warp LilycoveCity_Harbor, 255, 8, 11 diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc index 7fd365b36..3ad36cc18 100644 --- a/data/scripts/maps/CaveOfOrigin_1F.inc +++ b/data/scripts/maps/CaveOfOrigin_1F.inc @@ -4,5 +4,5 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 checkflag 113 - callif 1, CaveOfOrigin_1F_EventScript_1A04E3 + call_if 1, CaveOfOrigin_1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc index 9603ae83b..c3bbdd45f 100644 --- a/data/scripts/maps/CaveOfOrigin_B1F.inc +++ b/data/scripts/maps/CaveOfOrigin_B1F.inc @@ -4,5 +4,5 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 checkflag 113 - callif 1, CaveOfOrigin_B1F_EventScript_1A04E3 + call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc index 6b3a55648..fb65de171 100644 --- a/data/scripts/maps/CaveOfOrigin_B2F.inc +++ b/data/scripts/maps/CaveOfOrigin_B2F.inc @@ -4,5 +4,5 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 checkflag 113 - callif 1, CaveOfOrigin_B2F_EventScript_1A04E3 + call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc index 8e61048d2..c21b04e91 100644 --- a/data/scripts/maps/CaveOfOrigin_B3F.inc +++ b/data/scripts/maps/CaveOfOrigin_B3F.inc @@ -4,5 +4,5 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 checkflag 113 - callif 1, CaveOfOrigin_B3F_EventScript_1A04E3 + call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 5517a9c7e..f5ce8138f 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 checkflag 2145 - callif 1, CaveOfOrigin_B4F_EventScript_15DDC1 + call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 end CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 @@ -20,7 +20,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 checkflag 113 - callif 1, CaveOfOrigin_B4F_EventScript_1A04E3 + call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3 end CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 @@ -67,7 +67,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 clearflag 2145 specialval RESULT, sub_810E300 compare RESULT, 1 - callif 1, CaveOfOrigin_B4F_EventScript_15DE73 + call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag 816 setflag 855 setflag 856 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 97a22bae3..ab094c824 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -6,7 +6,7 @@ DesertRuins_MapScripts:: @ 815CAF3 DesertRuins_MapScript1_15CB03:: @ 815CB03 checkflag 2145 - callif 1, DesertRuins_EventScript_15CB0D + call_if 1, DesertRuins_EventScript_15CB0D end DesertRuins_EventScript_15CB0D:: @ 815CB0D @@ -15,7 +15,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D DesertRuins_MapScript1_15CB11:: @ 815CB11 checkflag 2128 - callif 0, DesertRuins_EventScript_15CB1B + call_if 0, DesertRuins_EventScript_15CB1B end DesertRuins_EventScript_15CB1B:: @ 815CB1B @@ -34,7 +34,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall checkflag 2128 - jumpeq DesertRuins_EventScript_15CB6D + goto_if_eq DesertRuins_EventScript_15CB6D braillemsg DesertRuins_Braille_1C54C8 waitbutton hidebox 0, 0, 29, 19 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 9a914fcd8..f30c202c8 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -10,7 +10,7 @@ DewfordTown_EventScript_14E002:: @ 814E002 lock faceplayer checkflag 189 - jumpif 0, DewfordTown_EventScript_14E076 + goto_if 0, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 waittext multichoicedef 21, 6, 0, 2, 0 @@ -44,7 +44,7 @@ DewfordTown_EventScript_14E06B:: @ 814E06B DewfordTown_EventScript_14E076:: @ 814E076 msgbox DewfordTown_Text_16B3BC, 5 compare RESULT, 1 - jumpeq DewfordTown_EventScript_14E093 + goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release end @@ -75,12 +75,12 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 lock faceplayer checkflag 257 - jumpeq DewfordTown_EventScript_14E11B + goto_if_eq DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, 5 compare RESULT, 1 - jumpeq DewfordTown_EventScript_14E0F0 + goto_if_eq DewfordTown_EventScript_14E0F0 compare RESULT, 0 - jumpeq DewfordTown_EventScript_14E111 + goto_if_eq DewfordTown_EventScript_14E111 end DewfordTown_EventScript_14E0F0:: @ 814E0F0 @@ -101,9 +101,9 @@ DewfordTown_EventScript_14E11B:: @ 814E11B waittext multichoice 20, 8, 50, 1 compare RESULT, 0 - jumpeq DewfordTown_EventScript_14E13D + goto_if_eq DewfordTown_EventScript_14E13D compare RESULT, 1 - jumpeq DewfordTown_EventScript_14E147 + goto_if_eq DewfordTown_EventScript_14E147 end DewfordTown_EventScript_14E13D:: @ 814E13D @@ -177,9 +177,9 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 setflag 743 spriteinvisible 4, 0, 11 checkflag 149 - callif 0, DewfordTown_EventScript_14E281 + call_if 0, DewfordTown_EventScript_14E281 checkflag 149 - callif 1, DewfordTown_EventScript_14E28A + call_if 1, DewfordTown_EventScript_14E28A closebutton copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 11 @@ -600,9 +600,9 @@ DewfordTown_EventScript_14E413:: @ 814E413 call DewfordTown_EventScript_1A0102 msgbox DewfordTown_Text_16B9CE, 5 compare RESULT, 1 - jumpeq DewfordTown_EventScript_14E439 + goto_if_eq DewfordTown_EventScript_14E439 compare RESULT, 0 - jumpeq DewfordTown_EventScript_14E443 + goto_if_eq DewfordTown_EventScript_14E443 end DewfordTown_EventScript_14E439:: @ 814E439 @@ -617,15 +617,15 @@ DewfordTown_EventScript_14E443:: @ 814E443 lock faceplayer compare RESULT, 1 - jumpeq DewfordTown_EventScript_14E46E + goto_if_eq DewfordTown_EventScript_14E46E compare RESULT, 0 - jumpeq DewfordTown_EventScript_14E485 + goto_if_eq DewfordTown_EventScript_14E485 end DewfordTown_EventScript_14E46E:: @ 814E46E inccounter GAME_STAT_STARTED_TRENDS compare 0x8004, 0 - jumpeq DewfordTown_EventScript_14E48F + goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 457f510f0..cf484a546 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -8,15 +8,15 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B DewfordTown_Gym_EventScript_153071:: @ 8153071 checktrainerflag OPPONENT_BRAWLY - jumpeq DewfordTown_Gym_EventScript_1530AA + goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar 0x8001, 0x8000 compare 0x8000, 0 - jumpeq DewfordTown_Gym_EventScript_1530BA + goto_if_eq DewfordTown_Gym_EventScript_1530BA compare 0x8000, 1 - jumpeq DewfordTown_Gym_EventScript_1530B6 + goto_if_eq DewfordTown_Gym_EventScript_1530B6 compare 0x8000, 2 - jumpeq DewfordTown_Gym_EventScript_1530B2 + goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE DewfordTown_Gym_EventScript_1530AA:: @ 81530AA @@ -43,14 +43,14 @@ DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 comparevars 0x8000, 0x8001 - jumpeq DewfordTown_Gym_EventScript_1530F5 + goto_if_eq DewfordTown_Gym_EventScript_1530F5 copyvar 0x8001, 0x8000 compare 0x8000, 1 - jumpeq DewfordTown_Gym_EventScript_1530F6 + goto_if_eq DewfordTown_Gym_EventScript_1530F6 compare 0x8000, 2 - jumpeq DewfordTown_Gym_EventScript_153101 + goto_if_eq DewfordTown_Gym_EventScript_153101 compare 0x8000, 3 - jumpeq DewfordTown_Gym_EventScript_15310C + goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 return @@ -82,17 +82,17 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar 0x8000, 0 checktrainerflag OPPONENT_HIDEKI - jumpif 0, DewfordTown_Gym_EventScript_153135 + goto_if 0, DewfordTown_Gym_EventScript_153135 addvar 0x8000, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA - jumpif 0, DewfordTown_Gym_EventScript_153143 + goto_if 0, DewfordTown_Gym_EventScript_153143 addvar 0x8000, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA - jumpif 0, DewfordTown_Gym_EventScript_153151 + goto_if 0, DewfordTown_Gym_EventScript_153151 addvar 0x8000, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 @@ -101,7 +101,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151 DewfordTown_Gym_EventScript_153152:: @ 8153152 trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 checkflag 166 - jumpif 0, DewfordTown_Gym_EventScript_1531B5 + goto_if 0, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release end @@ -116,7 +116,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag 2056 addvar 0x4085, 1 compare 0x4085, 6 - callif 1, DewfordTown_Gym_EventScript_1A00FB + call_if 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 @@ -125,7 +125,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 giveitem ITEM_TM08 compare RESULT, 0 - jumpeq DewfordTown_Gym_EventScript_1A029B + goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 setflag 166 release @@ -165,7 +165,7 @@ DewfordTown_Gym_EventScript_15323F:: @ 815323F lock faceplayer checkflag 1204 - jumpeq DewfordTown_Gym_EventScript_153254 + goto_if_eq DewfordTown_Gym_EventScript_153254 msgbox DewfordTown_Gym_Text_174D98, 4 release end @@ -178,14 +178,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall checkflag 2056 - jumpeq DewfordTown_Gym_EventScript_15327E + goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall checkflag 2056 - jumpeq DewfordTown_Gym_EventScript_15327E + goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 70689f7ac..cc096080e 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -7,7 +7,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 call DewfordTown_Hall_EventScript_1A0102 special sub_80FA5E4 compare RESULT, 1 - jumpeq DewfordTown_Hall_EventScript_1532B2 + goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 release end @@ -32,9 +32,9 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD special sub_80EB83C msgbox DewfordTown_Hall_Text_1755F9, 5 compare RESULT, 1 - jumpeq DewfordTown_Hall_EventScript_1532F6 + goto_if_eq DewfordTown_Hall_EventScript_1532F6 compare RESULT, 0 - jumpeq DewfordTown_Hall_EventScript_153300 + goto_if_eq DewfordTown_Hall_EventScript_153300 end DewfordTown_Hall_EventScript_1532F6:: @ 81532F6 @@ -192,14 +192,14 @@ DewfordTown_Hall_EventScript_1534FD:: @ 81534FD move 8, DewfordTown_Hall_Movement_153599 waitmove 0 compare 0x8008, 0 - jumpeq DewfordTown_Hall_EventScript_15351E + goto_if_eq DewfordTown_Hall_EventScript_15351E compare 0x8008, 1 - jumpeq DewfordTown_Hall_EventScript_153534 + goto_if_eq DewfordTown_Hall_EventScript_153534 end DewfordTown_Hall_EventScript_15351E:: @ 815351E compare FACING, 4 - jumpeq DewfordTown_Hall_EventScript_1534FC + goto_if_eq DewfordTown_Hall_EventScript_1534FC move 255, DewfordTown_Hall_Movement_1A0843 waitmove 0 return @@ -211,16 +211,16 @@ DewfordTown_Hall_EventScript_153535:: @ 8153535 move 7, DewfordTown_Hall_Movement_15359B waitmove 0 compare 0x8008, 0 - jumpeq DewfordTown_Hall_EventScript_153556 + goto_if_eq DewfordTown_Hall_EventScript_153556 compare 0x8008, 1 - jumpeq DewfordTown_Hall_EventScript_153583 + goto_if_eq DewfordTown_Hall_EventScript_153583 end DewfordTown_Hall_EventScript_153556:: @ 8153556 compare FACING, 2 - callif 1, DewfordTown_Hall_EventScript_15356D + call_if 1, DewfordTown_Hall_EventScript_15356D compare FACING, 1 - callif 1, DewfordTown_Hall_EventScript_153578 + call_if 1, DewfordTown_Hall_EventScript_153578 return DewfordTown_Hall_EventScript_15356D:: @ 815356D @@ -235,7 +235,7 @@ DewfordTown_Hall_EventScript_153578:: @ 8153578 DewfordTown_Hall_EventScript_153583:: @ 8153583 compare FACING, 3 - jumpeq DewfordTown_Hall_EventScript_1534FC + goto_if_eq DewfordTown_Hall_EventScript_1534FC move 255, DewfordTown_Hall_Movement_1A083F waitmove 0 return @@ -253,11 +253,11 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D faceplayer call DewfordTown_Hall_EventScript_1A0102 checkflag 230 - jumpeq DewfordTown_Hall_EventScript_1535D1 + goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem ITEM_TM36 compare RESULT, 0 - jumpeq DewfordTown_Hall_EventScript_1A029B + goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag 230 release end diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index 529f8bb24..befe47404 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -5,11 +5,11 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC lock faceplayer checkflag 289 - jumpeq DewfordTown_House2_EventScript_153615 + goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem ITEM_SILK_SCARF compare RESULT, 0 - jumpeq DewfordTown_House2_EventScript_15360B + goto_if_eq DewfordTown_House2_EventScript_15360B setflag 289 release end diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index 9b6d2a8b7..c9768d006 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -4,7 +4,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB checkflag 2090 - callif 1, EverGrandeCity_EventScript_1A02C1 + call_if 1, EverGrandeCity_EventScript_1A02C1 end EverGrandeCity_EventScript_14D4E5:: @ 814D4E5 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 4d2179cc1..2b0f9545f 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -54,16 +54,16 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playsfx 8 checkgender compare RESULT, 0 - callif 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C compare RESULT, 1 - callif 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 reappear 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkgender compare RESULT, 0 - jumpeq EverGrandeCity_ChampionsRoom_EventScript_15B886 + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 compare RESULT, 1 - jumpeq EverGrandeCity_ChampionsRoom_EventScript_15B8BB + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C @@ -129,9 +129,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkgender compare RESULT, 0 - callif 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB compare RESULT, 1 - callif 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closebutton move 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF move 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 55e38da15..3ddcb6ef3 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -25,9 +25,9 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 checkflag 1248 - callif 1, EverGrandeCity_DrakesRoom_EventScript_15B758 + call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 compare 0x409c, 4 - callif 1, EverGrandeCity_DrakesRoom_EventScript_15B75E + call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E end EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758 @@ -42,7 +42,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer checkflag 1248 - jumpeq EverGrandeCity_DrakesRoom_EventScript_15B78B + goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B playmusic 450, 0 msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 9271f3da9..2526b2ea6 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -25,9 +25,9 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 checkflag 1247 - callif 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE + call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE compare 0x409c, 3 - callif 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 + call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE @@ -42,7 +42,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer checkflag 1247 - jumpeq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 + goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playmusic 450, 0 msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 175990328..0999f9a4d 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -45,9 +45,9 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkgender compare RESULT, 0 - jumpeq EverGrandeCity_HallOfFame_EventScript_15BC41 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 compare RESULT, 1 - jumpeq EverGrandeCity_HallOfFame_EventScript_15BC4D + goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D end EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 9b693c227..9e2c4c0b7 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -25,9 +25,9 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F checkflag 1246 - callif 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 + call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 compare 0x409c, 2 - callif 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A + call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A end EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624 @@ -42,7 +42,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer checkflag 1246 - jumpeq EverGrandeCity_PhoebesRoom_EventScript_15B657 + goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 playmusic 450, 0 msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index bfb3cdc1b..7065bdefe 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -6,7 +6,7 @@ EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B sethealplace 20 setflag 2132 checkflag 263 - callif 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B + call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B end EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B @@ -48,17 +48,17 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall checkflag 263 - jumpeq EverGrandeCity_PokemonLeague_EventScript_15BB57 + goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy 0x4000, 0x4001 compare 0x4000, 11 - callif 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 + call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 compare 0x4000, 8 - callif 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F + call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waittext pause 75 checkflag 2060 - jumpif 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A + goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closebutton move 3, EverGrandeCity_PokemonLeague_Movement_15BB7E move 4, EverGrandeCity_PokemonLeague_Movement_15BB81 diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index bbb95e0ad..d9e7a8213 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -6,9 +6,9 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F checkflag 1245 - callif 1, EverGrandeCity_SidneysRoom_EventScript_15B564 + call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 compare 0x409c, 1 - callif 1, EverGrandeCity_SidneysRoom_EventScript_15B56A + call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A end EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564 @@ -43,7 +43,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer checkflag 1245 - jumpeq EverGrandeCity_SidneysRoom_EventScript_15B5BD + goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD playmusic 450, 0 msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index a48be5b24..043588ed5 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -13,7 +13,7 @@ FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer checkflag 139 - jumpeq FallarborTown_EventScript_14E80A + goto_if_eq FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index ed67d922d..1dddf43de 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -93,7 +93,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 checkflag 270 - jumpeq FallarborTown_ContestLobby_EventScript_153AA9 + goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9 msgbox FallarborTown_ContestLobby_Text_177246, 2 end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 8a44cdcfb..0228fe25d 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -9,25 +9,25 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 lock faceplayer checkflag 229 - jumpeq FallarborTown_House1_EventScript_153C54 + goto_if_eq FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 compare RESULT, 1 - jumpeq FallarborTown_House1_EventScript_153BDA + goto_if_eq FallarborTown_House1_EventScript_153BDA msgbox FallarborTown_House1_Text_177755, 4 release end FallarborTown_House1_EventScript_153BDA:: @ 8153BDA checkflag 2 - callif 0, FallarborTown_House1_EventScript_153C2D + call_if 0, FallarborTown_House1_EventScript_153C2D checkflag 2 - callif 1, FallarborTown_House1_EventScript_153C3E + call_if 1, FallarborTown_House1_EventScript_153C3E compare RESULT, 0 - jumpeq FallarborTown_House1_EventScript_153C47 + goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem ITEM_TM27 compare RESULT, 0 - jumpeq FallarborTown_House1_EventScript_1A029B + goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 call FallarborTown_House1_EventScript_1A067F setflag 229 @@ -59,9 +59,9 @@ FallarborTown_House1_EventScript_153C5E:: @ 8153C5E lock faceplayer checkflag 229 - jumpeq FallarborTown_House1_EventScript_153C86 + goto_if_eq FallarborTown_House1_EventScript_153C86 checkflag 139 - jumpeq FallarborTown_House1_EventScript_153C7C + goto_if_eq FallarborTown_House1_EventScript_153C7C msgbox FallarborTown_House1_Text_177A2B, 4 release end diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index c36036ce3..5ecc475ea 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -6,7 +6,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 move 1, FallarborTown_House2_Movement_1A0839 waitmove 0 checkflag 1 - jumpeq FallarborTown_House2_EventScript_153CB6 + goto_if_eq FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 setflag 1 goto FallarborTown_House2_EventScript_153CB6 @@ -15,7 +15,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 compare RESULT, 0 - jumpeq FallarborTown_House2_EventScript_153D60 + goto_if_eq FallarborTown_House2_EventScript_153D60 msgbox FallarborTown_House2_Text_177BDB, 5 switch RESULT case 0, FallarborTown_House2_EventScript_153D60 @@ -27,12 +27,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 special sub_80F9A4C waitstate compare 0x8004, 255 - jumpeq FallarborTown_House2_EventScript_153D60 + goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 compare RESULT, 1 - jumpeq FallarborTown_House2_EventScript_153D52 + goto_if_eq FallarborTown_House2_EventScript_153D52 compare 0x8005, 0 - jumpeq FallarborTown_House2_EventScript_153D44 + goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -41,7 +41,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A special sub_8132670 waitstate compare 0x8004, 0 - jumpeq FallarborTown_House2_EventScript_153CE4 + goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 removeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_153D60 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 7f9d5ae12..b5426de8e 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -19,7 +19,7 @@ FortreeCity_EventScript_14C95E:: @ 814C95E lock faceplayer checkflag 295 - jumpeq FortreeCity_EventScript_14C973 + goto_if_eq FortreeCity_EventScript_14C973 msgbox FortreeCity_Text_1675C2, 4 release end @@ -58,7 +58,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 faceplayer checkitem ITEM_DEVON_SCOPE, 1 compare RESULT, 1 - jumpeq FortreeCity_EventScript_14C9CF + goto_if_eq FortreeCity_EventScript_14C9CF msgbox FortreeCity_Text_167868, 4 release end @@ -66,7 +66,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 FortreeCity_EventScript_14C9CF:: @ 814C9CF msgbox FortreeCity_Text_16788B, 5 compare RESULT, 1 - jumpeq FortreeCity_EventScript_14C9E4 + goto_if_eq FortreeCity_EventScript_14C9E4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 971b05f1b..8744141cb 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -18,7 +18,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 checkflag 170 - jumpif 0, FortreeCity_Gym_EventScript_157F3E + goto_if 0, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release end @@ -38,7 +38,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E giveitem ITEM_TM40 compare RESULT, 0 - jumpeq FortreeCity_Gym_EventScript_1A029B + goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 setflag 170 release @@ -68,7 +68,7 @@ FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE lock faceplayer checkflag 1225 - jumpeq FortreeCity_Gym_EventScript_157FD3 + goto_if_eq FortreeCity_Gym_EventScript_157FD3 msgbox FortreeCity_Gym_Text_18589C, 4 release end @@ -81,14 +81,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall checkflag 2060 - jumpeq FortreeCity_Gym_EventScript_157FFD + goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall checkflag 2060 - jumpeq FortreeCity_Gym_EventScript_157FFD + goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index f5bda05ab..446831c33 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -5,24 +5,24 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 lock faceplayer checkflag 155 - jumpeq FortreeCity_House1_EventScript_157EAD + goto_if_eq FortreeCity_House1_EventScript_157EAD setvar 0x8008, 1 copyvar 0x8004, 0x8008 specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 - jumpeq FortreeCity_House1_EventScript_157E95 + goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 compare 0x8004, 255 - jumpeq FortreeCity_House1_EventScript_157E95 + goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT comparevars RESULT, 0x8009 - jumpif 5, FortreeCity_House1_EventScript_157E9F + goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a special sub_804DB68 diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index ea4aad3d8..f210dd3ac 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -5,9 +5,9 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 lock faceplayer checkflag 264 - jumpeq FortreeCity_House2_EventScript_158157 + goto_if_eq FortreeCity_House2_EventScript_158157 checkflag 118 - callif 0, FortreeCity_House2_EventScript_15814B + call_if 0, FortreeCity_House2_EventScript_15814B msgbox FortreeCity_House2_Text_186360, 4 multichoice 21, 8, 54, 1 switch RESULT @@ -23,7 +23,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 msgbox FortreeCity_House2_Text_1864C6, 4 giveitem ITEM_TM10 compare RESULT, 0 - jumpeq FortreeCity_House2_EventScript_1A029B + goto_if_eq FortreeCity_House2_EventScript_1A029B setflag 264 msgbox FortreeCity_House2_Text_18652F, 4 release diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 33d0ed1ae..5de611399 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -8,11 +8,11 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F FortreeCity_House4_EventScript_158188:: @ 8158188 lockall checkflag 223 - jumpeq FortreeCity_House4_EventScript_158204 + goto_if_eq FortreeCity_House4_EventScript_158204 checkflag 224 - jumpeq FortreeCity_House4_EventScript_1581D6 + goto_if_eq FortreeCity_House4_EventScript_1581D6 checkflag 222 - jumpeq FortreeCity_House4_EventScript_1581C2 + goto_if_eq FortreeCity_House4_EventScript_1581C2 msgbox FortreeCity_House4_Text_186835, 4 closebutton setflag 222 @@ -36,7 +36,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 msgbox FortreeCity_House4_Text_186881, 4 giveitem ITEM_MENTAL_HERB compare RESULT, 0 - jumpeq FortreeCity_House4_EventScript_1A029B + goto_if_eq FortreeCity_House4_EventScript_1A029B setflag 223 releaseall end diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index 59aaa2fc3..f389a774e 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -5,7 +5,7 @@ GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 lock faceplayer checkflag 109 - jumpeq GraniteCave_1F_EventScript_15CBD3 + goto_if_eq GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 giveitem ITEM_HM05 setflag 109 diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 895241406..004c3d679 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -11,17 +11,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem ITEM_TM47 compare RESULT, 0 - callif 1, GraniteCave_StevensRoom_EventScript_15CC83 + call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closebutton compare FACING, 2 - callif 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 1 - callif 1, GraniteCave_StevensRoom_EventScript_15CC78 + call_if 1, GraniteCave_StevensRoom_EventScript_15CC78 compare FACING, 3 - callif 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 4 - callif 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D playsfx 9 disappear 1 release diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 0c26f0f88..a265b97e1 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -18,9 +18,9 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 setflag 0x4000 checkgender compare RESULT, 0 - jumpeq InsideOfTruck_EventScript_15FC45 + goto_if_eq InsideOfTruck_EventScript_15FC45 compare RESULT, 1 - jumpeq InsideOfTruck_EventScript_15FC68 + goto_if_eq InsideOfTruck_EventScript_15FC68 end InsideOfTruck_EventScript_15FC45:: @ 815FC45 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index e706914d7..73523c460 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -6,7 +6,7 @@ IslandCave_MapScripts:: @ 815EEB6 IslandCave_MapScript1_15EEC6:: @ 815EEC6 checkflag 2145 - callif 1, IslandCave_EventScript_15EED0 + call_if 1, IslandCave_EventScript_15EED0 end IslandCave_EventScript_15EED0:: @ 815EED0 @@ -15,7 +15,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0 IslandCave_MapScript1_15EED4:: @ 815EED4 checkflag 2129 - callif 0, IslandCave_EventScript_15EEDE + call_if 0, IslandCave_EventScript_15EEDE end IslandCave_EventScript_15EEDE:: @ 815EEDE @@ -46,7 +46,7 @@ S_OpenRegiceChamber:: @ 815EF19 IslandCave_EventScript_15EF59:: @ 815EF59 lockall checkflag 2129 - jumpeq IslandCave_EventScript_15EF72 + goto_if_eq IslandCave_EventScript_15EF72 braillemsg IslandCave_Braille_1C54FC special DoBrailleWait waitstate @@ -62,7 +62,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemsg IslandCave_Braille_1C54FC checkflag 2129 - jumpeq IslandCave_EventScript_15EF95 + goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait waitstate goto IslandCave_EventScript_15EF95 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 151f1ec79..e80894dc2 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -9,7 +9,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 JaggedPass_MapScript1_15D274:: @ 815D274 compare 0x40bd, 1 - callif 1, JaggedPass_EventScript_15D280 + call_if 1, JaggedPass_EventScript_15D280 end JaggedPass_EventScript_15D280:: @ 815D280 @@ -26,7 +26,7 @@ JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq JaggedPass_EventScript_15D2C3 + goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 end @@ -39,7 +39,7 @@ JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq JaggedPass_EventScript_15D301 + goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 125b2d42b..ca476eb97 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -6,11 +6,11 @@ LavaridgeTown_MapScripts:: @ 814E4A3 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE setflag 2066 checkflag 139 - callif 1, LavaridgeTown_EventScript_14E4DF + call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 compare 0x4053, 2 - callif 1, LavaridgeTown_EventScript_14E4D0 + call_if 1, LavaridgeTown_EventScript_14E4D0 end LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 @@ -45,16 +45,16 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED waitmove 0 checkgender compare RESULT, 0 - callif 1, LavaridgeTown_EventScript_14E56B + call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 - callif 1, LavaridgeTown_EventScript_14E570 + call_if 1, LavaridgeTown_EventScript_14E570 compare 0x8008, 1 - callif 1, LavaridgeTown_EventScript_14E68F + call_if 1, LavaridgeTown_EventScript_14E68F checkgender compare RESULT, 0 - jumpeq LavaridgeTown_EventScript_14E5AB + goto_if_eq LavaridgeTown_EventScript_14E5AB compare RESULT, 1 - jumpeq LavaridgeTown_EventScript_14E5D0 + goto_if_eq LavaridgeTown_EventScript_14E5D0 end LavaridgeTown_EventScript_14E56B:: @ 814E56B @@ -71,14 +71,14 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 setvar 0x8008, 0 checkgender compare RESULT, 0 - callif 1, LavaridgeTown_EventScript_14E56B + call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 - callif 1, LavaridgeTown_EventScript_14E570 + call_if 1, LavaridgeTown_EventScript_14E570 checkgender compare RESULT, 0 - jumpeq LavaridgeTown_EventScript_14E5AB + goto_if_eq LavaridgeTown_EventScript_14E5AB compare RESULT, 1 - jumpeq LavaridgeTown_EventScript_14E5D0 + goto_if_eq LavaridgeTown_EventScript_14E5D0 end LavaridgeTown_EventScript_14E5AB:: @ 814E5AB @@ -100,22 +100,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closebutton compare 0x8008, 1 - callif 1, LavaridgeTown_EventScript_14E646 + call_if 1, LavaridgeTown_EventScript_14E646 compare 0x8008, 0 - callif 1, LavaridgeTown_EventScript_14E64E + call_if 1, LavaridgeTown_EventScript_14E64E disappear 8 reappear 7 pause 30 compare 0x8008, 1 - callif 1, LavaridgeTown_EventScript_14E69A + call_if 1, LavaridgeTown_EventScript_14E69A compare 0x8008, 0 - callif 1, LavaridgeTown_EventScript_14E6A5 + call_if 1, LavaridgeTown_EventScript_14E6A5 disappear 7 setvar 0x4053, 2 playmusicbattle 0 fadedefault compare 0x8008, 0 - jumpeq LavaridgeTown_EventScript_14E644 + goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end @@ -129,13 +129,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 LavaridgeTown_EventScript_14E64E:: @ 814E64E compare FACING, 2 - callif 1, LavaridgeTown_EventScript_14E67B + call_if 1, LavaridgeTown_EventScript_14E67B compare FACING, 1 - callif 1, LavaridgeTown_EventScript_14E680 + call_if 1, LavaridgeTown_EventScript_14E680 compare FACING, 3 - callif 1, LavaridgeTown_EventScript_14E685 + call_if 1, LavaridgeTown_EventScript_14E685 compare FACING, 4 - callif 1, LavaridgeTown_EventScript_14E68A + call_if 1, LavaridgeTown_EventScript_14E68A return LavaridgeTown_EventScript_14E67B:: @ 814E67B @@ -166,13 +166,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 compare FACING, 2 - callif 1, LavaridgeTown_EventScript_14E6D2 + call_if 1, LavaridgeTown_EventScript_14E6D2 compare FACING, 1 - callif 1, LavaridgeTown_EventScript_14E6D2 + call_if 1, LavaridgeTown_EventScript_14E6D2 compare FACING, 3 - callif 1, LavaridgeTown_EventScript_14E6DD + call_if 1, LavaridgeTown_EventScript_14E6DD compare FACING, 4 - callif 1, LavaridgeTown_EventScript_14E6D2 + call_if 1, LavaridgeTown_EventScript_14E6D2 return LavaridgeTown_EventScript_14E6D2:: @ 814E6D2 @@ -238,7 +238,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E LavaridgeTown_EventScript_14E710:: @ 814E710 specialval RESULT, player_get_direction_lower_nybble compare RESULT, 1 - jumpeq LavaridgeTown_EventScript_14E721 + goto_if_eq LavaridgeTown_EventScript_14E721 end LavaridgeTown_EventScript_14E721:: @ 814E721 @@ -273,13 +273,13 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A lock faceplayer checkflag 266 - jumpeq LavaridgeTown_EventScript_14E79E + goto_if_eq LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, 5 compare RESULT, 0 - jumpeq LavaridgeTown_EventScript_14E7B2 + goto_if_eq LavaridgeTown_EventScript_14E7B2 countpokemon compare RESULT, 6 - jumpeq LavaridgeTown_EventScript_14E7A8 + goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag 266 fanfare 370 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 1f5810e7f..e22d4471f 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -14,27 +14,27 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar 0x400e, 0 setvar 0x400f, 0 checktrainerflag OPPONENT_COLE - jumpeq LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6 setvar 0x400b, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 checktrainerflag OPPONENT_ZANE - jumpeq LavaridgeTown_Gym_1F_EventScript_1536D4 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4 setvar 0x400c, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 checktrainerflag OPPONENT_AXLE - jumpeq LavaridgeTown_Gym_1F_EventScript_1536E2 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2 setvar 0x400d, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 checktrainerflag OPPONENT_SADIE - jumpeq LavaridgeTown_Gym_1F_EventScript_1536F0 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0 setvar 0x400e, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 checktrainerflag OPPONENT_ANDY - jumpeq LavaridgeTown_Gym_1F_EventScript_1536FE + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE setvar 0x400f, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE @@ -42,27 +42,27 @@ LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF checktrainerflag OPPONENT_COLE - jumpeq LavaridgeTown_Gym_1F_EventScript_15370C + goto_if_eq LavaridgeTown_Gym_1F_EventScript_15370C spritebehave 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C checktrainerflag OPPONENT_ZANE - jumpeq LavaridgeTown_Gym_1F_EventScript_153719 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153719 spritebehave 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 checktrainerflag OPPONENT_AXLE - jumpeq LavaridgeTown_Gym_1F_EventScript_153726 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153726 spritebehave 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 checktrainerflag OPPONENT_SADIE - jumpeq LavaridgeTown_Gym_1F_EventScript_153733 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153733 spritebehave 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 checktrainerflag OPPONENT_ANDY - jumpeq LavaridgeTown_Gym_1F_EventScript_153740 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153740 spritebehave 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 @@ -71,7 +71,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 checkflag 168 - jumpif 0, LavaridgeTown_Gym_1F_EventScript_1537A7 + goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release end @@ -85,7 +85,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag 2058 addvar 0x4085, 1 compare 0x4085, 6 - callif 1, LavaridgeTown_Gym_1F_EventScript_1A00FB + call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag 806 @@ -96,7 +96,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 giveitem ITEM_TM50 compare RESULT, 0 - jumpeq LavaridgeTown_Gym_1F_EventScript_1A029B + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 setflag 168 release @@ -136,7 +136,7 @@ LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859 lock faceplayer checkflag 1213 - jumpeq LavaridgeTown_Gym_1F_EventScript_15386E + goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E msgbox LavaridgeTown_Gym_1F_Text_176312, 4 release end @@ -149,14 +149,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall checkflag 2058 - jumpeq LavaridgeTown_Gym_1F_EventScript_153898 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall checkflag 2058 - jumpeq LavaridgeTown_Gym_1F_EventScript_153898 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index 6ff103ce3..c924684bc 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -29,11 +29,11 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 lock faceplayer checkflag 254 - jumpeq LavaridgeTown_HerbShop_EventScript_153684 + goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem ITEM_CHARCOAL compare RESULT, 0 - jumpeq LavaridgeTown_HerbShop_EventScript_1A029B + goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag 254 release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 082e88bd5..f700988f9 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -8,7 +8,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 setvar 0x4086, 0 setflag 802 checkflag 2090 - callif 1, LilycoveCity_EventScript_1A02C1 + call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E end @@ -29,9 +29,9 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F setmaptile 72, 6, 445, 0 .endif checkflag 112 - callif 0, LilycoveCity_EventScript_14CABE + call_if 0, LilycoveCity_EventScript_14CABE checkflag 2061 - callif 1, LilycoveCity_EventScript_14CB2B + call_if 1, LilycoveCity_EventScript_14CB2B end LilycoveCity_EventScript_14CABE:: @ 814CABE @@ -65,13 +65,13 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 faceplayer checkdailyflags checkflag 2255 - jumpeq LilycoveCity_EventScript_14CBB4 + goto_if_eq LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq LilycoveCity_EventScript_1A029B + goto_if_eq LilycoveCity_EventScript_1A029B setflag 2255 msgbox LilycoveCity_Text_1C5B1D, 4 release @@ -90,7 +90,7 @@ LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer checkflag 2061 - jumpeq LilycoveCity_EventScript_14CBDC + goto_if_eq LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release end @@ -108,7 +108,7 @@ LilycoveCity_EventScript_14CBEF:: @ 814CBEF lock faceplayer checkflag 112 - jumpeq LilycoveCity_EventScript_14CC04 + goto_if_eq LilycoveCity_EventScript_14CC04 msgbox LilycoveCity_Text_1688C1, 4 release end @@ -122,7 +122,7 @@ LilycoveCity_EventScript_14CC0E:: @ 814CC0E lock faceplayer checkflag 112 - jumpeq LilycoveCity_EventScript_14CC23 + goto_if_eq LilycoveCity_EventScript_14CC23 msgbox LilycoveCity_Text_1689BF, 4 release end @@ -148,7 +148,7 @@ LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer checkflag 2061 - jumpeq LilycoveCity_EventScript_14CC5D + goto_if_eq LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release end @@ -187,7 +187,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall checkflag 2052 - jumpeq LilycoveCity_EventScript_14CCC0 + goto_if_eq LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall end @@ -212,7 +212,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC LilycoveCity_EventScript_14CCE5:: @ 814CCE5 lockall checkflag 218 - jumpeq LilycoveCity_EventScript_14CD18 + goto_if_eq LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 move LAST_TALKED, LilycoveCity_Movement_1A0839 waitmove 0 @@ -249,19 +249,19 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 faceplayer checkgender compare RESULT, 0 - jumpeq LilycoveCity_EventScript_14CD60 + goto_if_eq LilycoveCity_EventScript_14CD60 compare RESULT, 1 - jumpeq LilycoveCity_EventScript_14CDD3 + goto_if_eq LilycoveCity_EventScript_14CDD3 end LilycoveCity_EventScript_14CD60:: @ 814CD60 playmusic 415, 1 checkflag 286 - callif 1, LilycoveCity_EventScript_14CDB0 + call_if 1, LilycoveCity_EventScript_14CDB0 checkflag 286 - callif 0, LilycoveCity_EventScript_14CDB9 + call_if 0, LilycoveCity_EventScript_14CDB9 compare RESULT, 0 - jumpeq LilycoveCity_EventScript_14CDC2 + goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch 0x4023 case 0, LilycoveCity_EventScript_14CE46 @@ -288,11 +288,11 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 LilycoveCity_EventScript_14CDD3:: @ 814CDD3 playmusic 421, 1 checkflag 286 - callif 1, LilycoveCity_EventScript_14CE23 + call_if 1, LilycoveCity_EventScript_14CE23 checkflag 286 - callif 0, LilycoveCity_EventScript_14CE2C + call_if 0, LilycoveCity_EventScript_14CE2C compare RESULT, 0 - jumpeq LilycoveCity_EventScript_14CE35 + goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch 0x4023 case 0, LilycoveCity_EventScript_14CE76 @@ -350,11 +350,11 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 checkflag 2060 - callif 1, LilycoveCity_EventScript_14CEDE + call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 - callif 1, LilycoveCity_EventScript_14CEEE + call_if 1, LilycoveCity_EventScript_14CEEE compare RESULT, 1 - callif 1, LilycoveCity_EventScript_14CEF7 + call_if 1, LilycoveCity_EventScript_14CEF7 clearflag 722 clearflag 849 goto LilycoveCity_EventScript_14CF6B @@ -362,7 +362,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 LilycoveCity_EventScript_14CEDE:: @ 814CEDE checkflag 2062 - jumpeq LilycoveCity_EventScript_14CEE8 + goto_if_eq LilycoveCity_EventScript_14CEE8 return LilycoveCity_EventScript_14CEE8:: @ 814CEE8 @@ -375,7 +375,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE LilycoveCity_EventScript_14CEF7:: @ 814CEF7 checkflag 2052 - jumpeq LilycoveCity_EventScript_14CF09 + goto_if_eq LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -387,11 +387,11 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 checkflag 2060 - callif 1, LilycoveCity_EventScript_14CEDE + call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 - callif 1, LilycoveCity_EventScript_14CF47 + call_if 1, LilycoveCity_EventScript_14CF47 compare RESULT, 1 - callif 1, LilycoveCity_EventScript_14CF50 + call_if 1, LilycoveCity_EventScript_14CF50 clearflag 760 goto LilycoveCity_EventScript_14CF6B end @@ -402,7 +402,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 LilycoveCity_EventScript_14CF50:: @ 814CF50 checkflag 2052 - jumpeq LilycoveCity_EventScript_14CF62 + goto_if_eq LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index ebd59cd91..1abc71238 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -14,7 +14,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 checkflag 775 - jumpeq LilycoveCity_ContestLobby_EventScript_158898 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 setvar 0x4099, 0 end @@ -32,9 +32,9 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_1588DE + goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158918 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -45,7 +45,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE setvar 0x4099, 0 specialval RESULT, GiveMonArtistRibbon compare RESULT, 1 - callif 1, LilycoveCity_ContestLobby_EventScript_158948 + call_if 1, LilycoveCity_ContestLobby_EventScript_158948 move 4, LilycoveCity_ContestLobby_Movement_158A43 waitmove 0 disappear 4 @@ -57,7 +57,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_1588DE + goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton move 4, LilycoveCity_ContestLobby_Movement_158A43 @@ -189,7 +189,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B checkflag 775 - jumpeq LilycoveCity_ContestLobby_EventScript_158A6A + goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A setvar 0x4099, 0 end @@ -206,9 +206,9 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_158AAE + goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158AE8 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE @@ -218,7 +218,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE setvar 0x4099, 0 specialval RESULT, GiveMonArtistRibbon compare RESULT, 1 - callif 1, LilycoveCity_ContestLobby_EventScript_158B18 + call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 move 11, LilycoveCity_ContestLobby_Movement_158B6D waitmove 0 disappear 11 @@ -230,7 +230,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_158AAE + goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton move 11, LilycoveCity_ContestLobby_Movement_158B6D @@ -306,9 +306,9 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158BBA + goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA checkflag 2 - jumpeq LilycoveCity_ContestLobby_EventScript_158BAE + goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C waittext setflag 2 @@ -329,11 +329,11 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, 5 compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158C35 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog hidebox 0, 0, 15, 9 compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158C35 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 setflag 3 return @@ -362,18 +362,18 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 setvar CONTEST_RANK, 0 choosecontestpkmn compare 0x8004, 255 - jumpeq LilycoveCity_ContestLobby_EventScript_158CEA + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158C96 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_158CC0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 compare RESULT, 2 - jumpeq LilycoveCity_ContestLobby_EventScript_158CC0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 compare RESULT, 3 - jumpeq LilycoveCity_ContestLobby_EventScript_158CA4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4 compare RESULT, 4 - jumpeq LilycoveCity_ContestLobby_EventScript_158CB2 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2 end LilycoveCity_ContestLobby_EventScript_158C96:: @ 8158C96 @@ -403,7 +403,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA checkflag 3 - callif 0, LilycoveCity_ContestLobby_EventScript_158BC4 + call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4 message LilycoveCity_ContestLobby_Text_1886DC waittext multichoice 0, 0, 4, 0 @@ -421,11 +421,11 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 special sub_808363C waitstate compare RESULT, 3 - jumpeq LilycoveCity_ContestLobby_EventScript_158D90 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90 compare RESULT, 5 - jumpeq LilycoveCity_ContestLobby_EventScript_158DA1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 compare RESULT, 6 - jumpeq LilycoveCity_ContestLobby_EventScript_158DB2 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 message2 LilycoveCity_ContestLobby_Text_18872A waittext contestlinktransfer @@ -570,7 +570,7 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialval RESULT, sub_80C5044 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_158EE8 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 @@ -708,7 +708,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027 checkflag 150 - jumpif 0, LilycoveCity_ContestLobby_EventScript_159039 + goto_if 0, LilycoveCity_ContestLobby_EventScript_159039 msgbox LilycoveCity_ContestLobby_Text_188DDA, 2 end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 95945a595..638bf8cf1 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall checkflag 2052 - jumpeq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 + goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 checkflag 2061 - jumpeq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF + goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmove 0 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 48758ac5c..f5c511179 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -5,12 +5,12 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 lock faceplayer checkflag 2 - callif 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 + call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 checkflag 2 - callif 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialval RESULT, sub_8090FC0 compare RESULT, 1 - jumpeq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 + goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index b28fe3a47..9a9843053 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C lock faceplayer checkflag 2 - callif 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF + call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar 0x8005, 0x4043 special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 @@ -23,7 +23,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 warpplace LilycoveCity_DepartmentStore_1F, 255, 2, 1 compare 0x4043, 0 - jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 0 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 @@ -32,7 +32,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 warpplace LilycoveCity_DepartmentStore_2F, 255, 2, 1 compare 0x4043, 1 - jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 1 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 @@ -41,7 +41,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 warpplace LilycoveCity_DepartmentStore_3F, 255, 2, 1 compare 0x4043, 2 - jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 2 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 @@ -50,7 +50,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B warpplace LilycoveCity_DepartmentStore_4F, 255, 2, 1 compare 0x4043, 3 - jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 3 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 @@ -59,7 +59,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E warpplace LilycoveCity_DepartmentStore_5F, 255, 2, 1 compare 0x4043, 4 - jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 4 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index c1be4bbe7..f3989bc2a 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -5,9 +5,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 event_96 3 compare RESULT, 1 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F compare RESULT, 0 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F @@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 faceplayer event_96 3 compare RESULT, 1 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release end @@ -128,22 +128,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 compare 0x4001, 0 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D compare 0x4001, 1 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 compare 0x4001, 2 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace 0x4000, 1 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 compare 0x4001, 0 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 compare 0x4001, 1 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 compare 0x4001, 2 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 nop bufferitem 0, 0x4000 @@ -155,10 +155,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 - jumpif 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playsfx 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 @@ -167,10 +167,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 - jumpif 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playsfx 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index ac1198aee..5704a090b 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -10,12 +10,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E faceplayer checkdailyflags compare 0x4045, 0 - jumpif 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 + goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag 2250 - jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159E4C + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159E56 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag 2250 message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waittext @@ -34,24 +34,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmove 0 compare 0x8004, 0 - jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159E60 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 inccounter GAME_STAT_WON_POKEMON_LOTTERY compare 0x8006, 0 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 bufferitem 0, 0x8005 compare 0x8004, 1 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare 0x8004, 2 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 compare 0x8004, 3 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A compare 0x8004, 4 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 giveitem 0x8005 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159E9C + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end @@ -113,7 +113,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 giveitem 0x4045 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 471d1f8b5..884b43bb1 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -11,13 +11,13 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 faceplayer checkitem ITEM_EON_TICKET, 1 compare RESULT, 1 - jumpeq LilycoveCity_Harbor_EventScript_1599EE + goto_if_eq LilycoveCity_Harbor_EventScript_1599EE goto LilycoveCity_Harbor_EventScript_1598BA end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA checkflag 2052 - jumpeq LilycoveCity_Harbor_EventScript_1598CD + goto_if_eq LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release end @@ -26,7 +26,7 @@ LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD msgbox LilycoveCity_Harbor_Text_18B36F, 4 checkitem ITEM_SS_TICKET, 1 compare RESULT, 0 - jumpeq LilycoveCity_Harbor_EventScript_159929 + goto_if_eq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 waittext goto LilycoveCity_Harbor_EventScript_1598F1 @@ -49,7 +49,7 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, 5 compare RESULT, 0 - jumpeq LilycoveCity_Harbor_EventScript_15997E + goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A warp SSTidalCorridor, 255, 1, 10 @@ -60,7 +60,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 LilycoveCity_Harbor_EventScript_15995B:: @ 815995B msgbox LilycoveCity_Harbor_Text_18B499, 5 compare RESULT, 0 - jumpeq LilycoveCity_Harbor_EventScript_15997E + goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp BattleTower_Outside, 255, 19, 23 waitstate @@ -81,9 +81,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A pause 30 spriteinvisible LAST_TALKED, 13, 10 compare FACING, 2 - callif 1, LilycoveCity_Harbor_EventScript_1599D9 + call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 - callif 1, LilycoveCity_Harbor_EventScript_1599CE + call_if 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 setvar 0x8004, 2 @@ -107,11 +107,11 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE checkflag 2052 - jumpif 0, LilycoveCity_Harbor_EventScript_1598BA + goto_if 0, LilycoveCity_Harbor_EventScript_1598BA checkflag 206 - jumpeq LilycoveCity_Harbor_EventScript_1598BA + goto_if_eq LilycoveCity_Harbor_EventScript_1598BA checkflag 2131 - jumpif 0, LilycoveCity_Harbor_EventScript_1598BA + goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closebutton move LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 @@ -130,9 +130,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE pause 30 disappear 4 compare FACING, 2 - callif 1, LilycoveCity_Harbor_EventScript_1599D9 + call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 - callif 1, LilycoveCity_Harbor_EventScript_1599CE + call_if 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 special ScrSpecial_HealPlayerParty @@ -160,7 +160,7 @@ LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer checkflag 2052 - jumpeq LilycoveCity_Harbor_EventScript_159AA2 + goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index 75780667d..d3399f5ac 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -5,11 +5,11 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 lock faceplayer checkflag 234 - jumpeq LilycoveCity_House2_EventScript_159BDA + goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem ITEM_TM44 compare RESULT, 0 - jumpeq LilycoveCity_House2_EventScript_1A029B + goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag 234 msgbox LilycoveCity_House2_Text_18B883, 4 release diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 51e4988b3..6926f4f45 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -12,7 +12,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 faceplayer msgbox LilycoveCity_House3_Text_18B8CC, 5 compare RESULT, 0 - jumpeq LilycoveCity_House3_EventScript_159C1D + goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closebutton move LAST_TALKED, LilycoveCity_House3_Movement_1A083D diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index a481f9c32..c0fa73360 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -12,9 +12,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 waittext multichoice 20, 8, 16, 1 compare RESULT, 0 - jumpeq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 compare RESULT, 1 - jumpeq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F end LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F @@ -24,9 +24,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, 5 compare RESULT, 0 - jumpeq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 compare RESULT, 1 - jumpeq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end LilycoveCity_LilycoveMuseum_1F_EventScript_158477:: @ 8158477 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 06a3ae4ca..ec316b576 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -5,31 +5,31 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 checkflag 160 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 checkflag 161 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 checkflag 162 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 checkflag 163 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 checkflag 164 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D end LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD @@ -97,7 +97,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall checkflag 236 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 specialval 0x8004, sub_80C4D50 switch 0x8004 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C @@ -126,7 +126,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 givedecoration 44 compare RESULT, 0 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag 236 closebutton releaseall @@ -147,35 +147,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D lockall checkflag 162 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 lockall checkflag 164 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 lockall checkflag 160 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 lockall checkflag 161 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 lockall checkflag 163 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3 end diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 2786c930c..286ad055e 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -17,19 +17,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE special sub_80F9A0C waitstate compare 0x8004, 255 - jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B7B + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 compare RESULT, 1 - jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves compare RESULT, 1 - jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 special sub_80F9EEC fadescreen 0 compare 0x8005, 4 - jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 switch RESULT diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 5809e28c8..b398076fa 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -22,7 +22,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer checkflag 2061 - jumpeq LilycoveCity_PokemonCenter_1F_EventScript_15935D + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index e503ef4ec..14806cba4 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -62,9 +62,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 compare 0x4095, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 compare 0x4095, 2 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 end LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 @@ -72,35 +72,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 setvar 0x8004, 8 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar 0x8004, 9 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar 0x8004, 10 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar 0x8004, 11 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar 0x8004, 12 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar 0x8004, 13 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar 0x8004, 14 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar 0x8004, 15 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5 @@ -149,13 +149,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F setvar 0x8004, 13 special sub_810FDAC compare 0x4095, 0 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 release end @@ -163,7 +163,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 release end @@ -189,13 +189,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 setvar 0x8004, 8 special sub_810FDAC compare 0x4095, 0 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 release end @@ -203,7 +203,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 release end @@ -229,13 +229,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D setvar 0x8004, 9 special sub_810FDAC compare 0x4095, 0 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 release end @@ -243,7 +243,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 release end @@ -269,13 +269,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 setvar 0x8004, 10 special sub_810FDAC compare 0x4095, 0 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 release end @@ -283,7 +283,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 release end @@ -310,10 +310,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B special sub_810FDAC specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 release end @@ -321,7 +321,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 release end @@ -343,10 +343,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D special sub_810FDAC specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 release end @@ -354,7 +354,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 release end @@ -376,10 +376,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF special sub_810FDAC specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 release end @@ -387,7 +387,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 release end @@ -409,10 +409,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 special sub_810FDAC specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 release end @@ -420,7 +420,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 release end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 2da725de7..1c019e046 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -6,19 +6,19 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag 2063 compare 0x4092, 2 - callif 1, LittlerootTown_EventScript_14D57B + call_if 1, LittlerootTown_EventScript_14D57B checkflag 82 - callif 0, LittlerootTown_EventScript_14D583 + call_if 0, LittlerootTown_EventScript_14D583 compare 0x4050, 3 - callif 1, LittlerootTown_EventScript_14D5A6 + call_if 1, LittlerootTown_EventScript_14D5A6 compare 0x4082, 4 - callif 1, LittlerootTown_EventScript_14D570 + call_if 1, LittlerootTown_EventScript_14D570 compare 0x408c, 4 - callif 1, LittlerootTown_EventScript_14D570 + call_if 1, LittlerootTown_EventScript_14D570 compare 0x40c7, 1 - callif 1, LittlerootTown_EventScript_14D567 + call_if 1, LittlerootTown_EventScript_14D567 compare 0x408d, 3 - callif 1, LittlerootTown_EventScript_14D563 + call_if 1, LittlerootTown_EventScript_14D563 end LittlerootTown_EventScript_14D563:: @ 814D563 @@ -41,7 +41,7 @@ LittlerootTown_EventScript_14D57B:: @ 814D57B LittlerootTown_EventScript_14D583:: @ 814D583 compare 0x4050, 0 - jumpeq LittlerootTown_EventScript_14D59A + goto_if_eq LittlerootTown_EventScript_14D59A movespriteperm 1, 10, 1 spritebehave 1, 7 return @@ -56,9 +56,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 spritebehave 4, 8 checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D5C5 + call_if 1, LittlerootTown_EventScript_14D5C5 compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D5CD + call_if 1, LittlerootTown_EventScript_14D5CD return LittlerootTown_EventScript_14D5C5:: @ 814D5C5 @@ -188,11 +188,11 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF lock faceplayer checkflag 116 - jumpeq LittlerootTown_EventScript_14D72F + goto_if_eq LittlerootTown_EventScript_14D72F checkflag 82 - jumpeq LittlerootTown_EventScript_14D722 + goto_if_eq LittlerootTown_EventScript_14D722 compare 0x4050, 0 - jumpif 5, LittlerootTown_EventScript_14D708 + goto_if 5, LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release end @@ -335,9 +335,9 @@ LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D822 + call_if 1, LittlerootTown_EventScript_14D822 compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D82B + call_if 1, LittlerootTown_EventScript_14D82B releaseall end @@ -353,9 +353,9 @@ LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D84E + call_if 1, LittlerootTown_EventScript_14D84E compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D857 + call_if 1, LittlerootTown_EventScript_14D857 releaseall end @@ -408,27 +408,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D93C + call_if 1, LittlerootTown_EventScript_14D93C compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D947 + call_if 1, LittlerootTown_EventScript_14D947 checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D926 + call_if 1, LittlerootTown_EventScript_14D926 compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D931 + call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closebutton checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D952 + call_if 1, LittlerootTown_EventScript_14D952 compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D995 + call_if 1, LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14DAAA + call_if 1, LittlerootTown_EventScript_14DAAA compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14DAED + call_if 1, LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end @@ -454,32 +454,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 LittlerootTown_EventScript_14D952:: @ 814D952 compare 0x8008, 0 - callif 1, LittlerootTown_EventScript_14D9D8 + call_if 1, LittlerootTown_EventScript_14D9D8 compare 0x8008, 1 - callif 1, LittlerootTown_EventScript_14D9ED + call_if 1, LittlerootTown_EventScript_14D9ED compare 0x8008, 2 - callif 1, LittlerootTown_EventScript_14DA02 + call_if 1, LittlerootTown_EventScript_14DA02 compare 0x8008, 3 - callif 1, LittlerootTown_EventScript_14DA17 + call_if 1, LittlerootTown_EventScript_14DA17 compare 0x8008, 4 - callif 1, LittlerootTown_EventScript_14DA2C + call_if 1, LittlerootTown_EventScript_14DA2C compare 0x8008, 5 - callif 1, LittlerootTown_EventScript_14DA41 + call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 compare 0x8008, 0 - callif 1, LittlerootTown_EventScript_14D9D8 + call_if 1, LittlerootTown_EventScript_14D9D8 compare 0x8008, 1 - callif 1, LittlerootTown_EventScript_14D9ED + call_if 1, LittlerootTown_EventScript_14D9ED compare 0x8008, 2 - callif 1, LittlerootTown_EventScript_14DA56 + call_if 1, LittlerootTown_EventScript_14DA56 compare 0x8008, 3 - callif 1, LittlerootTown_EventScript_14DA6B + call_if 1, LittlerootTown_EventScript_14DA6B compare 0x8008, 4 - callif 1, LittlerootTown_EventScript_14DA80 + call_if 1, LittlerootTown_EventScript_14DA80 compare 0x8008, 5 - callif 1, LittlerootTown_EventScript_14DA95 + call_if 1, LittlerootTown_EventScript_14DA95 return LittlerootTown_EventScript_14D9D8:: @ 814D9D8 @@ -554,32 +554,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 LittlerootTown_EventScript_14DAAA:: @ 814DAAA compare 0x8008, 0 - callif 1, LittlerootTown_EventScript_14DB30 + call_if 1, LittlerootTown_EventScript_14DB30 compare 0x8008, 1 - callif 1, LittlerootTown_EventScript_14DB3B + call_if 1, LittlerootTown_EventScript_14DB3B compare 0x8008, 2 - callif 1, LittlerootTown_EventScript_14DB46 + call_if 1, LittlerootTown_EventScript_14DB46 compare 0x8008, 3 - callif 1, LittlerootTown_EventScript_14DB6C + call_if 1, LittlerootTown_EventScript_14DB6C compare 0x8008, 4 - callif 1, LittlerootTown_EventScript_14DB92 + call_if 1, LittlerootTown_EventScript_14DB92 compare 0x8008, 5 - callif 1, LittlerootTown_EventScript_14DBB8 + call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED compare 0x8008, 0 - callif 1, LittlerootTown_EventScript_14DB30 + call_if 1, LittlerootTown_EventScript_14DB30 compare 0x8008, 1 - callif 1, LittlerootTown_EventScript_14DB3B + call_if 1, LittlerootTown_EventScript_14DB3B compare 0x8008, 2 - callif 1, LittlerootTown_EventScript_14DBDE + call_if 1, LittlerootTown_EventScript_14DBDE compare 0x8008, 3 - callif 1, LittlerootTown_EventScript_14DC04 + call_if 1, LittlerootTown_EventScript_14DC04 compare 0x8008, 4 - callif 1, LittlerootTown_EventScript_14DC2A + call_if 1, LittlerootTown_EventScript_14DC2A compare 0x8008, 5 - callif 1, LittlerootTown_EventScript_14DC50 + call_if 1, LittlerootTown_EventScript_14DC50 return LittlerootTown_EventScript_14DB30:: @ 814DB30 @@ -843,9 +843,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 faceplayer checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D926 + call_if 1, LittlerootTown_EventScript_14D926 compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D931 + call_if 1, LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 move 4, LittlerootTown_Movement_1A0841 waitmove 0 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 849115390..ca872ba0f 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -6,9 +6,9 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B compare 0x4092, 6 - callif 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 + call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 checkflag 274 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 end LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 @@ -19,7 +19,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 checkgender compare RESULT, 0 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152680 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 return LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 @@ -28,11 +28,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A compare 0x4092, 3 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 compare 0x4092, 5 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC compare 0x4092, 6 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 0803cd512..0176db332 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -5,9 +5,9 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF checkflag 130 - callif 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE + call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare 0x4092, 4 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 end @@ -24,16 +24,16 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 checkgender compare RESULT, 0 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 end @ 81527F1 lockall checkgender compare RESULT, 0 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_15280A + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A compare RESULT, 1 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152814 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152814 end LittlerootTown_BrendansHouse_2F_EventScript_15280A:: @ 815280A @@ -52,9 +52,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E lockall checkgender compare RESULT, 0 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152837 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 compare RESULT, 1 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_15285D + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15285D end LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index b70dc0687..1d76bb6dc 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -6,9 +6,9 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 compare 0x4092, 6 - callif 0, LittlerootTown_MaysHouse_1F_EventScript_15289E + call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E checkflag 274 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 end LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E @@ -19,7 +19,7 @@ LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 checkgender compare RESULT, 1 - jumpeq LittlerootTown_MaysHouse_1F_EventScript_1528BE + goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE return LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE @@ -28,11 +28,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 compare 0x4092, 3 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_152902 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 compare 0x4092, 5 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA compare 0x4092, 6 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 end LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA @@ -118,9 +118,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 lockall checkgender compare RESULT, 0 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 compare RESULT, 1 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -136,11 +136,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB lock faceplayer checkflag 130 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152A21 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag 301 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152A17 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 compare 0x408d, 3 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152A2B + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 release diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 85a41caff..a0dda8b70 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -5,9 +5,9 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B checkflag 130 - callif 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A + call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare 0x4092, 4 - callif 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 + call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 end @@ -24,19 +24,19 @@ LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 checkgender compare RESULT, 1 - jumpeq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 end LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall checkflag 292 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkgender compare RESULT, 0 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare RESULT, 1 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playsfx 9 disappear LAST_TALKED setvar 0x408d, 3 @@ -58,11 +58,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closebutton compare FACING, 4 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 compare FACING, 2 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 compare FACING, 3 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F return LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29 @@ -92,11 +92,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closebutton compare FACING, 4 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 2 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 3 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA return LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F @@ -114,22 +114,22 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 waitmove 0 checkgender compare RESULT, 0 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB compare RESULT, 1 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag 293 releaseall end LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB checkflag 293 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152BFF + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4 return LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED checkflag 293 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152C08 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08 msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4 return @@ -195,9 +195,9 @@ LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 lockall checkgender compare RESULT, 0 - jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C52 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 compare RESULT, 1 - jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C5C + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C end LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 80148ce08..bd846b4fe 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -31,9 +31,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 compare RESULT, 1 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA compare RESULT, 0 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA @@ -45,9 +45,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, 5 compare RESULT, 1 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 compare RESULT, 0 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 @@ -60,9 +60,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, 5 compare RESULT, 1 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 compare RESULT, 0 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A @@ -86,9 +86,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer compare 0x4084, 3 - jumpif 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 checkflag 88 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4 setflag 88 release @@ -108,9 +108,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A lock faceplayer checkflag 896 - jumpif 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F + goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F compare 0x4084, 5 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 release end @@ -125,9 +125,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA waitmove 0 checkgender compare RESULT, 0 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 compare RESULT, 1 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 setflag 116 setvar 0x4051, 1 @@ -140,7 +140,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem ITEM_POKE_BALL, 5 compare RESULT, 0 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 setvar RESULT, 0 return @@ -149,7 +149,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem ITEM_POKE_BALL, 5 compare RESULT, 0 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 setvar RESULT, 1 return @@ -189,9 +189,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 faceplayer checkgender compare RESULT, 0 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE compare RESULT, 1 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 0304181fb..63364c6e5 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -4,7 +4,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE checkflag 2145 - callif 1, MagmaHideout_B1F_EventScript_15F2B8 + call_if 1, MagmaHideout_B1F_EventScript_15F2B8 end MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 78d1961e5..cae65f41e 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -9,7 +9,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 clearflag 99 setvar 0x4093, 0 checkflag 209 - callif 1, MauvilleCity_EventScript_14C053 + call_if 1, MauvilleCity_EventScript_14C053 end MauvilleCity_EventScript_14C053:: @ 814C053 @@ -53,7 +53,7 @@ MauvilleCity_EventScript_14C0A2:: @ 814C0A2 lock faceplayer checkflag 98 - jumpeq MauvilleCity_EventScript_14C0BA + goto_if_eq MauvilleCity_EventScript_14C0BA msgbox MauvilleCity_Text_16674A, 4 setflag 98 release @@ -68,7 +68,7 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4 lock faceplayer checkflag 284 - jumpeq MauvilleCity_EventScript_14C0E4 + goto_if_eq MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 closebutton move 7, MauvilleCity_Movement_1A083D @@ -87,7 +87,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4 MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall checkflag 284 - jumpeq MauvilleCity_EventScript_14C292 + goto_if_eq MauvilleCity_EventScript_14C292 move 6, MauvilleCity_Movement_1A0843 waitmove 0 msgbox MauvilleCity_Text_165BE3, 4 @@ -106,9 +106,9 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 MauvilleCity_EventScript_14C154:: @ 814C154 compare RESULT, 1 - callif 1, MauvilleCity_EventScript_14C23C + call_if 1, MauvilleCity_EventScript_14C23C compare RESULT, 0 - jumpeq MauvilleCity_EventScript_14C285 + goto_if_eq MauvilleCity_EventScript_14C285 closebutton switch FACING case 2, MauvilleCity_EventScript_14C187 @@ -285,11 +285,11 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock faceplayer checkflag 209 - jumpeq MauvilleCity_EventScript_14C368 + goto_if_eq MauvilleCity_EventScript_14C368 compare 0x40ba, 2 - jumpeq MauvilleCity_EventScript_14C33C + goto_if_eq MauvilleCity_EventScript_14C33C checkflag 208 - jumpeq MauvilleCity_EventScript_14C332 + goto_if_eq MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 giveitem ITEM_BASEMENT_KEY setflag 208 @@ -306,7 +306,7 @@ MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 giveitem ITEM_TM24 compare RESULT, 0 - jumpeq MauvilleCity_EventScript_1A029B + goto_if_eq MauvilleCity_EventScript_1A029B setflag 209 msgbox MauvilleCity_Text_166488, 4 release diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index e0faf85a0..0b577885e 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -5,23 +5,23 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 lock faceplayer checkflag 90 - jumpeq MauvilleCity_BikeShop_EventScript_15686E + goto_if_eq MauvilleCity_BikeShop_EventScript_15686E checkflag 89 - jumpeq MauvilleCity_BikeShop_EventScript_1567D1 + goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, 5 compare RESULT, 1 - jumpeq MauvilleCity_BikeShop_EventScript_156824 + goto_if_eq MauvilleCity_BikeShop_EventScript_156824 compare RESULT, 0 - jumpeq MauvilleCity_BikeShop_EventScript_156817 + goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 msgbox MauvilleCity_BikeShop_Text_181016, 5 compare RESULT, 1 - jumpeq MauvilleCity_BikeShop_EventScript_156824 + goto_if_eq MauvilleCity_BikeShop_EventScript_156824 compare RESULT, 0 - jumpeq MauvilleCity_BikeShop_EventScript_156817 + goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0 @@ -65,19 +65,19 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E msgbox MauvilleCity_BikeShop_Text_1813A0, 5 compare RESULT, 1 - jumpeq MauvilleCity_BikeShop_EventScript_15688D + goto_if_eq MauvilleCity_BikeShop_EventScript_15688D compare RESULT, 0 - jumpeq MauvilleCity_BikeShop_EventScript_1568BF + goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D msgbox MauvilleCity_BikeShop_Text_1813D4, 4 checkitem ITEM_ACRO_BIKE, 1 compare RESULT, 1 - jumpeq MauvilleCity_BikeShop_EventScript_1568C9 + goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9 checkitem ITEM_MACH_BIKE, 1 compare RESULT, 1 - jumpeq MauvilleCity_BikeShop_EventScript_1568EA + goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA msgbox MauvilleCity_BikeShop_Text_181498, 4 release end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index fa5b58885..db6223400 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -7,7 +7,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 msgbox MauvilleCity_GameCorner_Text_181C35, 4 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156B32 + goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 waittext showmoney 0, 0 @@ -34,10 +34,10 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins 16385 compare 0x4001, 9950 - jumpif 4, MauvilleCity_GameCorner_EventScript_156B5C + goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156B3C + goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 50 paymoney 0x3e8, 0 updatemoney 0, 0 @@ -53,10 +53,10 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins 16385 compare 0x4001, 9500 - jumpif 4, MauvilleCity_GameCorner_EventScript_156B5C + goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156B3C + goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 500 paymoney 0x2710, 0 updatemoney 0, 0 @@ -101,7 +101,7 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 compare RESULT, 1 - jumpeq MauvilleCity_GameCorner_EventScript_156B88 + goto_if_eq MauvilleCity_GameCorner_EventScript_156B88 release end @@ -145,7 +145,7 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156D0D + goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156C46 case 2, MauvilleCity_GameCorner_EventScript_156C80 @@ -155,11 +155,11 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 compare 0x4002, 1000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 88 checkdecor 88 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156D02 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 88 updatecoins 0, 0 @@ -171,11 +171,11 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 compare 0x4002, 1000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 89 checkdecor 89 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156D02 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 89 updatecoins 0, 0 @@ -187,11 +187,11 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 compare 0x4002, 1000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 90 checkdecor 90 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156D02 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 90 updatecoins 0, 0 @@ -222,7 +222,7 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 compare RESULT, 1 - jumpeq MauvilleCity_GameCorner_EventScript_156D36 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D36 release end @@ -278,7 +278,7 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F77 + goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156E3C case 2, MauvilleCity_GameCorner_EventScript_156E76 @@ -290,10 +290,10 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins 16386 compare 0x4002, 1500 - jumpif 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 1500 additem ITEM_TM32, 1 updatecoins 0, 0 @@ -305,10 +305,10 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins 16386 compare 0x4002, 3500 - jumpif 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 3500 additem ITEM_TM29, 1 updatecoins 0, 0 @@ -320,10 +320,10 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins 16386 compare 0x4002, 4000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM35, 1 updatecoins 0, 0 @@ -335,10 +335,10 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins 16386 compare 0x4002, 4000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM24, 1 updatecoins 0, 0 @@ -350,10 +350,10 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins 16386 compare 0x4002, 4000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM13, 1 updatecoins 0, 0 @@ -390,10 +390,10 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 lock faceplayer checkflag 226 - jumpeq MauvilleCity_GameCorner_EventScript_157072 + goto_if_eq MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_157068 + goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch 0x4023 case 0, MauvilleCity_GameCorner_EventScript_156FDB case 1, MauvilleCity_GameCorner_EventScript_157005 @@ -404,7 +404,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB bufferdecor 1, 88 checkdecor 88 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_157059 + goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 88 setflag 226 @@ -415,7 +415,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 bufferdecor 1, 89 checkdecor 89 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_157059 + goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 89 setflag 226 @@ -426,7 +426,7 @@ MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F bufferdecor 1, 90 checkdecor 90 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_157059 + goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 90 setflag 226 @@ -454,17 +454,17 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C faceplayer checkitem ITEM_COIN_CASE, 1 compare RESULT, 1 - jumpeq MauvilleCity_GameCorner_EventScript_15709C + goto_if_eq MauvilleCity_GameCorner_EventScript_15709C msgbox MauvilleCity_GameCorner_Text_18201E, 4 goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag 225 - jumpeq MauvilleCity_GameCorner_EventScript_1570CA + goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA checkcoins 16385 compare 0x4001, 1 - jumpif 4, MauvilleCity_GameCorner_EventScript_1570CA + goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag 225 givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 @@ -523,7 +523,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialval RESULT, sub_810F424 pokecasino RESULT @@ -534,7 +534,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialval RESULT, sub_810F424 pokecasino RESULT @@ -545,7 +545,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialval RESULT, sub_810F424 pokecasino RESULT @@ -556,7 +556,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialval RESULT, sub_810F424 pokecasino RESULT @@ -567,7 +567,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialval RESULT, sub_810F424 pokecasino RESULT @@ -578,7 +578,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialval RESULT, sub_810F424 pokecasino RESULT @@ -589,7 +589,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialval RESULT, sub_810F424 pokecasino RESULT @@ -600,7 +600,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialval RESULT, sub_810F424 pokecasino RESULT @@ -611,7 +611,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialval RESULT, sub_810F424 pokecasino RESULT @@ -622,7 +622,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialval RESULT, sub_810F424 pokecasino RESULT @@ -633,7 +633,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialval RESULT, sub_810F424 pokecasino RESULT @@ -644,7 +644,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialval RESULT, sub_810F424 pokecasino RESULT diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 75136dcef..80a33ffb0 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -4,7 +4,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 checkflag 1208 - jumpeq MauvilleCity_Gym_EventScript_1565A7 + goto_if_eq MauvilleCity_Gym_EventScript_1565A7 switch 0x4093 case 0, MauvilleCity_Gym_EventScript_156491 case 1, MauvilleCity_Gym_EventScript_15657D @@ -14,7 +14,7 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456 MauvilleCity_Gym_EventScript_156491:: @ 8156491 checkflag 99 - jumpeq MauvilleCity_Gym_EventScript_15649B + goto_if_eq MauvilleCity_Gym_EventScript_15649B end MauvilleCity_Gym_EventScript_15649B:: @ 815649B @@ -70,9 +70,9 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag 167 - jumpif 0, MauvilleCity_Gym_EventScript_15661D + goto_if 0, MauvilleCity_Gym_EventScript_15661D compare 0x40ba, 2 - jumpeq MauvilleCity_Gym_EventScript_156641 + goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 release end @@ -86,7 +86,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag 2057 addvar 0x4085, 1 compare 0x4085, 6 - callif 1, MauvilleCity_Gym_EventScript_1A00FB + call_if 1, MauvilleCity_Gym_EventScript_1A00FB setvar 0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 @@ -98,7 +98,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB MauvilleCity_Gym_EventScript_15661D:: @ 815661D giveitem ITEM_TM34 compare RESULT, 0 - jumpeq MauvilleCity_Gym_EventScript_1A029B + goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 setflag 167 release @@ -112,9 +112,9 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641 MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall checkflag 1208 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 1 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 1 setvar 0x8004, 0 goto MauvilleCity_Gym_EventScript_1566BA @@ -123,9 +123,9 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall checkflag 1208 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 2 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 2 setvar 0x8004, 1 goto MauvilleCity_Gym_EventScript_1566BA @@ -134,9 +134,9 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall checkflag 1208 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 3 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 3 setvar 0x8004, 2 goto MauvilleCity_Gym_EventScript_1566BA @@ -148,9 +148,9 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special DrawWholeMapView playsfx 44 checkflag 99 - jumpeq MauvilleCity_Gym_EventScript_1566E1 + goto_if_eq MauvilleCity_Gym_EventScript_1566E1 checkflag 99 - jumpif 0, MauvilleCity_Gym_EventScript_1566DC + goto_if 0, MauvilleCity_Gym_EventScript_1566DC releaseall end @@ -192,7 +192,7 @@ MauvilleCity_Gym_EventScript_156742:: @ 8156742 lock faceplayer checkflag 1208 - jumpeq MauvilleCity_Gym_EventScript_156757 + goto_if_eq MauvilleCity_Gym_EventScript_156757 msgbox MauvilleCity_Gym_Text_180815, 4 release end @@ -205,14 +205,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall checkflag 2057 - jumpeq MauvilleCity_Gym_EventScript_156781 + goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall checkflag 2057 - jumpeq MauvilleCity_Gym_EventScript_156781 + goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index 48ee31be5..e76564847 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -5,7 +5,7 @@ MauvilleCity_House1_EventScript_1569FD:: @ 81569FD lock faceplayer checkflag 107 - jumpeq MauvilleCity_House1_EventScript_156A29 + goto_if_eq MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 giveitem ITEM_HM06 setflag 107 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index edb74f9f9..24236ede6 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -5,11 +5,11 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 lock faceplayer checkflag 258 - jumpeq MauvilleCity_House2_EventScript_15733D + goto_if_eq MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 compare RESULT, 1 - jumpeq MauvilleCity_House2_EventScript_1572E5 + goto_if_eq MauvilleCity_House2_EventScript_1572E5 release end @@ -21,9 +21,9 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 waitmove 0 msgbox MauvilleCity_House2_Text_1824D8, 5 compare RESULT, 1 - jumpeq MauvilleCity_House2_EventScript_15731B + goto_if_eq MauvilleCity_House2_EventScript_15731B compare RESULT, 0 - jumpeq MauvilleCity_House2_EventScript_157347 + goto_if_eq MauvilleCity_House2_EventScript_157347 end MauvilleCity_House2_EventScript_15731B:: @ 815731B diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 3e7155955..d5e1574cc 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -216,7 +216,7 @@ MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock faceplayer checkflag 244 - jumpeq MeteorFalls_1F_1R_EventScript_15C66E + goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E setflag 244 msgbox MeteorFalls_1F_1R_Text_1937EB, 4 release diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index 8e45c34ae..23d814855 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq MeteorFalls_1F_2R_EventScript_15C6A0 + goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 end @@ -18,7 +18,7 @@ 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, sub_8082C68 compare RESULT, 1 - jumpeq MeteorFalls_1F_2R_EventScript_15C6E2 + goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 end @@ -31,7 +31,7 @@ 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, sub_8082C68 compare RESULT, 1 - jumpeq MeteorFalls_1F_2R_EventScript_15C728 + goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index ddb317364..d1b8e88b3 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -8,7 +8,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag 102 clearflag 103 checkflag 2090 - callif 1, MossdeepCity_EventScript_1A02C1 + call_if 1, MossdeepCity_EventScript_1A02C1 end MossdeepCity_EventScript_14CFAE:: @ 814CFAE @@ -69,14 +69,14 @@ MossdeepCity_EventScript_14D027:: @ 814D027 lock faceplayer checkflag 276 - jumpeq MossdeepCity_EventScript_14D069 + goto_if_eq MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, 5 compare RESULT, 0 - jumpeq MossdeepCity_EventScript_14D073 + goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem ITEM_KINGS_ROCK compare RESULT, 0 - jumpeq MossdeepCity_EventScript_1A029B + goto_if_eq MossdeepCity_EventScript_1A029B setflag 276 release end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 59669596a..f644e93cc 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special sub_813601C compare RESULT, 1 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 end MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 @@ -18,9 +18,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special sub_813601C compare RESULT, 0 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E compare 0x40c0, 0 - callif 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF + call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF end MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E @@ -50,11 +50,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 move 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmove 0 compare 0x40c0, 1 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 compare 0x40c0, 2 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B compare 0x40c0, 3 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty setvar 0x40c0, 0 releaseall @@ -85,7 +85,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer compare 0x4001, 1 - jumpeq MossdeepCity_GameCorner_1F_EventScript_15AD59 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release end @@ -95,28 +95,28 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special sub_810F414 msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 compare RESULT, 0 - jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 compare RESULT, 0 - jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 compare RESULT, 0 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog compare RESULT, 0 - jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closebutton compare FACING, 2 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 compare FACING, 4 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 compare FACING, 3 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MossdeepCity_GameCorner_B1F, 255, 3, 1 waitstate release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index c7d1201fd..77cc96f4d 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -23,11 +23,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special sub_813556C waitstate compare RESULT, 3 - callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 + call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 compare RESULT, 1 - callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 + call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 compare RESULT, 2 - callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE + call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton special ScrSpecial_HealPlayerParty move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 733f6816e..4c46ca334 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -4,25 +4,25 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 checkflag 100 - jumpeq MossdeepCity_Gym_EventScript_15A510 + goto_if_eq MossdeepCity_Gym_EventScript_15A510 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 checkflag 101 - jumpeq MossdeepCity_Gym_EventScript_15A528 + goto_if_eq MossdeepCity_Gym_EventScript_15A528 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 checkflag 102 - jumpeq MossdeepCity_Gym_EventScript_15A540 + goto_if_eq MossdeepCity_Gym_EventScript_15A540 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 checkflag 103 - jumpeq MossdeepCity_Gym_EventScript_15A558 + goto_if_eq MossdeepCity_Gym_EventScript_15A558 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 @@ -51,7 +51,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 checkflag 171 - jumpif 0, MossdeepCity_Gym_EventScript_15A5C6 + goto_if 0, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release end @@ -74,7 +74,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 giveitem ITEM_TM04 compare RESULT, 0 - jumpeq MossdeepCity_Gym_EventScript_1A029B + goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 setflag 171 release @@ -83,7 +83,7 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA lockall checkflag 100 - jumpeq MossdeepCity_Gym_EventScript_15A621 + goto_if_eq MossdeepCity_Gym_EventScript_15A621 setflag 100 move 255, MossdeepCity_Gym_Movement_15A7F7 waitmove 0 @@ -110,7 +110,7 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 MossdeepCity_Gym_EventScript_15A646:: @ 815A646 lockall checkflag 101 - jumpeq MossdeepCity_Gym_EventScript_15A675 + goto_if_eq MossdeepCity_Gym_EventScript_15A675 setflag 101 move 255, MossdeepCity_Gym_Movement_15A7F7 waitmove 0 @@ -131,7 +131,7 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A lockall checkflag 102 - jumpeq MossdeepCity_Gym_EventScript_15A6C9 + goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 setflag 102 move 255, MossdeepCity_Gym_Movement_15A7F7 waitmove 0 @@ -152,7 +152,7 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE lockall checkflag 103 - jumpeq MossdeepCity_Gym_EventScript_15A71D + goto_if_eq MossdeepCity_Gym_EventScript_15A71D setflag 103 move 255, MossdeepCity_Gym_Movement_15A7F7 waitmove 0 @@ -211,7 +211,7 @@ MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8 lock faceplayer checkflag 1229 - jumpeq MossdeepCity_Gym_EventScript_15A7ED + goto_if_eq MossdeepCity_Gym_EventScript_15A7ED msgbox MossdeepCity_Gym_Text_18C7E3, 4 release end @@ -229,14 +229,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall checkflag 2061 - jumpeq MossdeepCity_Gym_EventScript_15A81A + goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall checkflag 2061 - jumpeq MossdeepCity_Gym_EventScript_15A81A + goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 319dfba8e..c8af8f886 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -8,7 +8,7 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F msgbox MossdeepCity_House1_Text_18D465, 4 specialval RESULT, GetPokeblockNameByMonNature compare RESULT, 0 - jumpeq MossdeepCity_House1_EventScript_15A855 + goto_if_eq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 release end diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index f3d07b64e..3cf5a8ff4 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -20,9 +20,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B setflag 224 clearflag 933 compare FACING, 2 - callif 1, MossdeepCity_House2_EventScript_15A8AE + call_if 1, MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 - callif 1, MossdeepCity_House2_EventScript_15A8B9 + call_if 1, MossdeepCity_House2_EventScript_15A8B9 disappear 3 release end diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index fd97ee598..8f9bf4dc5 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -5,10 +5,10 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 lock faceplayer checkflag 152 - jumpeq MossdeepCity_House3_EventScript_15A9B1 + goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 compare RESULT, 0 - jumpeq MossdeepCity_House3_EventScript_15A9BB + goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem ITEM_SUPER_ROD setflag 152 diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 12dc941e7..215cf5e35 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -5,7 +5,7 @@ MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer checkflag 2052 - jumpeq MossdeepCity_House4_EventScript_15AB46 + goto_if_eq MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release end @@ -20,7 +20,7 @@ MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 faceplayer special sub_80BB63C compare RESULT, 0 - jumpeq MossdeepCity_House4_EventScript_15AB6D + goto_if_eq MossdeepCity_House4_EventScript_15AB6D special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_18E17E, 4 release diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index db31e4c62..369523b42 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -8,9 +8,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B specialval RESULT, GetWeekCount buffernum 0, RESULT compare RESULT, 0 - callif 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA + call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 - callif 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 + call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closebutton move LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmove 0 @@ -33,11 +33,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 lock faceplayer checkflag 192 - jumpeq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem ITEM_SUN_STONE compare RESULT, 0 - jumpeq MossdeepCity_SpaceCenter_1F_EventScript_1A029B + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag 192 msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 release diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index d4477bd39..f6ba77cb9 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -6,7 +6,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 checkflag 2052 - callif 0, MossdeepCity_StevensHouse_EventScript_15A9DF + call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF end MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF @@ -15,7 +15,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 compare 0x40c6, 1 - callif 1, MossdeepCity_StevensHouse_EventScript_15A9F5 + call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 end MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 @@ -73,10 +73,10 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 compare RESULT, 0 - jumpeq MossdeepCity_StevensHouse_EventScript_15AAE6 + goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 countpokemon compare RESULT, 6 - jumpeq MossdeepCity_StevensHouse_EventScript_15AADC + goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT disappear 2 fanfare 370 @@ -87,7 +87,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C bufferpoke 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 - callif 1, MossdeepCity_StevensHouse_EventScript_1A0678 + call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag 968 setflag 298 releaseall @@ -114,7 +114,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02 lockall checkflag 302 - jumpeq MossdeepCity_StevensHouse_EventScript_15AB16 + goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16 msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4 releaseall end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 0134adbdf..458e4a15b 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -19,17 +19,17 @@ MtChimney_EventScript_15CF95:: @ 815CF95 nop msgbox MtChimney_Text_195760, 5 compare RESULT, 0 - jumpeq MtChimney_EventScript_15D00B + goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 compare RESULT, 0 - jumpeq MtChimney_EventScript_15D018 + goto_if_eq MtChimney_EventScript_15D018 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 compare RESULT, 1 - callif 1, MtChimney_EventScript_15D000 + call_if 1, MtChimney_EventScript_15D000 giveitem ITEM_LAVA_COOKIE compare RESULT, 0 - jumpeq MtChimney_EventScript_15CFF3 + goto_if_eq MtChimney_EventScript_15CFF3 hidemoney 0, 0 release end @@ -407,12 +407,12 @@ MtChimney_EventScript_15D174:: @ 815D174 MtChimney_EventScript_15D17D:: @ 815D17D lockall checkflag 139 - jumpif 0, MtChimney_EventScript_15D1D0 + goto_if 0, MtChimney_EventScript_15D1D0 checkflag 115 - jumpeq MtChimney_EventScript_15D1C6 + goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 compare RESULT, 0 - jumpeq MtChimney_EventScript_15D1BC + goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem ITEM_METEORITE setflag 115 @@ -442,7 +442,7 @@ MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq MtChimney_EventScript_15D20A + goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 24101b0cb..6f4ea44a5 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 compare 0x40a3, 1 - callif 1, MtChimney_CableCarStation_EventScript_15C111 + call_if 1, MtChimney_CableCarStation_EventScript_15C111 end MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 @@ -33,9 +33,9 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B faceplayer msgbox MtChimney_CableCarStation_Text_19256A, 5 compare RESULT, 1 - jumpeq MtChimney_CableCarStation_EventScript_15C16C + goto_if_eq MtChimney_CableCarStation_EventScript_15C16C compare RESULT, 0 - jumpeq MtChimney_CableCarStation_EventScript_15C19B + goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 805c4a8d3..026d54bfe 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -5,11 +5,11 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 lock faceplayer checkflag 282 - jumpeq MtPyre_1F_EventScript_15D352 + goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem ITEM_CLEANSE_TAG compare RESULT, 0 - jumpeq MtPyre_1F_EventScript_1A029B + goto_if_eq MtPyre_1F_EventScript_1A029B setflag 282 release end diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 657b4ef15..4f8d99c5e 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -5,7 +5,7 @@ MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq MtPyre_6F_EventScript_15D46F + goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 end diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index efffc7c3b..550f74d9a 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -9,7 +9,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C MtPyre_Exterior_EventScript_15D492:: @ 815D492 getplayerxy 0x4000, 0x4001 compare 0x4001, 12 - jumpif 0, MtPyre_Exterior_EventScript_15D4A3 + goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index f30b6fb9e..31a83857b 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -31,11 +31,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 waitmove 0 pause 50 compare 0x8008, 0 - callif 1, MtPyre_Summit_EventScript_15D593 + call_if 1, MtPyre_Summit_EventScript_15D593 compare 0x8008, 1 - callif 1, MtPyre_Summit_EventScript_15D59E + call_if 1, MtPyre_Summit_EventScript_15D59E compare 0x8008, 2 - callif 1, MtPyre_Summit_EventScript_15D59F + call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 .else @@ -53,11 +53,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 pause 20 call MtPyre_Summit_EventScript_15D57A compare 0x8008, 0 - callif 1, MtPyre_Summit_EventScript_15D5AA + call_if 1, MtPyre_Summit_EventScript_15D5AA compare 0x8008, 1 - callif 1, MtPyre_Summit_EventScript_15D5BF + call_if 1, MtPyre_Summit_EventScript_15D5BF compare 0x8008, 2 - callif 1, MtPyre_Summit_EventScript_15D5CA + call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 .else @@ -144,9 +144,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF msgbox MtPyre_Summit_Text_1B64B3, 5 .endif compare RESULT, 1 - callif 1, MtPyre_Summit_EventScript_15D611 + call_if 1, MtPyre_Summit_EventScript_15D611 compare RESULT, 0 - callif 1, MtPyre_Summit_EventScript_15D61A + call_if 1, MtPyre_Summit_EventScript_15D61A release end @@ -170,11 +170,11 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 lock faceplayer checkflag 259 - jumpeq MtPyre_Summit_EventScript_15D6C4 + goto_if_eq MtPyre_Summit_EventScript_15D6C4 checkflag 113 - jumpeq MtPyre_Summit_EventScript_15D64A + goto_if_eq MtPyre_Summit_EventScript_15D64A checkflag 129 - jumpeq MtPyre_Summit_EventScript_15D6BA + goto_if_eq MtPyre_Summit_EventScript_15D6BA .ifdef SAPPHIRE msgbox UnknownString_81B54BE, 4 .else @@ -190,9 +190,9 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A msgbox MtPyre_Summit_Text_1B6283, 5 .endif compare RESULT, 1 - jumpeq MtPyre_Summit_EventScript_15D669 + goto_if_eq MtPyre_Summit_EventScript_15D669 compare RESULT, 0 - jumpeq MtPyre_Summit_EventScript_15D69B + goto_if_eq MtPyre_Summit_EventScript_15D69B end MtPyre_Summit_EventScript_15D669:: @ 815D669 @@ -221,9 +221,9 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B msgbox MtPyre_Summit_Text_1B62E7, 5 .endif compare RESULT, 1 - jumpeq MtPyre_Summit_EventScript_15D669 + goto_if_eq MtPyre_Summit_EventScript_15D669 compare RESULT, 0 - jumpeq MtPyre_Summit_EventScript_15D69B + goto_if_eq MtPyre_Summit_EventScript_15D69B end MtPyre_Summit_EventScript_15D6BA:: @ 815D6BA @@ -269,11 +269,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 waitmove 0 pause 50 compare 0x8008, 0 - callif 1, MtPyre_Summit_EventScript_15D75E + call_if 1, MtPyre_Summit_EventScript_15D75E compare 0x8008, 1 - callif 1, MtPyre_Summit_EventScript_15D769 + call_if 1, MtPyre_Summit_EventScript_15D769 compare 0x8008, 2 - callif 1, MtPyre_Summit_EventScript_15D774 + call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 .else @@ -281,11 +281,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 .endif closebutton compare 0x8008, 0 - callif 1, MtPyre_Summit_EventScript_15D77F + call_if 1, MtPyre_Summit_EventScript_15D77F compare 0x8008, 1 - callif 1, MtPyre_Summit_EventScript_15D78A + call_if 1, MtPyre_Summit_EventScript_15D78A compare 0x8008, 2 - callif 1, MtPyre_Summit_EventScript_15D795 + call_if 1, MtPyre_Summit_EventScript_15D795 disappear 2 setvar 0x40b9, 3 releaseall diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 547fc72e7..698f2f6cd 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -5,7 +5,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A NewMauville_Entrance_MapScript1_15E495:: @ 815E495 compare 0x40ba, 0 - callif 1, NewMauville_Entrance_EventScript_15E4A1 + call_if 1, NewMauville_Entrance_EventScript_15E4A1 end NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 @@ -28,10 +28,10 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC msgbox NewMauville_Entrance_Text_1982C0, 4 checkitem ITEM_BASEMENT_KEY, 1 compare RESULT, 0 - jumpeq NewMauville_Entrance_EventScript_15E55D + goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982D4, 5 compare RESULT, 0 - jumpeq NewMauville_Entrance_EventScript_15E55D + goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmaptile 3, 0, 707, 0 setmaptile 4, 0, 708, 0 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index b088b8e7d..352bb8a6d 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -6,11 +6,11 @@ NewMauville_Inside_MapScripts:: @ 815E55F NewMauville_Inside_MapScript1_15E56F:: @ 815E56F compare 0x4001, 1 - callif 1, NewMauville_Inside_EventScript_15E5DA + call_if 1, NewMauville_Inside_EventScript_15E5DA compare 0x4002, 1 - callif 1, NewMauville_Inside_EventScript_15E728 + call_if 1, NewMauville_Inside_EventScript_15E728 checkflag 2145 - callif 1, NewMauville_Inside_EventScript_15E58F + call_if 1, NewMauville_Inside_EventScript_15E58F end NewMauville_Inside_EventScript_15E58F:: @ 815E58F @@ -24,7 +24,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 NewMauville_Inside_MapScript1_15E59E:: @ 815E59E compare 0x40ba, 2 - callif 1, NewMauville_Inside_EventScript_15E88B + call_if 1, NewMauville_Inside_EventScript_15E88B end NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA @@ -151,7 +151,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 lockall compare 0x40ba, 2 - jumpeq NewMauville_Inside_EventScript_15E8F6 + goto_if_eq NewMauville_Inside_EventScript_15E8F6 msgbox NewMauville_Inside_Text_198315, 4 releaseall end diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index f1d554d87..d620df71e 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -6,11 +6,11 @@ OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E setflag 2064 checkflag 116 - callif 0, OldaleTown_EventScript_14DD92 + call_if 0, OldaleTown_EventScript_14DD92 checkflag 132 - callif 0, OldaleTown_EventScript_14DD9E + call_if 0, OldaleTown_EventScript_14DD9E checkflag 116 - callif 1, OldaleTown_EventScript_14DD8C + call_if 1, OldaleTown_EventScript_14DD8C end OldaleTown_EventScript_14DD8C:: @ 814DD8C @@ -39,9 +39,9 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC lock faceplayer checkflag 132 - jumpeq OldaleTown_EventScript_14DE79 + goto_if_eq OldaleTown_EventScript_14DE79 checkflag 1 - jumpeq OldaleTown_EventScript_14DE79 + goto_if_eq OldaleTown_EventScript_14DE79 setflag 1 playmusic 420, 0 msgbox OldaleTown_Text_16AEF2, 4 @@ -77,7 +77,7 @@ OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 giveitem ITEM_POTION compare RESULT, 0 - jumpeq OldaleTown_EventScript_14DE83 + goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 setflag 132 fadedefault @@ -196,7 +196,7 @@ OldaleTown_EventScript_14DEDF:: @ 814DEDF lock faceplayer checkflag 116 - jumpeq OldaleTown_EventScript_14DF26 + goto_if_eq OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closebutton move 3, OldaleTown_Movement_1A083D @@ -258,9 +258,9 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 OldaleTown_EventScript_14DF92:: @ 814DF92 checkgender compare RESULT, 0 - jumpeq OldaleTown_EventScript_14DFAA + goto_if_eq OldaleTown_EventScript_14DFAA compare RESULT, 1 - jumpeq OldaleTown_EventScript_14DFB8 + goto_if_eq OldaleTown_EventScript_14DFB8 end OldaleTown_EventScript_14DFAA:: @ 814DFAA diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index 3f4994890..77d7eee4d 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -7,7 +7,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 message OldaleTown_Mart_Text_1A0BE4 waittext checkflag 116 - jumpeq OldaleTown_Mart_EventScript_152FA8 + goto_if_eq OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 msgbox OldaleTown_Mart_Text_1A0C02, 4 release @@ -44,7 +44,7 @@ OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 lock faceplayer checkflag 116 - jumpeq OldaleTown_Mart_EventScript_152FDB + goto_if_eq OldaleTown_Mart_EventScript_152FDB msgbox OldaleTown_Mart_Text_174A8A, 4 release end diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index 4ba96ddc8..6d2fe54f0 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -27,7 +27,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer checkflag 2049 - jumpeq OldaleTown_PokemonCenter_1F_EventScript_152F4C + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index f2174441f..aaeeb2453 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -7,27 +7,27 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 checkdailyflags call PacifidlogTown_House2_EventScript_1541B4 checkflag 299 - jumpeq PacifidlogTown_House2_EventScript_154254 + goto_if_eq PacifidlogTown_House2_EventScript_154254 checkflag 300 - callif 1, PacifidlogTown_House2_EventScript_1541CE + call_if 1, PacifidlogTown_House2_EventScript_1541CE checkflag 300 - callif 0, PacifidlogTown_House2_EventScript_1541D7 + call_if 0, PacifidlogTown_House2_EventScript_1541D7 setflag 300 specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 4 - jumpif 4, PacifidlogTown_House2_EventScript_1541EC + goto_if 4, PacifidlogTown_House2_EventScript_1541EC specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 2 - jumpif 4, PacifidlogTown_House2_EventScript_15421B + goto_if 4, PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag 299 - jumpif 0, PacifidlogTown_House2_EventScript_1A14DC + goto_if 0, PacifidlogTown_House2_EventScript_1A14DC specialval RESULT, sub_810F908 compare RESULT, 0 - callif 1, PacifidlogTown_House2_EventScript_1541E8 + call_if 1, PacifidlogTown_House2_EventScript_1541E8 return PacifidlogTown_House2_EventScript_1541CE:: @ 81541CE @@ -47,7 +47,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 giveitem ITEM_TM27 compare RESULT, 0 - jumpeq PacifidlogTown_House2_EventScript_1A029B + goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 @@ -63,7 +63,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 giveitem ITEM_TM21 compare RESULT, 0 - jumpeq PacifidlogTown_House2_EventScript_1A029B + goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 6ab9a09b0..73f749400 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -5,24 +5,24 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E lock faceplayer checkflag 154 - jumpeq PacifidlogTown_House3_EventScript_154338 + goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar 0x8008, 2 copyvar 0x8004, 0x8008 specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 - jumpeq PacifidlogTown_House3_EventScript_154320 + goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 compare 0x8004, 255 - jumpeq PacifidlogTown_House3_EventScript_154320 + goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT comparevars RESULT, 0x8009 - jumpif 5, PacifidlogTown_House3_EventScript_15432A + goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a special sub_804DB68 diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index e48644beb..b7a6c9f86 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -14,9 +14,9 @@ PacifidlogTown_House4_EventScript_15435E:: @ 815435E faceplayer msgbox PacifidlogTown_House4_Text_17963D, 5 compare RESULT, 1 - jumpeq PacifidlogTown_House4_EventScript_15437F + goto_if_eq PacifidlogTown_House4_EventScript_15437F compare RESULT, 0 - jumpeq PacifidlogTown_House4_EventScript_154389 + goto_if_eq PacifidlogTown_House4_EventScript_154389 end PacifidlogTown_House4_EventScript_15437F:: @ 815437F diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index dca1a51b0..fdc496d1f 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -6,7 +6,7 @@ PacifidlogTown_House5_EventScript_154394:: @ 8154394 faceplayer specialval RESULT, IsMirageIslandPresent compare RESULT, 1 - jumpeq PacifidlogTown_House5_EventScript_1543B0 + goto_if_eq PacifidlogTown_House5_EventScript_1543B0 msgbox PacifidlogTown_House5_Text_179718, 4 release end diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index ed575844c..1ffc14144 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -6,9 +6,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag 2070 compare 0x4057, 0 - callif 1, PetalburgCity_EventScript_14B731 + call_if 1, PetalburgCity_EventScript_14B731 compare 0x4057, 2 - callif 1, PetalburgCity_EventScript_14B739 + call_if 1, PetalburgCity_EventScript_14B739 end PetalburgCity_EventScript_14B731:: @ 814B731 @@ -188,23 +188,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 move 9, PetalburgCity_Movement_1A0835 waitmove 0 compare 0x8008, 0 - callif 1, PetalburgCity_EventScript_14B91B + call_if 1, PetalburgCity_EventScript_14B91B compare 0x8008, 1 - callif 1, PetalburgCity_EventScript_14B930 + call_if 1, PetalburgCity_EventScript_14B930 compare 0x8008, 2 - callif 1, PetalburgCity_EventScript_14B93B + call_if 1, PetalburgCity_EventScript_14B93B compare 0x8008, 3 - callif 1, PetalburgCity_EventScript_14B950 + call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closebutton compare 0x8008, 0 - callif 1, PetalburgCity_EventScript_14B965 + call_if 1, PetalburgCity_EventScript_14B965 compare 0x8008, 1 - callif 1, PetalburgCity_EventScript_14B977 + call_if 1, PetalburgCity_EventScript_14B977 compare 0x8008, 2 - callif 1, PetalburgCity_EventScript_14B989 + call_if 1, PetalburgCity_EventScript_14B989 compare 0x8008, 3 - callif 1, PetalburgCity_EventScript_14B99B + call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 move 9, PetalburgCity_Movement_1A0843 move 255, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index f8dfb0a39..4b0757f63 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -7,28 +7,28 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C compare 0x4085, 6 - jumpeq PetalburgCity_Gym_EventScript_1544A3 + goto_if_eq PetalburgCity_Gym_EventScript_1544A3 compare 0x4085, 7 - callif 4, PetalburgCity_Gym_EventScript_1544ED + call_if 4, PetalburgCity_Gym_EventScript_1544ED end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar 0x8005, 1 call PetalburgCity_Gym_EventScript_154F9A checktrainerflag OPPONENT_RANDALL - callif 1, PetalburgCity_Gym_EventScript_154FBB + call_if 1, PetalburgCity_Gym_EventScript_154FBB checktrainerflag OPPONENT_MARY - callif 1, PetalburgCity_Gym_EventScript_154FDC + call_if 1, PetalburgCity_Gym_EventScript_154FDC checktrainerflag OPPONENT_PARKER - callif 1, PetalburgCity_Gym_EventScript_154FFD + call_if 1, PetalburgCity_Gym_EventScript_154FFD checktrainerflag OPPONENT_LORI - callif 1, PetalburgCity_Gym_EventScript_15501E + call_if 1, PetalburgCity_Gym_EventScript_15501E checktrainerflag OPPONENT_GEORGE - callif 1, PetalburgCity_Gym_EventScript_15503F + call_if 1, PetalburgCity_Gym_EventScript_15503F checktrainerflag OPPONENT_JODY - callif 1, PetalburgCity_Gym_EventScript_155060 + call_if 1, PetalburgCity_Gym_EventScript_155060 checktrainerflag OPPONENT_BERKE - callif 1, PetalburgCity_Gym_EventScript_155081 + call_if 1, PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -45,11 +45,11 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED PetalburgCity_Gym_MapScript1_15451B:: @ 815451B compare 0x4085, 1 - callif 1, PetalburgCity_Gym_EventScript_15453B + call_if 1, PetalburgCity_Gym_EventScript_15453B compare 0x4085, 6 - callif 0, PetalburgCity_Gym_EventScript_154543 + call_if 0, PetalburgCity_Gym_EventScript_154543 checkflag 2052 - callif 1, PetalburgCity_Gym_EventScript_15454B + call_if 1, PetalburgCity_Gym_EventScript_15454B end PetalburgCity_Gym_EventScript_15453B:: @ 815453B @@ -145,65 +145,65 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 reappear 10 playsfx 8 compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_1547EE + call_if 1, PetalburgCity_Gym_EventScript_1547EE compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_154800 + call_if 1, PetalburgCity_Gym_EventScript_154800 compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_15481C + call_if 1, PetalburgCity_Gym_EventScript_15481C compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_15481C + call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_154884 + call_if 1, PetalburgCity_Gym_EventScript_154884 compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_15488F + call_if 1, PetalburgCity_Gym_EventScript_15488F compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_1548A1 + call_if 1, PetalburgCity_Gym_EventScript_1548A1 compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_1548B3 + call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_1548C5 + call_if 1, PetalburgCity_Gym_EventScript_1548C5 compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_1548D0 + call_if 1, PetalburgCity_Gym_EventScript_1548D0 compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_1548DB + call_if 1, PetalburgCity_Gym_EventScript_1548DB compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_1548E6 + call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_15492F + call_if 1, PetalburgCity_Gym_EventScript_15492F compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_154930 + call_if 1, PetalburgCity_Gym_EventScript_154930 compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_15493B + call_if 1, PetalburgCity_Gym_EventScript_15493B compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_15493C + call_if 1, PetalburgCity_Gym_EventScript_15493C compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_1548F1 + call_if 1, PetalburgCity_Gym_EventScript_1548F1 compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_1548FC + call_if 1, PetalburgCity_Gym_EventScript_1548FC compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_1548F1 + call_if 1, PetalburgCity_Gym_EventScript_1548F1 compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_1548F1 + call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closebutton setflag 0x4001 playmusic 420, 0 compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_154835 + call_if 1, PetalburgCity_Gym_EventScript_154835 compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_15484E + call_if 1, PetalburgCity_Gym_EventScript_15484E compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_154860 + call_if 1, PetalburgCity_Gym_EventScript_154860 compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_154872 + call_if 1, PetalburgCity_Gym_EventScript_154872 disappear 10 setflag 728 setvar 0x4085, 1 @@ -353,11 +353,11 @@ PetalburgCity_Gym_EventScript_15493C:: @ 815493C PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_1549B8 + goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag 169 - jumpif 0, PetalburgCity_Gym_EventScript_154A2C + goto_if 0, PetalburgCity_Gym_EventScript_154A2C checkflag 2052 - jumpeq PetalburgCity_Gym_EventScript_154B69 + goto_if_eq PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release end @@ -365,15 +365,15 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D PetalburgCity_Gym_EventScript_154969:: @ 8154969 specialval RESULT, IsEnigmaBerryValid compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkpcitem ITEM_ENIGMA_BERRY, 1 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 compare 0x402d, 0 - jumpeq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 setvar RESULT, 1 return @@ -385,7 +385,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem ITEM_ENIGMA_BERRY compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_1A029B + goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 release end @@ -414,28 +414,28 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_1A029B + goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag 169 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closebutton compare FACING, 2 - callif 1, PetalburgCity_Gym_EventScript_154ABC + call_if 1, PetalburgCity_Gym_EventScript_154ABC compare FACING, 1 - callif 1, PetalburgCity_Gym_EventScript_154AC7 + call_if 1, PetalburgCity_Gym_EventScript_154AC7 compare FACING, 3 - callif 1, PetalburgCity_Gym_EventScript_154AD2 + call_if 1, PetalburgCity_Gym_EventScript_154AD2 compare FACING, 4 - callif 1, PetalburgCity_Gym_EventScript_154ADD + call_if 1, PetalburgCity_Gym_EventScript_154ADD pause 70 compare FACING, 2 - callif 1, PetalburgCity_Gym_EventScript_154AE8 + call_if 1, PetalburgCity_Gym_EventScript_154AE8 compare FACING, 1 - callif 1, PetalburgCity_Gym_EventScript_154AF3 + call_if 1, PetalburgCity_Gym_EventScript_154AF3 compare FACING, 3 - callif 1, PetalburgCity_Gym_EventScript_154AFE + call_if 1, PetalburgCity_Gym_EventScript_154AFE compare FACING, 4 - callif 1, PetalburgCity_Gym_EventScript_154B09 + call_if 1, PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release end @@ -593,14 +593,14 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare 0x4085, 6 - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 @@ -623,150 +623,150 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare 0x4085, 6 - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall checktrainerflag OPPONENT_RANDALL - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall checktrainerflag OPPONENT_RANDALL - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall checktrainerflag OPPONENT_MARY - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall checktrainerflag OPPONENT_MARY - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall checktrainerflag OPPONENT_PARKER - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall checktrainerflag OPPONENT_LORI - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall checktrainerflag OPPONENT_LORI - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall checktrainerflag OPPONENT_GEORGE - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall checktrainerflag OPPONENT_JODY - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall checktrainerflag OPPONENT_BERKE - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154E29 + goto_if_eq PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -784,7 +784,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154E65 + goto_if_eq PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -802,7 +802,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154EA1 + goto_if_eq PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -820,7 +820,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154EDD + goto_if_eq PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -838,7 +838,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154F19 + goto_if_eq PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -856,7 +856,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154F55 + goto_if_eq PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -874,7 +874,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154F91 + goto_if_eq PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end @@ -892,72 +892,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A setvar 0x8004, 1 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB setvar 0x8004, 2 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC setvar 0x8004, 3 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD setvar 0x8004, 4 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E setvar 0x8004, 5 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F setvar 0x8004, 6 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 setvar 0x8004, 7 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 setvar 0x8004, 8 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return @@ -1022,7 +1022,7 @@ PetalburgCity_Gym_EventScript_15518B:: @ 815518B lock faceplayer checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_1551A0 + goto_if_eq PetalburgCity_Gym_EventScript_1551A0 msgbox PetalburgCity_Gym_Text_17AB96, 4 release end @@ -1035,14 +1035,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall checkflag 2059 - jumpeq PetalburgCity_Gym_EventScript_1551CA + goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall checkflag 2059 - jumpeq PetalburgCity_Gym_EventScript_1551CA + goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc index 2eac03cac..ab7bb822a 100644 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ b/data/scripts/maps/PetalburgCity_Mart.inc @@ -7,7 +7,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 message PetalburgCity_Mart_Text_1A0BE4 waittext checkflag 296 - jumpeq PetalburgCity_Mart_EventScript_1552EA + goto_if_eq PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 msgbox PetalburgCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 5ef99eee1..63dcaa6ca 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -29,17 +29,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 specialval RESULT, IsStarterInParty compare RESULT, 1 - jumpeq PetalburgCity_PokemonCenter_1F_EventScript_15524F + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F release end PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F compare 0x4023, 0 - callif 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 compare 0x4023, 1 - callif 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B compare 0x4023, 2 - callif 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index fb521aa46..d8e95d8c6 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -5,13 +5,13 @@ PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 lock faceplayer checkflag 126 - jumpeq PetalburgCity_WallysHouse_EventScript_1543F7 + goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 checkflag 122 - jumpeq PetalburgCity_WallysHouse_EventScript_154427 + goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 checkflag 1217 - jumpeq PetalburgCity_WallysHouse_EventScript_154406 + goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 checkflag 135 - jumpeq PetalburgCity_WallysHouse_EventScript_15443B + goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B msgbox PetalburgCity_WallysHouse_Text_179805, 4 setflag 135 release @@ -19,7 +19,7 @@ PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 checkflag 122 - jumpeq PetalburgCity_WallysHouse_EventScript_154431 + goto_if_eq PetalburgCity_WallysHouse_EventScript_154431 goto PetalburgCity_WallysHouse_EventScript_154406 end @@ -50,9 +50,9 @@ PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 lock faceplayer checkflag 122 - jumpeq PetalburgCity_WallysHouse_EventScript_15446D + goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D checkflag 1217 - jumpeq PetalburgCity_WallysHouse_EventScript_154463 + goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 msgbox PetalburgCity_WallysHouse_Text_179C2C, 4 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 463fbec3c..d1d3a1b8a 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -92,7 +92,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA msgbox PetalburgWoods_Text_19507E, 4 giveitem ITEM_GREAT_BALL compare RESULT, 0 - jumpeq PetalburgWoods_EventScript_15CE3F + goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D end @@ -242,11 +242,11 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC lock faceplayer checkflag 297 - jumpeq PetalburgWoods_EventScript_15CF0B + goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem ITEM_MIRACLE_SEED compare RESULT, 0 - jumpeq PetalburgWoods_EventScript_1A029B + goto_if_eq PetalburgWoods_EventScript_1A029B setflag 297 release end @@ -273,7 +273,7 @@ PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq PetalburgWoods_EventScript_15CF65 + goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 end diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index b0a714763..5f9f76be2 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -21,7 +21,7 @@ Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route102_EventScript_14EB25 + goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 end diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 2d0c1c921..d12f8918f 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -11,9 +11,9 @@ Route103_EventScript_14EB92:: @ 814EB92 lockall checkgender compare RESULT, 0 - jumpeq Route103_EventScript_14EBAB + goto_if_eq Route103_EventScript_14EBAB compare RESULT, 1 - jumpeq Route103_EventScript_14EC04 + goto_if_eq Route103_EventScript_14EC04 end Route103_EventScript_14EBAB:: @ 814EBAB @@ -175,7 +175,7 @@ Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route103_EventScript_14EDD6 + goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 end @@ -188,7 +188,7 @@ Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route103_EventScript_14EE1C + goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 end @@ -206,7 +206,7 @@ Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route103_EventScript_14EE75 + goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index d829c6a93..584ab47dd 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -18,9 +18,9 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 Route104_EventScript_14EEAE:: @ 814EEAE checkflag 127 - jumpif 0, Route104_EventScript_14EEC4 + goto_if 0, Route104_EventScript_14EEC4 checkflag 2057 - jumpif 0, Route104_EventScript_14EEC4 + goto_if 0, Route104_EventScript_14EEC4 clearflag 906 return @@ -32,11 +32,11 @@ Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer checkflag 246 - jumpeq Route104_EventScript_14EEFF + goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY compare RESULT, 0 - jumpeq Route104_EventScript_1A029B + goto_if_eq Route104_EventScript_1A029B setflag 246 msgbox Route104_Text_1C5665, 4 release @@ -51,11 +51,11 @@ Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer checkflag 279 - jumpeq Route104_EventScript_14EF38 + goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB compare RESULT, 0 - jumpeq Route104_EventScript_1A029B + goto_if_eq Route104_EventScript_1A029B setflag 279 release end @@ -105,11 +105,11 @@ Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer checkflag 262 - jumpeq Route104_EventScript_14EFC2 + goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 compare RESULT, 0 - jumpeq Route104_EventScript_1A029B + goto_if_eq Route104_EventScript_1A029B setflag 262 release end @@ -159,9 +159,9 @@ Route104_EventScript_14EFD5:: @ 814EFD5 moveoffscreen 2 setvar 0x408e, 0 checkflag 189 - jumpif 0, Route104_EventScript_14F08B + goto_if 0, Route104_EventScript_14F08B checkflag 189 - jumpeq Route104_EventScript_14F095 + goto_if_eq Route104_EventScript_14F095 end Route104_EventScript_14F08B:: @ 814F08B @@ -411,7 +411,7 @@ Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route104_EventScript_14F1C7 + goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -424,7 +424,7 @@ Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route104_EventScript_14F205 + goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -437,7 +437,7 @@ Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route104_EventScript_14F243 + goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 693939cf4..ce32a544a 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -5,9 +5,9 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag 2109 compare 0x4090, 1 - callif 1, Route104_MrBrineysHouse_EventScript_15BCD4 + call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag 188 - callif 1, Route104_MrBrineysHouse_EventScript_15BCD0 + call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 end Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 @@ -25,11 +25,11 @@ Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB lock faceplayer checkflag 147 - callif 0, Route104_MrBrineysHouse_EventScript_15BD0E + call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E checkflag 189 - jumpif 0, Route104_MrBrineysHouse_EventScript_15BD65 + goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65 checkflag 149 - jumpif 0, Route104_MrBrineysHouse_EventScript_15BD7E + goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E goto Route104_MrBrineysHouse_EventScript_15BD32 end @@ -38,7 +38,7 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 compare RESULT, 0 - jumpeq Route104_MrBrineysHouse_EventScript_15BD97 + goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -55,14 +55,14 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 msgbox Route104_MrBrineysHouse_Text_191CC3, 5 compare RESULT, 0 - jumpeq Route104_MrBrineysHouse_EventScript_15BD97 + goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E msgbox Route104_MrBrineysHouse_Text_191DA6, 5 compare RESULT, 0 - jumpeq Route104_MrBrineysHouse_EventScript_15BD97 + goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 02842c62d..d4d7b59cb 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -5,9 +5,9 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag 2108 checkflag 127 - jumpif 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 checkflag 2057 - jumpif 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 setflag 1 end @@ -19,25 +19,25 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B lock faceplayer checkflag 1 - jumpeq Route104_PrettyPetalFlowerShop_EventScript_15BE7C + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 checkflag 127 - jumpeq Route104_PrettyPetalFlowerShop_EventScript_15BE4A + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag 127 msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 compare RESULT, 1 - callif 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A compare RESULT, 0 - callif 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, 5 compare RESULT, 1 - callif 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A compare RESULT, 0 - callif 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -73,7 +73,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 lock faceplayer checkflag 94 - jumpif 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 + goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 release end @@ -91,13 +91,13 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA faceplayer checkdailyflags checkflag 2256 - jumpeq Route104_PrettyPetalFlowerShop_EventScript_15BF1A + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route104_PrettyPetalFlowerShop_EventScript_1A029B + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag 2256 msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 release diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index ff1c9d258..e090c4bf2 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -5,21 +5,21 @@ Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer checktrainerflag OPPONENT_BRIANNA_1 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_CINDY_2 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_AMY_AND_LIV_3 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_GINA_AND_MIA_2 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_LUCAS_2 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_MIKE_1 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 setflag 215 msgbox Route104_Prototype_Text_19B267, 4 checkflag 216 - jumpeq Route104_Prototype_EventScript_160CFB + goto_if_eq Route104_Prototype_EventScript_160CFB release end @@ -32,21 +32,21 @@ Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer checktrainerflag OPPONENT_BRIANNA_1 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_CINDY_2 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_AMY_AND_LIV_3 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_GINA_AND_MIA_2 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_LUCAS_2 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_MIKE_1 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 setflag 216 msgbox Route104_Prototype_Text_19B2E9, 4 checkflag 215 - jumpeq Route104_Prototype_EventScript_160CFB + goto_if_eq Route104_Prototype_EventScript_160CFB release end diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index c71e2ce05..1182dae7e 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -4,7 +4,7 @@ Route105_MapScripts:: @ 814F298 Route105_MapScript1_14F29E:: @ 814F29E checkflag 228 - callif 0, Route105_EventScript_14F2A8 + call_if 0, Route105_EventScript_14F2A8 end Route105_EventScript_14F2A8:: @ 814F2A8 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 0c25594c6..0acf70e64 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -19,7 +19,7 @@ Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route106_EventScript_14F38D + goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 end diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index a14bb7298..9daa57b7e 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -10,7 +10,7 @@ Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route107_EventScript_14F3FA + goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 6e9d4adff..09be54c49 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -272,7 +272,7 @@ Route109_EventScript_14F680:: @ 814F680 lock faceplayer checkflag 149 - jumpif 0, Route109_EventScript_14F691 + goto_if 0, Route109_EventScript_14F691 goto Route109_EventScript_14F6AF end @@ -280,7 +280,7 @@ Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 msgbox Route109_Text_16E0F9, 5 compare RESULT, 0 - jumpeq Route109_EventScript_14F6F1 + goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end @@ -329,11 +329,11 @@ Route109_EventScript_14F725:: @ 814F725 faceplayer special GetPlayerBigGuyGirlString checkflag 280 - jumpeq Route109_EventScript_14F762 + goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem ITEM_SOFT_SAND compare RESULT, 0 - jumpeq Route109_EventScript_1A029B + goto_if_eq Route109_EventScript_1A029B closebutton move LAST_TALKED, Route109_Movement_1A083D waitmove 0 @@ -398,7 +398,7 @@ Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route109_EventScript_14F830 + goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 end @@ -411,7 +411,7 @@ Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route109_EventScript_14F86E + goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index e8afb54fb..789ee3e56 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -10,11 +10,11 @@ Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 lock faceplayer checkflag 140 - jumpeq Route109_SeashoreHouse_EventScript_160E36 + goto_if_eq Route109_SeashoreHouse_EventScript_160E36 checkflag 141 - jumpeq Route109_SeashoreHouse_EventScript_160E08 + goto_if_eq Route109_SeashoreHouse_EventScript_160E08 checkflag 2 - jumpeq Route109_SeashoreHouse_EventScript_160DFE + goto_if_eq Route109_SeashoreHouse_EventScript_160DFE msgbox Route109_SeashoreHouse_Text_19B4D9, 4 setflag 2 release @@ -29,7 +29,7 @@ Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 giveitem ITEM_SODA_POP, 6 compare RESULT, 0 - jumpeq Route109_SeashoreHouse_EventScript_160E2C + goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag 140 release end @@ -44,7 +44,7 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 nop msgbox Route109_SeashoreHouse_Text_19B702, 5 compare RESULT, 1 - jumpeq Route109_SeashoreHouse_EventScript_160E5A + goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoney 0, 0 release @@ -53,10 +53,10 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A checkmoney 0x12c, 0 compare RESULT, 0 - jumpeq Route109_SeashoreHouse_EventScript_160E9E + goto_if_eq Route109_SeashoreHouse_EventScript_160E9E checkitemspace ITEM_SODA_POP, 1 compare RESULT, 0 - jumpeq Route109_SeashoreHouse_EventScript_160EAB + goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 paymoney 0x12c, 0 updatemoney 0, 0 @@ -95,11 +95,11 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 checktrainerflag OPPONENT_DWAYNE - jumpif 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if 0, Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_JOHANNA - jumpif 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if 0, Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_SIMON - jumpif 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if 0, Route109_SeashoreHouse_EventScript_160F29 setflag 141 release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 745faaddf..723c41e0c 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -13,7 +13,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 compare 0x40a9, 1 - callif 1, Route110_EventScript_14F92F + call_if 1, Route110_EventScript_14F92F end Route110_EventScript_14F92F:: @ 814F92F @@ -133,7 +133,7 @@ Route110_EventScript_14FA2E:: @ 814FA2E lockall specialval RESULT, GetRecordedCyclingRoadResults compare RESULT, 0 - jumpeq Route110_EventScript_14FA49 + goto_if_eq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 releaseall end @@ -148,9 +148,9 @@ Route110_EventScript_14FA53:: @ 814FA53 faceplayer specialval RESULT, GetPlayerAvatarBike compare RESULT, 1 - jumpeq Route110_EventScript_14FA84 + goto_if_eq Route110_EventScript_14FA84 compare 0x40a9, 0 - jumpeq Route110_EventScript_14FA7A + goto_if_eq Route110_EventScript_14FA7A msgbox Route110_Text_16F26A, 4 release end @@ -179,7 +179,7 @@ Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route110_EventScript_14FAE3 + goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 end @@ -207,7 +207,7 @@ Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route110_EventScript_14FB66 + goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 end @@ -225,7 +225,7 @@ Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route110_EventScript_14FBBB + goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 end @@ -238,7 +238,7 @@ Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route110_EventScript_14FBF9 + goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 end @@ -327,9 +327,9 @@ Route110_EventScript_14FD34:: @ 814FD34 lockall checkgender compare RESULT, 0 - callif 1, Route110_EventScript_14FDA7 + call_if 1, Route110_EventScript_14FDA7 compare RESULT, 1 - callif 1, Route110_EventScript_14FDAC + call_if 1, Route110_EventScript_14FDAC move 28, Route110_Movement_1A0845 waitmove 0 move 28, Route110_Movement_1A0833 @@ -338,16 +338,16 @@ Route110_EventScript_14FD34:: @ 814FD34 waitmove 0 pause 30 compare 0x8008, 1 - callif 1, Route110_EventScript_14FF14 + call_if 1, Route110_EventScript_14FF14 compare 0x8008, 2 - callif 1, Route110_EventScript_14FF1F + call_if 1, Route110_EventScript_14FF1F compare 0x8008, 3 - callif 1, Route110_EventScript_14FF2A + call_if 1, Route110_EventScript_14FF2A checkgender compare RESULT, 0 - jumpeq Route110_EventScript_14FDB1 + goto_if_eq Route110_EventScript_14FDB1 compare RESULT, 1 - jumpeq Route110_EventScript_14FE2B + goto_if_eq Route110_EventScript_14FE2B releaseall end @@ -426,22 +426,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closebutton compare 0x8008, 1 - callif 1, Route110_EventScript_14FF56 + call_if 1, Route110_EventScript_14FF56 compare 0x8008, 2 - callif 1, Route110_EventScript_14FF5E + call_if 1, Route110_EventScript_14FF5E compare 0x8008, 3 - callif 1, Route110_EventScript_14FF66 + call_if 1, Route110_EventScript_14FF66 spritebehave 28, 10 spritebehave 29, 10 disappear 28 reappear 29 pause 45 compare 0x8008, 1 - callif 1, Route110_EventScript_14FF35 + call_if 1, Route110_EventScript_14FF35 compare 0x8008, 2 - callif 1, Route110_EventScript_14FF40 + call_if 1, Route110_EventScript_14FF40 compare 0x8008, 3 - callif 1, Route110_EventScript_14FF4B + call_if 1, Route110_EventScript_14FF4B disappear 29 setvar 0x4069, 1 playmusicbattle 0 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 96e492b39..32b3ae4fb 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -4,9 +4,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE compare 0x40a9, 3 - callif 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 compare 0x40a9, 2 - callif 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5 @@ -25,9 +25,9 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 lockall specialval RESULT, GetPlayerAvatarBike @ player state? compare RESULT, 2 - callif 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D + call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 - jumpeq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 + goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag 2091 setvar 0x4001, 1 releaseall diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 08d6fb5f1..95ea7454e 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -12,7 +12,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B lockall specialval RESULT, GetPlayerAvatarBike compare RESULT, 0 - jumpeq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 + goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag 2091 setvar 0x4001, 1 releaseall diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 10e1a6865..d18f30a43 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B compare 0x4001, 1 - callif 1, Route110_TrickHouseEnd_EventScript_161994 + call_if 1, Route110_TrickHouseEnd_EventScript_161994 end Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 @@ -62,7 +62,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B setvar 0x40c1, 0 giveitem ITEM_RARE_CANDY compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -75,7 +75,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 setvar 0x40c1, 0 giveitem ITEM_TIMER_BALL compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -88,7 +88,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 setvar 0x40c1, 0 giveitem ITEM_HARD_STONE compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -101,7 +101,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF setvar 0x40c1, 0 giveitem ITEM_SMOKE_BALL compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -114,7 +114,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB setvar 0x40c1, 0 giveitem ITEM_TM12 compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -127,7 +127,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 setvar 0x40c1, 0 giveitem ITEM_MAGNET compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -140,7 +140,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 setvar 0x40c1, 0 giveitem ITEM_PP_MAX compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -151,13 +151,13 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closebutton compare FACING, 1 - callif 1, Route110_TrickHouseEnd_EventScript_161C74 + call_if 1, Route110_TrickHouseEnd_EventScript_161C74 compare FACING, 2 - callif 1, Route110_TrickHouseEnd_EventScript_161C7F + call_if 1, Route110_TrickHouseEnd_EventScript_161C7F compare FACING, 3 - callif 1, Route110_TrickHouseEnd_EventScript_161C8A + call_if 1, Route110_TrickHouseEnd_EventScript_161C8A compare FACING, 4 - callif 1, Route110_TrickHouseEnd_EventScript_161C95 + call_if 1, Route110_TrickHouseEnd_EventScript_161C95 pause 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 closebutton @@ -172,7 +172,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF givedecoration 31 .endc compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C61 + call_if 1, Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E special ResetTrickHouseEndRoomFlag diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 2601942be..81d6a44e0 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -7,17 +7,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B setflag 2114 compare 0x40b5, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_160FCE + goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE compare 0x40c1, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_160FB2 + goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 compare 0x40a6, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_16108E + goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E compare 0x40a7, 5 - callif 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE compare 0x40a7, 3 - callif 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE compare 0x40a7, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE switch 0x40a7 case 0, Route110_TrickHouseEntrance_EventScript_16109A case 1, Route110_TrickHouseEntrance_EventScript_1610A0 @@ -28,7 +28,7 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 setvar 0x40a5, 1 compare 0x4044, 8 - jumpeq Route110_TrickHouseEntrance_EventScript_160FC8 + goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 setvar 0x40a7, 2 end @@ -45,56 +45,56 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE setvar 0x40a7, 0 compare 0x4044, 1 - callif 1, Route110_TrickHouseEntrance_EventScript_16103C + call_if 1, Route110_TrickHouseEntrance_EventScript_16103C compare 0x4044, 2 - callif 1, Route110_TrickHouseEntrance_EventScript_161046 + call_if 1, Route110_TrickHouseEntrance_EventScript_161046 compare 0x4044, 3 - callif 1, Route110_TrickHouseEntrance_EventScript_161050 + call_if 1, Route110_TrickHouseEntrance_EventScript_161050 compare 0x4044, 4 - callif 1, Route110_TrickHouseEntrance_EventScript_16105A + call_if 1, Route110_TrickHouseEntrance_EventScript_16105A compare 0x4044, 5 - callif 1, Route110_TrickHouseEntrance_EventScript_161064 + call_if 1, Route110_TrickHouseEntrance_EventScript_161064 compare 0x4044, 6 - callif 1, Route110_TrickHouseEntrance_EventScript_16106E + call_if 1, Route110_TrickHouseEntrance_EventScript_16106E compare 0x4044, 7 - callif 1, Route110_TrickHouseEntrance_EventScript_161078 + call_if 1, Route110_TrickHouseEntrance_EventScript_161078 compare 0x4044, 8 - callif 1, Route110_TrickHouseEntrance_EventScript_161082 + call_if 1, Route110_TrickHouseEntrance_EventScript_161082 return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C checkflag 2057 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 checkflag 2058 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 checkflag 2059 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A checkflag 2060 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 checkflag 2061 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E checkflag 2062 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 checkflag 2052 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082 @@ -214,7 +214,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall pause 20 compare 0x4044, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_161327 + call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton pause 20 @@ -249,21 +249,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D move 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmove 0 compare 0x4044, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1612CD + call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD compare 0x4044, 1 - callif 1, Route110_TrickHouseEntrance_EventScript_1612D6 + call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 compare 0x4044, 2 - callif 1, Route110_TrickHouseEntrance_EventScript_1612DF + call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF compare 0x4044, 3 - callif 1, Route110_TrickHouseEntrance_EventScript_1612E8 + call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 compare 0x4044, 4 - callif 1, Route110_TrickHouseEntrance_EventScript_1612F1 + call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 compare 0x4044, 5 - callif 1, Route110_TrickHouseEntrance_EventScript_1612FA + call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA compare 0x4044, 6 - callif 1, Route110_TrickHouseEntrance_EventScript_161303 + call_if 1, Route110_TrickHouseEntrance_EventScript_161303 compare 0x4044, 7 - callif 1, Route110_TrickHouseEntrance_EventScript_16130C + call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closebutton setvar 0x40a6, 1 warp Route110_TrickHouseEntrance, 255, 6, 2 @@ -352,27 +352,27 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E waitmove 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 compare 0x4044, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_1613CE + goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE compare 0x4044, 2 - jumpeq Route110_TrickHouseEntrance_EventScript_1613FA + goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA compare 0x4044, 3 - jumpeq Route110_TrickHouseEntrance_EventScript_161426 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 compare 0x4044, 4 - jumpeq Route110_TrickHouseEntrance_EventScript_161452 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 compare 0x4044, 5 - jumpeq Route110_TrickHouseEntrance_EventScript_16147E + goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E compare 0x4044, 6 - jumpeq Route110_TrickHouseEntrance_EventScript_1614AA + goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA compare 0x4044, 7 - jumpeq Route110_TrickHouseEntrance_EventScript_1614D6 + goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE giveitem ITEM_RARE_CANDY compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -380,9 +380,9 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA giveitem ITEM_TIMER_BALL compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -390,9 +390,9 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 giveitem ITEM_HARD_STONE compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -400,9 +400,9 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 giveitem ITEM_SMOKE_BALL compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -410,9 +410,9 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E giveitem ITEM_TM12 compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -420,9 +420,9 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA giveitem ITEM_MAGNET compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -430,9 +430,9 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 giveitem ITEM_PP_MAX compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -455,9 +455,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 givedecoration 31 .endif compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161551 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02B8 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall end @@ -496,7 +496,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 closebutton compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_1615DD + goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end @@ -578,7 +578,7 @@ Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 compare 0x4044, 8 - jumpeq Route110_TrickHouseEntrance_EventScript_1616D7 + goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 releaseall end @@ -603,7 +603,7 @@ gUnknown_081616E1:: @ 81616E1 Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 compare 0x40AB, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 playsfx SE_PIN setvar 0x40AB, 2 @@ -614,7 +614,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 compare 0x40AC, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 playsfx SE_PIN setvar 0x40AC, 2 @@ -625,7 +625,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 compare 0x40AD, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 playsfx SE_PIN setvar 0x40AD, 2 @@ -636,7 +636,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB compare 0x40AE, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 playsfx SE_PIN setvar 0x40AE, 2 @@ -647,7 +647,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 compare 0x40AF, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 playsfx SE_PIN setvar 0x40AF, 2 @@ -658,7 +658,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D compare 0x40B0, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 playsfx SE_PIN setvar 0x40B0, 2 @@ -669,7 +669,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 compare 0x40B1, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 playsfx SE_PIN setvar 0x40B1, 2 @@ -680,7 +680,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F compare 0x40B2, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 playsfx SE_PIN setvar 0x40B2, 2 @@ -727,11 +727,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall compare 0x4044, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1618E1 + call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 compare 0x4044, 1 - callif 1, Route110_TrickHouseEntrance_EventScript_1618F6 + call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 compare 0x4044, 2 - callif 1, Route110_TrickHouseEntrance_EventScript_16190B + call_if 1, Route110_TrickHouseEntrance_EventScript_16190B setvar 0x40a5, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index b4f800876..3a89c2db1 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE compare 0x40ab, 2 - jumpeq Route110_TrickHousePuzzle1_EventScript_161D0A + goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A end Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A @@ -14,7 +14,7 @@ Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall compare 0x40ab, 0 - jumpeq Route110_TrickHousePuzzle1_EventScript_161D26 + goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 goto Route110_TrickHousePuzzle1_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 96e9d8143..a4731d329 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -5,13 +5,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 compare 0x4001, 1 - callif 1, Route110_TrickHousePuzzle2_EventScript_161E2C + call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C compare 0x4002, 1 - callif 1, Route110_TrickHousePuzzle2_EventScript_161E3F + call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F compare 0x4003, 1 - callif 1, Route110_TrickHousePuzzle2_EventScript_161E52 + call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 compare 0x4004, 1 - callif 1, Route110_TrickHousePuzzle2_EventScript_161E65 + call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE @@ -24,7 +24,7 @@ Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall compare 0x40ac, 0 - jumpeq Route110_TrickHousePuzzle2_EventScript_161DD5 + goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 goto Route110_TrickHousePuzzle2_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index c81c5dd1c..86d68a6ef 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 compare 0x4009, 0 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 @@ -32,19 +32,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmaptile 1, 3, 600, 0 setmaptile 10, 2, 600, 0 compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle3_EventScript_161F9F + call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FA9 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FB3 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FBD + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FC7 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 compare 0x4008, 6 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FD1 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 compare 0x4008, 7 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FDB + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F @@ -303,19 +303,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar 0x4006, 0 setvar 0x4007, 0 compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle3_EventScript_162683 + call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle3_EventScript_162689 + call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle3_EventScript_16268F + call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle3_EventScript_162695 + call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle3_EventScript_16269B + call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B compare 0x4008, 6 - callif 1, Route110_TrickHousePuzzle3_EventScript_1626A1 + call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 compare 0x4008, 7 - callif 1, Route110_TrickHousePuzzle3_EventScript_1626A7 + call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 @@ -348,14 +348,14 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 compare 0x4009, 0 - callif 1, Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView compare 0x4009, 1 - jumpeq Route110_TrickHousePuzzle3_EventScript_1626DD + goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD compare 0x4009, 0 - jumpeq Route110_TrickHousePuzzle3_EventScript_1626E4 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end Route110_TrickHousePuzzle3_EventScript_1626DD:: @ 81626DD @@ -371,7 +371,7 @@ Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall compare 0x40ad, 0 - jumpeq Route110_TrickHousePuzzle3_EventScript_1626FD + goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD goto Route110_TrickHousePuzzle3_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 11c0074d9..0c9fc426f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall compare 0x40ae, 0 - jumpeq Route110_TrickHousePuzzle4_EventScript_162760 + goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 goto Route110_TrickHousePuzzle4_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index be416e326..72268710b 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -14,7 +14,7 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall compare 0x40af, 0 - jumpeq Route110_TrickHousePuzzle5_EventScript_1627E7 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 goto Route110_TrickHousePuzzle5_EventScript_161892 end @@ -28,7 +28,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 move 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 compare 0x4001, 1 - jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F end @@ -38,7 +38,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 move 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 compare 0x4002, 1 - jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end @@ -48,7 +48,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 move 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 compare 0x4003, 1 - jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 end @@ -58,7 +58,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 move 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 compare 0x4004, 1 - jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B end @@ -68,7 +68,7 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 move 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 compare 0x4005, 1 - jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F end @@ -166,11 +166,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F move 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare 0x4009, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B compare 0x4009, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 switch RESULT @@ -188,11 +188,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 move 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E9B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B compare 0x4009, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162ED3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 compare 0x4009, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F0B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 switch RESULT @@ -210,11 +210,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 move 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare 0x4009, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B compare 0x4009, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 switch RESULT @@ -232,11 +232,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B move 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare 0x4009, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B compare 0x4009, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 switch RESULT @@ -254,11 +254,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F move 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E9B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B compare 0x4009, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162ED3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 compare 0x4009, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F0B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 switch RESULT @@ -419,80 +419,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F43 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F4E + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F59 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F64 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F6F + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F7A + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F85 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F90 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F9B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FA6 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FB1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FBC + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FC7 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 compare 0x4009, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FD2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 compare 0x4009, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FDD + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FE8 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FF3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FFE + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_163009 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_163014 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_16301F + call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_16302A + call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_163035 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_163040 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_16304B + call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_163056 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_163061 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_16306C + call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_163077 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_163082 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index bd0a7c8d8..ddf845142 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -18,7 +18,7 @@ Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall compare 0x40b0, 0 - jumpeq Route110_TrickHousePuzzle6_EventScript_1630FC + goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC goto Route110_TrickHousePuzzle6_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index a4093c546..c9dcce5e3 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -11,15 +11,15 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 checkflag 194 - callif 1, Route110_TrickHousePuzzle7_EventScript_163195 + call_if 1, Route110_TrickHousePuzzle7_EventScript_163195 checkflag 195 - callif 1, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8 checkflag 196 - callif 1, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB checkflag 197 - callif 1, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE checkflag 198 - callif 1, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1 return Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 @@ -74,7 +74,7 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 compare 0x40b6, 1 - jumpeq Route110_TrickHousePuzzle7_EventScript_16326E + goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E clearflag 194 clearflag 195 clearflag 196 @@ -87,7 +87,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F compare 0x40b6, 1 - callif 1, Route110_TrickHousePuzzle7_EventScript_163167 + call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 end Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B @@ -101,7 +101,7 @@ Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall compare 0x40b1, 0 - jumpeq Route110_TrickHousePuzzle7_EventScript_16329D + goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D goto Route110_TrickHousePuzzle7_EventScript_161892 end @@ -122,75 +122,75 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall pause 32 checkflag 194 - callif 0, Route110_TrickHousePuzzle7_EventScript_163195 + call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 checkflag 194 - callif 1, Route110_TrickHousePuzzle7_EventScript_1631F4 + call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView playsfx 36 checkflag 194 - jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633A4 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 checkflag 194 - jumpeq Route110_TrickHousePuzzle7_EventScript_1633A9 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9 end Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall pause 32 checkflag 195 - callif 0, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 checkflag 195 - callif 1, Route110_TrickHousePuzzle7_EventScript_163207 + call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView playsfx 36 checkflag 195 - jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633AE + goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE checkflag 195 - jumpeq Route110_TrickHousePuzzle7_EventScript_1633B3 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3 end Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall pause 32 checkflag 196 - callif 0, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB checkflag 196 - callif 1, Route110_TrickHousePuzzle7_EventScript_16321A + call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView playsfx 36 checkflag 196 - jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633B8 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 checkflag 196 - jumpeq Route110_TrickHousePuzzle7_EventScript_1633BD + goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD end Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall pause 32 checkflag 197 - callif 0, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE checkflag 197 - callif 1, Route110_TrickHousePuzzle7_EventScript_16322D + call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView playsfx 36 checkflag 197 - jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633C2 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 checkflag 197 - jumpeq Route110_TrickHousePuzzle7_EventScript_1633C7 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7 end Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall pause 32 checkflag 198 - callif 0, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 checkflag 198 - callif 1, Route110_TrickHousePuzzle7_EventScript_163240 + call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView playsfx 36 checkflag 198 - jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633CC + goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC checkflag 198 - jumpeq Route110_TrickHousePuzzle7_EventScript_1633D1 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1 end Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index d4afab4ea..5f0b00684 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall compare 0x40b2, 0 - jumpeq Route110_TrickHousePuzzle8_EventScript_16342E + goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E goto Route110_TrickHousePuzzle8_EventScript_161892 end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 68be7e7d2..2a69df98a 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -5,7 +5,7 @@ Route111_MapScripts:: @ 814FF91 Route111_MapScript1_14FF9C:: @ 814FF9C checkflag 228 - callif 0, Route111_EventScript_14FFA6 + call_if 0, Route111_EventScript_14FFA6 end Route111_EventScript_14FFA6:: @ 814FFA6 @@ -17,21 +17,21 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 checktrainerflag OPPONENT_VICKY - jumpif 0, Route111_EventScript_15000D + goto_if 0, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy 0x4000, 0x4001 compare 0x4001, 34 - jumpif 0, Route111_EventScript_15000C + goto_if 0, Route111_EventScript_15000C compare 0x4001, 107 - jumpif 2, Route111_EventScript_15000C + goto_if 2, Route111_EventScript_15000C compare 0x4001, 72 - jumpif 2, Route111_EventScript_150009 + goto_if 2, Route111_EventScript_150009 compare 0x4000, 2000 - jumpif 2, Route111_EventScript_15000C + goto_if 2, Route111_EventScript_15000C compare 0x4000, 8 - jumpif 0, Route111_EventScript_15000C + goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 setweather 8 @@ -53,7 +53,7 @@ Route111_EventScript_150023:: @ 8150023 lockall msgbox Route111_Text_16FA54, 5 compare RESULT, 0 - jumpeq Route111_EventScript_15005F + goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL closebutton setflag 963 @@ -75,7 +75,7 @@ Route111_EventScript_150069:: @ 8150069 lockall msgbox Route111_Text_16FAED, 5 compare RESULT, 0 - jumpeq Route111_EventScript_1500A5 + goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL closebutton setflag 964 @@ -122,11 +122,11 @@ Route111_EventScript_1500C5:: @ 81500C5 faceplayer checkdailyflags checkflag 2252 - jumpeq Route111_EventScript_150100 + goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem ITEM_RAZZ_BERRY compare RESULT, 0 - jumpeq Route111_EventScript_1A029B + goto_if_eq Route111_EventScript_1A029B setflag 2252 special GetPlayerBigGuyGirlString msgbox Route111_Text_1C5781, 4 @@ -165,7 +165,7 @@ Route111_EventScript_150122:: @ 8150122 Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 compare RESULT, 0 - jumpeq Route111_EventScript_150151 + goto_if_eq Route111_EventScript_150151 setvar 0x4003, 1 releaseall end @@ -174,13 +174,13 @@ Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closebutton compare 0x8004, 0 - callif 1, Route111_EventScript_150188 + call_if 1, Route111_EventScript_150188 compare 0x8004, 1 - callif 1, Route111_EventScript_150193 + call_if 1, Route111_EventScript_150193 compare 0x8004, 2 - callif 1, Route111_EventScript_15019E + call_if 1, Route111_EventScript_15019E compare 0x8004, 3 - callif 1, Route111_EventScript_1501A9 + call_if 1, Route111_EventScript_1501A9 releaseall end @@ -239,7 +239,7 @@ Route111_EventScript_1501D1:: @ 81501D1 setflag 2115 msgbox Route111_Text_16F705, 5 compare RESULT, 1 - jumpeq Route111_EventScript_1501F3 + goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release end @@ -394,7 +394,7 @@ Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route111_EventScript_15042A + goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 end @@ -422,7 +422,7 @@ Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route111_EventScript_1504AD + goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 end @@ -435,7 +435,7 @@ Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route111_EventScript_1504EB + goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 end diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index 107026a4b..a33b436dc 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -11,9 +11,9 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB faceplayer msgbox Route111_OldLadysRestStop_Text_1923AF, 5 compare RESULT, 1 - jumpeq Route111_OldLadysRestStop_EventScript_15BFFC + goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC compare RESULT, 0 - jumpeq Route111_OldLadysRestStop_EventScript_15C029 + goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC @@ -22,9 +22,9 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC call Route111_OldLadysRestStop_EventScript_1A02CA msgbox Route111_OldLadysRestStop_Text_19244D, 5 compare RESULT, 1 - jumpeq Route111_OldLadysRestStop_EventScript_15BFFC + goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC compare RESULT, 0 - jumpeq Route111_OldLadysRestStop_EventScript_15C029 + goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end Route111_OldLadysRestStop_EventScript_15C029:: @ 815C029 diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 3fbaf7958..39fc62eaf 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -14,11 +14,11 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A faceplayer setvar 0x8008, 3 checkflag 277 - jumpeq Route111_WinstrateFamilysHouse_EventScript_15BF72 + goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem ITEM_MACHO_BRACE compare RESULT, 0 - jumpeq Route111_WinstrateFamilysHouse_EventScript_1A029B + goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag 277 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -41,7 +41,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 faceplayer setvar 0x8008, 4 checkflag 4 - jumpeq Route111_WinstrateFamilysHouse_EventScript_15BFB6 + goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 setflag 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 1c1e36838..22c055320 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -40,7 +40,7 @@ Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route112_EventScript_150587 + goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 016b868a8..c4ab89f23 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -6,7 +6,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E warp6 Route112, 255, 28, 28 compare 0x40a3, 2 - callif 1, Route112_CableCarStation_EventScript_15C052 + call_if 1, Route112_CableCarStation_EventScript_15C052 end Route112_CableCarStation_EventScript_15C052:: @ 815C052 @@ -34,9 +34,9 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C faceplayer msgbox Route112_CableCarStation_Text_1924F5, 5 compare RESULT, 1 - jumpeq Route112_CableCarStation_EventScript_15C0AD + goto_if_eq Route112_CableCarStation_EventScript_15C0AD compare RESULT, 0 - jumpeq Route112_CableCarStation_EventScript_15C0DC + goto_if_eq Route112_CableCarStation_EventScript_15C0DC end Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 1fc5a9345..67d28e6df 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -15,9 +15,9 @@ Route113_MapScript1_1505DA:: @ 81505DA Route113_EventScript_1505E5:: @ 81505E5 getplayerxy 0x4000, 0x4001 compare 0x4000, 19 - jumpif 0, Route113_EventScript_150604 + goto_if 0, Route113_EventScript_150604 compare 0x4000, 84 - jumpif 2, Route113_EventScript_150604 + goto_if 2, Route113_EventScript_150604 setweather 7 return @@ -62,7 +62,7 @@ Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route113_EventScript_150690 + goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 end @@ -75,7 +75,7 @@ Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route113_EventScript_1506CE + goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 24f4803b2..2fec004e4 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag 2116 compare 0x40be, 1 - callif 1, Route113_GlassWorkshop_EventScript_16355F + call_if 1, Route113_GlassWorkshop_EventScript_16355F end Route113_GlassWorkshop_EventScript_16355F:: @ 816355F @@ -16,11 +16,11 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer compare 0x40be, 10 - jumpif 4, Route113_GlassWorkshop_EventScript_1638D2 + goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 compare 0x40be, 2 - jumpeq Route113_GlassWorkshop_EventScript_1635B5 + goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 compare 0x40be, 1 - jumpeq Route113_GlassWorkshop_EventScript_1635AB + goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 giveitem ITEM_SOOT_SACK setvar 0x40be, 1 @@ -36,10 +36,10 @@ Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 checkitem ITEM_SOOT_SACK, 1 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_1635E4 + goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 compare 0x4048, 250 - jumpif 0, Route113_GlassWorkshop_EventScript_163818 + goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waittext goto Route113_GlassWorkshop_EventScript_1635EE @@ -71,10 +71,10 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 bufferitem 0, 0x8008 setvar 0x800a, 250 compare 0x4048, 250 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 10 subvar 0x4048, 250 goto Route113_GlassWorkshop_EventScript_163851 @@ -85,10 +85,10 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C bufferitem 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 11 subvar 0x4048, 500 goto Route113_GlassWorkshop_EventScript_163851 @@ -99,10 +99,10 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 bufferitem 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 12 subvar 0x4048, 500 goto Route113_GlassWorkshop_EventScript_163851 @@ -113,10 +113,10 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 bufferitem 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 13 subvar 0x4048, 1000 goto Route113_GlassWorkshop_EventScript_163851 @@ -127,10 +127,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 bufferitem 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 14 subvar 0x4048, 1000 goto Route113_GlassWorkshop_EventScript_163851 @@ -142,10 +142,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C bufferdecor 0, 0x8008 setvar 0x800a, 6000 compare 0x4048, 6000 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 15 subvar 0x4048, 6000 goto Route113_GlassWorkshop_EventScript_163851 @@ -157,10 +157,10 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD bufferdecor 0, 0x8008 setvar 0x800a, 8000 compare 0x4048, 8000 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 16 subvar 0x4048, 8000 goto Route113_GlassWorkshop_EventScript_163851 @@ -202,9 +202,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare 0x8009, 0 - callif 1, Route113_GlassWorkshop_EventScript_163889 + call_if 1, Route113_GlassWorkshop_EventScript_163889 compare 0x8009, 1 - callif 1, Route113_GlassWorkshop_EventScript_1638A1 + call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release end @@ -212,13 +212,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 Route113_GlassWorkshop_EventScript_163889:: @ 8163889 giveitem 0x8008 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_1638B4 + goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 givedecoration 0x8008 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_1638C3 + goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return Route113_GlassWorkshop_EventScript_1638B4:: @ 81638B4 @@ -296,9 +296,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare 0x8009, 0 - callif 1, Route113_GlassWorkshop_EventScript_163889 + call_if 1, Route113_GlassWorkshop_EventScript_163889 compare 0x8009, 1 - callif 1, Route113_GlassWorkshop_EventScript_1638A1 + call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index cfe1dfe7d..6d28b87a4 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -6,14 +6,14 @@ Route114_EventScript_150733:: @ 8150733 faceplayer checkdailyflags checkflag 2251 - jumpeq Route114_EventScript_150778 + goto_if_eq Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar RESULT, 15 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route114_EventScript_1A029B + goto_if_eq Route114_EventScript_1A029B setflag 2251 msgbox Route114_Text_1C5861, 4 release @@ -28,11 +28,11 @@ Route114_EventScript_150782:: @ 8150782 lock faceplayer checkflag 231 - jumpeq Route114_EventScript_1507B9 + goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 compare RESULT, 0 - jumpeq Route114_EventScript_1A029B + goto_if_eq Route114_EventScript_1A029B setflag 231 msgbox Route114_Text_1701C5, 4 release @@ -89,7 +89,7 @@ Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route114_EventScript_150874 + goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -102,7 +102,7 @@ Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route114_EventScript_1508B2 + goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 50305dc04..b217f24c4 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -10,11 +10,11 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 lock faceplayer checkflag 261 - jumpeq Route114_FossilManiacsHouse_EventScript_15C1F2 + goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem ITEM_TM28 compare RESULT, 0 - jumpeq Route114_FossilManiacsHouse_EventScript_1A029B + goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag 261 release end diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 7986a0436..13843f758 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -5,13 +5,13 @@ Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F lock faceplayer checkflag 267 - jumpeq Route114_FossilManiacsTunnel_EventScript_15C24E + goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 compare RESULT, 1 - jumpeq Route114_FossilManiacsTunnel_EventScript_15C244 + goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 checkitem ITEM_CLAW_FOSSIL, 1 compare RESULT, 1 - jumpeq Route114_FossilManiacsTunnel_EventScript_15C244 + goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 msgbox Route114_FossilManiacsTunnel_Text_192795, 4 release end diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index ff8a1c565..e4334647c 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -10,7 +10,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 lock faceplayer checkflag 131 - jumpeq Route114_LanettesHouse_EventScript_15C28F + goto_if_eq Route114_LanettesHouse_EventScript_15C28F setflag 2123 msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE @@ -19,7 +19,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 givedecoration 100 .endif compare RESULT, 0 - jumpeq Route114_LanettesHouse_EventScript_1A02AE + goto_if_eq Route114_LanettesHouse_EventScript_1A02AE setflag 131 release end @@ -33,7 +33,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall msgbox Route114_LanettesHouse_Text_192B4A, 5 compare RESULT, 1 - jumpeq Route114_LanettesHouse_EventScript_15C2B7 + goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall end @@ -41,7 +41,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, 5 compare RESULT, 1 - callif 1, Route114_LanettesHouse_EventScript_15C2CC + call_if 1, Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 2b0d744ca..3bacb06d1 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -17,7 +17,7 @@ Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route115_EventScript_150970 + goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 end @@ -35,7 +35,7 @@ Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route115_EventScript_1509C5 + goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 end @@ -48,7 +48,7 @@ Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route115_EventScript_150A03 + goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 7b9a5162f..94b7d25d6 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -4,7 +4,7 @@ Route116_MapScripts:: @ 8150A31 Route116_MapScript1_150A37:: @ 8150A37 checkflag 143 - callif 1, Route116_EventScript_150A41 + call_if 1, Route116_EventScript_150A41 end Route116_EventScript_150A41:: @ 8150A41 @@ -15,9 +15,9 @@ Route116_EventScript_150A49:: @ 8150A49 lock faceplayer checkflag 143 - jumpeq Route116_EventScript_150A67 + goto_if_eq Route116_EventScript_150A67 checkflag 142 - jumpeq Route116_EventScript_150A71 + goto_if_eq Route116_EventScript_150A71 msgbox Route116_Text_1703CF, 4 release end @@ -36,7 +36,7 @@ Route116_EventScript_150A7B:: @ 8150A7B lock faceplayer checkflag 287 - jumpeq Route116_EventScript_150B04 + goto_if_eq Route116_EventScript_150B04 msgbox Route116_Text_1705AE, 4 goto Route116_EventScript_150A94 end @@ -45,17 +45,17 @@ Route116_EventScript_150A94:: @ 8150A94 setflag 287 giveitem ITEM_REPEAT_BALL compare RESULT, 0 - jumpeq Route116_EventScript_150B12 + goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 closebutton compare FACING, 2 - callif 1, Route116_EventScript_150AEE + call_if 1, Route116_EventScript_150AEE compare FACING, 1 - callif 1, Route116_EventScript_150AEE + call_if 1, Route116_EventScript_150AEE compare FACING, 3 - callif 1, Route116_EventScript_150AEE + call_if 1, Route116_EventScript_150AEE compare FACING, 4 - callif 1, Route116_EventScript_150AF9 + call_if 1, Route116_EventScript_150AF9 disappear LAST_TALKED clearflag 949 setflag 256 @@ -149,10 +149,10 @@ Route116_EventScript_150B8F:: @ 8150B8F faceplayer checkitem ITEM_BLACK_GLASSES, 1 compare RESULT, 1 - jumpeq Route116_EventScript_150BCA + goto_if_eq Route116_EventScript_150BCA specialval RESULT, sub_810F828 compare RESULT, 1 - jumpeq Route116_EventScript_150BBB + goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 release end @@ -168,7 +168,7 @@ Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_170921, 4 specialval RESULT, sub_810F828 compare RESULT, 1 - jumpeq Route116_EventScript_150BF4 + goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 release end @@ -182,13 +182,13 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 pause 20 compare FACING, 2 - callif 1, Route116_EventScript_150C37 + call_if 1, Route116_EventScript_150C37 compare FACING, 1 - callif 1, Route116_EventScript_150C37 + call_if 1, Route116_EventScript_150C37 compare FACING, 3 - callif 1, Route116_EventScript_150C37 + call_if 1, Route116_EventScript_150C37 compare FACING, 4 - callif 1, Route116_EventScript_150C42 + call_if 1, Route116_EventScript_150C42 disappear LAST_TALKED release end @@ -242,7 +242,7 @@ Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route116_EventScript_150CB7 + goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 end @@ -265,7 +265,7 @@ Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route116_EventScript_150D23 + goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 end diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index d141fae37..10991c38c 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -18,7 +18,7 @@ Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA lock faceplayer checkflag 199 - jumpeq Route116_TunnelersRestHouse_EventScript_15C30F + goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F msgbox Route116_TunnelersRestHouse_Text_193135, 4 release end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 61dbf6a30..a84d1eaf8 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -8,7 +8,7 @@ Route117_MapScript1_150D40:: @ 8150D40 Route117_EventScript_150D46:: @ 8150D46 checkflag 134 - jumpif 0, Route117_EventScript_150D56 + goto_if 0, Route117_EventScript_150D56 movespriteperm 3, 47, 6 Route117_EventScript_150D56:: @ 8150D56 @@ -42,7 +42,7 @@ Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150DB4 + goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 end @@ -55,7 +55,7 @@ Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150DF2 + goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 end @@ -68,7 +68,7 @@ Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150E30 + goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 end @@ -81,7 +81,7 @@ Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150E6E + goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 end @@ -99,7 +99,7 @@ Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150EC7 + goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 end @@ -112,7 +112,7 @@ Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150F0D + goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index a28352c94..7d4109f59 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -10,12 +10,12 @@ Route118_EventScript_150F34:: @ 8150F34 lock faceplayer checkflag 227 - jumpeq Route118_EventScript_150F89 + goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 compare RESULT, 1 - jumpeq Route118_EventScript_150F5E + goto_if_eq Route118_EventScript_150F5E compare RESULT, 0 - jumpeq Route118_EventScript_150F7F + goto_if_eq Route118_EventScript_150F7F end Route118_EventScript_150F5E:: @ 8150F5E @@ -84,11 +84,11 @@ Route118_EventScript_151004:: @ 8151004 msgbox Route118_Text_170D66, 4 closebutton compare 0x8008, 0 - callif 1, Route118_EventScript_151048 + call_if 1, Route118_EventScript_151048 compare 0x8008, 1 - callif 1, Route118_EventScript_151053 + call_if 1, Route118_EventScript_151053 compare 0x8008, 2 - callif 1, Route118_EventScript_15105E + call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 disappear 19 releaseall @@ -163,7 +163,7 @@ Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route118_EventScript_1510B6 + goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 end @@ -186,7 +186,7 @@ Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route118_EventScript_151122 + goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index bd73bbf31..0d71ac056 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -5,14 +5,14 @@ Route119_MapScripts:: @ 8151167 Route119_MapScript1_151172:: @ 8151172 checkflag 2145 - callif 1, Route119_EventScript_15117C + call_if 1, Route119_EventScript_15117C end Route119_EventScript_15117C:: @ 815117C compare 0x8004, 6 - callif 1, Route119_EventScript_151193 + call_if 1, Route119_EventScript_151193 compare 0x8004, 7 - callif 1, Route119_EventScript_151197 + call_if 1, Route119_EventScript_151197 return Route119_EventScript_151193:: @ 8151193 @@ -28,7 +28,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 compare 0x40b3, 1 - callif 1, Route119_EventScript_1511B9 + call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -53,29 +53,29 @@ Route119_EventScript_1511DB:: @ 81511DB reappear 25 checkgender compare RESULT, 0 - callif 1, Route119_EventScript_151254 + call_if 1, Route119_EventScript_151254 compare RESULT, 1 - callif 1, Route119_EventScript_151259 + call_if 1, Route119_EventScript_151259 pause 65 compare 0x4001, 1 - callif 1, Route119_EventScript_1513A6 + call_if 1, Route119_EventScript_1513A6 compare 0x4001, 2 - callif 1, Route119_EventScript_1513B1 + call_if 1, Route119_EventScript_1513B1 move 255, Route119_Movement_1A0845 waitmove 0 pause 30 compare 0x4001, 1 - callif 1, Route119_EventScript_1513D2 + call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 - callif 1, Route119_EventScript_1513E1 + call_if 1, Route119_EventScript_1513E1 disappear 25 reappear 16 pause 30 checkgender compare RESULT, 0 - jumpeq Route119_EventScript_15125E + goto_if_eq Route119_EventScript_15125E compare RESULT, 1 - jumpeq Route119_EventScript_1512D8 + goto_if_eq Route119_EventScript_1512D8 releaseall end @@ -155,16 +155,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closebutton compare 0x4001, 1 - callif 1, Route119_EventScript_1513D2 + call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 - callif 1, Route119_EventScript_1513E1 + call_if 1, Route119_EventScript_1513E1 disappear 16 reappear 25 pause 30 compare 0x4001, 1 - callif 1, Route119_EventScript_1513BC + call_if 1, Route119_EventScript_1513BC compare 0x4001, 2 - callif 1, Route119_EventScript_1513C7 + call_if 1, Route119_EventScript_1513C7 disappear 25 setvar 0x4072, 1 playmusicbattle 0 @@ -298,7 +298,7 @@ Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route119_EventScript_1514E6 + goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 end @@ -311,7 +311,7 @@ Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route119_EventScript_151524 + goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 end diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 95ec39d61..762a6c299 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 compare 0x40b3, 0 - callif 1, Route119_WeatherInstitute_1F_EventScript_163C41 + call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 end Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41 @@ -18,7 +18,7 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D faceplayer special GetPlayerBigGuyGirlString compare 0x40b3, 0 - jumpeq Route119_WeatherInstitute_1F_EventScript_163C67 + goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 release end diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index f88b97cfe..35e547f79 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -5,9 +5,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 compare 0x40b3, 0 - callif 1, Route119_WeatherInstitute_2F_EventScript_163CE4 + call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 compare 0x40b3, 1 - callif 1, Route119_WeatherInstitute_2F_EventScript_163CF0 + call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 end Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4 @@ -57,7 +57,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 countpokemon compare RESULT, 6 - jumpeq Route119_WeatherInstitute_2F_EventScript_163DB4 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 fanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare @@ -88,6 +88,6 @@ Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock faceplayer checkflag 151 - jumpeq Route119_WeatherInstitute_2F_EventScript_163DBE + goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 74250fd0f..f0179d317 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -6,22 +6,22 @@ Route120_MapScripts:: @ 815160E Route120_MapScript1_15161E:: @ 815161E checkflag 2145 - callif 1, Route120_EventScript_151628 + call_if 1, Route120_EventScript_151628 end Route120_EventScript_151628:: @ 8151628 compare 0x8004, 0 - callif 1, Route120_EventScript_15166B + call_if 1, Route120_EventScript_15166B compare 0x8004, 1 - callif 1, Route120_EventScript_151672 + call_if 1, Route120_EventScript_151672 compare 0x8004, 2 - callif 1, Route120_EventScript_151676 + call_if 1, Route120_EventScript_151676 compare 0x8004, 3 - callif 1, Route120_EventScript_15167A + call_if 1, Route120_EventScript_15167A compare 0x8004, 4 - callif 1, Route120_EventScript_15167E + call_if 1, Route120_EventScript_15167E compare 0x8004, 5 - callif 1, Route120_EventScript_151682 + call_if 1, Route120_EventScript_151682 return Route120_EventScript_15166B:: @ 815166B @@ -51,11 +51,11 @@ Route120_EventScript_151682:: @ 8151682 Route120_MapScript1_151686:: @ 8151686 checkflag 228 - callif 0, Route120_EventScript_1516A2 + call_if 0, Route120_EventScript_1516A2 checkflag 285 - callif 1, Route120_EventScript_1516B5 + call_if 1, Route120_EventScript_1516B5 checkflag 285 - callif 0, Route120_EventScript_1516DA + call_if 0, Route120_EventScript_1516DA end Route120_EventScript_1516A2:: @ 81516A2 @@ -82,11 +82,11 @@ Route120_MapScript1_1516DF:: @ 81516DF Route120_EventScript_1516EA:: @ 81516EA getplayerxy 0x4000, 0x4001 compare 0x4001, 14 - jumpif 3, Route120_EventScript_151715 + goto_if 3, Route120_EventScript_151715 compare 0x4001, 60 - jumpif 3, Route120_EventScript_151719 + goto_if 3, Route120_EventScript_151719 compare 0x4001, 61 - jumpif 4, Route120_EventScript_151711 + goto_if 4, Route120_EventScript_151711 return Route120_EventScript_151711:: @ 8151711 @@ -99,9 +99,9 @@ Route120_EventScript_151715:: @ 8151715 Route120_EventScript_151719:: @ 8151719 compare 0x4000, 7 - jumpif 3, Route120_EventScript_151735 + goto_if 3, Route120_EventScript_151735 compare 0x4000, 19 - jumpif 3, Route120_EventScript_151715 + goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -114,12 +114,12 @@ Route120_EventScript_151739:: @ 8151739 faceplayer checkdailyflags checkflag 2254 - jumpeq Route120_EventScript_151837 + goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 compare RESULT, 1 - callif 1, Route120_EventScript_151841 + call_if 1, Route120_EventScript_151841 compare RESULT, 0 - callif 1, Route120_EventScript_15184A + call_if 1, Route120_EventScript_15184A specialval RESULT, GetPlayerTrainerIdOnesDigit switch RESULT case 0, Route120_EventScript_1517DC @@ -162,7 +162,7 @@ Route120_EventScript_151808:: @ 8151808 Route120_EventScript_151813:: @ 8151813 giveitem 0x8004 compare RESULT, 0 - jumpeq Route120_EventScript_1A029B + goto_if_eq Route120_EventScript_1A029B setflag 2254 msgbox Route120_Text_1C5A0B, 4 release @@ -185,10 +185,10 @@ Route120_EventScript_151853:: @ 8151853 lock faceplayer checkflag 290 - jumpeq Route120_EventScript_151884 + goto_if_eq Route120_EventScript_151884 msgbox Route120_Text_171827, 5 compare RESULT, 0 - jumpeq Route120_EventScript_151877 + goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -201,7 +201,7 @@ Route120_EventScript_151877:: @ 8151877 Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, 5 compare RESULT, 0 - jumpeq Route120_EventScript_151877 + goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -209,9 +209,9 @@ Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closebutton compare FACING, 2 - callif 1, Route120_EventScript_15197F + call_if 1, Route120_EventScript_15197F compare FACING, 3 - callif 1, Route120_EventScript_15198A + call_if 1, Route120_EventScript_15198A move 31, Route120_Movement_1A083F waitmove 0 pause 20 @@ -294,7 +294,7 @@ Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route120_EventScript_1519F1 + goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 end @@ -317,7 +317,7 @@ Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route120_EventScript_151A5D + goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 end diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index e1aaec716..c87774cb8 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -75,7 +75,7 @@ Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route121_EventScript_151BB0 + goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 end @@ -103,7 +103,7 @@ Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route121_EventScript_151C3B + goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 6850cdeb2..3724e9aeb 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -35,7 +35,7 @@ Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A faceplayer msgbox Route121_SafariZoneEntrance_Text_1C3704, 5 compare RESULT, 1 - jumpeq Route121_SafariZoneEntrance_EventScript_15C379 + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release end @@ -53,7 +53,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 compare RESULT, 1 - jumpeq Route121_SafariZoneEntrance_EventScript_15C3B3 + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C end @@ -61,11 +61,11 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 - jumpeq Route121_SafariZoneEntrance_EventScript_15C450 + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450 call Route121_SafariZoneEntrance_EventScript_15C425 checkmoney 0x1f4, 0 compare RESULT, 0 - jumpeq Route121_SafariZoneEntrance_EventScript_15C45E + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 paymoney 0x1f4, 0 updatemoney 0, 0 @@ -89,10 +89,10 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 countpokemon compare RESULT, 6 - jumpif 5, Route121_SafariZoneEntrance_EventScript_15C44F + goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialval RESULT, CheckFreePokemonStorageSpace compare RESULT, 1 - jumpeq Route121_SafariZoneEntrance_EventScript_15C44F + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C end diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 891a395f0..395eaa7c3 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -10,15 +10,15 @@ Route123_EventScript_151C5D:: @ 8151C5D lock faceplayer checkflag 232 - jumpeq Route123_EventScript_151CAC + goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty compare RESULT, 0 - jumpeq Route123_EventScript_151CAA + goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 giveitem ITEM_TM19 compare RESULT, 0 - jumpeq Route123_EventScript_1A029B + goto_if_eq Route123_EventScript_1A029B setflag 232 msgbox Route123_Text_171E34, 4 release @@ -64,7 +64,7 @@ Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route123_EventScript_151D3D + goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 end @@ -77,7 +77,7 @@ Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route123_EventScript_151D7B + goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 18e94034d..4f7bad5f9 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -11,14 +11,14 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 faceplayer checkdailyflags checkflag 2253 - jumpeq Route123_BerryMastersHouse_EventScript_163A5A + goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 random 10 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 2253 msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 random 10 @@ -26,7 +26,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 release end @@ -41,16 +41,16 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 faceplayer checkdailyflags checkflag 2257 - jumpeq Route123_BerryMastersHouse_EventScript_163C13 + goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 setvar 0x8004, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer compare RESULT, 1 - jumpeq Route123_BerryMastersHouse_EventScript_163AAD + goto_if_eq Route123_BerryMastersHouse_EventScript_163AAD compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_163A9B + goto_if_eq Route123_BerryMastersHouse_EventScript_163A9B end Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B @@ -61,17 +61,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD compare 0x8004, 0 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 compare 0x8004, 1 - jumpeq Route123_BerryMastersHouse_EventScript_163B1E + goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E compare 0x8004, 2 - jumpeq Route123_BerryMastersHouse_EventScript_163B4F + goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F compare 0x8004, 3 - jumpeq Route123_BerryMastersHouse_EventScript_163B80 + goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 compare 0x8004, 4 - jumpeq Route123_BerryMastersHouse_EventScript_163BB1 + goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 compare 0x8004, 5 - jumpeq Route123_BerryMastersHouse_EventScript_163BE2 + goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 @@ -80,62 +80,62 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D release end Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E checkflag 248 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_SPELON_BERRY compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 248 goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F checkflag 249 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_PAMTRE_BERRY compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 249 goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 checkflag 250 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_WATMEL_BERRY compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 250 goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 checkflag 251 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_DURIN_BERRY compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 251 goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 checkflag 252 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_BELUE_BERRY compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 252 goto Route123_BerryMastersHouse_EventScript_163C1D end diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 68f17b12a..a60b29b99 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -4,7 +4,7 @@ Route124_MapScripts:: @ 8151DDF Route124_MapScript1_151DE5:: @ 8151DE5 checkflag 2090 - callif 1, Route124_EventScript_1A02C1 + call_if 1, Route124_EventScript_1A02C1 end Route124_EventScript_151DEF:: @ 8151DEF @@ -25,7 +25,7 @@ Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route124_EventScript_151E4D + goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 end @@ -48,7 +48,7 @@ Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route124_EventScript_151EBD + goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 end @@ -61,7 +61,7 @@ Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route124_EventScript_151F03 + goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 2d0d624c0..b3e91e43c 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -10,7 +10,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 lock faceplayer checkflag 217 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_163E20 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 setflag 217 goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E @@ -24,7 +24,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare 0x4001, 0 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_164329 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end @@ -32,16 +32,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar 0x4001, 0 checkitem ITEM_RED_SHARD, 1 compare RESULT, 1 - callif 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 compare RESULT, 1 - callif 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 compare RESULT, 1 - callif 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 compare RESULT, 1 - callif 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C return Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A @@ -248,13 +248,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitem 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F checkitemspace 0x8009, 1 compare RESULT, 1 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 checkitem 0x8008, 2 compare RESULT, 0 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end @@ -264,10 +264,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare 0x4001, 0 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_164333 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 compare RESULT, 1 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index a5d2457d5..045a55a11 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -4,7 +4,7 @@ Route125_MapScripts:: @ 8151F1E Route125_MapScript1_151F24:: @ 8151F24 checkflag 2090 - callif 1, Route125_EventScript_1A02C1 + call_if 1, Route125_EventScript_1A02C1 end Route125_EventScript_151F2E:: @ 8151F2E @@ -31,7 +31,7 @@ Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route125_EventScript_151FB1 + goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index f3d1a77f9..729922681 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -4,7 +4,7 @@ Route126_MapScripts:: @ 8151FFE Route126_MapScript1_152004:: @ 8152004 checkflag 2090 - callif 1, Route126_EventScript_1A02C1 + call_if 1, Route126_EventScript_1A02C1 end Route126_EventScript_15200E:: @ 815200E diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index b4461b253..284d1fbd4 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -4,7 +4,7 @@ Route127_MapScripts:: @ 815206A Route127_MapScript1_152070:: @ 8152070 checkflag 2090 - callif 1, Route127_EventScript_1A02C1 + call_if 1, Route127_EventScript_1A02C1 end Route127_EventScript_15207A:: @ 815207A diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 011591400..7db99f7b3 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -5,7 +5,7 @@ Route128_MapScripts:: @ 815211B Route128_MapScript1_152126:: @ 8152126 checkflag 2090 - callif 1, Route128_EventScript_1A02C1 + call_if 1, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end @@ -184,7 +184,7 @@ Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route128_EventScript_1522CB + goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 end @@ -197,7 +197,7 @@ Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route128_EventScript_152309 + goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index bac6728a7..2c93c1bd6 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -5,7 +5,7 @@ Route130_MapScripts:: @ 81523C2 Route130_MapScript1_1523C8:: @ 81523C8 specialval RESULT, IsMirageIslandPresent compare RESULT, 1 - jumpeq Route130_EventScript_15240C + goto_if_eq Route130_EventScript_15240C setflag 17 setflag 18 setflag 19 diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 81cb7dc02..124788a17 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -4,7 +4,7 @@ Route131_MapScripts:: @ 815243E Route131_MapScript1_152444:: @ 8152444 checkflag 2052 - callif 1, Route131_EventScript_15244E + call_if 1, Route131_EventScript_15244E end Route131_EventScript_15244E:: @ 815244E diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 77f0a5f6f..13a4ce265 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -12,7 +12,7 @@ RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer checkflag 142 - jumpeq RustboroCity_EventScript_14C39B + goto_if_eq RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release end @@ -37,7 +37,7 @@ RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer checkflag 2055 - jumpeq RustboroCity_EventScript_14C3CF + goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release end @@ -51,7 +51,7 @@ RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer checkflag 188 - jumpeq RustboroCity_EventScript_14C3EE + goto_if_eq RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release end @@ -327,7 +327,7 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer checkflag 143 - jumpeq RustboroCity_EventScript_14C614 + goto_if_eq RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release end @@ -364,13 +364,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 RustboroCity_EventScript_14C650:: @ 814C650 compare 0x4001, 0 - callif 1, RustboroCity_EventScript_14C691 + call_if 1, RustboroCity_EventScript_14C691 compare 0x4001, 1 - callif 1, RustboroCity_EventScript_14C6BD + call_if 1, RustboroCity_EventScript_14C6BD compare 0x4001, 2 - callif 1, RustboroCity_EventScript_14C6E9 + call_if 1, RustboroCity_EventScript_14C6E9 compare 0x4001, 3 - callif 1, RustboroCity_EventScript_14C715 + call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 moveoffscreen 9 @@ -458,19 +458,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 RustboroCity_EventScript_14C77D:: @ 814C77D compare 0x4001, 0 - callif 1, RustboroCity_EventScript_14C7FE + call_if 1, RustboroCity_EventScript_14C7FE compare 0x4001, 1 - callif 1, RustboroCity_EventScript_14C82A + call_if 1, RustboroCity_EventScript_14C82A compare 0x4001, 2 - callif 1, RustboroCity_EventScript_14C856 + call_if 1, RustboroCity_EventScript_14C856 compare 0x4001, 3 - callif 1, RustboroCity_EventScript_14C882 + call_if 1, RustboroCity_EventScript_14C882 compare 0x4001, 4 - callif 1, RustboroCity_EventScript_14C8B8 + call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem ITEM_GREAT_BALL compare RESULT, 0 - callif 1, RustboroCity_EventScript_14C7F5 + call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closebutton setflag 144 @@ -550,12 +550,12 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer checkflag 288 - jumpeq RustboroCity_EventScript_14C917 + goto_if_eq RustboroCity_EventScript_14C917 checkgender compare RESULT, 0 - jumpeq RustboroCity_EventScript_14C8FD + goto_if_eq RustboroCity_EventScript_14C8FD compare RESULT, 1 - jumpeq RustboroCity_EventScript_14C90A + goto_if_eq RustboroCity_EventScript_14C90A end RustboroCity_EventScript_14C8FD:: @ 814C8FD @@ -573,9 +573,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkgender compare RESULT, 0 - jumpeq RustboroCity_EventScript_14C92F + goto_if_eq RustboroCity_EventScript_14C92F compare RESULT, 1 - jumpeq RustboroCity_EventScript_14C939 + goto_if_eq RustboroCity_EventScript_14C939 end RustboroCity_EventScript_14C92F:: @ 814C92F diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index d400de1ef..3e98746f3 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -5,7 +5,7 @@ RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 lock faceplayer checkflag 137 - jumpeq RustboroCity_CuttersHouse_EventScript_157D53 + goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 giveitem ITEM_HM01 setflag 137 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index 97a59257f..f5fb02c93 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C checkflag 144 - callif 0, RustboroCity_DevonCorp_1F_EventScript_157416 + call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416 end RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 @@ -16,9 +16,9 @@ RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 lock faceplayer checkflag 144 - jumpeq RustboroCity_DevonCorp_1F_EventScript_15744A + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A checkflag 142 - jumpeq RustboroCity_DevonCorp_1F_EventScript_157440 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440 msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4 release end @@ -37,11 +37,11 @@ RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 lock faceplayer checkflag 144 - jumpeq RustboroCity_DevonCorp_1F_EventScript_15747B + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B checkflag 143 - jumpeq RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 checkflag 142 - jumpeq RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4 release end @@ -60,11 +60,11 @@ RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F lock faceplayer checkflag 144 - jumpeq RustboroCity_DevonCorp_1F_EventScript_1574B6 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6 checkflag 143 - jumpeq RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 checkflag 142 - jumpeq RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index e35015b3e..0c604c513 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 compare 0x40c4, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC end RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer compare 0x40c4, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release end @@ -24,9 +24,9 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer compare 0x40c4, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 287 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157519 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4 release end @@ -40,9 +40,9 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer compare 0x40c4, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 188 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157543 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4 release end @@ -56,7 +56,7 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer compare 0x40c4, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release end @@ -65,16 +65,16 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 lock faceplayer compare 0x40c4, 2 - jumpeq RustboroCity_DevonCorp_2F_EventScript_15764A + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A compare 0x40c4, 1 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157640 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 compare RESULT, 1 - jumpeq RustboroCity_DevonCorp_2F_EventScript_1575A6 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 checkitem ITEM_CLAW_FOSSIL, 1 compare RESULT, 1 - jumpeq RustboroCity_DevonCorp_2F_EventScript_1575EE + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE release end @@ -87,7 +87,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 waitmove 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157636 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 removeitem ITEM_ROOT_FOSSIL, 1 @@ -105,7 +105,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE waitmove 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157636 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 removeitem ITEM_CLAW_FOSSIL, 1 @@ -126,9 +126,9 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A compare 0x40c5, 1 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157661 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 compare 0x40c5, 2 - jumpeq RustboroCity_DevonCorp_2F_EventScript_1576B4 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 end RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 @@ -136,7 +136,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon compare RESULT, 6 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157707 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 setflag 267 @@ -147,7 +147,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -156,7 +156,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon compare RESULT, 6 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157707 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 setflag 267 @@ -167,7 +167,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 2b749c873..fe39af9c4 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -6,7 +6,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 compare 0x408f, 0 - callif 1, RustboroCity_DevonCorp_3F_EventScript_15772D + call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D end RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D @@ -147,9 +147,9 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock faceplayer checkflag 272 - jumpeq RustboroCity_DevonCorp_3F_EventScript_15789B + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B checkflag 189 - jumpeq RustboroCity_DevonCorp_3F_EventScript_157864 + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closebutton move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D @@ -161,7 +161,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 giveitem ITEM_EXP_SHARE compare RESULT, 0 - jumpeq RustboroCity_DevonCorp_3F_EventScript_1A029B + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 closebutton @@ -182,7 +182,7 @@ RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 lock faceplayer checkflag 256 - jumpeq RustboroCity_DevonCorp_3F_EventScript_1578C5 + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5 msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4 release end diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index d6e0c92b3..0dfec5cfa 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -9,11 +9,11 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 lock faceplayer checkflag 213 - jumpeq RustboroCity_Flat2_2F_EventScript_157DCF + goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem ITEM_PREMIER_BALL compare RESULT, 0 - jumpeq RustboroCity_Flat2_2F_EventScript_1A029B + goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag 213 release end diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 776cb5c0a..6bb33b4dc 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -4,7 +4,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE checkflag 165 - jumpif 0, RustboroCity_Gym_EventScript_15793C + goto_if 0, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release end @@ -21,14 +21,14 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setvar 0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 compare 0x4085, 6 - callif 1, RustboroCity_Gym_EventScript_1A00FB + call_if 1, RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39 compare RESULT, 0 - jumpeq RustboroCity_Gym_EventScript_1A029B + goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag 165 msgbox RustboroCity_Gym_Text_184170, 4 release @@ -48,7 +48,7 @@ RustboroCity_Gym_EventScript_15798E:: @ 815798E lock faceplayer checkflag 1201 - jumpeq RustboroCity_Gym_EventScript_1579A3 + goto_if_eq RustboroCity_Gym_EventScript_1579A3 msgbox RustboroCity_Gym_Text_183A4B, 4 release end @@ -61,14 +61,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall checkflag 2055 - jumpeq RustboroCity_Gym_EventScript_1579CD + goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall checkflag 2055 - jumpeq RustboroCity_Gym_EventScript_1579CD + goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 402fff1d3..e45bf2080 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -5,24 +5,24 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D lock faceplayer checkflag 153 - jumpeq RustboroCity_House1_EventScript_157D13 + goto_if_eq RustboroCity_House1_EventScript_157D13 setvar 0x8008, 0 copyvar 0x8004, 0x8008 specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 - jumpeq RustboroCity_House1_EventScript_157CFB + goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 compare 0x8004, 255 - jumpeq RustboroCity_House1_EventScript_157CFB + goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT comparevars RESULT, 0x8009 - jumpif 5, RustboroCity_House1_EventScript_157D05 + goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a special sub_804DB68 diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc index 6b4ff3a77..7ee528ade 100644 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ b/data/scripts/maps/RustboroCity_Mart.inc @@ -7,9 +7,9 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 message RustboroCity_Mart_Text_1A0BE4 waittext checkflag 287 - jumpif 0, RustboroCity_Mart_EventScript_157BEF + goto_if 0, RustboroCity_Mart_EventScript_157BEF checkflag 287 - jumpeq RustboroCity_Mart_EventScript_157C18 + goto_if_eq RustboroCity_Mart_EventScript_157C18 end RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 168c0aaa2..e5a9622fb 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -78,15 +78,15 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE lock faceplayer checkflag 275 - jumpeq RustboroCity_PokemonSchool_EventScript_157B34 + goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 compare FACING, 4 - callif 1, RustboroCity_PokemonSchool_EventScript_157B1E + call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E compare FACING, 3 - callif 1, RustboroCity_PokemonSchool_EventScript_157B29 + call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem ITEM_QUICK_CLAW compare RESULT, 0 - jumpeq RustboroCity_PokemonSchool_EventScript_1A029B + goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closebutton move LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmove 0 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 129bef7c9..bcc612511 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -11,7 +11,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 compare 0x409a, 2 - callif 1, RusturfTunnel_EventScript_15C773 + call_if 1, RusturfTunnel_EventScript_15C773 end RusturfTunnel_EventScript_15C773:: @ 815C773 @@ -33,7 +33,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 lock faceplayer checkflag 1 - jumpeq RusturfTunnel_EventScript_15C7BC + goto_if_eq RusturfTunnel_EventScript_15C7BC setflag 1 msgbox RusturfTunnel_Text_1944C5, 4 closebutton @@ -53,35 +53,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall compare 0x4001, 1 - callif 1, RusturfTunnel_EventScript_15C8CA + call_if 1, RusturfTunnel_EventScript_15C8CA compare 0x4001, 2 - callif 1, RusturfTunnel_EventScript_15C8DF + call_if 1, RusturfTunnel_EventScript_15C8DF compare 0x4001, 3 - callif 1, RusturfTunnel_EventScript_15C8EA + call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 compare 0x4001, 2 - callif 1, RusturfTunnel_EventScript_15C8EB + call_if 1, RusturfTunnel_EventScript_15C8EB compare 0x4001, 3 - callif 1, RusturfTunnel_EventScript_15C8EB + call_if 1, RusturfTunnel_EventScript_15C8EB giveitem ITEM_HM04 setflag 106 msgbox RusturfTunnel_Text_194693, 4 closebutton compare 0x4001, 1 - callif 1, RusturfTunnel_EventScript_15C880 + call_if 1, RusturfTunnel_EventScript_15C880 compare 0x4001, 2 - callif 1, RusturfTunnel_EventScript_15C892 + call_if 1, RusturfTunnel_EventScript_15C892 compare 0x4001, 3 - callif 1, RusturfTunnel_EventScript_15C8AE + call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closebutton compare 0x4001, 1 - callif 1, RusturfTunnel_EventScript_15C8F7 + call_if 1, RusturfTunnel_EventScript_15C8F7 compare 0x4001, 2 - callif 1, RusturfTunnel_EventScript_15C909 + call_if 1, RusturfTunnel_EventScript_15C909 compare 0x4001, 3 - callif 1, RusturfTunnel_EventScript_15C91B + call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index a301bb6fe..d076510dc 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -42,9 +42,9 @@ SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 gUnknown_0815FD0D:: @ 815FD0D compare 0x40B4, 2 - jumpeq SSTidalCorridor_EventScript_15FD24 + goto_if_eq SSTidalCorridor_EventScript_15FD24 compare 0x40B4, 7 - jumpeq SSTidalCorridor_EventScript_15FD3A + goto_if_eq SSTidalCorridor_EventScript_15FD3A end SSTidalCorridor_EventScript_15FD24:: @ 815FD24 @@ -114,9 +114,9 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 lock faceplayer compare 0x40b4, 4 - jumpeq SSTidalCorridor_EventScript_15FDF8 + goto_if_eq SSTidalCorridor_EventScript_15FDF8 compare 0x40b4, 8 - jumpeq SSTidalCorridor_EventScript_15FE17 + goto_if_eq SSTidalCorridor_EventScript_15FE17 msgbox SSTidalCorridor_Text_19913B, 4 release end @@ -125,7 +125,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 sethealplace 8 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag 260 - callif 1, SSTidalCorridor_EventScript_15FE36 + call_if 1, SSTidalCorridor_EventScript_15FE36 warp LilycoveCity_Harbor, 255, 8, 11 waitstate release @@ -135,7 +135,7 @@ SSTidalCorridor_EventScript_15FE17:: @ 815FE17 sethealplace 4 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag 260 - callif 1, SSTidalCorridor_EventScript_15FE36 + call_if 1, SSTidalCorridor_EventScript_15FE36 warp SlateportCity_Harbor, 255, 8, 11 waitstate release @@ -148,9 +148,9 @@ SSTidalCorridor_EventScript_15FE36:: @ 815FE36 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A lockall compare 0x40b4, 2 - jumpeq SSTidalCorridor_EventScript_15FE5B + goto_if_eq SSTidalCorridor_EventScript_15FE5B compare 0x40b4, 7 - jumpeq SSTidalCorridor_EventScript_15FE5B + goto_if_eq SSTidalCorridor_EventScript_15FE5B msgbox SSTidalCorridor_Text_199268, 4 releaseall end @@ -164,7 +164,7 @@ SSTidalCorridor_EventScript_15FE60:: @ 815FE60 lock faceplayer checkflag 247 - jumpeq SSTidalCorridor_EventScript_15FE7A + goto_if_eq SSTidalCorridor_EventScript_15FE7A call SSTidalCorridor_EventScript_15FE84 msgbox SSTidalCorridor_Text_199203, 4 release @@ -177,21 +177,21 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A SSTidalCorridor_EventScript_15FE84:: @ 815FE84 checktrainerflag OPPONENT_PHILLIP - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_LEONARD - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_COLTON - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_TUCKER - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_THOMAS - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_LEA_AND_JED - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_GARRET - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_ANETTE - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 setflag 247 goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 4d588cd46..aa84b6b48 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -5,11 +5,11 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 lock faceplayer checkflag 260 - jumpeq SSTidalRooms_EventScript_15FF3D + goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem ITEM_TM49 compare RESULT, 0 - jumpeq SSTidalRooms_EventScript_1A029B + goto_if_eq SSTidalRooms_EventScript_1A029B setflag 260 msgbox SSTidalRooms_Text_199C1A, 4 release diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index f0529fbec..9005bef3b 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -21,7 +21,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B SafariZone_Southeast_MapScript1_160073:: @ 8160073 compare 0x40a4, 2 - callif 1, SafariZone_Southeast_EventScript_16007F + call_if 1, SafariZone_Southeast_EventScript_16007F end SafariZone_Southeast_EventScript_16007F:: @ 816007F @@ -53,10 +53,10 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer compare 0x4001, 0 - jumpeq SafariZone_Southeast_EventScript_1600D1 + goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 compare RESULT, 1 - jumpeq SafariZone_Southeast_EventScript_1600E0 + goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release end diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 76a930dc0..091db022c 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -7,10 +7,10 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 waitbutton hidebox 0, 0, 29, 19 checkflag 228 - jumpeq SealedChamber_InnerRoom_EventScript_15F247 + goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialval RESULT, CheckRelicanthWailord compare RESULT, 0 - jumpeq SealedChamber_InnerRoom_EventScript_15F247 + goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeout 0 playsfx 49 special DoSealedChamberShakingEffect1 diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 83ca4e4df..dfa4777fa 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -15,7 +15,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB checkflag 2127 - callif 0, SealedChamber_OuterRoom_EventScript_15F0F5 + call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 end SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 @@ -110,7 +110,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall checkflag 2127 - jumpeq SealedChamber_OuterRoom_EventScript_15F1CF + goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemsg SealedChamber_OuterRoom_Braille_1C53B1 waitbutton hidebox 0, 0, 29, 19 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 6238e7f4a..dc2b107e3 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag checkflag 2106 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E06E + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E @@ -21,27 +21,27 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 faceplayer checkdailyflags checkflag 2143 - callif 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 + call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E138 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 checkitem ITEM_SHOAL_SHELL, 4 compare RESULT, 0 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E138 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, 5 compare RESULT, 0 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E16C + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 compare RESULT, 0 - callif 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 + call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 compare RESULT, 2 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E12E + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 removeitem ITEM_SHOAL_SALT, 4 removeitem ITEM_SHOAL_SHELL, 4 giveitem ITEM_SHELL_BELL compare RESULT, 0 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 setflag 2 release @@ -50,13 +50,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 ShoalCave_LowTideEntranceRoom_EventScript_15E106:: @ 815E106 checkitem ITEM_SHOAL_SALT, 5 compare RESULT, 1 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E117 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E117 return ShoalCave_LowTideEntranceRoom_EventScript_15E117:: @ 815E117 checkitem ITEM_SHOAL_SHELL, 5 compare RESULT, 1 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E128 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E128 return ShoalCave_LowTideEntranceRoom_EventScript_15E128:: @ 815E128 @@ -71,10 +71,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138 checkitem ITEM_SHOAL_SALT, 1 compare RESULT, 1 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E162 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 checkitem ITEM_SHOAL_SHELL, 1 compare RESULT, 1 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E162 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4 release end diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index bed2d7b21..05fc6a315 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D checkflag 2106 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1AB + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB @@ -22,46 +22,46 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 checkflag 952 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA checkflag 2106 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmaptile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA checkflag 953 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB checkflag 2106 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmaptile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB checkflag 956 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E213 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 setmaptile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 checkflag 957 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E22B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B setmaptile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B checkflag 958 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E243 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 setmaptile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 checkflag 959 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E256 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 setmaptile 16, 13, 857, 1 return @@ -71,10 +71,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall checkflag 956 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 20, 859, 0 special DrawWholeMapView setflag 956 @@ -89,10 +89,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall checkflag 957 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 10, 859, 0 special DrawWholeMapView setflag 957 @@ -102,10 +102,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall checkflag 958 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 6, 9, 859, 0 special DrawWholeMapView setflag 958 @@ -115,10 +115,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall checkflag 959 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 16, 13, 859, 0 special DrawWholeMapView setflag 959 @@ -128,10 +128,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall checkflag 952 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E35B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 31, 8, 858, 0 special DrawWholeMapView setflag 952 @@ -146,10 +146,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall checkflag 953 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E35B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 14, 26, 858, 0 special DrawWholeMapView setflag 953 diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index 67de2676f..db5779efe 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF checkflag 955 - jumpeq ShoalCave_LowTideLowerRoom_EventScript_15E412 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 setmaptile 18, 2, 856, 1 return @@ -18,10 +18,10 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall checkflag 955 - jumpeq ShoalCave_LowTideLowerRoom_EventScript_15E445 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem ITEM_SHOAL_SALT compare RESULT, 0 - jumpeq ShoalCave_LowTideLowerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmaptile 18, 2, 858, 0 special DrawWholeMapView setflag 955 @@ -37,11 +37,11 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F lock faceplayer checkflag 283 - jumpeq ShoalCave_LowTideLowerRoom_EventScript_15E47E + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem ITEM_FOCUS_BAND compare RESULT, 0 - jumpeq ShoalCave_LowTideLowerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag 283 release end diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index c46a2cb2d..bffb7bd49 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 checkflag 954 - jumpeq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 + goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 setmaptile 11, 11, 856, 1 return @@ -18,10 +18,10 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall checkflag 954 - jumpeq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 + goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem ITEM_SHOAL_SALT compare RESULT, 0 - jumpeq ShoalCave_LowTideStairsRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmaptile 11, 11, 858, 0 special DrawWholeMapView setflag 954 diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index d659a23c1..e41d579c0 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -4,7 +4,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 SkyPillar_Top_MapScript1_15F308:: @ 815F308 checkflag 2145 - callif 1, SkyPillar_Top_EventScript_15F312 + call_if 1, SkyPillar_Top_EventScript_15F312 end SkyPillar_Top_EventScript_15F312:: @ 815F312 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index e156f8948..4b11b2f8d 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -13,7 +13,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BA68 + call_if 1, SlateportCity_EventScript_14BA68 end SlateportCity_EventScript_14BA5C:: @ 814BA5C @@ -68,10 +68,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 msgbox SlateportCity_Text_164682, 4 specialval RESULT, LeadMonHasEffortRibbon compare RESULT, 1 - callif 1, SlateportCity_EventScript_14BB35 + call_if 1, SlateportCity_EventScript_14BB35 specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare RESULT, 0 - callif 1, SlateportCity_EventScript_14BB2B + call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 fanfare 370 message SlateportCity_Text_1646DD @@ -96,7 +96,7 @@ SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BB56 + call_if 1, SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release end @@ -110,7 +110,7 @@ SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BB77 + call_if 1, SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release end @@ -124,9 +124,9 @@ SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BBA1 + call_if 1, SlateportCity_EventScript_14BBA1 checkflag 96 - jumpeq SlateportCity_EventScript_14BBAB + goto_if_eq SlateportCity_EventScript_14BBAB msgbox SlateportCity_Text_164937, 4 release end @@ -145,7 +145,7 @@ SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BBCC + call_if 1, SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release end @@ -157,7 +157,7 @@ SlateportCity_EventScript_14BBCC:: @ 814BBCC SlateportCity_EventScript_14BBD6:: @ 814BBD6 compare 0x4058, 1 - jumpeq SlateportCity_EventScript_14BBEA + goto_if_eq SlateportCity_EventScript_14BBEA msgbox SlateportCity_Text_164AA9, 2 end @@ -169,7 +169,7 @@ SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BC0A + call_if 1, SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release end @@ -183,7 +183,7 @@ SlateportCity_EventScript_14BC14:: @ 814BC14 lock faceplayer checkflag 148 - jumpeq SlateportCity_EventScript_14BC29 + goto_if_eq SlateportCity_EventScript_14BC29 msgbox SlateportCity_Text_164BBF, 4 release end @@ -200,9 +200,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall checkflag 2052 - jumpeq SlateportCity_EventScript_14BC63 + goto_if_eq SlateportCity_EventScript_14BC63 checkflag 2061 - jumpeq SlateportCity_EventScript_14BC59 + goto_if_eq SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall end @@ -236,7 +236,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall checkflag 2052 - jumpeq SlateportCity_EventScript_14BCA5 + goto_if_eq SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall end @@ -254,7 +254,7 @@ SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BCCF + call_if 1, SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release end @@ -289,9 +289,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 faceplayer msgbox SlateportCity_Text_1650F1, 5 compare RESULT, 1 - callif 1, SlateportCity_EventScript_14BD28 + call_if 1, SlateportCity_EventScript_14BD28 compare RESULT, 0 - callif 1, SlateportCity_EventScript_14BD31 + call_if 1, SlateportCity_EventScript_14BD31 release end @@ -411,7 +411,7 @@ SlateportCity_EventScript_14BE20:: @ 814BE20 lock faceplayer checkflag 96 - jumpif 0, SlateportCity_EventScript_14BE16 + goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waittext pokemartdecor SlateportCity_Decorations2 @@ -443,7 +443,7 @@ SlateportCity_Decorations2:: @ 814BE40 lock faceplayer checkflag 96 - jumpif 0, SlateportCity_EventScript_14BE16 + goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waittext pokemartdecor SlateportCity_Decorations3 diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 559719583..b2963098c 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -13,11 +13,11 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E lock faceplayer checkflag 265 - jumpeq SlateportCity_ContestHall_EventScript_155595 + goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem ITEM_TM41 compare RESULT, 0 - jumpeq SlateportCity_ContestHall_EventScript_1A029B + goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag 265 msgbox SlateportCity_ContestHall_Text_17CE28, 4 release diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index b1ce50815..b541fb0e8 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -102,7 +102,7 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall checkflag 95 - jumpeq SlateportCity_ContestLobby_EventScript_155526 + goto_if_eq SlateportCity_ContestLobby_EventScript_155526 move 7, SlateportCity_ContestLobby_Movement_1A0839 waitmove 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index d7769eb81..33a99b2a4 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -6,9 +6,9 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 warp6 SlateportCity, 255, 28, 13 setvar 0x4001, 0 compare 0x40a0, 1 - callif 1, SlateportCity_Harbor_EventScript_155F89 + call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag 2052 - callif 1, SlateportCity_Harbor_EventScript_155F85 + call_if 1, SlateportCity_Harbor_EventScript_155F85 end SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 @@ -64,13 +64,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 disappear 8 setvar 0x40a0, 2 compare 0x8008, 0 - callif 1, SlateportCity_Harbor_EventScript_15605C + call_if 1, SlateportCity_Harbor_EventScript_15605C compare 0x8008, 1 - callif 1, SlateportCity_Harbor_EventScript_156071 + call_if 1, SlateportCity_Harbor_EventScript_156071 compare 0x8008, 2 - callif 1, SlateportCity_Harbor_EventScript_156086 + call_if 1, SlateportCity_Harbor_EventScript_156086 compare 0x8008, 3 - callif 1, SlateportCity_Harbor_EventScript_156086 + call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closebutton setflag 821 @@ -160,7 +160,7 @@ SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer checkflag 2052 - jumpeq SlateportCity_Harbor_EventScript_1560D9 + goto_if_eq SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release end @@ -169,7 +169,7 @@ SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 msgbox SlateportCity_Harbor_Text_17FA73, 4 checkitem ITEM_SS_TICKET, 1 compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_156135 + goto_if_eq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A waittext goto SlateportCity_Harbor_EventScript_1560FD @@ -192,7 +192,7 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, 5 compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_15618A + goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 warp SSTidalCorridor, 255, 1, 10 @@ -203,7 +203,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F SlateportCity_Harbor_EventScript_156167:: @ 8156167 msgbox SlateportCity_Harbor_Text_17FB9C, 5 compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_15618A + goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp BattleTower_Outside, 255, 19, 23 waitstate @@ -224,9 +224,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 pause 30 spriteinvisible LAST_TALKED, 9, 8 compare FACING, 2 - callif 1, SlateportCity_Harbor_EventScript_1561EF + call_if 1, SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 - callif 1, SlateportCity_Harbor_EventScript_1561E4 + call_if 1, SlateportCity_Harbor_EventScript_1561E4 pause 30 spriteinvisible 255, 0, 0 setvar 0x8004, 5 @@ -269,13 +269,13 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer checkflag 2061 - jumpeq SlateportCity_Harbor_EventScript_15626F + goto_if_eq SlateportCity_Harbor_EventScript_15626F checkflag 271 - jumpeq SlateportCity_Harbor_EventScript_156265 + goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag 112 - jumpeq SlateportCity_Harbor_EventScript_156258 + goto_if_eq SlateportCity_Harbor_EventScript_156258 compare 0x40a0, 2 - jumpeq SlateportCity_Harbor_EventScript_15624E + goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closebutton move LAST_TALKED, SlateportCity_Harbor_Movement_1A083D @@ -301,12 +301,12 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 SlateportCity_Harbor_EventScript_15626F:: @ 815626F compare 0x4001, 1 - jumpeq SlateportCity_Harbor_EventScript_156380 + goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 compare RESULT, 1 - jumpeq SlateportCity_Harbor_EventScript_1562A7 + goto_if_eq SlateportCity_Harbor_EventScript_1562A7 checkflag 2052 - jumpeq SlateportCity_Harbor_EventScript_15629D + goto_if_eq SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release end @@ -334,10 +334,10 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_156374 + goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_TOOTH compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_1A029B + goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag 294 @@ -347,10 +347,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_156374 + goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_SCALE compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_1A029B + goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag 294 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 4161889e1..f9ffba65f 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -6,9 +6,9 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B faceplayer msgbox SlateportCity_House1_Text_17D46A, 5 compare RESULT, 1 - jumpeq SlateportCity_House1_EventScript_15569C + goto_if_eq SlateportCity_House1_EventScript_15569C compare RESULT, 0 - jumpeq SlateportCity_House1_EventScript_1556BF + goto_if_eq SlateportCity_House1_EventScript_1556BF end SlateportCity_House1_EventScript_15569C:: @ 815569C @@ -16,9 +16,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C special sub_80F9A0C waitstate compare 0x8004, 255 - jumpif 5, SlateportCity_House1_EventScript_1556C9 + goto_if 5, SlateportCity_House1_EventScript_1556C9 compare 0x8004, 255 - jumpeq SlateportCity_House1_EventScript_1556BF + goto_if_eq SlateportCity_House1_EventScript_1556BF end SlateportCity_House1_EventScript_1556BF:: @ 81556BF @@ -29,20 +29,20 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialval RESULT, ScriptGetPartyMonSpecies compare RESULT, SPECIES_EGG - jumpeq SlateportCity_House1_EventScript_15571C + goto_if_eq SlateportCity_House1_EventScript_15571C special sub_80BFAE0 special sub_80BFB10 compare RESULT, 1 - jumpeq SlateportCity_House1_EventScript_155726 + goto_if_eq SlateportCity_House1_EventScript_155726 specialval RESULT, sub_810F96C special sub_80BFAE0 compare RESULT, 1 - jumpeq SlateportCity_House1_EventScript_155726 + goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 compare RESULT, 1 - jumpeq SlateportCity_House1_EventScript_155730 + goto_if_eq SlateportCity_House1_EventScript_155730 compare RESULT, 0 - jumpeq SlateportCity_House1_EventScript_1556BF + goto_if_eq SlateportCity_House1_EventScript_1556BF end SlateportCity_House1_EventScript_15571C:: @ 815571C @@ -61,7 +61,7 @@ SlateportCity_House1_EventScript_155730:: @ 8155730 specialval RESULT, sub_80BF9B4 special sub_80BFAE0 compare RESULT, 1 - jumpeq SlateportCity_House1_EventScript_15575A + goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 release end diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/scripts/maps/SlateportCity_House2.inc index 2d50f0851..934fae153 100644 --- a/data/scripts/maps/SlateportCity_House2.inc +++ b/data/scripts/maps/SlateportCity_House2.inc @@ -10,7 +10,7 @@ SlateportCity_House2_EventScript_156399:: @ 8156399 faceplayer checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 1 - jumpeq SlateportCity_House2_EventScript_1563B5 + goto_if_eq SlateportCity_House2_EventScript_1563B5 msgbox SlateportCity_House2_Text_180567, 4 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 83cac24ef..45b69dff2 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -35,7 +35,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 compare RESULT, 1 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155B2D + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closebutton hidemoney 0, 0 move 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D @@ -46,7 +46,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D checkmoney 0x32, 0 compare RESULT, 0 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155B5A + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A paymoney 0x32, 0 updatemoney 0, 0 nop @@ -58,7 +58,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A checkflag 149 - jumpif 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B + goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closebutton hidemoney 0, 0 @@ -166,14 +166,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 giveitem ITEM_TM46 compare RESULT, 0 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag 269 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closebutton compare FACING, 2 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155C98 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 compare FACING, 2 - jumpif 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD + goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD end SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 57bfbbd03..136054947 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -22,21 +22,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 move 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmove 0 compare FACING, 1 - callif 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 compare FACING, 4 - callif 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 compare FACING, 4 - callif 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D + call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closebutton move 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmove 0 compare FACING, 1 - callif 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare FACING, 3 - callif 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closebutton diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index fa2aae4ab..6656e58a4 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -24,19 +24,19 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 setvar 0x4002, 0 checkflag 204 - callif 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 203 - callif 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 202 - callif 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 201 - callif 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 200 - callif 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 compare 0x4002, 5 - callif 1, SlateportCity_PokemonFanClub_EventScript_15588D + call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D compare 0x40b7, 2 - jumpeq SlateportCity_PokemonFanClub_EventScript_1557FE + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 end @@ -50,15 +50,15 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 setvar 0x4001, 0 checkflag 204 - callif 0, SlateportCity_PokemonFanClub_EventScript_1559FE + call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE checkflag 203 - callif 0, SlateportCity_PokemonFanClub_EventScript_1559E7 + call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7 checkflag 202 - callif 0, SlateportCity_PokemonFanClub_EventScript_1559D0 + call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0 checkflag 201 - callif 0, SlateportCity_PokemonFanClub_EventScript_1559B9 + call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 checkflag 200 - callif 0, SlateportCity_PokemonFanClub_EventScript_1559A2 + call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 bufferfirstpoke 0 switch 0x4001 case 0, SlateportCity_PokemonFanClub_EventScript_155899 @@ -86,7 +86,7 @@ SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 checkitemspace ITEM_RED_SCARF, 1 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_155998 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 200 giveitem ITEM_RED_SCARF @@ -97,7 +97,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 checkitemspace ITEM_BLUE_SCARF, 1 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_155998 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 201 giveitem ITEM_BLUE_SCARF @@ -108,7 +108,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 checkitemspace ITEM_PINK_SCARF, 1 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_155998 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 202 giveitem ITEM_PINK_SCARF @@ -119,7 +119,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 checkitemspace ITEM_GREEN_SCARF, 1 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_155998 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 203 giveitem ITEM_GREEN_SCARF @@ -130,7 +130,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 checkitemspace ITEM_YELLOW_SCARF, 1 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_155998 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 204 giveitem ITEM_YELLOW_SCARF @@ -146,7 +146,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 specialval RESULT, CheckLeadMonCool compare RESULT, 1 - callif 1, SlateportCity_PokemonFanClub_EventScript_1559B3 + call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 return SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 @@ -156,7 +156,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 specialval RESULT, CheckLeadMonBeauty compare RESULT, 1 - callif 1, SlateportCity_PokemonFanClub_EventScript_1559CA + call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA return SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA @@ -166,7 +166,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 specialval RESULT, CheckLeadMonCute compare RESULT, 1 - callif 1, SlateportCity_PokemonFanClub_EventScript_1559E1 + call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 return SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 @@ -176,7 +176,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 specialval RESULT, CheckLeadMonSmart compare RESULT, 1 - callif 1, SlateportCity_PokemonFanClub_EventScript_1559F8 + call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 return SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 @@ -186,7 +186,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE specialval RESULT, CheckLeadMonTough compare RESULT, 1 - callif 1, SlateportCity_PokemonFanClub_EventScript_155A0F + call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F return SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F @@ -197,11 +197,11 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 lock faceplayer checkflag 278 - jumpeq SlateportCity_PokemonFanClub_EventScript_155A75 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 4 - jumpif 4, SlateportCity_PokemonFanClub_EventScript_155A3A + goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A release end @@ -214,7 +214,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 giveitem ITEM_SOOTHE_BELL compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_1A029B + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag 278 release end diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 4c0596d29..d585fb94c 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -4,13 +4,13 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall checkflag 2052 - jumpeq SlateportCity_SternsShipyard_1F_EventScript_155388 + goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 checkflag 2061 - jumpeq SlateportCity_SternsShipyard_1F_EventScript_15539C + goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C checkflag 149 - jumpeq SlateportCity_SternsShipyard_1F_EventScript_1553CF + goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF checkflag 148 - jumpeq SlateportCity_SternsShipyard_1F_EventScript_1553B0 + goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 waitmove 0 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 0c22fbc37..d718fed6e 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -6,9 +6,9 @@ SootopolisCity_MapScripts:: @ 814D07D SootopolisCity_MapScript1_14D08D:: @ 814D08D checkflag 129 - callif 0, SootopolisCity_EventScript_14D0A0 + call_if 0, SootopolisCity_EventScript_14D0A0 checkflag 129 - callif 1, SootopolisCity_EventScript_14D0B1 + call_if 1, SootopolisCity_EventScript_14D0B1 end SootopolisCity_EventScript_14D0A0:: @ 814D0A0 @@ -18,7 +18,7 @@ SootopolisCity_EventScript_14D0A0:: @ 814D0A0 SootopolisCity_EventScript_14D0B1:: @ 814D0B1 checkflag 113 - callif 0, SootopolisCity_EventScript_14D0BB + call_if 0, SootopolisCity_EventScript_14D0BB return SootopolisCity_EventScript_14D0BB:: @ 814D0BB @@ -36,9 +36,9 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag 2077 checkflag 113 - callif 1, SootopolisCity_EventScript_14D159 + call_if 1, SootopolisCity_EventScript_14D159 checkflag 2090 - callif 1, SootopolisCity_EventScript_14D123 + call_if 1, SootopolisCity_EventScript_14D123 end SootopolisCity_EventScript_14D123:: @ 814D123 @@ -46,7 +46,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 movespriteperm 1, 29, 19 movespriteperm 2, 33, 19 compare 0x405e, 1 - callif 1, SootopolisCity_EventScript_14D142 + call_if 1, SootopolisCity_EventScript_14D142 return SootopolisCity_EventScript_14D142:: @ 814D142 @@ -69,7 +69,7 @@ SootopolisCity_EventScript_14D16E:: @ 814D16E lock faceplayer checkflag 113 - jumpeq SootopolisCity_EventScript_14D183 + goto_if_eq SootopolisCity_EventScript_14D183 msgbox SootopolisCity_Text_1696A4, 4 release end @@ -93,27 +93,27 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F checkdailyflags special GetPlayerBigGuyGirlString checkflag 2258 - jumpeq SootopolisCity_EventScript_14D241 + goto_if_eq SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 random 10 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq SootopolisCity_EventScript_1A029B + goto_if_eq SootopolisCity_EventScript_1A029B setflag 2258 msgbox SootopolisCity_Text_1C64D0, 4 random 2 compare RESULT, 0 - jumpeq SootopolisCity_EventScript_14D1FF + goto_if_eq SootopolisCity_EventScript_14D1FF compare RESULT, 1 - jumpeq SootopolisCity_EventScript_14D220 + goto_if_eq SootopolisCity_EventScript_14D220 end SootopolisCity_EventScript_14D1FF:: @ 814D1FF giveitem ITEM_FIGY_BERRY compare RESULT, 0 - jumpeq SootopolisCity_EventScript_1A029B + goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release end @@ -121,7 +121,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF SootopolisCity_EventScript_14D220:: @ 814D220 giveitem ITEM_IAPAPA_BERRY compare RESULT, 0 - jumpeq SootopolisCity_EventScript_1A029B + goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release end @@ -129,7 +129,7 @@ SootopolisCity_EventScript_14D220:: @ 814D220 SootopolisCity_EventScript_14D241:: @ 814D241 msgbox SootopolisCity_Text_1C6540, 5 compare RESULT, 1 - jumpeq SootopolisCity_EventScript_14D25E + goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release end @@ -143,7 +143,7 @@ SootopolisCity_EventScript_14D268:: @ 814D268 lock faceplayer checkflag 1236 - jumpeq SootopolisCity_EventScript_14D27D + goto_if_eq SootopolisCity_EventScript_14D27D msgbox SootopolisCity_Text_16A4D6, 4 release end @@ -157,7 +157,7 @@ SootopolisCity_EventScript_14D287:: @ 814D287 lock faceplayer checkflag 113 - jumpeq SootopolisCity_EventScript_14D29C + goto_if_eq SootopolisCity_EventScript_14D29C msgbox SootopolisCity_Text_169813, 4 release end @@ -171,7 +171,7 @@ SootopolisCity_EventScript_14D2A6:: @ 814D2A6 lock faceplayer checkflag 113 - jumpeq SootopolisCity_EventScript_14D2BB + goto_if_eq SootopolisCity_EventScript_14D2BB msgbox SootopolisCity_Text_1698A0, 4 release end @@ -185,7 +185,7 @@ SootopolisCity_EventScript_14D2C5:: @ 814D2C5 lock faceplayer checkflag 113 - jumpeq SootopolisCity_EventScript_14D2DA + goto_if_eq SootopolisCity_EventScript_14D2DA msgbox SootopolisCity_Text_1697A7, 4 release end @@ -446,7 +446,7 @@ SootopolisCity_EventScript_14D498:: @ 814D498 lock faceplayer checkflag 113 - jumpeq SootopolisCity_EventScript_14D4AD + goto_if_eq SootopolisCity_EventScript_14D4AD .ifdef SAPPHIRE msgbox SootopolisCity_Text_169DA6, 4 .else diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 9fe6da43d..d776e8ecf 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -20,11 +20,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E compare 0x4022, 8 - jumpif 0, SootopolisCity_Gym_1F_EventScript_15AF85 + goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 compare 0x4022, 28 - jumpif 0, SootopolisCity_Gym_1F_EventScript_15AF73 + goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 compare 0x4022, 69 - jumpif 0, SootopolisCity_Gym_1F_EventScript_15AF61 + goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 setmaptile 8, 4, 519, 0 setmaptile 8, 5, 519, 0 @@ -88,9 +88,9 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D checkflag 172 - jumpif 0, SootopolisCity_Gym_1F_EventScript_15B056 + goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 checkflag 2060 - jumpif 0, SootopolisCity_Gym_1F_EventScript_15B07A + goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release end @@ -110,7 +110,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 giveitem ITEM_TM03 compare RESULT, 0 - jumpeq SootopolisCity_Gym_1F_EventScript_1A029B + goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 setflag 172 release @@ -125,7 +125,7 @@ SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084 lock faceplayer checkflag 1236 - jumpeq SootopolisCity_Gym_1F_EventScript_15B099 + goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099 msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4 release end @@ -138,14 +138,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall checkflag 2062 - jumpeq SootopolisCity_Gym_1F_EventScript_15B0C3 + goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall checkflag 2062 - jumpeq SootopolisCity_Gym_1F_EventScript_15B0C3 + goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 604f04c4f..e01a00d97 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -5,7 +5,7 @@ SootopolisCity_House1_EventScript_15B29B:: @ 815B29B lock faceplayer checkflag 121 - jumpeq SootopolisCity_House1_EventScript_15B2C7 + goto_if_eq SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 giveitem ITEM_TM31 setflag 121 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 409a871a8..011806291 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -6,9 +6,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 faceplayer msgbox SootopolisCity_House2_Text_18FA66, 5 compare RESULT, 1 - callif 1, SootopolisCity_House2_EventScript_15B307 + call_if 1, SootopolisCity_House2_EventScript_15B307 compare RESULT, 0 - callif 1, SootopolisCity_House2_EventScript_15B310 + call_if 1, SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index 88e35730e..f1bf0bf19 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -6,7 +6,7 @@ SootopolisCity_House3_EventScript_15B31A:: @ 815B31A faceplayer msgbox SootopolisCity_House3_Text_18FB36, 5 compare RESULT, 1 - jumpeq SootopolisCity_House3_EventScript_15B339 + goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release end diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index cccfa78ee..1e1b53956 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -5,14 +5,14 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 lock faceplayer checkflag 245 - jumpeq SootopolisCity_House6_EventScript_15B3CD + goto_if_eq SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, 5 compare RESULT, 0 - callif 1, SootopolisCity_House6_EventScript_15B3C3 + call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration 117 compare RESULT, 0 - jumpeq SootopolisCity_House6_EventScript_15B3D7 + goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag 245 release end diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index 9d7618316..662117741 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -10,14 +10,14 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 waitstate copyvar RESULT, 0x8004 compare RESULT, 255 - jumpeq SootopolisCity_House8_EventScript_15B448 + goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize compare RESULT, 1 - jumpeq SootopolisCity_House8_EventScript_15B452 + goto_if_eq SootopolisCity_House8_EventScript_15B452 compare RESULT, 2 - jumpeq SootopolisCity_House8_EventScript_15B45C + goto_if_eq SootopolisCity_House8_EventScript_15B45C compare RESULT, 3 - jumpeq SootopolisCity_House8_EventScript_15B466 + goto_if_eq SootopolisCity_House8_EventScript_15B466 release end @@ -40,7 +40,7 @@ SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 giveitem ITEM_ELIXIR compare RESULT, 0 - jumpeq SootopolisCity_House8_EventScript_15B488 + goto_if_eq SootopolisCity_House8_EventScript_15B488 closebutton release end @@ -59,14 +59,14 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 waitstate copyvar RESULT, 0x8004 compare RESULT, 255 - jumpeq SootopolisCity_House8_EventScript_15B4D9 + goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize compare RESULT, 1 - jumpeq SootopolisCity_House8_EventScript_15B4E3 + goto_if_eq SootopolisCity_House8_EventScript_15B4E3 compare RESULT, 2 - jumpeq SootopolisCity_House8_EventScript_15B4ED + goto_if_eq SootopolisCity_House8_EventScript_15B4ED compare RESULT, 3 - jumpeq SootopolisCity_House8_EventScript_15B4F7 + goto_if_eq SootopolisCity_House8_EventScript_15B4F7 release end @@ -89,7 +89,7 @@ SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 giveitem ITEM_ELIXIR compare RESULT, 0 - jumpeq SootopolisCity_House8_EventScript_15B519 + goto_if_eq SootopolisCity_House8_EventScript_15B519 closebutton release end diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index 9f37f9d0b..6cfb2ff79 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -30,9 +30,9 @@ SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A lock faceplayer checkflag 113 - jumpeq SootopolisCity_Mart_EventScript_15B268 + goto_if_eq SootopolisCity_Mart_EventScript_15B268 checkflag 129 - jumpif 0, SootopolisCity_Mart_EventScript_15B268 + goto_if 0, SootopolisCity_Mart_EventScript_15B268 msgbox SootopolisCity_Mart_Text_18F8D7, 4 release end @@ -46,9 +46,9 @@ SootopolisCity_Mart_EventScript_15B272:: @ 815B272 lock faceplayer checkflag 113 - jumpeq SootopolisCity_Mart_EventScript_15B290 + goto_if_eq SootopolisCity_Mart_EventScript_15B290 checkflag 129 - jumpif 0, SootopolisCity_Mart_EventScript_15B290 + goto_if 0, SootopolisCity_Mart_EventScript_15B290 msgbox SootopolisCity_Mart_Text_18F96B, 4 release end diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 29cc06584..00c9d3310 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -18,9 +18,9 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 lock faceplayer checkflag 113 - jumpeq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 checkflag 129 - jumpif 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4 release end @@ -34,9 +34,9 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 lock faceplayer checkflag 113 - jumpeq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE checkflag 129 - jumpif 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4 release end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 9723647cd..fc7d811c4 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -11,7 +11,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 faceplayer msgbox SouthernIsland_Exterior_Text_1C5215, 5 compare RESULT, 0 - jumpeq SouthernIsland_Exterior_EventScript_160B25 + goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closebutton move LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index f341f5aeb..84e6b93c5 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -5,7 +5,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E checkflag 2145 - callif 1, SouthernIsland_Interior_EventScript_160B68 + call_if 1, SouthernIsland_Interior_EventScript_160B68 end SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 @@ -24,9 +24,9 @@ SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 checkgender compare RESULT, 0 - jumpeq SouthernIsland_Interior_EventScript_160B8F + goto_if_eq SouthernIsland_Interior_EventScript_160B8F compare RESULT, 1 - jumpeq SouthernIsland_Interior_EventScript_160B95 + goto_if_eq SouthernIsland_Interior_EventScript_160B95 end SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F @@ -45,9 +45,9 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 checkflag 206 - jumpeq SouthernIsland_Interior_EventScript_160C08 + goto_if_eq SouthernIsland_Interior_EventScript_160C08 checkflag 2131 - jumpif 0, SouthernIsland_Interior_EventScript_160C08 + goto_if 0, SouthernIsland_Interior_EventScript_160C08 setflag 206 special SpawnCameraDummy move 127, SouthernIsland_Interior_Movement_160C12 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index c879ec609..8ef61d0f0 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -7,7 +7,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE setflag 2119 checkflag 129 - jumpeq Underwater_SeafloorCavern_EventScript_15D9BB + goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB end Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB @@ -16,7 +16,7 @@ Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF checkflag 129 - callif 1, Underwater_SeafloorCavern_EventScript_15D9C9 + call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9 end Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index bbd0db9d9..4e2895166 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -5,9 +5,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 getplayerxy 0x8004, 0x8005 compare 0x8004, 12 - jumpif 5, Underwater_SealedChamber_EventScript_15F0A6 + goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 compare 0x8005, 44 - jumpif 5, Underwater_SealedChamber_EventScript_15F0A6 + goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index cbd782f35..52aca6d12 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -14,15 +14,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId compare RESULT, 0 - callif 1, LinkContestRoom1_EventScript_15F5E0 + call_if 1, LinkContestRoom1_EventScript_15F5E0 compare RESULT, 1 - callif 1, LinkContestRoom1_EventScript_15F5E4 + call_if 1, LinkContestRoom1_EventScript_15F5E4 compare RESULT, 2 - callif 1, LinkContestRoom1_EventScript_15F5E8 + call_if 1, LinkContestRoom1_EventScript_15F5E8 compare RESULT, 3 - callif 1, LinkContestRoom1_EventScript_15F5EC + call_if 1, LinkContestRoom1_EventScript_15F5EC compare RESULT, 4 - callif 1, LinkContestRoom1_EventScript_15F5F0 + call_if 1, LinkContestRoom1_EventScript_15F5F0 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 @@ -47,7 +47,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 compare 0x4009, 1 - callif 1, LinkContestRoom1_EventScript_15F600 + call_if 1, LinkContestRoom1_EventScript_15F600 end LinkContestRoom1_EventScript_15F600:: @ 815F600 @@ -76,7 +76,7 @@ LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 compare 0x4000, 8 - jumpif 0, LinkContestRoom1_EventScript_15F630 + goto_if 0, LinkContestRoom1_EventScript_15F630 return LinkContestRoom1_EventScript_15F646:: @ 815F646 @@ -415,9 +415,9 @@ SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB checkgender compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_15FBF3 + goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_15FBF9 + goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9 return FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index 610643823..66aa080ba 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -12,7 +12,7 @@ VerdanturfTown_EventScript_14E866:: @ 814E866 lock faceplayer checkflag 199 - jumpeq VerdanturfTown_EventScript_14E885 + goto_if_eq VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 move 2, VerdanturfTown_Movement_1A083D waitmove 0 @@ -38,7 +38,7 @@ VerdanturfTown_EventScript_14E8AB:: @ 814E8AB lock faceplayer checkflag 199 - jumpeq VerdanturfTown_EventScript_14E8C0 + goto_if_eq VerdanturfTown_EventScript_14E8C0 msgbox VerdanturfTown_Text_16CD4D, 4 release end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 8fd4016d1..00454133d 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -102,11 +102,11 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 lock faceplayer checkflag 235 - jumpeq VerdanturfTown_ContestLobby_EventScript_153E76 + goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem ITEM_TM45 compare RESULT, 0 - jumpeq VerdanturfTown_ContestLobby_EventScript_1A029B + goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag 235 release end diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index 80bd6151d..fad64292b 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -5,7 +5,7 @@ VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B lock faceplayer checkflag 193 - jumpeq VerdanturfTown_WandasHouse_EventScript_153F73 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73 msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4 setflag 193 release @@ -20,9 +20,9 @@ VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D lock faceplayer checkflag 126 - jumpeq VerdanturfTown_WandasHouse_EventScript_153FA5 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 checkflag 1213 - jumpeq VerdanturfTown_WandasHouse_EventScript_153F9B + goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B msgbox VerdanturfTown_WandasHouse_Text_17859A, 4 release end @@ -45,9 +45,9 @@ VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 lock faceplayer checkflag 1213 - jumpeq VerdanturfTown_WandasHouse_EventScript_153FE0 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 checkflag 190 - jumpeq VerdanturfTown_WandasHouse_EventScript_153FD6 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 release end @@ -66,11 +66,11 @@ VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA lock faceplayer checkflag 126 - jumpeq VerdanturfTown_WandasHouse_EventScript_154025 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 checkflag 1213 - jumpeq VerdanturfTown_WandasHouse_EventScript_15401B + goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B checkflag 199 - jumpeq VerdanturfTown_WandasHouse_EventScript_154011 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4 release end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 3eae03f37..7ea560d0d 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -4,7 +4,7 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 checkflag 126 - callif 1, VictoryRoad_1F_EventScript_15DE93 + call_if 1, VictoryRoad_1F_EventScript_15DE93 end VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 @@ -95,7 +95,7 @@ VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq VictoryRoad_1F_EventScript_15DF58 + goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 38378eb2e..6202a8acf 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -27,9 +27,9 @@ SpeakToBard: faceplayer msgbox gTextBard_HiImTheBard, MSGBOX_YESNO compare RESULT, YES - jumpeq yes_hear_song + goto_if_eq yes_hear_song compare RESULT, NO - jumpeq dont_hear_song + goto_if_eq dont_hear_song end yes_hear_song: @@ -40,7 +40,7 @@ yes_hear_song: special ScrSpecial_HasBardSongBeenChanged compare RESULT, FALSE @ Prompt new lyrics only if song hasn't been changed - jumpeq prompt_write_lyrics + goto_if_eq prompt_write_lyrics msgbox gTextBard_OhWhatAMovingSong, 4 release end @@ -53,9 +53,9 @@ dont_hear_song: prompt_write_lyrics: msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO compare RESULT, YES - jumpeq write_lyrics + goto_if_eq write_lyrics compare RESULT, NO - jumpeq dont_write_lyrics + goto_if_eq dont_write_lyrics end write_lyrics: @@ -64,7 +64,7 @@ write_lyrics: lock faceplayer compare RESULT, NO - jumpeq dont_write_lyrics + goto_if_eq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 setvar 0x8004, 1 @ Give the player ear rape again @@ -72,7 +72,7 @@ write_lyrics: pause 60 msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO compare RESULT, NO - jumpeq write_lyrics @ Keep looping until player responds YES + goto_if_eq write_lyrics @ Keep looping until player responds YES special ScrSpecial_SaveBardSongLyrics msgbox gTextBard_OkayThatsIt, 4 release @@ -95,7 +95,7 @@ SpeakToHipster: msgbox gTextHipster_TheyCallMeTheHipster, 4 special ScrSpecial_GetHipsterSpokenFlag compare RESULT, FALSE - jumpeq hipster_first_time + goto_if_eq hipster_first_time msgbox gTextHipster_TaughtYouAlready, 4 release end @@ -103,7 +103,7 @@ SpeakToHipster: hipster_first_time: special ScrSpecial_HipsterTeachWord compare RESULT, TRUE @ TRUE if player learned a new word - jumpeq teach_new_word + goto_if_eq teach_new_word msgbox gTextHipster_YouAlreadyKnowALot, 4 release end @@ -126,10 +126,10 @@ SpeakToTrader: faceplayer msgbox gTextTrader_Introduction, MSGBOX_YESNO compare RESULT, NO - jumpeq dont_want_to_trade + goto_if_eq dont_want_to_trade special ScrSpecial_GetTraderTradedFlag compare RESULT, TRUE - jumpeq already_traded + goto_if_eq already_traded message gTextTrader_MenuPrompt waittext goto do_trader_menu_get @@ -147,15 +147,15 @@ do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate compare 0x8004, 0 - jumpeq cancelled_get_menu + goto_if_eq cancelled_get_menu compare 0x8004, 65535 - jumpeq rare_item_cant_trade_away + goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO compare RESULT, NO - jumpeq dont_want_item + goto_if_eq dont_want_item special ScrSpecial_DoesPlayerHaveNoDecorations compare RESULT, TRUE - jumpeq player_has_no_decorations + goto_if_eq player_has_no_decorations goto do_trader_menu_give end @@ -184,15 +184,15 @@ do_trader_menu_give: special ScrSpecial_TraderMenuGiveDecoration waitstate compare 0x8006, 0 - jumpeq cancelled_give_menu + goto_if_eq cancelled_give_menu compare 0x8006, 65535 - jumpeq decoration_is_in_use + goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull compare RESULT, 1 - jumpeq decorations_full + goto_if_eq decorations_full msgbox gTextTrader_SoWellTrade, MSGBOX_YESNO compare RESULT, NO - jumpeq do_trader_menu_give + goto_if_eq do_trader_menu_give special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 end @@ -226,51 +226,51 @@ SpeakToStoryteller: faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO compare RESULT, NO - jumpeq dont_hear_story + goto_if_eq dont_hear_story specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare RESULT, 0 @ If slot is 0, then the list is empty - jumpeq no_stories_recorded + goto_if_eq no_stories_recorded choose_story: message gTextStoryteller_WhichTale waittext special ScrSpecial_StorytellerStoryListMenu waitstate compare RESULT, FALSE - jumpeq cancel_story_menu + goto_if_eq cancel_story_menu setvar 0x8008, 1 special ScrSpecial_StorytellerDisplayStory waittext waitbutton specialval RESULT, ScrSpecial_StorytellerUpdateStat compare RESULT, FALSE - jumpeq no_stat_update + goto_if_eq no_stat_update goto stat_update cancel_story_menu: compare 0x8008, 0 - jumpeq dont_hear_story + goto_if_eq dont_hear_story goto yes_hear_story no_stat_update: msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO compare RESULT, YES - jumpeq choose_story + goto_if_eq choose_story yes_hear_story: specialval RESULT, ScrSpecial_HasStorytellerAlreadyRecorded compare RESULT, TRUE - jumpeq cant_record_story @ already recorded story + goto_if_eq cant_record_story @ already recorded story specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare RESULT, 4 - jumpeq cant_record_story @ story list is full + goto_if_eq cant_record_story @ story list is full goto prompt_record_story no_stories_recorded: msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 prompt_record_story: msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO compare RESULT, NO - jumpeq dont_hear_story + goto_if_eq dont_hear_story specialval RESULT, ScrSpecial_StorytellerInitializeRandomStat compare RESULT, TRUE - jumpeq stat_update + goto_if_eq stat_update msgbox gTextStoryteller_ImNotSatisfied, 4 closebutton release @@ -306,25 +306,25 @@ SpeakToGiddy: faceplayer msgbox gTextGiddy_Introduction, MSGBOX_YESNO compare RESULT, YES - jumpeq yes_hear_giddy + goto_if_eq yes_hear_giddy compare RESULT, NO - jumpeq dont_hear_giddy + goto_if_eq dont_hear_giddy end yes_hear_giddy: special ScrSpecial_GiddyShouldTellAnotherTale compare RESULT, TRUE - jumpeq tell_giddy_tale + goto_if_eq tell_giddy_tale compare RESULT, FALSE - jumpeq bye_bye + goto_if_eq bye_bye end tell_another_giddy_tale: special ScrSpecial_GiddyShouldTellAnotherTale compare RESULT, TRUE - jumpeq also_i_was_thinking + goto_if_eq also_i_was_thinking compare RESULT, FALSE - jumpeq bye_bye + goto_if_eq bye_bye end also_i_was_thinking: @@ -338,9 +338,9 @@ tell_giddy_tale: waittext yesnobox 20, 8 compare RESULT, 1 - jumpeq tell_another_giddy_tale + goto_if_eq tell_another_giddy_tale compare RESULT, 0 - jumpeq tell_another_giddy_tale + goto_if_eq tell_another_giddy_tale end dont_hear_giddy: diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index e3577debf..97adca508 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -2,7 +2,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 lock faceplayer checkflag 2053 - jumpeq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4 goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D end @@ -30,11 +30,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A lock faceplayer compare 0x8004, 1 - callif 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 - jumpeq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 compare RESULT, 1 - jumpeq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB end PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1 @@ -84,11 +84,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 lock faceplayer compare 0x8004, 1 - callif 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 - jumpeq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 compare RESULT, 1 - jumpeq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB end PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D @@ -98,9 +98,9 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77 checkflag 2059 - jumpif 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 + goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 checkflag 2124 - jumpeq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 setflag 2124 msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3 release diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 776ba0a8b..bbbc0952d 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -9,9 +9,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 move 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmove 0 compare 0x8005, 0 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F compare 0x8005, 1 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closebutton setvar 0x4092, 4 @@ -60,7 +60,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB checkflag 81 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4 call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B pause 30 @@ -70,9 +70,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB setflag 755 checkgender compare RESULT, 0 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 compare RESULT, 1 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playsfx 9 disappear 0x8008 releaseall @@ -253,17 +253,17 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 lock faceplayer compare 0x4082, 4 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 compare 0x408c, 4 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 checkflag 2059 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D checkflag 82 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 compare 0x4001, 1 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 compare 0x4092, 7 - jumpif 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C + goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 release end @@ -275,11 +275,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33 LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D checkflag 133 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 giveitem ITEM_AMULET_COIN compare RESULT, 0 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_1A029B + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 setflag 133 release @@ -363,13 +363,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE lockall checkgender compare RESULT, 0 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD compare RESULT, 1 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD compare 0x8008, 0 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D compare 0x8008, 1 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmove 0 playsfx 21 @@ -379,23 +379,23 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE waitmove 0 pause 20 compare 0x8008, 0 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD compare 0x8008, 1 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 giveitem ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closebutton compare 0x8008, 0 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 compare 0x8008, 1 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closebutton compare 0x8008, 0 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 compare 0x8008, 1 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playsfx 8 disappear 0x8009 setflag 291 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 05f91a3aa..0cf3163fd 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -40,24 +40,24 @@ VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall msgbox FallarborTown_ContestLobby_Text_1B6E63, 5 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1B76A1 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B76E5 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7780 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780 specialval RESULT, PlayerHasBerries compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B770E + goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialval RESULT, sub_810CA00 compare RESULT, 65535 - jumpif 5, FallarborTown_ContestLobby_EventScript_1B76EF + goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, 65535 - jumpeq FallarborTown_ContestLobby_EventScript_1B7776 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 @@ -68,16 +68,16 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1B7734 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7726 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 checkdailyflags checkflag 2241 - jumpeq FallarborTown_ContestLobby_EventScript_1B774F + goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end @@ -150,9 +150,9 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 msgbox FallarborTown_ContestLobby_Text_1B742F, 4 specialval RESULT, PlayerHasBerries compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1B77DC + goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B77E6 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B77E6 end FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC @@ -163,7 +163,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 checkdailyflags checkflag 2241 - jumpeq FallarborTown_ContestLobby_EventScript_1B77F6 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 end @@ -210,23 +210,23 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall specialval RESULT, PlayerHasBerries compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7897 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7942 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialval RESULT, sub_810CA00 compare RESULT, 65535 - jumpif 5, FallarborTown_ContestLobby_EventScript_1B7878 + goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, 65535 - jumpeq FallarborTown_ContestLobby_EventScript_1B7938 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 msgbox FallarborTown_ContestLobby_Text_1B727C, 5 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1B78A1 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7936 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 @@ -237,21 +237,21 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 call S_DoSaveDialog compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7936 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 waittext special sub_8083614 waitstate compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1B7980 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7980 compare RESULT, 2 - jumpeq FallarborTown_ContestLobby_EventScript_1B794C + goto_if_eq FallarborTown_ContestLobby_EventScript_1B794C compare RESULT, 3 - jumpeq FallarborTown_ContestLobby_EventScript_1B7959 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7959 compare RESULT, 5 - jumpeq FallarborTown_ContestLobby_EventScript_1B7966 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7966 compare RESULT, 6 - jumpeq FallarborTown_ContestLobby_EventScript_1B7973 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7973 end FallarborTown_ContestLobby_EventScript_1B78F3:: @ 81B78F3 diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 0394329ee..6098c7dce 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -15,7 +15,7 @@ gUnknown_081C342D:: @ 81C342D lockall msgbox UnknownString_81C34B2, 5 compare RESULT, 1 - jumpeq EventScript_1C3443 + goto_if_eq EventScript_1C3443 releaseall end @@ -44,10 +44,10 @@ gUnknown_081C346A:: @ 81C346A lockall special SafariZoneGetPokeblockNameInFeeder compare RESULT, -1 - jumpif 5, EventScript_1C34A9 + goto_if 5, EventScript_1C34A9 msgbox UnknownString_81C354E, 5 compare RESULT, 1 - jumpeq EventScript_1C348E + goto_if_eq EventScript_1C348E releaseall end @@ -56,7 +56,7 @@ EventScript_1C348E: special sub_810BAF4 waitstate compare RESULT, -1 - jumpif 5, EventScript_1C34A0 + goto_if 5, EventScript_1C34A0 end EventScript_1C34A0: diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 629125030..eae7db0c0 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -3,7 +3,7 @@ Route111_EventScript_1A3858:: @ 81A3858 faceplayer msgbox Route111_Text_1A3520, 5 compare RESULT, 1 - jumpeq Route111_EventScript_1A3877 + goto_if_eq Route111_EventScript_1A3877 msgbox Route111_Text_1A37B5, 4 release end @@ -11,17 +11,17 @@ Route111_EventScript_1A3858:: @ 81A3858 Route111_EventScript_1A3877:: @ 81A3877 giveitem ITEM_TM43 compare RESULT, 0 - jumpeq Route111_EventScript_1A38D9 + goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 closebutton setflag 96 clearflag 948 compare FACING, 3 - callif 1, Route111_EventScript_1A38C3 + call_if 1, Route111_EventScript_1A38C3 compare FACING, 4 - callif 1, Route111_EventScript_1A38C3 + call_if 1, Route111_EventScript_1A38C3 compare FACING, 2 - callif 1, Route111_EventScript_1A38CE + call_if 1, Route111_EventScript_1A38CE disappear LAST_TALKED release end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index f91295e49..66a923c5e 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -4,30 +4,30 @@ Event_TV:: @ 81A6E72 special sub_80C2014 specialval RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare RESULT, 2 - jumpeq EventScript_1A6F01 + goto_if_eq EventScript_1A6F01 compare RESULT, 1 - jumpeq EventScript_1A6F0B + goto_if_eq EventScript_1A6F0B checkflag 2098 - jumpif 0, EventScript_1A6EF1 + goto_if 0, EventScript_1A6EF1 checkflag 2097 - jumpeq EventScript_1A6EF1 + goto_if_eq EventScript_1A6EF1 specialval RESULT, IsTVShowInSearchOfTrainersAiring compare RESULT, 1 - jumpeq EventScript_1A6F66 + goto_if_eq EventScript_1A6F66 goto EventScript_1A6F50 end EventScript_1A6EBB: specialval 0x8004, special_0x44 compare 0x8004, 255 - jumpeq EventScript_1A6F3F + goto_if_eq EventScript_1A6F3F specialval RESULT, special_0x4a compare RESULT, 255 - jumpeq EventScript_1A6F3F + goto_if_eq EventScript_1A6F3F copyvar 0x8004, RESULT specialval RESULT, sub_80BDA0C compare RESULT, 0 - jumpif 5, EventScript_1A6F21 + goto_if 5, EventScript_1A6F21 end EventScript_1A6EF1: @@ -60,7 +60,7 @@ EventScript_1A6F21: waittext waitbutton compare RESULT, 1 - jumpif 5, EventScript_1A6F21 + goto_if 5, EventScript_1A6F21 goto EventScript_1A6F37 end @@ -79,7 +79,7 @@ EventScript_1A6F3F: EventScript_1A6F50: special sub_80BECE8 compare RESULT, 0 - jumpeq EventScript_1A6EBB + goto_if_eq EventScript_1A6EBB waittext waitbutton goto EventScript_1A6F37 @@ -90,6 +90,6 @@ EventScript_1A6F66: waittext waitbutton compare RESULT, 0 - jumpeq EventScript_1A6F66 + goto_if_eq EventScript_1A6F66 goto EventScript_1A6F37 end -- cgit v1.2.3 From 1e2601a0287fdacfb8f0d680fbe82a274414ea65 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:10:51 -0500 Subject: more script command renaming --- data/event_scripts.s | 368 ++++++++++----------- data/field_move_scripts.inc | 28 +- data/scripts/berry_tree.inc | 24 +- data/scripts/cable_club.inc | 100 +++--- data/scripts/contest_hall.inc | 210 ++++++------ data/scripts/day_care.inc | 56 ++-- data/scripts/gabby_and_ty.inc | 18 +- data/scripts/magma_chimney.inc | 8 +- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 2 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 8 +- .../maps/AbandonedShip_HiddenFloorRooms.inc | 16 +- data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 4 +- data/scripts/maps/BattleTower_Corridor.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 30 +- data/scripts/maps/BattleTower_Outside.inc | 6 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DewfordTown.inc | 20 +- data/scripts/maps/DewfordTown_Gym.inc | 18 +- data/scripts/maps/DewfordTown_Hall.inc | 24 +- data/scripts/maps/DewfordTown_House2.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 12 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 4 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 6 +- data/scripts/maps/FallarborTown_House2.inc | 10 +- data/scripts/maps/FortreeCity.inc | 4 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 6 +- data/scripts/maps/FortreeCity_House2.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 10 +- data/scripts/maps/InsideOfTruck.inc | 4 +- data/scripts/maps/JaggedPass.inc | 6 +- data/scripts/maps/LavaridgeTown.inc | 52 +-- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 4 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 18 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 42 +-- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 10 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 30 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 22 +- data/scripts/maps/LilycoveCity_Harbor.inc | 16 +- data/scripts/maps/LilycoveCity_House2.inc | 2 +- data/scripts/maps/LilycoveCity_House3.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 8 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 8 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 76 ++--- data/scripts/maps/LittlerootTown.inc | 96 +++--- .../maps/LittlerootTown_BrendansHouse_1F.inc | 10 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 12 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 16 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 28 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 28 +- data/scripts/maps/MauvilleCity.inc | 8 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 16 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 86 ++--- data/scripts/maps/MauvilleCity_Gym.inc | 12 +- data/scripts/maps/MauvilleCity_House2.inc | 6 +- data/scripts/maps/MeteorFalls_1F_2R.inc | 6 +- data/scripts/maps/MossdeepCity.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 28 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 2 +- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 6 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 8 +- data/scripts/maps/MtChimney.inc | 12 +- data/scripts/maps/MtChimney_CableCarStation.inc | 6 +- data/scripts/maps/MtPyre_1F.inc | 2 +- data/scripts/maps/MtPyre_6F.inc | 2 +- data/scripts/maps/MtPyre_Exterior.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 36 +- data/scripts/maps/NewMauville_Entrance.inc | 6 +- data/scripts/maps/NewMauville_Inside.inc | 8 +- data/scripts/maps/OldaleTown.inc | 6 +- data/scripts/maps/PacifidlogTown_House2.inc | 10 +- data/scripts/maps/PacifidlogTown_House3.inc | 6 +- data/scripts/maps/PacifidlogTown_House4.inc | 4 +- data/scripts/maps/PacifidlogTown_House5.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 20 +- data/scripts/maps/PetalburgCity_Gym.inc | 170 +++++----- .../maps/PetalburgCity_PokemonCenter_1F.inc | 8 +- data/scripts/maps/PetalburgWoods.inc | 6 +- data/scripts/maps/Route102.inc | 2 +- data/scripts/maps/Route103.inc | 10 +- data/scripts/maps/Route104.inc | 12 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 8 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 10 +- data/scripts/maps/Route106.inc | 2 +- data/scripts/maps/Route107.inc | 2 +- data/scripts/maps/Route109.inc | 8 +- data/scripts/maps/Route109_SeashoreHouse.inc | 8 +- data/scripts/maps/Route110.inc | 42 +-- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 8 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 26 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 120 +++---- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 10 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 42 +-- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 102 +++--- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 6 +- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 2 +- data/scripts/maps/Route111.inc | 34 +- data/scripts/maps/Route111_OldLadysRestStop.inc | 8 +- .../maps/Route111_WinstrateFamilysHouse.inc | 2 +- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 6 +- data/scripts/maps/Route113.inc | 8 +- data/scripts/maps/Route113_GlassWorkshop.inc | 52 +-- data/scripts/maps/Route114.inc | 8 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 2 +- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 4 +- data/scripts/maps/Route114_LanettesHouse.inc | 6 +- data/scripts/maps/Route115.inc | 6 +- data/scripts/maps/Route116.inc | 28 +- data/scripts/maps/Route117.inc | 12 +- data/scripts/maps/Route118.inc | 14 +- data/scripts/maps/Route119.inc | 34 +- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 6 +- data/scripts/maps/Route120.inc | 40 +-- data/scripts/maps/Route121.inc | 4 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 12 +- data/scripts/maps/Route123.inc | 8 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 32 +- data/scripts/maps/Route124.inc | 6 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 20 +- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route128.inc | 4 +- data/scripts/maps/Route130.inc | 2 +- data/scripts/maps/RustboroCity.inc | 28 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 34 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 4 +- data/scripts/maps/RustboroCity_House1.inc | 6 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 6 +- data/scripts/maps/RusturfTunnel.inc | 24 +- data/scripts/maps/SSTidalCorridor.inc | 12 +- data/scripts/maps/SSTidalRooms.inc | 2 +- data/scripts/maps/SafariZone_Southeast.inc | 6 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 2 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 20 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 12 +- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 4 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 2 +- data/scripts/maps/SlateportCity.inc | 24 +- data/scripts/maps/SlateportCity_ContestHall.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 34 +- data/scripts/maps/SlateportCity_House1.inc | 20 +- data/scripts/maps/SlateportCity_House2.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 10 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 28 +- data/scripts/maps/SootopolisCity.inc | 14 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 +- data/scripts/maps/SootopolisCity_House2.inc | 4 +- data/scripts/maps/SootopolisCity_House3.inc | 2 +- data/scripts/maps/SootopolisCity_House6.inc | 4 +- data/scripts/maps/SootopolisCity_House8.inc | 20 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 18 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- data/scripts/mauville_man.inc | 74 ++--- data/scripts/mystery_event_club.inc | 12 +- data/scripts/players_house.inc | 38 +-- data/scripts/pokeblocks.inc | 44 +-- data/scripts/safari_zone.inc | 8 +- data/scripts/secret_power_tm.inc | 10 +- data/scripts/tv.inc | 18 +- 186 files changed, 1701 insertions(+), 1701 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 037e8a1b0..dae57cfd6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -430,7 +430,7 @@ EventScript_15F3E2: EventScript_15F419: msgbox UnknownString_81A38FB, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_15F384 closebutton special SecretBasePC_PackUp @@ -476,13 +476,13 @@ gUnknown_0815F49A:: @ 815F49A EventScript_15F4A1: special sub_80BC56C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EventScript_15F4E0 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq EventScript_15F503 special sub_80BC224 msgbox UnknownString_81A3958, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A22, 3 special sub_80BC5BC @@ -492,7 +492,7 @@ EventScript_15F4A1: EventScript_15F4E0: msgbox UnknownString_81A3982, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 special sub_80BC5BC @@ -526,13 +526,13 @@ gUnknown_0815F523:: @ 815F523 gUnknown_0815F528:: @ 815F528 special GetShieldToyTVDecorationInfo - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_15F558 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EventScript_15F561 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq EventScript_15F56A - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq EventScript_15F573 end @@ -936,7 +936,7 @@ gUnknown_0819F818:: @ 819F818 move LAST_TALKED, Movement_19F8F0 waitmove 0 specialval RESULT, ScrSpecial_HasTrainerBeenFought - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if 5, EventScript_19F83F special PlayTrainerEncounterMusic special sub_8082524 @@ -950,10 +950,10 @@ gUnknown_0819F840:: @ 819F840 faceplayer call EventScript_19F8E5 specialval RESULT, ScrSpecial_HasTrainerBeenFought - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if 5, EventScript_19F877 special CheckForAlivePartyMons - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if 5, EventScript_19F870 special PlayTrainerEncounterMusic special sub_8082524 @@ -979,7 +979,7 @@ gUnknown_0819F878:: @ 819F878 gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_19F8AD special PlayTrainerEncounterMusic special sub_8082524 @@ -996,10 +996,10 @@ EventScript_19F8AD: gUnknown_0819F8AE:: @ 819F8AE specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_19F8DD special CheckForAlivePartyMons - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if 5, EventScript_19F8DE special PlayTrainerEncounterMusic special sub_8082524 @@ -1036,15 +1036,15 @@ EventScript_19F8F2: waitbutton reptrainerbattle specialval RESULT, ScrSpecial_GetTrainerBattleMode - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_19F934 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq EventScript_19F936 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EventScript_19F936 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq EventScript_19F936 - compare RESULT, 8 + compare_var_to_imm RESULT, 8 goto_if_eq EventScript_19F936 EventScript_19F934: @@ -1335,11 +1335,11 @@ EventScript_19FC84: return gUnknown_0819FC9F:: @ 819FC9F - compare 0x4096, 1 + compare_var_to_imm 0x4096, 1 goto_if_eq EventScript_19FCC1 - compare 0x4096, 2 + compare_var_to_imm 0x4096, 2 goto_if_eq EventScript_19FCD7 - compare 0x4096, 3 + compare_var_to_imm 0x4096, 3 goto_if_eq EventScript_19FCF0 end @@ -1433,9 +1433,9 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B lock faceplayer msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq do_heal_party - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq dont_heal_party end @@ -1471,9 +1471,9 @@ dont_heal_party:: @ 819FDC7 OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE specialval RESULT, IsPokerusInParty - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDEA - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1498,9 +1498,9 @@ Std_ObtainItem_: @ 819FE07 bufferitem 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket - compare 0x8007, 0x1 + compare_var_to_imm 0x8007, 0x1 call_if 1, Std_ObtainItem_Success - compare 0x8007, 0x0 + compare_var_to_imm 0x8007, 0x0 call_if 1, Std_ObtainItem_Fail return @@ -1515,31 +1515,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstd 2, 0xE - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstd 2, 0xF - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstd 2, 0x10 - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstd 2, 0x11 - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstd 2, 0x12 - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 call_if 1, PlayGetItemFanfare return @@ -1571,9 +1571,9 @@ Std_ObtainDecoration: @ 819FEDA Std_ObtainDecoration_: @ 819FEE8 bufferdecor 1, 0x8000 - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 call_if 1, Std_ObtainDecoration_Success - compare 0x8007, 0 + compare_var_to_imm 0x8007, 0 call_if 1, Std_ObtainDecoration_Fail return @@ -1599,9 +1599,9 @@ Std_FindItem: @ 819FF21 bufferitem 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 call_if 1, Std_FindItem_Success - compare 0x8007, 0 + compare_var_to_imm 0x8007, 0 call_if 1, Std_FindItem_Fail release return @@ -1628,9 +1628,9 @@ HiddenItemScript:: @ 819FF7B bufferitem 0x1, 0x8005 checkitemtype 0x8005 call GetItem_HandlePocket - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 goto_if_eq HiddenItemScript_Success - compare 0x8007, 0 + compare_var_to_imm 0x8007, 0 goto_if_eq HiddenItemScript_Fail end @@ -1654,9 +1654,9 @@ UnusedMixRecordsScript: @ 819FFD5 lock faceplayer msgbox UnusedMixRecordsPromptText, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq UnusedMixRecordsScript_Yes - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq UnusedMixRecordsScript_Done goto UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA @@ -1811,13 +1811,13 @@ Route109_EventScript_1A010C:: @ 81A010C UseSurfScript:: @ 81A0117 checkattack MOVE_SURF - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq UseSurfScript_NoMon bufferpartypoke 0, RESULT setanimation 0, RESULT lockall msgbox UseSurfPromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq UseSurfScript_No msgbox UsedSurfText, 4 doanimation 9 @@ -1836,9 +1836,9 @@ Route110_EventScript_1A014E:: @ 81A014E Route119_EventScript_1A014E:: @ 81A014E RustboroCity_EventScript_1A014E:: @ 81A014E checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_EventScript_1A0166 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_EventScript_1A016C end @@ -1854,9 +1854,9 @@ LavaridgeTown_EventScript_1A0172:: @ 81A0172 Route110_EventScript_1A0172:: @ 81A0172 Route119_EventScript_1A0172:: @ 81A0172 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_EventScript_1A018A - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LavaridgeTown_EventScript_1A0190 end @@ -2136,23 +2136,23 @@ Route109_EventScript_1A02EF:: @ 81A02EF LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A02F4:: @ 81A02F4 Route103_EventScript_1A02F4:: @ 81A02F4 - compare 0x4085, 0 + compare_var_to_imm 0x4085, 0 goto_if_eq Route101_EventScript_1A14DC - compare 0x4049, 0 + compare_var_to_imm 0x4049, 0 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 1 + compare_var_to_imm 0x4049, 1 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 2 + compare_var_to_imm 0x4049, 2 call_if 1, Route101_EventScript_1A0365 - compare 0x4049, 3 + compare_var_to_imm 0x4049, 3 call_if 1, Route101_EventScript_1A0365 - compare 0x4049, 4 + compare_var_to_imm 0x4049, 4 call_if 1, Route101_EventScript_1A0372 - compare 0x4049, 5 + compare_var_to_imm 0x4049, 5 call_if 1, Route101_EventScript_1A0372 - compare 0x4049, 6 + compare_var_to_imm 0x4049, 6 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 7 + compare_var_to_imm 0x4049, 7 call_if 1, Route101_EventScript_1A0358 return @@ -2183,7 +2183,7 @@ Route103_EventScript_1A037F:: @ 81A037F lock faceplayer msgbox Route101_Text_1C4449, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route101_EventScript_1A039B call Route101_EventScript_1A03B0 release @@ -2212,7 +2212,7 @@ Route101_EventScript_1A03B0:: @ 81A03B0 buffernum 1, 0x8009 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 - compare 0x800a, 0 + compare_var_to_imm 0x800a, 0 goto_if_eq Route101_EventScript_1A14DC setvar 0x8004, 1 specialval RESULT, ScriptGetPokedexInfo @@ -2279,9 +2279,9 @@ Movement_1A047A: BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, BattleTower_Outside_EventScript_160B2F - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A pause 30 spriteinvisible 255, 0, 0 @@ -2424,7 +2424,7 @@ Route119_EventScript_1A0587:: @ 81A0587 Route119_EventScript_1A0594:: @ 81A0594 Route120_EventScript_1A0594:: @ 81A0594 checkitem ITEM_DEVON_SCOPE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_1A05AE msgbox Route119_Text_171B93, 4 release @@ -2432,7 +2432,7 @@ Route120_EventScript_1A0594:: @ 81A0594 Route119_EventScript_1A05AE:: @ 81A05AE msgbox Route119_Text_171BB6, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_1A05C3 release end @@ -2449,19 +2449,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 pause 40 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 call_if 1, Route119_EventScript_1A0646 - compare 0x8004, 2 + compare_var_to_imm 0x8004, 2 call_if 1, Route119_EventScript_1A064A - compare 0x8004, 3 + compare_var_to_imm 0x8004, 3 call_if 1, Route119_EventScript_1A064E - compare 0x8004, 4 + compare_var_to_imm 0x8004, 4 call_if 1, Route119_EventScript_1A0652 - compare 0x8004, 5 + compare_var_to_imm 0x8004, 5 call_if 1, Route119_EventScript_1A0656 - compare 0x8004, 6 + compare_var_to_imm 0x8004, 6 call_if 1, Route119_EventScript_1A065A - compare 0x8004, 7 + compare_var_to_imm 0x8004, 7 call_if 1, Route119_EventScript_1A065E setflag 2145 dowildbattle @@ -3253,7 +3253,7 @@ gUnknown_081A14B8:: @ 81A14B8 lockall special ExecuteWhiteOut waitstate - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EventScript_1A14CA releaseall end @@ -3597,32 +3597,32 @@ SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4 gUnknown_081A2C51:: @ 81A2C51 special sub_80BB70C special sub_80BB63C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EventScript_1A2E45 checkattack MOVE_SECRET_POWER setanimation 0, RESULT bufferattack 1, MOVE_SECRET_POWER - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 goto_if_eq EventScript_1A2CB0 - compare 0x8007, 2 + compare_var_to_imm 0x8007, 2 goto_if_eq EventScript_1A2CB0 - compare 0x8007, 3 + compare_var_to_imm 0x8007, 3 goto_if_eq EventScript_1A2CB0 - compare 0x8007, 4 + compare_var_to_imm 0x8007, 4 goto_if_eq EventScript_1A2CB0 - compare 0x8007, 5 + compare_var_to_imm 0x8007, 5 goto_if_eq EventScript_1A2D08 - compare 0x8007, 6 + compare_var_to_imm 0x8007, 6 goto_if_eq EventScript_1A2D60 end EventScript_1A2CB0: lockall - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq EventScript_1A2CF1 bufferpartypoke 0, RESULT msgbox UnknownString_8198F34, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3649,11 +3649,11 @@ EventScript_1A2CFA: EventScript_1A2D08: lockall - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq EventScript_1A2D49 bufferpartypoke 0, RESULT msgbox UnknownString_81A197B, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3680,11 +3680,11 @@ EventScript_1A2D52: EventScript_1A2D60: lockall - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq EventScript_1A2DA1 bufferpartypoke 0, RESULT msgbox UnknownString_81A1A4B, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3728,7 +3728,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE waitmove 0 setvar 0x4097, 1 msgbox SecretBase_RedCave1_Text_198F89, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closebutton playsfx 9 @@ -3752,7 +3752,7 @@ gUnknown_081A2E14:: @ 81A2E14 setvar 0x4097, 1 playsfx 9 special sub_80BC114 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_1A2E38 clearflag 173 special sub_80BBAF0 @@ -3769,57 +3769,57 @@ EventScript_1A2E38: EventScript_1A2E45: checkattack MOVE_SECRET_POWER - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq EventScript_1A2EF7 setanimation 0, RESULT setorcopyvar 0x8004, RESULT lockall special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UnknownString_81A38FB, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_1A2F3A fadescreen 1 special sub_80BC50C closebutton fadescreen 0 msgbox UnknownString_81A3CC9, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_1A2F3A bufferpartypoke 0, 0x8004 bufferattack 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closebutton closebutton - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 goto_if_eq gUnknown_081A2CE6 - compare 0x8007, 2 + compare_var_to_imm 0x8007, 2 goto_if_eq gUnknown_081A2CE6 - compare 0x8007, 3 + compare_var_to_imm 0x8007, 3 goto_if_eq gUnknown_081A2CE6 - compare 0x8007, 4 + compare_var_to_imm 0x8007, 4 goto_if_eq gUnknown_081A2CE6 - compare 0x8007, 5 + compare_var_to_imm 0x8007, 5 goto_if_eq gUnknown_081A2D3E - compare 0x8007, 6 + compare_var_to_imm 0x8007, 6 goto_if_eq gUnknown_081A2D96 releaseall end EventScript_1A2EF7:: - compare 0x8007, 1 + compare_var_to_imm 0x8007, 1 goto_if_eq EventScript_1A2CF1 - compare 0x8007, 2 + compare_var_to_imm 0x8007, 2 goto_if_eq EventScript_1A2CF1 - compare 0x8007, 3 + compare_var_to_imm 0x8007, 3 goto_if_eq EventScript_1A2CF1 - compare 0x8007, 4 + compare_var_to_imm 0x8007, 4 goto_if_eq EventScript_1A2CF1 - compare 0x8007, 5 + compare_var_to_imm 0x8007, 5 goto_if_eq EventScript_1A2D49 - compare 0x8007, 6 + compare_var_to_imm 0x8007, 6 goto_if_eq EventScript_1A2DA1 end @@ -3872,10 +3872,10 @@ gUnknown_081A2F8A:: @ 81A2F8A EventScript_1A2F95: special sub_8100A7C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EventScript_1A2FBF addvar 0x8004, 1 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 goto_if_eq EventScript_1A2F95 disappear 0x8006 setflag 0x8005 @@ -3910,42 +3910,42 @@ SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 special sub_80BCE90 - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3032 - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30AE - compare 0x8004, 2 + compare_var_to_imm 0x8004, 2 goto_if_eq SecretBase_RedCave1_EventScript_1A312A - compare 0x8004, 3 + compare_var_to_imm 0x8004, 3 goto_if_eq SecretBase_RedCave1_EventScript_1A31A6 - compare 0x8004, 4 + compare_var_to_imm 0x8004, 4 goto_if_eq SecretBase_RedCave1_EventScript_1A3222 - compare 0x8004, 5 + compare_var_to_imm 0x8004, 5 goto_if_eq SecretBase_RedCave1_EventScript_1A329E - compare 0x8004, 6 + compare_var_to_imm 0x8004, 6 goto_if_eq SecretBase_RedCave1_EventScript_1A331A - compare 0x8004, 7 + compare_var_to_imm 0x8004, 7 goto_if_eq SecretBase_RedCave1_EventScript_1A3396 - compare 0x8004, 8 + compare_var_to_imm 0x8004, 8 goto_if_eq SecretBase_RedCave1_EventScript_1A3412 - compare 0x8004, 9 + compare_var_to_imm 0x8004, 9 goto_if_eq SecretBase_RedCave1_EventScript_1A348E end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3086 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1AEA, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A308F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1B83, 4 @@ -3970,17 +3970,17 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3102 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1E67, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A310B hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1F04, 4 @@ -4005,17 +4005,17 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A317E - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock faceplayer msgbox SecretBase_RedCave1_Text_1A218F, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3187 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2220, 4 @@ -4040,17 +4040,17 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A31FA - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock faceplayer msgbox SecretBase_RedCave1_Text_1A24E1, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3203 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A256F, 4 @@ -4075,17 +4075,17 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3276 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2830, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A327F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A28D7, 4 @@ -4110,17 +4110,17 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1CB2, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A32FB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1D48, 4 @@ -4145,17 +4145,17 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A336E - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock faceplayer msgbox SecretBase_RedCave1_Text_1A2026, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3377 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2095, 4 @@ -4180,17 +4180,17 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A33EA - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock faceplayer msgbox SecretBase_RedCave1_Text_1A236A, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2405, 4 @@ -4215,17 +4215,17 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3466 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2663, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A346F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2710, 4 @@ -4250,17 +4250,17 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2A13, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A34EB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2AE2, 4 @@ -4381,13 +4381,13 @@ SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar 0x8005, 1 special sub_80BF2C4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar 0x8009, 0x8006 msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4399,9 +4399,9 @@ SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEC3 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4426,24 +4426,24 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 faceplayer setvar 0x8005, 2 special sub_80BF2C4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 checkflag 105 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag 105 msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4455,9 +4455,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3 lock faceplayer - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF83 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4481,17 +4481,17 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer specialval RESULT, sub_80BF544 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar 0x8005, 3 special sub_80BF2C4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar 0x8009, 0x8006 msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 end @@ -4527,14 +4527,14 @@ SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4 setvar 0x8006, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4 copyvar 0x8007, 0x800a @@ -4562,13 +4562,13 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar 0x8005, 6 special sub_80BF2C4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar 0x8009, 0x8006 msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4580,9 +4580,9 @@ FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE137 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4601,7 +4601,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 setflag 2 @@ -4618,11 +4618,11 @@ FallarborTown_ContestLobby_EventScript_1AE188:: @ 81AE188 LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 - compare 0x4086, 2 + compare_var_to_imm 0x4086, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar 0x8005, 6 special sub_80BF2C4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE switch 0x4088 case 0, FallarborTown_ContestLobby_EventScript_1AE1FE @@ -4659,13 +4659,13 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar 0x8005, 7 special sub_80BF2C4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar 0x8009, 0x8006 msgbox BattleTower_Lobby_Text_1A776D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE241 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE297 end @@ -4674,9 +4674,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 waittext multichoice 19, 8, 45, 1 copyvar 0x8008, RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, BattleTower_Lobby_EventScript_1AE2A1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 setvar 0x8004, 12 @@ -4684,9 +4684,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2B3 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 end @@ -4704,7 +4704,7 @@ BattleTower_Lobby_EventScript_1AE2AA:: @ 81AE2AA return BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 setflag 2 @@ -4724,11 +4724,11 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 end BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED - compare 0x40bc, 0 + compare_var_to_imm 0x40bc, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar 0x8005, 7 special sub_80BF2C4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F clearflag 918 return @@ -4790,11 +4790,11 @@ Text_RepelWoreOff: @ 81C33EF MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 event_96 2 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA @@ -4802,11 +4802,11 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 event_96 2 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index c3aeeab7a..3716eab3c 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -3,13 +3,13 @@ S_CuttableTree:: @ 81B0DCC checkflag 2055 goto_if 0, CannotUseCut checkattack MOVE_CUT - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_CUT msgbox UseCutPromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -61,13 +61,13 @@ S_BreakableRock:: @ 81B0EB7 checkflag 2057 goto_if 0, CannotUseRockSmash checkattack MOVE_ROCK_SMASH - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -88,10 +88,10 @@ DoRockSmashMovement: @ 81B0F0C waitmove 0 disappear LAST_TALKED specialval RESULT, sub_810F5BC - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DoRockSmashMovement_Done waitstate releaseall @@ -130,11 +130,11 @@ S_PushableBoulder:: @ 81B0FCB checkflag 2089 goto_if_eq AlreadyUsedStrength checkattack 70 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq CannotUseStrength setanimation 0, RESULT msgbox UseStrengthPromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Strength_ChoseNo closebutton doanimation 40 @@ -191,12 +191,12 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq Waterfall_NoMonKnows bufferpartypoke 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 doanimation 43 @@ -224,13 +224,13 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall checkattack MOVE_DIVE - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq CannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Dive_Done msgbox UsedDiveText, 4 doanimation 44 @@ -247,13 +247,13 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq UnderwaterCannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 doanimation 44 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 64d5f9b79..92c5f83b3 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -22,7 +22,7 @@ Route102_EventScript_1A153D:: @ 81A153D lock faceplayer specialval RESULT, PlayerHasBerries - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route102_EventScript_1A1558 message Route102_Text_1A16B6 waittext @@ -32,9 +32,9 @@ Route102_EventScript_1A153D:: @ 81A153D Route102_EventScript_1A1558:: @ 81A1558 msgbox Route102_Text_1A16CD, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route102_EventScript_1A1577 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route102_EventScript_1A1593 end @@ -43,7 +43,7 @@ Route102_EventScript_1A1577:: @ 81A1577 closebutton special sub_80B4EE4 waitstate - compare ITEM_ID, 0 + compare_var_to_imm ITEM_ID, 0 goto_if_eq Route102_EventScript_1A1593 removeitem ITEM_ID, 1 call Route102_EventScript_1A16A9 @@ -82,9 +82,9 @@ Route102_EventScript_1A15BC:: @ 81A15BC goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 goto_if_eq Route102_EventScript_1A15F2 - compare 0x8005, 4 + compare_var_to_imm 0x8005, 4 goto_if_eq Route102_EventScript_1A15EB buffertext 1, Route102_Text_1A17B7 return @@ -102,14 +102,14 @@ Route102_EventScript_1A15F9:: @ 81A15F9 lock faceplayer msgbox Route102_Text_1A17C0, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route102_EventScript_1A161D - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route102_EventScript_1A164B Route102_EventScript_1A161D:: @ 81A161D special FieldObjectInteractionPickBerryTree - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD @@ -146,12 +146,12 @@ gUnknown_081A1654:: @ 81A1654 Route102_EventScript_1A165F:: @ 81A165F checkitem ITEM_WAILMER_PAIL, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route102_EventScript_1A168D msgbox Route102_Text_1A18E6, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route102_EventScript_1A1693 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route102_EventScript_1A168D Route102_EventScript_1A168D:: @ 81A168D diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index da3277ee3..a93a5f044 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -39,15 +39,15 @@ RustboroCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SlateportCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 - compare 0x4087, 1 + compare_var_to_imm 0x4087, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare 0x4087, 2 + compare_var_to_imm 0x4087, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare 0x4087, 5 + compare_var_to_imm 0x4087, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare 0x4087, 3 + compare_var_to_imm 0x4087, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D74 - compare 0x4087, 4 + compare_var_to_imm 0x4087, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D7E end @@ -90,7 +90,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 setvar 0x4087, 0 move 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmove 0 - compare 0x8007, 0 + compare_var_to_imm 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 move 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmove 0 @@ -101,7 +101,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA special CloseLink setvar 0x4087, 0 - compare 0x8007, 0 + compare_var_to_imm 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C move 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmove 0 @@ -128,7 +128,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 special CloseLink setvar 0x4087, 0 - compare 0x8007, 0 + compare_var_to_imm 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C move 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 waitmove 0 @@ -192,26 +192,26 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext special sub_808347C waitstate - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3F5E - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4068 - compare RESULT, 5 + compare_var_to_imm RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E @@ -237,7 +237,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E setdoorclosed 5, 1 doorchange release - compare 0x8004, 5 + compare_var_to_imm 0x8004, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp warp SingleBattleColosseum, 255, 6, 8 @@ -281,7 +281,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 setvar 0x8004, 2 return @@ -352,33 +352,33 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A40FA OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA call OldaleTown_PokemonCenter_2F_EventScript_1A41BB - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext special sub_80834E4 waitstate - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4166 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A432D - compare RESULT, 5 + compare_var_to_imm RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 @@ -406,10 +406,10 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB specialval RESULT, CalculatePlayerPartyCount - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1 specialval RESULT, GetNameOfEnigmaBerryInPlayerParty - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A41EE setvar RESULT, 1 return @@ -449,14 +449,14 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext @@ -464,19 +464,19 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 waitstate special sub_80835D8 waitstate - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4294 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A432D - compare RESULT, 5 + compare_var_to_imm RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42E9 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 @@ -619,7 +619,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 fadescreen 1 special sub_80C5568 waitstate - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 0 special sub_8083B90 @@ -630,7 +630,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E fadescreen 1 special sub_80C5568 waitstate - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 1 special sub_8083B90 @@ -641,7 +641,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 fadescreen 1 special sub_80C5568 waitstate - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 2 special sub_8083B90 @@ -652,7 +652,7 @@ DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4 fadescreen 1 special sub_80C5568 waitstate - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 3 special sub_8083B90 @@ -690,7 +690,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 setvar 0x8005, 0 special sub_80B929C waitstate - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -698,7 +698,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D setvar 0x8005, 1 special sub_80B929C waitstate - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -706,7 +706,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 setvar 0x8005, 2 special sub_80B929C waitstate - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -714,7 +714,7 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 setvar 0x8005, 3 special sub_80B929C waitstate - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -770,7 +770,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD end RecordCorner_EventScript_1A44BC:: @ 81A44BC - compare 0x4000, 0 + compare_var_to_imm 0x4000, 0 goto_if 5, RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 @@ -791,7 +791,7 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6 TradeRoom_PromptToCancelLink:: @ 81A44E5 msgbox TradeRoom_WillLinkBeTerminated, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq TradeRoom_TerminateLink hidebox 0, 0, 29, 19 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index b41a40e14..afac5e6ed 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -5,16 +5,16 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD - compare 0x408a, 0 + compare_var_to_imm 0x408a, 0 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F bufferstd 0, 0x800b msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1 setflag 1 goto FallarborTown_ContestLobby_EventScript_1A4F8F @@ -25,7 +25,7 @@ FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD return FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 - compare CONTEST_RANK, 0 + compare_var_to_imm CONTEST_RANK, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EF6 msgbox FallarborTown_ContestLobby_Text_1A6340, 4 releaseall @@ -33,7 +33,7 @@ FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 msgbox FallarborTown_ContestLobby_Text_1A64F4, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F13 msgbox FallarborTown_ContestLobby_Text_1A65EA, 4 releaseall @@ -63,7 +63,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 giveitem ITEM_LUXURY_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 setvar 0x408a, 0 closebutton @@ -120,18 +120,18 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 choosecontestpkmn - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50C8 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50D7 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50FB - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq FallarborTown_ContestLobby_EventScript_1A511F - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if_eq FallarborTown_ContestLobby_EventScript_1A512E end @@ -270,7 +270,7 @@ LinkContestRoom1_EventScript_1A5245:: @ 81A5245 return LinkContestRoom1_EventScript_1A525F:: @ 81A525F - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5273 msgbox LinkContestRoom1_Text_1A68F0, 3 return @@ -287,20 +287,20 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A53E5 call LinkContestRoom1_EventScript_1A5880 addvar 0x8006, 1 - compare 0x8006, 4 + compare_var_to_imm 0x8006, 4 goto_if 5, LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 setvar 0x4001, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE - compare 0x8006, 0 + compare_var_to_imm 0x8006, 0 goto_if_eq LinkContestRoom1_EventScript_1A52DB - compare 0x8006, 1 + compare_var_to_imm 0x8006, 1 goto_if_eq LinkContestRoom1_EventScript_1A52ED - compare 0x8006, 2 + compare_var_to_imm 0x8006, 2 goto_if_eq LinkContestRoom1_EventScript_1A52FF - compare 0x8006, 3 + compare_var_to_imm 0x8006, 3 goto_if_eq LinkContestRoom1_EventScript_1A5311 return @@ -357,7 +357,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 return LinkContestRoom1_EventScript_1A535E:: @ 81A535E - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5370 message LinkContestRoom1_Text_1A6A04 waittext @@ -385,7 +385,7 @@ LinkContestRoom1_EventScript_1A5377:: @ 81A5377 return LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3 - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A53C7 msgbox LinkContestRoom1_Text_1A6A1F, 4 return @@ -396,7 +396,7 @@ LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7 return LinkContestRoom1_EventScript_1A53CE:: @ 81A53CE - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A53DF message LinkContestRoom1_Text_1A6AE1 return @@ -431,15 +431,15 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 LinkContestRoom1_EventScript_1A5455:: @ 81A5455 special sub_80C47A0 - compare 0x4088, 1 + compare_var_to_imm 0x4088, 1 call_if 1, LinkContestRoom1_EventScript_1A555A - compare 0x4088, 2 + compare_var_to_imm 0x4088, 2 call_if 1, LinkContestRoom1_EventScript_1A55B8 - compare 0x4088, 3 + compare_var_to_imm 0x4088, 3 call_if 1, LinkContestRoom1_EventScript_1A5616 - compare 0x4088, 4 + compare_var_to_imm 0x4088, 4 call_if 1, LinkContestRoom1_EventScript_1A5674 - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 call_if 1, LinkContestRoom1_EventScript_1A56D2 setvar 0x4001, 9 setvar 0x4002, 9 @@ -449,7 +449,7 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 setvar 0x4006, 9 setvar 0x4007, 9 setvar 0x4008, 9 - compare 0x4000, 0 + compare_var_to_imm 0x4000, 0 call_if 2, LinkContestRoom1_EventScript_1A54EB setvar 0x4001, 0 setvar 0x4002, 0 @@ -464,123 +464,123 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB setvar RESULT, 8 special ScriptRandom - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LinkContestRoom1_EventScript_1A5760 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LinkContestRoom1_EventScript_1A5784 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 call_if 1, LinkContestRoom1_EventScript_1A57A8 - compare RESULT, 3 + compare_var_to_imm RESULT, 3 call_if 1, LinkContestRoom1_EventScript_1A57CC - compare RESULT, 4 + compare_var_to_imm RESULT, 4 call_if 1, LinkContestRoom1_EventScript_1A57F0 - compare RESULT, 5 + compare_var_to_imm RESULT, 5 call_if 1, LinkContestRoom1_EventScript_1A5814 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 call_if 1, LinkContestRoom1_EventScript_1A5838 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 call_if 1, LinkContestRoom1_EventScript_1A585C - compare 0x4000, 0 + compare_var_to_imm 0x4000, 0 goto_if 2, LinkContestRoom1_EventScript_1A54EB waitmove 0 return LinkContestRoom1_EventScript_1A555A:: @ 81A555A - compare 0x8004, 80 + compare_var_to_imm 0x8004, 80 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 70 + compare_var_to_imm 0x8004, 70 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 60 + compare_var_to_imm 0x8004, 60 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 50 + compare_var_to_imm 0x8004, 50 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 40 + compare_var_to_imm 0x8004, 40 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 30 + compare_var_to_imm 0x8004, 30 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 20 + compare_var_to_imm 0x8004, 20 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 10 + compare_var_to_imm 0x8004, 10 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 - compare 0x8004, 230 + compare_var_to_imm 0x8004, 230 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 210 + compare_var_to_imm 0x8004, 210 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 190 + compare_var_to_imm 0x8004, 190 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 170 + compare_var_to_imm 0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 150 + compare_var_to_imm 0x8004, 150 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 130 + compare_var_to_imm 0x8004, 130 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 110 + compare_var_to_imm 0x8004, 110 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 90 + compare_var_to_imm 0x8004, 90 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 - compare 0x8004, 380 + compare_var_to_imm 0x8004, 380 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 350 + compare_var_to_imm 0x8004, 350 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 320 + compare_var_to_imm 0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 290 + compare_var_to_imm 0x8004, 290 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 260 + compare_var_to_imm 0x8004, 260 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 230 + compare_var_to_imm 0x8004, 230 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 200 + compare_var_to_imm 0x8004, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 170 + compare_var_to_imm 0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 - compare 0x8004, 600 + compare_var_to_imm 0x8004, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 560 + compare_var_to_imm 0x8004, 560 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 520 + compare_var_to_imm 0x8004, 520 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 480 + compare_var_to_imm 0x8004, 480 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 440 + compare_var_to_imm 0x8004, 440 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 400 + compare_var_to_imm 0x8004, 400 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 360 + compare_var_to_imm 0x8004, 360 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 320 + compare_var_to_imm 0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 - compare 0x8004, 600 + compare_var_to_imm 0x8004, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 550 + compare_var_to_imm 0x8004, 550 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 500 + compare_var_to_imm 0x8004, 500 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 450 + compare_var_to_imm 0x8004, 450 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 400 + compare_var_to_imm 0x8004, 400 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 300 + compare_var_to_imm 0x8004, 300 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 200 + compare_var_to_imm 0x8004, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 100 + compare_var_to_imm 0x8004, 100 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return @@ -618,7 +618,7 @@ LinkContestRoom1_EventScript_1A575A:: @ 81A575A return LinkContestRoom1_EventScript_1A5760:: @ 81A5760 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 goto_if_eq LinkContestRoom1_EventScript_1A5783 move 6, LinkContestRoom1_Movement_1A5D8D playsfx 21 @@ -631,7 +631,7 @@ LinkContestRoom1_EventScript_1A5783:: @ 81A5783 return LinkContestRoom1_EventScript_1A5784:: @ 81A5784 - compare 0x4002, 1 + compare_var_to_imm 0x4002, 1 goto_if_eq LinkContestRoom1_EventScript_1A57A7 move 12, LinkContestRoom1_Movement_1A5D8D playsfx 21 @@ -644,7 +644,7 @@ LinkContestRoom1_EventScript_1A57A7:: @ 81A57A7 return LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 - compare 0x4003, 1 + compare_var_to_imm 0x4003, 1 goto_if_eq LinkContestRoom1_EventScript_1A57CB move 7, LinkContestRoom1_Movement_1A5D8D playsfx 21 @@ -657,7 +657,7 @@ LinkContestRoom1_EventScript_1A57CB:: @ 81A57CB return LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC - compare 0x4004, 1 + compare_var_to_imm 0x4004, 1 goto_if_eq LinkContestRoom1_EventScript_1A57EF move 8, LinkContestRoom1_Movement_1A5D8D playsfx 21 @@ -670,7 +670,7 @@ LinkContestRoom1_EventScript_1A57EF:: @ 81A57EF return LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 - compare 0x4005, 1 + compare_var_to_imm 0x4005, 1 goto_if_eq LinkContestRoom1_EventScript_1A5813 move 9, LinkContestRoom1_Movement_1A5D8D playsfx 21 @@ -683,7 +683,7 @@ LinkContestRoom1_EventScript_1A5813:: @ 81A5813 return LinkContestRoom1_EventScript_1A5814:: @ 81A5814 - compare 0x4006, 1 + compare_var_to_imm 0x4006, 1 goto_if_eq LinkContestRoom1_EventScript_1A5837 move 10, LinkContestRoom1_Movement_1A5D8D playsfx 21 @@ -696,7 +696,7 @@ LinkContestRoom1_EventScript_1A5837:: @ 81A5837 return LinkContestRoom1_EventScript_1A5838:: @ 81A5838 - compare 0x4007, 1 + compare_var_to_imm 0x4007, 1 goto_if_eq LinkContestRoom1_EventScript_1A585B move 11, LinkContestRoom1_Movement_1A5D8D playsfx 21 @@ -709,7 +709,7 @@ LinkContestRoom1_EventScript_1A585B:: @ 81A585B return LinkContestRoom1_EventScript_1A585C:: @ 81A585C - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 goto_if_eq LinkContestRoom1_EventScript_1A587F move 15, LinkContestRoom1_Movement_1A5D8D playsfx 21 @@ -782,7 +782,7 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE return LinkContestRoom1_EventScript_1A5930:: @ 81A5930 - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5944 msgbox LinkContestRoom1_Text_1A6AF5, 3 return @@ -809,7 +809,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A return LinkContestRoom1_EventScript_1A5984:: @ 81A5984 - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5998 msgbox LinkContestRoom1_Text_1A6C06, 4 return @@ -821,7 +821,7 @@ LinkContestRoom1_EventScript_1A5998:: @ 81A5998 return LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A59B6 msgbox LinkContestRoom1_Text_1A6C21, 4 return @@ -833,7 +833,7 @@ LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 return LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A59D4 msgbox LinkContestRoom1_Text_1A6C9D, 4 return @@ -845,7 +845,7 @@ LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 return LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A59F2 msgbox LinkContestRoom1_Text_1A6D16, 4 return @@ -895,7 +895,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 return LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5A89 msgbox LinkContestRoom1_Text_1A6D3C, 4 return @@ -908,7 +908,7 @@ LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 addvar 0x4001, 1 lockall - compare 0x4088, 1 + compare_var_to_imm 0x4088, 1 call_if 2, LinkContestRoom1_EventScript_1A5AE4 move 9, LinkContestRoom1_Movement_1A5DB7 move 12, LinkContestRoom1_Movement_1A5DBB @@ -918,7 +918,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 move 11, LinkContestRoom1_Movement_1A5DBB move 6, LinkContestRoom1_Movement_1A5DB3 move 8, LinkContestRoom1_Movement_1A5DAF - compare 0x4001, 4 + compare_var_to_imm 0x4001, 4 goto_if 5, LinkContestRoom1_EventScript_1A5A90 pause 30 return @@ -993,7 +993,7 @@ LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 return LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB - compare 0x4088, 5 + compare_var_to_imm 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 checkflag 2 @@ -1007,7 +1007,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB call LinkContestRoom1_EventScript_1A5A90 pause 30 special sub_80C4CF8 - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return @@ -1016,24 +1016,24 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 msgbox LinkContestRoom1_Text_1A6DF1, 3 pause 90 special sub_80C4CF8 - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 specialval RESULT, sub_80C4440 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C23 return LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 special sub_80C47C0 - compare 0x8005, 3 + compare_var_to_imm 0x8005, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C32 return LinkContestRoom1_EventScript_1A5C32:: @ 81A5C32 - compare CONTEST_RANK, 3 + compare_var_to_imm CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C41 setflag 2 return @@ -1053,7 +1053,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C pause 60 call LinkContestRoom1_EventScript_1A5C6A special sub_80C4CF8 - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C64 closebutton return @@ -1065,7 +1065,7 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A special sub_80C496C special sub_80C47C0 - comparevars 0x8004, 0x8005 + compare_var_to_var 0x8004, 0x8005 goto_if_eq LinkContestRoom1_EventScript_1A5C7C return @@ -1111,19 +1111,19 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 special sub_80C47C0 - compare 0x8005, 3 + compare_var_to_imm 0x8005, 3 goto_if_eq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 return LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC - compare 0x4088, 2 + compare_var_to_imm 0x4088, 2 call_if 1, LinkContestRoom1_EventScript_1A5C42 inccounter GAME_STAT_WON_CONTEST specialval RESULT, sub_80C4440 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D5B - compare CONTEST_RANK, 3 + compare_var_to_imm CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5D3B msgbox LinkContestRoom1_Text_1A6DF1, 3 return @@ -1135,7 +1135,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B giveitem ITEM_LUXURY_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D2D msgbox LinkContestRoom1_Text_1A6DF1, 3 return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 4c57e0b9f..acb87170a 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -3,11 +3,11 @@ Route117_EventScript_1B222D:: @ 81B222D faceplayer special sp0B5_daycare specialval RESULT, sp0B6_daycare - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_1B2262 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_EventScript_1B22E7 - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq Route117_EventScript_1B22FE msgbox Route117_Text_1B25CB, 4 release @@ -15,10 +15,10 @@ Route117_EventScript_1B222D:: @ 81B222D Route117_EventScript_1B2262:: @ 81B2262 msgbox Route117_Text_1B2659, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B28C4, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 clearflag 134 @@ -28,7 +28,7 @@ Route117_EventScript_1B2262:: @ 81B2262 Route117_EventScript_1B2298:: @ 81B2298 specialval RESULT, CalculatePlayerPartyCount - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if 5, Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 release @@ -48,7 +48,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 Route117_EventScript_1B22CD:: @ 81B22CD specialval RESULT, sub_8042B4C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route117_EventScript_1B22DE return @@ -82,14 +82,14 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 lock faceplayer specialval RESULT, sp0B6_daycare - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2407 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B242B - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq Route117_PokemonDayCare_EventScript_1B2558 msgbox Route117_PokemonDayCare_Text_1B28F2, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2A14, 4 release @@ -97,16 +97,16 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C specialval RESULT, sub_8095B6C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 fadescreen 1 special ChooseSendDaycareMon waitstate - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 specialval RESULT, sub_8095C10 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialval 0x8005, sub_8042328 checksound @@ -116,7 +116,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C special Daycare_SendPokemon_Special inccounter GAME_STAT_USED_DAYCARE specialval RESULT, sp0B6_daycare - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA release end @@ -128,7 +128,7 @@ Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0 Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -154,7 +154,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A specialval RESULT, sub_80417B8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 5, Route117_PokemonDayCare_EventScript_1B2411 return @@ -163,26 +163,26 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B setvar 0x8004, 0 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 specialval RESULT, CalculatePlayerPartyCount - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 specialval RESULT, sp0B6_daycare setvar 0x8004, 0 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 special ShowDaycareLevelMenu waitstate copyvar 0x8004, RESULT - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 goto Route117_PokemonDayCare_EventScript_1B24A8 end @@ -190,14 +190,14 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 special sub_8041770 msgbox Route117_PokemonDayCare_Text_1B2B49, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 specialval RESULT, sub_80B7CE8 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 release @@ -215,14 +215,14 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE msgbox Route117_PokemonDayCare_Text_1B2B93, 4 waitpokecry specialval RESULT, sp0B6_daycare - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520 msgbox Route117_PokemonDayCare_Text_1B2A4F, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -264,7 +264,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 setvar 0x8004, 1 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release @@ -273,7 +273,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 @ 81B2591 special ShowDaycareLevelMenu waitstate - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 copyvar 0x8004, RESULT specialval RESULT, sub_8041648 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 2625ff573..a2bae7c46 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -202,11 +202,11 @@ Route120_EventScript_1AE582:: @ 81AE582 Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route111_EventScript_1AE5E0 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, Route111_EventScript_1AE5EB - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, Route111_EventScript_1AE5FD checkflag 1 goto_if_eq Route111_EventScript_1AE73A @@ -236,16 +236,16 @@ Route118_EventScript_1AE60F:: @ 81AE60F Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route111_EventScript_1AE5E0 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, Route111_EventScript_1AE5EB - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, Route111_EventScript_1AE5FD checkflag 1 goto_if_eq Route111_EventScript_1AE73A specialval RESULT, GabbyAndTyGetLastQuote - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 specialval RESULT, sub_80BDD18 @@ -300,14 +300,14 @@ Route111_EventScript_1AE6E5:: @ 81AE6E5 end Route111_EventScript_1AE6F3:: @ 81AE6F3 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 setvar 0x8004, 10 call Route111_EventScript_1A00F3 lock faceplayer - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 special sub_80BDC14 diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 18bd1d53b..248c9622e 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -67,9 +67,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB fadescreen 0 movespriteperm 1, 10, 12 reappear 1 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, MtChimney_EventScript_1B2D7D - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, MtChimney_EventScript_1B2D88 move 255, MtChimney_Movement_1A083F waitmove 0 @@ -79,9 +79,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B3FFE, 4 .endif closebutton - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, MtChimney_EventScript_1B2D93 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, MtChimney_EventScript_1B2D9E disappear 1 setflag 927 diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index eb912028a..97871a9f5 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 checkflag 294 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 checkflag 1078 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 212d80416..c2f813e88 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -31,7 +31,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 checkflag 239 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playsfx 21 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 9f0b5ca85..c3a48f55d 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -63,7 +63,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 checkflag 240 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A checkflag 241 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 @@ -95,7 +95,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 checkflag 242 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 @@ -111,7 +111,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 checkflag 243 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index d8ed3fe07..bda0e9603 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -10,11 +10,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 setvar 0x4001, 1 getplayerxy 0x4002, 0x4003 setvar 0x4004, 1 - compare 0x4002, 21 + compare_var_to_imm 0x4002, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 - compare 0x4002, 36 + compare_var_to_imm 0x4002, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F - compare 0x4003, 2 + compare_var_to_imm 0x4003, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 switch 0x4004 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B @@ -44,7 +44,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setanimation 2, 0 doanimation 54 specialval RESULT, sub_810F4D4 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B checkanimation 54 pause 10 @@ -55,10 +55,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 specialval RESULT, sub_810F488 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA pause 20 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B checkanimation 54 pause 10 @@ -78,7 +78,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setanimation 2, 0 doanimation 54 specialval RESULT, sub_810F4FC - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B checkanimation 54 pause 10 @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setanimation 2, 0 doanimation 54 specialval RESULT, sub_810F4B0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B checkanimation 54 pause 10 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index b7fe34b81..0c223cbaa 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -4,7 +4,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 end @@ -17,7 +17,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 end diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index cfb4ba855..4b3dae8f8 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare 0x8006, 1 + compare_var_to_imm 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmaptile 12, 0, 519, 0 setmaptile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar 0x4000, 1 - compare 0x8006, 1 + compare_var_to_imm 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 move 1, BattleTower_Corridor_Movement_1608D5 move 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index fc5cee29a..4caffb405 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -18,7 +18,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C checkflag 237 goto_if_eq BattleTower_Lobby_EventScript_1602CD specialval 0x8007, sub_810F404 - compare 0x8007, 50 + compare_var_to_imm 0x8007, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC @@ -26,7 +26,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialval 0x8007, sub_810F404 - compare 0x8007, 100 + compare_var_to_imm 0x8007, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC @@ -77,10 +77,10 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 waittext setvar 0x8004, 0 special sub_81358A4 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special sub_8135E50 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waittext @@ -91,7 +91,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar 0x8004, 8 special sub_81358A4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waittext @@ -118,7 +118,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitfanfare setvar 0x8004, 9 special sub_81358A4 - compare RESULT, 49 + compare_var_to_imm RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -186,7 +186,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E faceplayer setvar 0x8004, 0 special sub_81358A4 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty msgbox BattleTower_Lobby_Text_199F2C, 4 @@ -209,7 +209,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D setvar 0x8004, 1 copyvar 0x8005, RESULT @@ -219,7 +219,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA fadescreen 1 special ChooseBattleTowerPlayerParty waitstate - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16064F msgbox BattleTower_Lobby_Text_199FDA, 5 switch RESULT @@ -245,7 +245,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 call S_DoSaveDialog setvar 0x4000, 5 hidebox 0, 0, 15, 10 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 inccounter GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty @@ -347,9 +347,9 @@ BattleTower_Lobby_EventScript_1606CC:: @ 81606CC call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160701 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_16070B end @@ -394,7 +394,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar 0x8008, 42 givedecoration 42 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 237 msgbox BattleTower_Lobby_Text_19ABAA, 4 @@ -403,12 +403,12 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 BattleTower_Lobby_EventScript_160773:: @ 8160773 specialval RESULT, sub_810F404 - compare RESULT, 100 + compare_var_to_imm RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar 0x8008, 43 givedecoration 43 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 238 msgbox BattleTower_Lobby_Text_19ABAA, 4 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 77f8b39b6..beb9ed690 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -13,7 +13,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 faceplayer msgbox BattleTower_Outside_Text_199D06, 4 checkitem ITEM_SS_TICKET, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D waittext @@ -36,7 +36,7 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 BattleTower_Outside_EventScript_1601D0:: @ 81601D0 msgbox BattleTower_Outside_Text_199DF2, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 @@ -47,7 +47,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 BattleTower_Outside_EventScript_1601FB:: @ 81601FB msgbox BattleTower_Outside_Text_199E0E, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index f5ce8138f..e79dfb3ff 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -66,7 +66,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 waitstate clearflag 2145 specialval RESULT, sub_810E300 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag 816 setflag 855 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index f30c202c8..8e442e46f 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -43,7 +43,7 @@ DewfordTown_EventScript_14E06B:: @ 814E06B DewfordTown_EventScript_14E076:: @ 814E076 msgbox DewfordTown_Text_16B3BC, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release @@ -77,9 +77,9 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 checkflag 257 goto_if_eq DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_EventScript_14E0F0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_EventScript_14E111 end @@ -100,9 +100,9 @@ DewfordTown_EventScript_14E11B:: @ 814E11B message DewfordTown_Text_16B84E waittext multichoice 20, 8, 50, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_EventScript_14E13D - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_EventScript_14E147 end @@ -599,9 +599,9 @@ DewfordTown_EventScript_14E413:: @ 814E413 faceplayer call DewfordTown_EventScript_1A0102 msgbox DewfordTown_Text_16B9CE, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_EventScript_14E439 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_EventScript_14E443 end @@ -616,15 +616,15 @@ DewfordTown_EventScript_14E443:: @ 814E443 call DewfordTown_EventScript_1A00F3 lock faceplayer - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_EventScript_14E46E - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_EventScript_14E485 end DewfordTown_EventScript_14E46E:: @ 814E46E inccounter GAME_STAT_STARTED_TRENDS - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index cf484a546..4168acd0c 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -11,11 +11,11 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar 0x8001, 0x8000 - compare 0x8000, 0 + compare_var_to_imm 0x8000, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare 0x8000, 1 + compare_var_to_imm 0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare 0x8000, 2 + compare_var_to_imm 0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -42,14 +42,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - comparevars 0x8000, 0x8001 + compare_var_to_var 0x8000, 0x8001 goto_if_eq DewfordTown_Gym_EventScript_1530F5 copyvar 0x8001, 0x8000 - compare 0x8000, 1 + compare_var_to_imm 0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare 0x8000, 2 + compare_var_to_imm 0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare 0x8000, 3 + compare_var_to_imm 0x8000, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -115,7 +115,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag 1204 setflag 2056 addvar 0x4085, 1 - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 @@ -124,7 +124,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 giveitem ITEM_TM08 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 setflag 166 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index cc096080e..39bcb0236 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -6,7 +6,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 faceplayer call DewfordTown_Hall_EventScript_1A0102 special sub_80FA5E4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 release @@ -31,9 +31,9 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD call DewfordTown_Hall_EventScript_1A0102 special sub_80EB83C msgbox DewfordTown_Hall_Text_1755F9, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532F6 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_153300 end @@ -191,14 +191,14 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD move 8, DewfordTown_Hall_Movement_153599 waitmove 0 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end DewfordTown_Hall_EventScript_15351E:: @ 815351E - compare FACING, 4 + compare_var_to_imm FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1534FC move 255, DewfordTown_Hall_Movement_1A0843 waitmove 0 @@ -210,16 +210,16 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 move 7, DewfordTown_Hall_Movement_15359B waitmove 0 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end DewfordTown_Hall_EventScript_153556:: @ 8153556 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, DewfordTown_Hall_EventScript_15356D - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, DewfordTown_Hall_EventScript_153578 return @@ -234,7 +234,7 @@ DewfordTown_Hall_EventScript_153578:: @ 8153578 return DewfordTown_Hall_EventScript_153583:: @ 8153583 - compare FACING, 3 + compare_var_to_imm FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1534FC move 255, DewfordTown_Hall_Movement_1A083F waitmove 0 @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem ITEM_TM36 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag 230 release diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index befe47404..b3b3eef34 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -8,7 +8,7 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem ITEM_SILK_SCARF - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B setflag 289 release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 2b0f9545f..be3557c22 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -53,16 +53,16 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 closebutton playsfx 8 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 reappear 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB end @@ -128,9 +128,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 waitmove 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closebutton move 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 3ddcb6ef3..1e32394d9 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 checkflag 1248 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 - compare 0x409c, 4 + compare_var_to_imm 0x409c, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E end diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 2526b2ea6..71e80287b 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 checkflag 1247 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE - compare 0x409c, 3 + compare_var_to_imm 0x409c, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 0999f9a4d..123a7cbe2 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -44,9 +44,9 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 setvar 0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D end diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 9e2c4c0b7..6fb0d7ba4 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F checkflag 1246 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 - compare 0x409c, 2 + compare_var_to_imm 0x409c, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 7065bdefe..0f0efbd26 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -50,9 +50,9 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 checkflag 263 goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy 0x4000, 0x4001 - compare 0x4000, 11 + compare_var_to_imm 0x4000, 11 call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 - compare 0x4000, 8 + compare_var_to_imm 0x4000, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waittext diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index d9e7a8213..bc8ad9f5a 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F checkflag 1245 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 - compare 0x409c, 1 + compare_var_to_imm 0x409c, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 0228fe25d..1971593cb 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -11,7 +11,7 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 checkflag 229 goto_if_eq FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_House1_EventScript_153BDA msgbox FallarborTown_House1_Text_177755, 4 release @@ -22,11 +22,11 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA call_if 0, FallarborTown_House1_EventScript_153C2D checkflag 2 call_if 1, FallarborTown_House1_EventScript_153C3E - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem ITEM_TM27 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 call FallarborTown_House1_EventScript_1A067F diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 5ecc475ea..74674d3df 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -14,7 +14,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_House2_EventScript_153D60 msgbox FallarborTown_House2_Text_177BDB, 5 switch RESULT @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special sub_80F9A4C waitstate - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special sub_8132670 waitstate - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 removeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index b5426de8e..565effc66 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -57,7 +57,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9CF msgbox FortreeCity_Text_167868, 4 release @@ -65,7 +65,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 FortreeCity_EventScript_14C9CF:: @ 814C9CF msgbox FortreeCity_Text_16788B, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9E4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 8744141cb..d601aabab 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -37,7 +37,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E giveitem ITEM_TM40 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 setflag 170 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 446831c33..e0942354d 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -11,17 +11,17 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox FortreeCity_House1_Text_18568C, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT - comparevars RESULT, 0x8009 + compare_var_to_var RESULT, 0x8009 goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index f210dd3ac..ce1dd2344 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -22,7 +22,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 giveitem ITEM_TM10 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag 264 msgbox FortreeCity_House2_Text_18652F, 4 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 5de611399..c4284b722 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -35,7 +35,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 waitmove 0 msgbox FortreeCity_House4_Text_186881, 4 giveitem ITEM_MENTAL_HERB - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B setflag 223 releaseall diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 004c3d679..9473cbe8e 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -10,17 +10,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA setflag 189 msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem ITEM_TM47 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, GraniteCave_StevensRoom_EventScript_15CC78 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D playsfx 9 disappear 1 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index a265b97e1..9eedd4e05 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -17,9 +17,9 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall setflag 0x4000 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq InsideOfTruck_EventScript_15FC68 end diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index e80894dc2..333ccbaad 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -8,7 +8,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 end JaggedPass_MapScript1_15D274:: @ 815D274 - compare 0x40bd, 1 + compare_var_to_imm 0x40bd, 1 call_if 1, JaggedPass_EventScript_15D280 end @@ -25,7 +25,7 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 end @@ -38,7 +38,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index ca476eb97..e091ed372 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -9,7 +9,7 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 - compare 0x4053, 2 + compare_var_to_imm 0x4053, 2 call_if 1, LavaridgeTown_EventScript_14E4D0 end @@ -44,16 +44,16 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED move 8, LavaridgeTown_Movement_1A0835 waitmove 0 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E68F checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -70,14 +70,14 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 faceplayer setvar 0x8008, 0 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -99,22 +99,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closebutton - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E64E disappear 8 reappear 7 pause 30 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 disappear 7 setvar 0x4053, 2 playmusicbattle 0 fadedefault - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end @@ -128,13 +128,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 return LavaridgeTown_EventScript_14E64E:: @ 814E64E - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LavaridgeTown_EventScript_14E67B - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, LavaridgeTown_EventScript_14E680 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, LavaridgeTown_EventScript_14E685 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LavaridgeTown_EventScript_14E68A return @@ -165,13 +165,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A return LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LavaridgeTown_EventScript_14E6D2 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, LavaridgeTown_EventScript_14E6D2 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, LavaridgeTown_EventScript_14E6DD - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LavaridgeTown_EventScript_14E6D2 return @@ -237,7 +237,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E LavaridgeTown_EventScript_14E710:: @ 814E710 specialval RESULT, player_get_direction_lower_nybble - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E721 end @@ -275,10 +275,10 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A checkflag 266 goto_if_eq LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E7B2 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag 266 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index e22d4471f..68f93443a 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -84,7 +84,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag 1213 setflag 2058 addvar 0x4085, 1 - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 @@ -95,7 +95,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 giveitem ITEM_TM50 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 setflag 168 diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index c924684bc..bf148186a 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem ITEM_CHARCOAL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag 254 release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index f700988f9..801e25396 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -70,7 +70,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 random 10 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B setflag 2255 msgbox LilycoveCity_Text_1C5B1D, 4 @@ -248,9 +248,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 lock faceplayer checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_EventScript_14CDD3 end @@ -260,7 +260,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 call_if 1, LilycoveCity_EventScript_14CDB0 checkflag 286 call_if 0, LilycoveCity_EventScript_14CDB9 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch 0x4023 @@ -291,7 +291,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 call_if 1, LilycoveCity_EventScript_14CE23 checkflag 286 call_if 0, LilycoveCity_EventScript_14CE2C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch 0x4023 @@ -351,9 +351,9 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 setvar RESULT, 0 checkflag 2060 call_if 1, LilycoveCity_EventScript_14CEDE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 clearflag 722 clearflag 849 @@ -388,9 +388,9 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 setvar RESULT, 0 checkflag 2060 call_if 1, LilycoveCity_EventScript_14CEDE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_EventScript_14CF50 clearflag 760 goto LilycoveCity_EventScript_14CF6B diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1abc71238..4785ffbbb 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -31,9 +31,9 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 showcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -44,7 +44,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE special sub_80C4CEC setvar 0x4099, 0 specialval RESULT, GiveMonArtistRibbon - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 move 4, LilycoveCity_ContestLobby_Movement_158A43 waitmove 0 @@ -56,7 +56,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton @@ -205,9 +205,9 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A fadescreen 1 showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end @@ -217,7 +217,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE special sub_80C4CEC setvar 0x4099, 0 specialval RESULT, GiveMonArtistRibbon - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 move 11, LilycoveCity_ContestLobby_Movement_158B6D waitmove 0 @@ -229,7 +229,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton @@ -305,7 +305,7 @@ LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall checkitem ITEM_CONTEST_PASS, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA checkflag 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE @@ -328,11 +328,11 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog hidebox 0, 0, 15, 9 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 setflag 3 return @@ -361,18 +361,18 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestpkmn - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4 - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2 end @@ -420,11 +420,11 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 copyvar 0x8004, RESULT special sub_808363C waitstate - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90 - compare RESULT, 5 + compare_var_to_imm RESULT, 5 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 message2 LilycoveCity_ContestLobby_Text_18872A waittext @@ -569,7 +569,7 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialval RESULT, sub_80C5044 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index f5c511179..5bdaa610a 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -9,7 +9,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 checkflag 2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialval RESULT, sub_8090FC0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 9a9843053..2ee04505e 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 warpplace LilycoveCity_DepartmentStore_1F, 255, 2, 1 - compare 0x4043, 0 + compare_var_to_imm 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 0 @@ -31,7 +31,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 warpplace LilycoveCity_DepartmentStore_2F, 255, 2, 1 - compare 0x4043, 1 + compare_var_to_imm 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 1 @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 warpplace LilycoveCity_DepartmentStore_3F, 255, 2, 1 - compare 0x4043, 2 + compare_var_to_imm 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 2 @@ -49,7 +49,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B warpplace LilycoveCity_DepartmentStore_4F, 255, 2, 1 - compare 0x4043, 3 + compare_var_to_imm 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 3 @@ -58,7 +58,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E warpplace LilycoveCity_DepartmentStore_5F, 255, 2, 1 - compare 0x4043, 4 + compare_var_to_imm 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index f3989bc2a..27d217b40 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -4,9 +4,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 event_96 3 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end @@ -52,7 +52,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 lock faceplayer event_96 3 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release @@ -127,22 +127,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace 0x4000, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 nop @@ -154,10 +154,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playsfx 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 @@ -166,10 +166,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playsfx 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 5704a090b..6c1ecbc1d 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -9,12 +9,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer checkdailyflags - compare 0x4045, 0 + compare_var_to_imm 0x4045, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag 2250 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag 2250 message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 @@ -33,24 +33,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E pause 10 move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmove 0 - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 inccounter GAME_STAT_WON_POKEMON_LOTTERY - compare 0x8006, 0 + compare_var_to_imm 0x8006, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare 0x8006, 1 + compare_var_to_imm 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 bufferitem 0, 0x8005 - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare 0x8004, 2 + compare_var_to_imm 0x8004, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare 0x8004, 3 + compare_var_to_imm 0x8004, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare 0x8004, 4 + compare_var_to_imm 0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 giveitem 0x8005 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end @@ -112,7 +112,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 giveitem 0x4045 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 release diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 884b43bb1..12c880d31 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -10,7 +10,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 lock faceplayer checkitem ITEM_EON_TICKET, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_Harbor_EventScript_1599EE goto LilycoveCity_Harbor_EventScript_1598BA end @@ -25,7 +25,7 @@ LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD msgbox LilycoveCity_Harbor_Text_18B36F, 4 checkitem ITEM_SS_TICKET, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 waittext @@ -48,7 +48,7 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A @@ -59,7 +59,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 LilycoveCity_Harbor_EventScript_15995B:: @ 815995B msgbox LilycoveCity_Harbor_Text_18B499, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp BattleTower_Outside, 255, 19, 23 @@ -80,9 +80,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A waitmove 0 pause 30 spriteinvisible LAST_TALKED, 13, 10 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 @@ -129,9 +129,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE waitmove 0 pause 30 disappear 4 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index d3399f5ac..cbf015eb3 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem ITEM_TM44 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag 234 msgbox LilycoveCity_House2_Text_18B883, 4 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 6926f4f45..62455f547 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -11,7 +11,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 lock faceplayer msgbox LilycoveCity_House3_Text_18B8CC, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closebutton diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index c0fa73360..236d48f65 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 waittext multichoice 20, 8, 16, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F end @@ -23,9 +23,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index ec316b576..e41d61fe8 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -125,7 +125,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 givedecoration 44 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag 236 closebutton diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 286ad055e..0127761a7 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,19 +16,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special sub_80F9A0C waitstate - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 special sub_80F9EEC fadescreen 0 - compare 0x8005, 4 + compare_var_to_imm 0x8005, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 14806cba4..e097504cf 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -61,9 +61,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 - compare 0x4095, 1 + compare_var_to_imm 0x4095, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 - compare 0x4095, 2 + compare_var_to_imm 0x4095, 2 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 end @@ -71,35 +71,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 setvar 0x8004, 8 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar 0x8004, 9 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar 0x8004, 10 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar 0x8004, 11 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar 0x8004, 12 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar 0x8004, 13 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar 0x8004, 14 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar 0x8004, 15 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -148,13 +148,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F faceplayer setvar 0x8004, 13 special sub_810FDAC - compare 0x4095, 0 + compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 release @@ -162,7 +162,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 release @@ -188,13 +188,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 faceplayer setvar 0x8004, 8 special sub_810FDAC - compare 0x4095, 0 + compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 release @@ -202,7 +202,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 release @@ -228,13 +228,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D faceplayer setvar 0x8004, 9 special sub_810FDAC - compare 0x4095, 0 + compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 release @@ -242,7 +242,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 release @@ -268,13 +268,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 faceplayer setvar 0x8004, 10 special sub_810FDAC - compare 0x4095, 0 + compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 release @@ -282,7 +282,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 release @@ -309,10 +309,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B setvar 0x8004, 11 special sub_810FDAC specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 release @@ -320,7 +320,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 release @@ -342,10 +342,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D setvar 0x8004, 12 special sub_810FDAC specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 release @@ -353,7 +353,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 release @@ -375,10 +375,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF setvar 0x8004, 14 special sub_810FDAC specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 release @@ -386,7 +386,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 release @@ -408,10 +408,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 setvar 0x8004, 15 special sub_810FDAC specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 release @@ -419,7 +419,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 1c019e046..936437fb9 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -5,19 +5,19 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag 2063 - compare 0x4092, 2 + compare_var_to_imm 0x4092, 2 call_if 1, LittlerootTown_EventScript_14D57B checkflag 82 call_if 0, LittlerootTown_EventScript_14D583 - compare 0x4050, 3 + compare_var_to_imm 0x4050, 3 call_if 1, LittlerootTown_EventScript_14D5A6 - compare 0x4082, 4 + compare_var_to_imm 0x4082, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare 0x408c, 4 + compare_var_to_imm 0x408c, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare 0x40c7, 1 + compare_var_to_imm 0x40c7, 1 call_if 1, LittlerootTown_EventScript_14D567 - compare 0x408d, 3 + compare_var_to_imm 0x408d, 3 call_if 1, LittlerootTown_EventScript_14D563 end @@ -40,7 +40,7 @@ LittlerootTown_EventScript_14D57B:: @ 814D57B return LittlerootTown_EventScript_14D583:: @ 814D583 - compare 0x4050, 0 + compare_var_to_imm 0x4050, 0 goto_if_eq LittlerootTown_EventScript_14D59A movespriteperm 1, 10, 1 spritebehave 1, 7 @@ -55,9 +55,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 clearflag 752 spritebehave 4, 8 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D5C5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D5CD return @@ -191,7 +191,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF goto_if_eq LittlerootTown_EventScript_14D72F checkflag 82 goto_if_eq LittlerootTown_EventScript_14D722 - compare 0x4050, 0 + compare_var_to_imm 0x4050, 0 goto_if 5, LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release @@ -334,9 +334,9 @@ LittlerootTown_EventScript_14D7FF:: @ 814D7FF LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D822 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D82B releaseall end @@ -352,9 +352,9 @@ LittlerootTown_EventScript_14D82B:: @ 814D82B LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D84E - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D857 releaseall end @@ -407,27 +407,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D93C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D947 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closebutton checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D952 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14DAAA - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare 0x8008, 4 + compare_var_to_imm 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare 0x8008, 5 + compare_var_to_imm 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare 0x8008, 4 + compare_var_to_imm 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare 0x8008, 5 + compare_var_to_imm 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare 0x8008, 4 + compare_var_to_imm 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare 0x8008, 5 + compare_var_to_imm 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare 0x8008, 4 + compare_var_to_imm 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare 0x8008, 5 + compare_var_to_imm 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DC50 return @@ -842,9 +842,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock faceplayer checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 move 4, LittlerootTown_Movement_1A0841 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index ca872ba0f..63e717a51 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B - compare 0x4092, 6 + compare_var_to_imm 0x4092, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 checkflag 274 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 @@ -18,7 +18,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 return @@ -27,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A - compare 0x4092, 3 + compare_var_to_imm 0x4092, 3 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 - compare 0x4092, 5 + compare_var_to_imm 0x4092, 5 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC - compare 0x4092, 6 + compare_var_to_imm 0x4092, 6 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 0176db332..8c0133625 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -6,7 +6,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF checkflag 130 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE - compare 0x4092, 4 + compare_var_to_imm 0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 @@ -23,16 +23,16 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 end @ 81527F1 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152814 end @@ -51,9 +51,9 @@ gUnknown_0815281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15285D end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 1d76bb6dc..73060a055 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 - compare 0x4092, 6 + compare_var_to_imm 0x4092, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E checkflag 274 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 @@ -18,7 +18,7 @@ LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 checkgender - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE return @@ -27,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 - compare 0x4092, 3 + compare_var_to_imm 0x4092, 3 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 - compare 0x4092, 5 + compare_var_to_imm 0x4092, 5 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA - compare 0x4092, 6 + compare_var_to_imm 0x4092, 6 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 end @@ -117,9 +117,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 @ 81529C7 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -139,7 +139,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag 301 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 - compare 0x408d, 3 + compare_var_to_imm 0x408d, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index a0dda8b70..ea6869b1b 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -6,7 +6,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B checkflag 130 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A - compare 0x4092, 4 + compare_var_to_imm 0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 @@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 checkgender - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 end @@ -33,9 +33,9 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D checkflag 292 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playsfx 9 disappear LAST_TALKED @@ -57,11 +57,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 waitmove 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closebutton - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F return @@ -91,11 +91,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A waitmove 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closebutton - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA return @@ -113,9 +113,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmove 0 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag 293 releaseall @@ -194,9 +194,9 @@ gUnknown_08152C39:: @ 8152C39 LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index bd846b4fe..d34e52f7f 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -30,9 +30,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE fanfare 370 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end @@ -44,9 +44,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -59,9 +59,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -85,7 +85,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer - compare 0x4084, 3 + compare_var_to_imm 0x4084, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 checkflag 88 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 @@ -109,7 +109,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A faceplayer checkflag 896 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F - compare 0x4084, 5 + compare_var_to_imm 0x4084, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 release @@ -124,9 +124,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA move 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 waitmove 0 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 setflag 116 @@ -139,7 +139,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem ITEM_POKE_BALL, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 setvar RESULT, 0 @@ -148,7 +148,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem ITEM_POKE_BALL, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 setvar RESULT, 1 @@ -188,9 +188,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 lock faceplayer checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index cae65f41e..d6cade75d 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -105,9 +105,9 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 end MauvilleCity_EventScript_14C154:: @ 814C154 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MauvilleCity_EventScript_14C23C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_EventScript_14C285 closebutton switch FACING @@ -286,7 +286,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 faceplayer checkflag 209 goto_if_eq MauvilleCity_EventScript_14C368 - compare 0x40ba, 2 + compare_var_to_imm 0x40ba, 2 goto_if_eq MauvilleCity_EventScript_14C33C checkflag 208 goto_if_eq MauvilleCity_EventScript_14C332 @@ -305,7 +305,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 giveitem ITEM_TM24 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag 209 msgbox MauvilleCity_Text_166488, 4 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 0b577885e..b418e8a79 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -10,17 +10,17 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end @@ -64,19 +64,19 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E msgbox MauvilleCity_BikeShop_Text_1813A0, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_15688D - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D msgbox MauvilleCity_BikeShop_Text_1813D4, 4 checkitem ITEM_ACRO_BIKE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9 checkitem ITEM_MACH_BIKE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA msgbox MauvilleCity_BikeShop_Text_181498, 4 release diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index db6223400..02b0c4bbb 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -6,7 +6,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 faceplayer msgbox MauvilleCity_GameCorner_Text_181C35, 4 checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 waittext @@ -33,10 +33,10 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins 16385 - compare 0x4001, 9950 + compare_var_to_imm 0x4001, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 50 paymoney 0x3e8, 0 @@ -52,10 +52,10 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins 16385 - compare 0x4001, 9500 + compare_var_to_imm 0x4001, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 500 paymoney 0x2710, 0 @@ -100,7 +100,7 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156B88 release end @@ -144,7 +144,7 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156C46 @@ -154,11 +154,11 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 - compare 0x4002, 1000 + compare_var_to_imm 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 88 checkdecor 88 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 88 @@ -170,11 +170,11 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 - compare 0x4002, 1000 + compare_var_to_imm 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 89 checkdecor 89 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 89 @@ -186,11 +186,11 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 - compare 0x4002, 1000 + compare_var_to_imm 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 90 checkdecor 90 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 90 @@ -221,7 +221,7 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156D36 release end @@ -277,7 +277,7 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156E3C @@ -289,10 +289,10 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins 16386 - compare 0x4002, 1500 + compare_var_to_imm 0x4002, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 1500 additem ITEM_TM32, 1 @@ -304,10 +304,10 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins 16386 - compare 0x4002, 3500 + compare_var_to_imm 0x4002, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 3500 additem ITEM_TM29, 1 @@ -319,10 +319,10 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins 16386 - compare 0x4002, 4000 + compare_var_to_imm 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM35, 1 @@ -334,10 +334,10 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins 16386 - compare 0x4002, 4000 + compare_var_to_imm 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM24, 1 @@ -349,10 +349,10 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins 16386 - compare 0x4002, 4000 + compare_var_to_imm 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM13, 1 @@ -392,7 +392,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 checkflag 226 goto_if_eq MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch 0x4023 case 0, MauvilleCity_GameCorner_EventScript_156FDB @@ -403,7 +403,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB bufferdecor 1, 88 checkdecor 88 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 88 @@ -414,7 +414,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 bufferdecor 1, 89 checkdecor 89 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 89 @@ -425,7 +425,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F bufferdecor 1, 90 checkdecor 90 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 90 @@ -453,7 +453,7 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C lock faceplayer checkitem ITEM_COIN_CASE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_15709C msgbox MauvilleCity_GameCorner_Text_18201E, 4 goto MauvilleCity_GameCorner_EventScript_157108 @@ -463,7 +463,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag 225 goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA checkcoins 16385 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag 225 givecoins 20 @@ -522,7 +522,7 @@ MauvilleCity_GameCorner_EventScript_157125:: @ 8157125 MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialval RESULT, sub_810F424 @@ -533,7 +533,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialval RESULT, sub_810F424 @@ -544,7 +544,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialval RESULT, sub_810F424 @@ -555,7 +555,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialval RESULT, sub_810F424 @@ -566,7 +566,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialval RESULT, sub_810F424 @@ -577,7 +577,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialval RESULT, sub_810F424 @@ -588,7 +588,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialval RESULT, sub_810F424 @@ -599,7 +599,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialval RESULT, sub_810F424 @@ -610,7 +610,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialval RESULT, sub_810F424 @@ -621,7 +621,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialval RESULT, sub_810F424 @@ -632,7 +632,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialval RESULT, sub_810F424 @@ -643,7 +643,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialval RESULT, sub_810F424 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 80a33ffb0..3255f8459 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -71,7 +71,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag 167 goto_if 0, MauvilleCity_Gym_EventScript_15661D - compare 0x40ba, 2 + compare_var_to_imm 0x40ba, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 release @@ -85,7 +85,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag 1208 setflag 2057 addvar 0x4085, 1 - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB setvar 0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 @@ -97,7 +97,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB MauvilleCity_Gym_EventScript_15661D:: @ 815661D giveitem ITEM_TM34 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 setflag 167 @@ -113,7 +113,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 1 + compare_var_to_imm 0x4093, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 1 setvar 0x8004, 0 @@ -124,7 +124,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 2 + compare_var_to_imm 0x4093, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 2 setvar 0x8004, 1 @@ -135,7 +135,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 3 + compare_var_to_imm 0x4093, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 3 setvar 0x8004, 2 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 24236ede6..7182a59aa 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -8,7 +8,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 goto_if_eq MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_1572E5 release end @@ -20,9 +20,9 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 move LAST_TALKED, MauvilleCity_House2_Movement_1A0835 waitmove 0 msgbox MauvilleCity_House2_Text_1824D8, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_15731B - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_House2_EventScript_157347 end diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index 23d814855..e6225bba0 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -4,7 +4,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 end @@ -17,7 +17,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 end @@ -30,7 +30,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index d1b8e88b3..d01c85ff3 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -71,11 +71,11 @@ MossdeepCity_EventScript_14D027:: @ 814D027 checkflag 276 goto_if_eq MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem ITEM_KINGS_ROCK - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B setflag 276 release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index f644e93cc..453b611cc 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special sub_813601C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 end @@ -17,9 +17,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special sub_813601C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E - compare 0x40c0, 0 + compare_var_to_imm 0x40c0, 0 call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF end @@ -49,11 +49,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 moveoffscreen 1 move 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmove 0 - compare 0x40c0, 1 + compare_var_to_imm 0x40c0, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 - compare 0x40c0, 2 + compare_var_to_imm 0x40c0, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B - compare 0x40c0, 3 + compare_var_to_imm 0x40c0, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty setvar 0x40c0, 0 @@ -84,7 +84,7 @@ MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release @@ -94,28 +94,28 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty special sub_810F414 msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MossdeepCity_GameCorner_B1F, 255, 3, 1 waitstate diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 77cc96f4d..a7ae2f947 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -22,11 +22,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E setvar 0x8005, 0 special sub_813556C waitstate - compare RESULT, 3 + compare_var_to_imm RESULT, 3 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton special ScrSpecial_HealPlayerParty diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 4c46ca334..4112a3b15 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -73,7 +73,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 giveitem ITEM_TM04 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 setflag 171 diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index c8af8f886..8f3d2ebfc 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -7,7 +7,7 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F bufferfirstpoke 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialval RESULT, GetPokeblockNameByMonNature - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 release diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 3cf5a8ff4..9be55e8d0 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B closebutton setflag 224 clearflag 933 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, MossdeepCity_House2_EventScript_15A8AE - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, MossdeepCity_House2_EventScript_15A8B9 disappear 3 release diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 8f9bf4dc5..b94e0ec19 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -7,7 +7,7 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 checkflag 152 goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem ITEM_SUPER_ROD diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 215cf5e35..6db52bc42 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -19,7 +19,7 @@ MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 lock faceplayer special sub_80BB63C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_House4_EventScript_15AB6D special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_18E17E, 4 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 369523b42..f5927aa77 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -7,9 +7,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B checkdailyflags specialval RESULT, GetWeekCount buffernum 0, RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closebutton move LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D @@ -36,7 +36,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem ITEM_SUN_STONE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag 192 msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index f6ba77cb9..c283d0532 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -14,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 - compare 0x40c6, 1 + compare_var_to_imm 0x40c6, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 end @@ -72,10 +72,10 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT disappear 2 @@ -86,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C givepokemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferpoke 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag 968 setflag 298 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 458e4a15b..9fa2b77de 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -18,17 +18,17 @@ MtChimney_EventScript_15CF95:: @ 815CF95 showmoney 0, 0 nop msgbox MtChimney_Text_195760, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtChimney_EventScript_15D018 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MtChimney_EventScript_15D000 giveitem ITEM_LAVA_COOKIE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoney 0, 0 release @@ -411,7 +411,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D checkflag 115 goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem ITEM_METEORITE @@ -441,7 +441,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 6f4ea44a5..b61097fdc 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA .byte 0 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 - compare 0x40a3, 1 + compare_var_to_imm 0x40a3, 1 call_if 1, MtChimney_CableCarStation_EventScript_15C111 end @@ -32,9 +32,9 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B lock faceplayer msgbox MtChimney_CableCarStation_Text_19256A, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MtChimney_CableCarStation_EventScript_15C16C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 026d54bfe..3f012780d 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem ITEM_CLEANSE_TAG - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B setflag 282 release diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 4f8d99c5e..6b85a88c3 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -4,7 +4,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 end diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 550f74d9a..787315320 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -8,7 +8,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C MtPyre_Exterior_EventScript_15D492:: @ 815D492 getplayerxy 0x4000, 0x4001 - compare 0x4001, 12 + compare_var_to_imm 0x4001, 12 goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 31a83857b..cc66242e3 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 move 2, MtPyre_Summit_Movement_1A0845 waitmove 0 pause 50 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 pause 20 call MtPyre_Summit_EventScript_15D57A - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -143,9 +143,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF .else msgbox MtPyre_Summit_Text_1B64B3, 5 .endif - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MtPyre_Summit_EventScript_15D611 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, MtPyre_Summit_EventScript_15D61A release end @@ -189,9 +189,9 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A .else msgbox MtPyre_Summit_Text_1B6283, 5 .endif - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -220,9 +220,9 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B .else msgbox MtPyre_Summit_Text_1B62E7, 5 .endif - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -268,11 +268,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 move 2, MtPyre_Summit_Movement_1A0845 waitmove 0 pause 50 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,11 +280,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closebutton - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D795 disappear 2 setvar 0x40b9, 3 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 698f2f6cd..94836d8c4 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A .byte 0 NewMauville_Entrance_MapScript1_15E495:: @ 815E495 - compare 0x40ba, 0 + compare_var_to_imm 0x40ba, 0 call_if 1, NewMauville_Entrance_EventScript_15E4A1 end @@ -27,10 +27,10 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC waitmove 0 msgbox NewMauville_Entrance_Text_1982C0, 4 checkitem ITEM_BASEMENT_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982D4, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmaptile 3, 0, 707, 0 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 352bb8a6d..3407c8a01 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 815E55F .byte 0 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, NewMauville_Inside_EventScript_15E5DA - compare 0x4002, 1 + compare_var_to_imm 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 checkflag 2145 call_if 1, NewMauville_Inside_EventScript_15E58F @@ -23,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E - compare 0x40ba, 2 + compare_var_to_imm 0x40ba, 2 call_if 1, NewMauville_Inside_EventScript_15E88B end @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 lockall - compare 0x40ba, 2 + compare_var_to_imm 0x40ba, 2 goto_if_eq NewMauville_Inside_EventScript_15E8F6 msgbox NewMauville_Inside_Text_198315, 4 releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index d620df71e..eef21daa7 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -76,7 +76,7 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 giveitem ITEM_POTION - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 setflag 132 @@ -257,9 +257,9 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 OldaleTown_EventScript_14DF92:: @ 814DF92 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_EventScript_14DFAA - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_EventScript_14DFB8 end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index aaeeb2453..07b6150d7 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -14,10 +14,10 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 call_if 0, PacifidlogTown_House2_EventScript_1541D7 setflag 300 specialval RESULT, GetLeadMonFriendshipScore - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_1541EC specialval RESULT, GetLeadMonFriendshipScore - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end @@ -26,7 +26,7 @@ PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag 299 goto_if 0, PacifidlogTown_House2_EventScript_1A14DC specialval RESULT, sub_810F908 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -46,7 +46,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 giveitem ITEM_TM27 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 @@ -62,7 +62,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 giveitem ITEM_TM21 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 73f749400..3a8dc3b1d 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -11,17 +11,17 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT - comparevars RESULT, 0x8009 + compare_var_to_var RESULT, 0x8009 goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index b7a6c9f86..bba0ede14 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -13,9 +13,9 @@ PacifidlogTown_House4_EventScript_15435E:: @ 815435E lock faceplayer msgbox PacifidlogTown_House4_Text_17963D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PacifidlogTown_House4_EventScript_15437F - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PacifidlogTown_House4_EventScript_154389 end diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index fdc496d1f..008c2f800 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5_EventScript_154394:: @ 8154394 lock faceplayer specialval RESULT, IsMirageIslandPresent - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PacifidlogTown_House5_EventScript_1543B0 msgbox PacifidlogTown_House5_Text_179718, 4 release diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 1ffc14144..f5b683b34 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -5,9 +5,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag 2070 - compare 0x4057, 0 + compare_var_to_imm 0x4057, 0 call_if 1, PetalburgCity_EventScript_14B731 - compare 0x4057, 2 + compare_var_to_imm 0x4057, 2 call_if 1, PetalburgCity_EventScript_14B739 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmove 0 move 9, PetalburgCity_Movement_1A0835 waitmove 0 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closebutton - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 move 9, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 4b0757f63..e22f02b50 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 .byte 0 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 - compare 0x4085, 7 + compare_var_to_imm 0x4085, 7 call_if 4, PetalburgCity_Gym_EventScript_1544ED end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED return PetalburgCity_Gym_MapScript1_15451B:: @ 815451B - compare 0x4085, 1 + compare_var_to_imm 0x4085, 1 call_if 1, PetalburgCity_Gym_EventScript_15453B - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 checkflag 2052 call_if 1, PetalburgCity_Gym_EventScript_15454B @@ -144,65 +144,65 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E PetalburgCity_Gym_EventScript_154669:: @ 8154669 reappear 10 playsfx 8 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closebutton setflag 0x4001 playmusic 420, 0 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 disappear 10 setflag 728 @@ -352,7 +352,7 @@ PetalburgCity_Gym_EventScript_15493C:: @ 815493C PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag 169 goto_if 0, PetalburgCity_Gym_EventScript_154A2C @@ -364,15 +364,15 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D PetalburgCity_Gym_EventScript_154969:: @ 8154969 specialval RESULT, IsEnigmaBerryValid - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkpcitem ITEM_ENIGMA_BERRY, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 - compare 0x402d, 0 + compare_var_to_imm 0x402d, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 setvar RESULT, 1 @@ -384,7 +384,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem ITEM_ENIGMA_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 release @@ -413,28 +413,28 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag 169 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154ABC - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, PetalburgCity_Gym_EventScript_154AC7 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, PetalburgCity_Gym_EventScript_154AD2 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154ADD pause 70 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154AE8 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, PetalburgCity_Gym_EventScript_154AF3 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, PetalburgCity_Gym_EventScript_154AFE - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release @@ -592,14 +592,14 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -622,14 +622,14 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -640,9 +640,9 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 setvar 0x8008, 7 setvar 0x8009, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -653,9 +653,9 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B setvar 0x8008, 1 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -666,9 +666,9 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E setvar 0x8008, 7 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -679,9 +679,9 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 setvar 0x8008, 1 setvar 0x8009, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -692,9 +692,9 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 setvar 0x8008, 1 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -705,9 +705,9 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 setvar 0x8008, 7 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -718,9 +718,9 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A setvar 0x8008, 1 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -731,9 +731,9 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D setvar 0x8008, 7 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -744,9 +744,9 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 setvar 0x8008, 1 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -757,9 +757,9 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 setvar 0x8008, 7 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -891,72 +891,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A setvar 0x8004, 1 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB setvar 0x8004, 2 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC setvar 0x8004, 3 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD setvar 0x8004, 4 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E setvar 0x8004, 5 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F setvar 0x8004, 6 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 setvar 0x8004, 7 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 setvar 0x8004, 8 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 63dcaa6ca..0884db479 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -28,17 +28,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 specialval RESULT, IsStarterInParty - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F release end PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F - compare 0x4023, 0 + compare_var_to_imm 0x4023, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 - compare 0x4023, 1 + compare_var_to_imm 0x4023, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B - compare 0x4023, 2 + compare_var_to_imm 0x4023, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index d1d3a1b8a..dcf0a27cf 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -91,7 +91,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA waitmove 0 msgbox PetalburgWoods_Text_19507E, 4 giveitem ITEM_GREAT_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D end @@ -245,7 +245,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem ITEM_MIRACLE_SEED - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B setflag 297 release @@ -272,7 +272,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 end diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 5f9f76be2..6d6b1c2da 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -20,7 +20,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 end diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index d12f8918f..328021785 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -10,9 +10,9 @@ Route103_MapScript1_14EB87:: @ 814EB87 Route103_EventScript_14EB92:: @ 814EB92 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route103_EventScript_14EBAB - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EC04 end @@ -174,7 +174,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 end @@ -187,7 +187,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 end @@ -205,7 +205,7 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 584ab47dd..8ab1999e6 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -35,7 +35,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 246 msgbox Route104_Text_1C5665, 4 @@ -54,7 +54,7 @@ Route104_EventScript_14EF09:: @ 814EF09 goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 279 release @@ -108,7 +108,7 @@ Route104_EventScript_14EF93:: @ 814EF93 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 262 release @@ -410,7 +410,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -423,7 +423,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -436,7 +436,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index ce32a544a..751c86825 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag 2109 - compare 0x4090, 1 + compare_var_to_imm 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag 188 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 @@ -37,7 +37,7 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E setflag 147 msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -54,14 +54,14 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 msgbox Route104_MrBrineysHouse_Text_191CC3, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E msgbox Route104_MrBrineysHouse_Text_191DA6, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index d4d7b59cb..097e99357 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -25,18 +25,18 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag 127 msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -96,7 +96,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA random 8 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag 2256 msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 0acf70e64..a1a13a003 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -18,7 +18,7 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 end diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index 9daa57b7e..c33bb7d19 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -9,7 +9,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 09be54c49..d3baeea34 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -279,7 +279,7 @@ Route109_EventScript_14F680:: @ 814F680 Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 msgbox Route109_Text_16E0F9, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end @@ -332,7 +332,7 @@ Route109_EventScript_14F725:: @ 814F725 goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem ITEM_SOFT_SAND - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route109_EventScript_1A029B closebutton move LAST_TALKED, Route109_Movement_1A083D @@ -397,7 +397,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 end @@ -410,7 +410,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 789ee3e56..2a69242c2 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -28,7 +28,7 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 giveitem ITEM_SODA_POP, 6 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag 140 release @@ -43,7 +43,7 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoney 0, 0 nop msgbox Route109_SeashoreHouse_Text_19B702, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoney 0, 0 @@ -52,10 +52,10 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A checkmoney 0x12c, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E9E checkitemspace ITEM_SODA_POP, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 paymoney 0x12c, 0 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 723c41e0c..68a2c6613 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -12,7 +12,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A0196 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 - compare 0x40a9, 1 + compare_var_to_imm 0x40a9, 1 call_if 1, Route110_EventScript_14F92F end @@ -132,7 +132,7 @@ Route110_EventScript_14FA25:: @ 814FA25 Route110_EventScript_14FA2E:: @ 814FA2E lockall specialval RESULT, GetRecordedCyclingRoadResults - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 releaseall @@ -147,9 +147,9 @@ Route110_EventScript_14FA53:: @ 814FA53 lock faceplayer specialval RESULT, GetPlayerAvatarBike - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FA84 - compare 0x40a9, 0 + compare_var_to_imm 0x40a9, 0 goto_if_eq Route110_EventScript_14FA7A msgbox Route110_Text_16F26A, 4 release @@ -178,7 +178,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 end @@ -206,7 +206,7 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 end @@ -224,7 +224,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 end @@ -237,7 +237,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 end @@ -326,9 +326,9 @@ Route110_EventScript_14FD29:: @ 814FD29 Route110_EventScript_14FD34:: @ 814FD34 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_EventScript_14FDA7 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route110_EventScript_14FDAC move 28, Route110_Movement_1A0845 waitmove 0 @@ -337,16 +337,16 @@ Route110_EventScript_14FD34:: @ 814FD34 move 28, Route110_Movement_1A0835 waitmove 0 pause 30 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF14 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, Route110_EventScript_14FF1F - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, Route110_EventScript_14FF2A checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FE2B releaseall end @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closebutton - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF56 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, Route110_EventScript_14FF5E - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, Route110_EventScript_14FF66 spritebehave 28, 10 spritebehave 29, 10 disappear 28 reappear 29 pause 45 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF35 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, Route110_EventScript_14FF40 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, Route110_EventScript_14FF4B disappear 29 setvar 0x4069, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 32b3ae4fb..daa55dc7f 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -3,9 +3,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 .byte 0 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE - compare 0x40a9, 3 + compare_var_to_imm 0x40a9, 3 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 - compare 0x40a9, 2 + compare_var_to_imm 0x40a9, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end @@ -24,9 +24,9 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 @ Coord event directly in front of the gatesman heading left to right lockall specialval RESULT, GetPlayerAvatarBike @ player state? - compare RESULT, 2 + compare_var_to_imm RESULT, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag 2091 setvar 0x4001, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 95ea7454e..63e8df87c 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -11,7 +11,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B lockall specialval RESULT, GetPlayerAvatarBike - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag 2091 setvar 0x4001, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index d18f30a43..7f4ffdddd 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 .byte 0 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161994 end @@ -61,7 +61,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_RARE_CANDY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -74,7 +74,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_TIMER_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -87,7 +87,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_HARD_STONE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -100,7 +100,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_SMOKE_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -113,7 +113,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_TM12 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -126,7 +126,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_MAGNET - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -139,7 +139,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_PP_MAX - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closebutton - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161C74 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route110_TrickHouseEnd_EventScript_161C7F - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, Route110_TrickHouseEnd_EventScript_161C8A - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_161C95 pause 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 @@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF .else givedecoration 31 .endc - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 81d6a44e0..28b1eb0de 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -6,17 +6,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B setflag 2114 - compare 0x40b5, 1 + compare_var_to_imm 0x40b5, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE - compare 0x40c1, 1 + compare_var_to_imm 0x40c1, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 - compare 0x40a6, 1 + compare_var_to_imm 0x40a6, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E - compare 0x40a7, 5 + compare_var_to_imm 0x40a7, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare 0x40a7, 3 + compare_var_to_imm 0x40a7, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare 0x40a7, 0 + compare_var_to_imm 0x40a7, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE switch 0x40a7 case 0, Route110_TrickHouseEntrance_EventScript_16109A @@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 setvar 0x40a5, 1 - compare 0x4044, 8 + compare_var_to_imm 0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 setvar 0x40a7, 2 end @@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE setvar 0x40a7, 0 - compare 0x4044, 1 + compare_var_to_imm 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_16103C - compare 0x4044, 2 + compare_var_to_imm 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_161046 - compare 0x4044, 3 + compare_var_to_imm 0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_161050 - compare 0x4044, 4 + compare_var_to_imm 0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_16105A - compare 0x4044, 5 + compare_var_to_imm 0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_161064 - compare 0x4044, 6 + compare_var_to_imm 0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_16106E - compare 0x4044, 7 + compare_var_to_imm 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_161078 - compare 0x4044, 8 + compare_var_to_imm 0x4044, 8 call_if 1, Route110_TrickHouseEntrance_EventScript_161082 return @@ -213,7 +213,7 @@ Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall pause 20 - compare 0x4044, 0 + compare_var_to_imm 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton @@ -248,21 +248,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D waitmove 0 move 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmove 0 - compare 0x4044, 0 + compare_var_to_imm 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD - compare 0x4044, 1 + compare_var_to_imm 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 - compare 0x4044, 2 + compare_var_to_imm 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF - compare 0x4044, 3 + compare_var_to_imm 0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 - compare 0x4044, 4 + compare_var_to_imm 0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 - compare 0x4044, 5 + compare_var_to_imm 0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA - compare 0x4044, 6 + compare_var_to_imm 0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_161303 - compare 0x4044, 7 + compare_var_to_imm 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closebutton setvar 0x40a6, 1 @@ -351,27 +351,27 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E move 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmove 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 - compare 0x4044, 1 + compare_var_to_imm 0x4044, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE - compare 0x4044, 2 + compare_var_to_imm 0x4044, 2 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA - compare 0x4044, 3 + compare_var_to_imm 0x4044, 3 goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 - compare 0x4044, 4 + compare_var_to_imm 0x4044, 4 goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 - compare 0x4044, 5 + compare_var_to_imm 0x4044, 5 goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E - compare 0x4044, 6 + compare_var_to_imm 0x4044, 6 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA - compare 0x4044, 7 + compare_var_to_imm 0x4044, 7 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE giveitem ITEM_RARE_CANDY - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -379,9 +379,9 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA giveitem ITEM_TIMER_BALL - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -389,9 +389,9 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 giveitem ITEM_HARD_STONE - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -399,9 +399,9 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 giveitem ITEM_SMOKE_BALL - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -409,9 +409,9 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E giveitem ITEM_TM12 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -419,9 +419,9 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA giveitem ITEM_MAGNET - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -429,9 +429,9 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 giveitem ITEM_PP_MAX - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -454,9 +454,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 .else givedecoration 31 .endif - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall @@ -495,7 +495,7 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 closebutton - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end @@ -577,7 +577,7 @@ Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 end Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 - compare 0x4044, 8 + compare_var_to_imm 0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 releaseall @@ -602,7 +602,7 @@ gUnknown_081616E1:: @ 81616E1 end Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 - compare 0x40AB, 0 + compare_var_to_imm 0x40AB, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 playsfx SE_PIN @@ -613,7 +613,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 end Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 - compare 0x40AC, 0 + compare_var_to_imm 0x40AC, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 playsfx SE_PIN @@ -624,7 +624,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 end Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 - compare 0x40AD, 0 + compare_var_to_imm 0x40AD, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 playsfx SE_PIN @@ -635,7 +635,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 end Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB - compare 0x40AE, 0 + compare_var_to_imm 0x40AE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 playsfx SE_PIN @@ -646,7 +646,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB end Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 - compare 0x40AF, 0 + compare_var_to_imm 0x40AF, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 playsfx SE_PIN @@ -657,7 +657,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 end Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D - compare 0x40B0, 0 + compare_var_to_imm 0x40B0, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 playsfx SE_PIN @@ -668,7 +668,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D end Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 - compare 0x40B1, 0 + compare_var_to_imm 0x40B1, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 playsfx SE_PIN @@ -679,7 +679,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 end Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F - compare 0x40B2, 0 + compare_var_to_imm 0x40B2, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 playsfx SE_PIN @@ -726,11 +726,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 lockall msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall - compare 0x4044, 0 + compare_var_to_imm 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 - compare 0x4044, 1 + compare_var_to_imm 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 - compare 0x4044, 2 + compare_var_to_imm 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_16190B setvar 0x40a5, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 3a89c2db1..d9536edde 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 .byte 0 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE - compare 0x40ab, 2 + compare_var_to_imm 0x40ab, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A end @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall - compare 0x40ab, 0 + compare_var_to_imm 0x40ab, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 goto Route110_TrickHousePuzzle1_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index a4731d329..4102bd9ec 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,13 +4,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 .byte 0 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C - compare 0x4002, 1 + compare_var_to_imm 0x4002, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F - compare 0x4003, 1 + compare_var_to_imm 0x4003, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 - compare 0x4004, 1 + compare_var_to_imm 0x4004, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end @@ -23,7 +23,7 @@ Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall - compare 0x40ac, 0 + compare_var_to_imm 0x40ac, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 goto Route110_TrickHousePuzzle2_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 86d68a6ef..377791261 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 - compare 0x4009, 0 + compare_var_to_imm 0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end @@ -31,19 +31,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmaptile 13, 7, 600, 0 setmaptile 1, 3, 600, 0 setmaptile 10, 2, 600, 0 - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 - compare 0x4008, 6 + compare_var_to_imm 0x4008, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 - compare 0x4008, 7 + compare_var_to_imm 0x4008, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return @@ -302,19 +302,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar 0x4005, 0 setvar 0x4006, 0 setvar 0x4007, 0 - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B - compare 0x4008, 6 + compare_var_to_imm 0x4008, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 - compare 0x4008, 7 + compare_var_to_imm 0x4008, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return @@ -347,14 +347,14 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 return Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 0 + compare_var_to_imm 0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD - compare 0x4009, 0 + compare_var_to_imm 0x4009, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end @@ -370,7 +370,7 @@ Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall - compare 0x40ad, 0 + compare_var_to_imm 0x40ad, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD goto Route110_TrickHousePuzzle3_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 0c9fc426f..0bff3f526 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall - compare 0x40ae, 0 + compare_var_to_imm 0x40ae, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 goto Route110_TrickHousePuzzle4_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 72268710b..67f5bc469 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall - compare 0x40af, 0 + compare_var_to_imm 0x40af, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 goto Route110_TrickHousePuzzle5_EventScript_161892 end @@ -27,7 +27,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall move 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F @@ -37,7 +37,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall move 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 - compare 0x4002, 1 + compare_var_to_imm 0x4002, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 @@ -47,7 +47,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall move 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 - compare 0x4003, 1 + compare_var_to_imm 0x4003, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 @@ -57,7 +57,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall move 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 - compare 0x4004, 1 + compare_var_to_imm 0x4004, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B @@ -67,7 +67,7 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall move 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 - compare 0x4005, 1 + compare_var_to_imm 0x4005, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F @@ -165,11 +165,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F waitmove 0 move 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare_var_to_imm 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare_var_to_imm 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 @@ -187,11 +187,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 waitmove 0 move 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare_var_to_imm 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare_var_to_imm 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 @@ -209,11 +209,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 waitmove 0 move 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare_var_to_imm 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare_var_to_imm 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 @@ -231,11 +231,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B waitmove 0 move 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare_var_to_imm 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare_var_to_imm 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 @@ -253,11 +253,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F waitmove 0 move 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare_var_to_imm 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare_var_to_imm 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 @@ -418,80 +418,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 end Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 - compare 0x4009, 4 + compare_var_to_imm 0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 - compare 0x4009, 5 + compare_var_to_imm 0x4009, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index ddf845142..e4ce617c9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -17,7 +17,7 @@ Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall - compare 0x40b0, 0 + compare_var_to_imm 0x40b0, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC goto Route110_TrickHousePuzzle6_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index c9dcce5e3..5d635e2c5 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -73,7 +73,7 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 - compare 0x40b6, 1 + compare_var_to_imm 0x40b6, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E clearflag 194 clearflag 195 @@ -86,7 +86,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E end Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F - compare 0x40b6, 1 + compare_var_to_imm 0x40b6, 1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 end @@ -100,7 +100,7 @@ Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall - compare 0x40b1, 0 + compare_var_to_imm 0x40b1, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D goto Route110_TrickHousePuzzle7_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index 5f0b00684..1c6a9847f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall - compare 0x40b2, 0 + compare_var_to_imm 0x40b2, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E goto Route110_TrickHousePuzzle8_EventScript_161892 end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 2a69df98a..7231b427a 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -22,15 +22,15 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy 0x4000, 0x4001 - compare 0x4001, 34 + compare_var_to_imm 0x4001, 34 goto_if 0, Route111_EventScript_15000C - compare 0x4001, 107 + compare_var_to_imm 0x4001, 107 goto_if 2, Route111_EventScript_15000C - compare 0x4001, 72 + compare_var_to_imm 0x4001, 72 goto_if 2, Route111_EventScript_150009 - compare 0x4000, 2000 + compare_var_to_imm 0x4000, 2000 goto_if 2, Route111_EventScript_15000C - compare 0x4000, 8 + compare_var_to_imm 0x4000, 8 goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 @@ -52,7 +52,7 @@ Route111_EventScript_15000D:: @ 815000D Route111_EventScript_150023:: @ 8150023 lockall msgbox Route111_Text_16FA54, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL closebutton @@ -74,7 +74,7 @@ Route111_EventScript_15005F:: @ 815005F Route111_EventScript_150069:: @ 8150069 lockall msgbox Route111_Text_16FAED, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL closebutton @@ -125,7 +125,7 @@ Route111_EventScript_1500C5:: @ 81500C5 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem ITEM_RAZZ_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_1A029B setflag 2252 special GetPlayerBigGuyGirlString @@ -164,7 +164,7 @@ Route111_EventScript_150122:: @ 8150122 Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_150151 setvar 0x4003, 1 releaseall @@ -173,13 +173,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closebutton - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 call_if 1, Route111_EventScript_150188 - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 call_if 1, Route111_EventScript_150193 - compare 0x8004, 2 + compare_var_to_imm 0x8004, 2 call_if 1, Route111_EventScript_15019E - compare 0x8004, 3 + compare_var_to_imm 0x8004, 3 call_if 1, Route111_EventScript_1501A9 releaseall end @@ -238,7 +238,7 @@ Route111_EventScript_1501D1:: @ 81501D1 faceplayer setflag 2115 msgbox Route111_Text_16F705, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release @@ -393,7 +393,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 end @@ -421,7 +421,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 end @@ -434,7 +434,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 end diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index a33b436dc..fdd0078ed 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -10,9 +10,9 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB lock faceplayer msgbox Route111_OldLadysRestStop_Text_1923AF, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end @@ -21,9 +21,9 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC closebutton call Route111_OldLadysRestStop_EventScript_1A02CA msgbox Route111_OldLadysRestStop_Text_19244D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 39fc62eaf..b5b6056f4 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem ITEM_MACHO_BRACE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag 277 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 22c055320..9a4c85158 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -39,7 +39,7 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index c4ab89f23..d2d01f253 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E warp6 Route112, 255, 28, 28 - compare 0x40a3, 2 + compare_var_to_imm 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end @@ -33,9 +33,9 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C lock faceplayer msgbox Route112_CableCarStation_Text_1924F5, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route112_CableCarStation_EventScript_15C0AD - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route112_CableCarStation_EventScript_15C0DC end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 67d28e6df..ae08ff5bb 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -14,9 +14,9 @@ Route113_MapScript1_1505DA:: @ 81505DA Route113_EventScript_1505E5:: @ 81505E5 getplayerxy 0x4000, 0x4001 - compare 0x4000, 19 + compare_var_to_imm 0x4000, 19 goto_if 0, Route113_EventScript_150604 - compare 0x4000, 84 + compare_var_to_imm 0x4000, 84 goto_if 2, Route113_EventScript_150604 setweather 7 return @@ -61,7 +61,7 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 end @@ -74,7 +74,7 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 2fec004e4..f83c5cf23 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -4,7 +4,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag 2116 - compare 0x40be, 1 + compare_var_to_imm 0x40be, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end @@ -15,11 +15,11 @@ Route113_GlassWorkshop_EventScript_16355F:: @ 816355F Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer - compare 0x40be, 10 + compare_var_to_imm 0x40be, 10 goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 - compare 0x40be, 2 + compare_var_to_imm 0x40be, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 - compare 0x40be, 1 + compare_var_to_imm 0x40be, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 giveitem ITEM_SOOT_SACK @@ -35,10 +35,10 @@ Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 checkitem ITEM_SOOT_SACK, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 - compare 0x4048, 250 + compare_var_to_imm 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waittext @@ -70,10 +70,10 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 bufferitem 0, 0x8008 setvar 0x800a, 250 - compare 0x4048, 250 + compare_var_to_imm 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 10 subvar 0x4048, 250 @@ -84,10 +84,10 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 bufferitem 0, 0x8008 setvar 0x800a, 500 - compare 0x4048, 500 + compare_var_to_imm 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 11 subvar 0x4048, 500 @@ -98,10 +98,10 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 bufferitem 0, 0x8008 setvar 0x800a, 500 - compare 0x4048, 500 + compare_var_to_imm 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 12 subvar 0x4048, 500 @@ -112,10 +112,10 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 bufferitem 0, 0x8008 setvar 0x800a, 1000 - compare 0x4048, 1000 + compare_var_to_imm 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 13 subvar 0x4048, 1000 @@ -126,10 +126,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 bufferitem 0, 0x8008 setvar 0x800a, 1000 - compare 0x4048, 1000 + compare_var_to_imm 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 14 subvar 0x4048, 1000 @@ -141,10 +141,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8008, 13 bufferdecor 0, 0x8008 setvar 0x800a, 6000 - compare 0x4048, 6000 + compare_var_to_imm 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 15 subvar 0x4048, 6000 @@ -156,10 +156,10 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8008, 6 bufferdecor 0, 0x8008 setvar 0x800a, 8000 - compare 0x4048, 8000 + compare_var_to_imm 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 16 subvar 0x4048, 8000 @@ -201,9 +201,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 pause 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare 0x8009, 0 + compare_var_to_imm 0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare_var_to_imm 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release @@ -211,13 +211,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 Route113_GlassWorkshop_EventScript_163889:: @ 8163889 giveitem 0x8008 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 givedecoration 0x8008 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -295,9 +295,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare 0x8009, 0 + compare_var_to_imm 0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare_var_to_imm 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 6d28b87a4..d910d3e16 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -12,7 +12,7 @@ Route114_EventScript_150733:: @ 8150733 addvar RESULT, 15 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 2251 msgbox Route114_Text_1C5861, 4 @@ -31,7 +31,7 @@ Route114_EventScript_150782:: @ 8150782 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 231 msgbox Route114_Text_1701C5, 4 @@ -88,7 +88,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -101,7 +101,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index b217f24c4..3406a78f6 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem ITEM_TM28 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag 261 release diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 13843f758..71c627728 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -7,10 +7,10 @@ Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F checkflag 267 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 checkitem ITEM_CLAW_FOSSIL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 msgbox Route114_FossilManiacsTunnel_Text_192795, 4 release diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index e4334647c..fbc4976ab 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -18,7 +18,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 .else givedecoration 100 .endif - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE setflag 131 release @@ -32,7 +32,7 @@ Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall msgbox Route114_LanettesHouse_Text_192B4A, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall @@ -40,7 +40,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 3bacb06d1..711a62e40 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -16,7 +16,7 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 end @@ -34,7 +34,7 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 end @@ -47,7 +47,7 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 94b7d25d6..838ebe814 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -44,17 +44,17 @@ Route116_EventScript_150A7B:: @ 8150A7B Route116_EventScript_150A94:: @ 8150A94 setflag 287 giveitem ITEM_REPEAT_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route116_EventScript_150AEE - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, Route116_EventScript_150AEE - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, Route116_EventScript_150AEE - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, Route116_EventScript_150AF9 disappear LAST_TALKED clearflag 949 @@ -148,10 +148,10 @@ Route116_EventScript_150B8F:: @ 8150B8F lock faceplayer checkitem ITEM_BLACK_GLASSES, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BCA specialval RESULT, sub_810F828 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 release @@ -167,7 +167,7 @@ Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_1708EE, 4 msgbox Route116_Text_170921, 4 specialval RESULT, sub_810F828 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 release @@ -181,13 +181,13 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 pause 20 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route116_EventScript_150C37 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, Route116_EventScript_150C37 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, Route116_EventScript_150C37 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, Route116_EventScript_150C42 disappear LAST_TALKED release @@ -241,7 +241,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 end @@ -264,7 +264,7 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index a84d1eaf8..2a27c01d7 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -41,7 +41,7 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 end @@ -54,7 +54,7 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 end @@ -67,7 +67,7 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 end @@ -80,7 +80,7 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 end @@ -98,7 +98,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 end @@ -111,7 +111,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 7d4109f59..e1b4fd345 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -12,9 +12,9 @@ Route118_EventScript_150F34:: @ 8150F34 checkflag 227 goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route118_EventScript_150F5E - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route118_EventScript_150F7F end @@ -83,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 pause 30 msgbox Route118_Text_170D66, 4 closebutton - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, Route118_EventScript_151048 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, Route118_EventScript_151053 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 disappear 19 @@ -162,7 +162,7 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 end @@ -185,7 +185,7 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 0d71ac056..cae90cd12 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare 0x8004, 6 + compare_var_to_imm 0x8004, 6 call_if 1, Route119_EventScript_151193 - compare 0x8004, 7 + compare_var_to_imm 0x8004, 7 call_if 1, Route119_EventScript_151197 return @@ -27,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A014E call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 - compare 0x40b3, 1 + compare_var_to_imm 0x40b3, 1 call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -52,29 +52,29 @@ Route119_EventScript_1511DB:: @ 81511DB lockall reappear 25 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route119_EventScript_151254 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route119_EventScript_151259 pause 65 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513A6 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513B1 move 255, Route119_Movement_1A0845 waitmove 0 pause 30 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 25 reappear 16 pause 30 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route119_EventScript_15125E - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_1512D8 releaseall end @@ -154,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closebutton - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 16 reappear 25 pause 30 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513BC - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513C7 disappear 25 setvar 0x4072, 1 @@ -297,7 +297,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 end @@ -310,7 +310,7 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 end diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 762a6c299..aa918bc34 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -4,7 +4,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 - compare 0x40b3, 0 + compare_var_to_imm 0x40b3, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 end @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D lock faceplayer special GetPlayerBigGuyGirlString - compare 0x40b3, 0 + compare_var_to_imm 0x40b3, 0 goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 35e547f79..a8fd671bd 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -4,9 +4,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 - compare 0x40b3, 0 + compare_var_to_imm 0x40b3, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 - compare 0x40b3, 1 + compare_var_to_imm 0x40b3, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 end @@ -56,7 +56,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 fanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index f0179d317..e736722b5 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 call_if 1, Route120_EventScript_15166B - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 call_if 1, Route120_EventScript_151672 - compare 0x8004, 2 + compare_var_to_imm 0x8004, 2 call_if 1, Route120_EventScript_151676 - compare 0x8004, 3 + compare_var_to_imm 0x8004, 3 call_if 1, Route120_EventScript_15167A - compare 0x8004, 4 + compare_var_to_imm 0x8004, 4 call_if 1, Route120_EventScript_15167E - compare 0x8004, 5 + compare_var_to_imm 0x8004, 5 call_if 1, Route120_EventScript_151682 return @@ -81,11 +81,11 @@ Route120_MapScript1_1516DF:: @ 81516DF Route120_EventScript_1516EA:: @ 81516EA getplayerxy 0x4000, 0x4001 - compare 0x4001, 14 + compare_var_to_imm 0x4001, 14 goto_if 3, Route120_EventScript_151715 - compare 0x4001, 60 + compare_var_to_imm 0x4001, 60 goto_if 3, Route120_EventScript_151719 - compare 0x4001, 61 + compare_var_to_imm 0x4001, 61 goto_if 4, Route120_EventScript_151711 return @@ -98,9 +98,9 @@ Route120_EventScript_151715:: @ 8151715 return Route120_EventScript_151719:: @ 8151719 - compare 0x4000, 7 + compare_var_to_imm 0x4000, 7 goto_if 3, Route120_EventScript_151735 - compare 0x4000, 19 + compare_var_to_imm 0x4000, 19 goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -116,9 +116,9 @@ Route120_EventScript_151739:: @ 8151739 checkflag 2254 goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route120_EventScript_151841 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route120_EventScript_15184A specialval RESULT, GetPlayerTrainerIdOnesDigit switch RESULT @@ -161,7 +161,7 @@ Route120_EventScript_151808:: @ 8151808 Route120_EventScript_151813:: @ 8151813 giveitem 0x8004 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag 2254 msgbox Route120_Text_1C5A0B, 4 @@ -187,7 +187,7 @@ Route120_EventScript_151853:: @ 8151853 checkflag 290 goto_if_eq Route120_EventScript_151884 msgbox Route120_Text_171827, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -200,7 +200,7 @@ Route120_EventScript_151877:: @ 8151877 Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -208,9 +208,9 @@ Route120_EventScript_151884:: @ 8151884 Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route120_EventScript_15197F - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, Route120_EventScript_15198A move 31, Route120_Movement_1A083F waitmove 0 @@ -293,7 +293,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 end @@ -316,7 +316,7 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 end diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index c87774cb8..3af8ff7cf 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -74,7 +74,7 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 end @@ -102,7 +102,7 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 3724e9aeb..efc2ab4fb 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -34,7 +34,7 @@ Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A lock faceplayer msgbox Route121_SafariZoneEntrance_Text_1C3704, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release @@ -52,7 +52,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 showmoney 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C @@ -60,11 +60,11 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 checkitem ITEM_POKEBLOCK_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450 call Route121_SafariZoneEntrance_EventScript_15C425 checkmoney 0x1f4, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 paymoney 0x1f4, 0 @@ -88,10 +88,10 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialval RESULT, CheckFreePokemonStorageSpace - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 395eaa7c3..f4ba11b0d 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -13,11 +13,11 @@ Route123_EventScript_151C5D:: @ 8151C5D goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 giveitem ITEM_TM19 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag 232 msgbox Route123_Text_171E34, 4 @@ -63,7 +63,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 end @@ -76,7 +76,7 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 4f7bad5f9..4c35b52ec 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 2253 msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 release @@ -47,9 +47,9 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AAD - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163A9B end @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare 0x8004, 2 + compare_var_to_imm 0x8004, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare 0x8004, 3 + compare_var_to_imm 0x8004, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare 0x8004, 4 + compare_var_to_imm 0x8004, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare 0x8004, 5 + compare_var_to_imm 0x8004, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end @@ -79,7 +79,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 random 10 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D release @@ -90,7 +90,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_SPELON_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 248 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -101,7 +101,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_PAMTRE_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 249 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -112,7 +112,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_WATMEL_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 250 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -123,7 +123,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_DURIN_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 251 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -134,7 +134,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_BELUE_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 252 goto Route123_BerryMastersHouse_EventScript_163C1D diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index a60b29b99..ef9f0ebed 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -24,7 +24,7 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 end @@ -47,7 +47,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 end @@ -60,7 +60,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index b3e91e43c..1deeb9e34 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,7 +23,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end @@ -31,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar 0x4001, 0 checkitem ITEM_RED_SHARD, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C return @@ -247,13 +247,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitem 0, 0x8008 bufferitem 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F checkitemspace 0x8009, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 checkitem 0x8008, 2 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end @@ -263,10 +263,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 giveitem 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 045a55a11..7d5fc0376 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -30,7 +30,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 7db99f7b3..10bb0a1cc 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -183,7 +183,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 end @@ -196,7 +196,7 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 2c93c1bd6..83b972dbf 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81523C2 Route130_MapScript1_1523C8:: @ 81523C8 specialval RESULT, IsMirageIslandPresent - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route130_EventScript_15240C setflag 17 setflag 18 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 13a4ce265..1a2afe16d 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -363,13 +363,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 end RustboroCity_EventScript_14C650:: @ 814C650 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 call_if 1, RustboroCity_EventScript_14C691 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 @@ -457,19 +457,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 end RustboroCity_EventScript_14C77D:: @ 814C77D - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RustboroCity_EventScript_14C82A - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RustboroCity_EventScript_14C856 - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RustboroCity_EventScript_14C882 - compare 0x4001, 4 + compare_var_to_imm 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem ITEM_GREAT_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closebutton @@ -552,9 +552,9 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA checkflag 288 goto_if_eq RustboroCity_EventScript_14C917 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_EventScript_14C90A end @@ -572,9 +572,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_EventScript_14C939 end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 0c604c513..352850d9e 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA .byte 0 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC end @@ -14,7 +14,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 287 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 188 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release @@ -64,16 +64,16 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 lock faceplayer - compare 0x40c4, 2 + compare_var_to_imm 0x40c4, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 checkitem ITEM_CLAW_FOSSIL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE release end @@ -86,7 +86,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmove 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -104,7 +104,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmove 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -125,9 +125,9 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 end RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A - compare 0x40c5, 1 + compare_var_to_imm 0x40c5, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 - compare 0x40c5, 2 + compare_var_to_imm 0x40c5, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 end @@ -135,7 +135,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 bufferpoke 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 @@ -146,7 +146,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 waittext givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -155,7 +155,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 bufferpoke 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 @@ -166,7 +166,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 waittext givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index fe39af9c4..78feb0ce5 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 - compare 0x408f, 0 + compare_var_to_imm 0x408f, 0 call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D end @@ -160,7 +160,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 giveitem ITEM_EXP_SHARE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 0dfec5cfa..fefc67d0f 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem ITEM_PREMIER_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag 213 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 6bb33b4dc..353ac8fe3 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -20,14 +20,14 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE addvar 0x4085, 1 setvar 0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag 165 msgbox RustboroCity_Gym_Text_184170, 4 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index e45bf2080..0dd47d2d3 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -11,17 +11,17 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT - comparevars RESULT, 0x8009 + compare_var_to_var RESULT, 0x8009 goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index e5a9622fb..5f4de010e 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -79,13 +79,13 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE faceplayer checkflag 275 goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem ITEM_QUICK_CLAW - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closebutton move LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index bcc612511..b4546e27a 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -10,7 +10,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 - compare 0x409a, 2 + compare_var_to_imm 0x409a, 2 call_if 1, RusturfTunnel_EventScript_15C773 end @@ -52,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8CA - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C8DF - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C8EB - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem ITEM_HM04 setflag 106 msgbox RusturfTunnel_Text_194693, 4 closebutton - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C880 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C892 - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closebutton - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C909 - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index d076510dc..da9d31cca 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -41,9 +41,9 @@ SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 return gUnknown_0815FD0D:: @ 815FD0D - compare 0x40B4, 2 + compare_var_to_imm 0x40B4, 2 goto_if_eq SSTidalCorridor_EventScript_15FD24 - compare 0x40B4, 7 + compare_var_to_imm 0x40B4, 7 goto_if_eq SSTidalCorridor_EventScript_15FD3A end @@ -113,9 +113,9 @@ SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 lock faceplayer - compare 0x40b4, 4 + compare_var_to_imm 0x40b4, 4 goto_if_eq SSTidalCorridor_EventScript_15FDF8 - compare 0x40b4, 8 + compare_var_to_imm 0x40b4, 8 goto_if_eq SSTidalCorridor_EventScript_15FE17 msgbox SSTidalCorridor_Text_19913B, 4 release @@ -147,9 +147,9 @@ SSTidalCorridor_EventScript_15FE36:: @ 815FE36 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A lockall - compare 0x40b4, 2 + compare_var_to_imm 0x40b4, 2 goto_if_eq SSTidalCorridor_EventScript_15FE5B - compare 0x40b4, 7 + compare_var_to_imm 0x40b4, 7 goto_if_eq SSTidalCorridor_EventScript_15FE5B msgbox SSTidalCorridor_Text_199268, 4 releaseall diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index aa84b6b48..f9e815d1f 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem ITEM_TM49 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag 260 msgbox SSTidalRooms_Text_199C1A, 4 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 9005bef3b..8cc342f88 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -20,7 +20,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B end SafariZone_Southeast_MapScript1_160073:: @ 8160073 - compare 0x40a4, 2 + compare_var_to_imm 0x40a4, 2 call_if 1, SafariZone_Southeast_EventScript_16007F end @@ -52,10 +52,10 @@ SafariZone_Southeast_EventScript_16009E:: @ 816009E SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 091db022c..2650f4ab5 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -9,7 +9,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 checkflag 228 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialval RESULT, CheckRelicanthWailord - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeout 0 playsfx 49 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index dc2b107e3..bad7397c0 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -23,24 +23,24 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 checkflag 2143 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 checkitem ITEM_SHOAL_SHELL, 4 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 removeitem ITEM_SHOAL_SALT, 4 removeitem ITEM_SHOAL_SHELL, 4 giveitem ITEM_SHELL_BELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 setflag 2 @@ -49,13 +49,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 ShoalCave_LowTideEntranceRoom_EventScript_15E106:: @ 815E106 checkitem ITEM_SHOAL_SALT, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E117 return ShoalCave_LowTideEntranceRoom_EventScript_15E117:: @ 815E117 checkitem ITEM_SHOAL_SHELL, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E128 return @@ -70,10 +70,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138 checkitem ITEM_SHOAL_SALT, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 checkitem ITEM_SHOAL_SHELL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4 release diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 05fc6a315..8dec3b212 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -73,7 +73,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 checkflag 956 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 20, 859, 0 special DrawWholeMapView @@ -91,7 +91,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 checkflag 957 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 10, 859, 0 special DrawWholeMapView @@ -104,7 +104,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 checkflag 958 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 6, 9, 859, 0 special DrawWholeMapView @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 checkflag 959 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 16, 13, 859, 0 special DrawWholeMapView @@ -130,7 +130,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 checkflag 952 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 31, 8, 858, 0 special DrawWholeMapView @@ -148,7 +148,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 checkflag 953 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 14, 26, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index db5779efe..01719a9cf 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 checkflag 955 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem ITEM_SHOAL_SALT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmaptile 18, 2, 858, 0 special DrawWholeMapView @@ -40,7 +40,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem ITEM_FOCUS_BAND - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag 283 release diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index bffb7bd49..1c5cde842 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 checkflag 954 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem ITEM_SHOAL_SALT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmaptile 11, 11, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 4b11b2f8d..c43ddfaee 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -12,7 +12,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C .endif setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BA68 end @@ -67,10 +67,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 bufferfirstpoke 0 msgbox SlateportCity_Text_164682, 4 specialval RESULT, LeadMonHasEffortRibbon - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_EventScript_14BB35 specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 fanfare 370 @@ -95,7 +95,7 @@ SlateportCity_EventScript_14BB35:: @ 814BB35 SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release @@ -109,7 +109,7 @@ SlateportCity_EventScript_14BB56:: @ 814BB56 SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release @@ -123,7 +123,7 @@ SlateportCity_EventScript_14BB77:: @ 814BB77 SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBA1 checkflag 96 goto_if_eq SlateportCity_EventScript_14BBAB @@ -144,7 +144,7 @@ SlateportCity_EventScript_14BBAB:: @ 814BBAB SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release @@ -156,7 +156,7 @@ SlateportCity_EventScript_14BBCC:: @ 814BBCC end SlateportCity_EventScript_14BBD6:: @ 814BBD6 - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 goto_if_eq SlateportCity_EventScript_14BBEA msgbox SlateportCity_Text_164AA9, 2 end @@ -168,7 +168,7 @@ SlateportCity_EventScript_14BBEA:: @ 814BBEA SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release @@ -253,7 +253,7 @@ SlateportCity_EventScript_14BCAF:: @ 814BCAF SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release @@ -288,9 +288,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 lock faceplayer msgbox SlateportCity_Text_1650F1, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_EventScript_14BD28 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, SlateportCity_EventScript_14BD31 release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index b2963098c..d30089fbb 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -16,7 +16,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem ITEM_TM41 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag 265 msgbox SlateportCity_ContestHall_Text_17CE28, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 33a99b2a4..be1504415 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 warp6 SlateportCity, 255, 28, 13 setvar 0x4001, 0 - compare 0x40a0, 1 + compare_var_to_imm 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag 2052 call_if 1, SlateportCity_Harbor_EventScript_155F85 @@ -63,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 disappear 7 disappear 8 setvar 0x40a0, 2 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closebutton @@ -168,7 +168,7 @@ SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 msgbox SlateportCity_Harbor_Text_17FA73, 4 checkitem ITEM_SS_TICKET, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A waittext @@ -191,7 +191,7 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 @@ -202,7 +202,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F SlateportCity_Harbor_EventScript_156167:: @ 8156167 msgbox SlateportCity_Harbor_Text_17FB9C, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp BattleTower_Outside, 255, 19, 23 @@ -223,9 +223,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 waitmove 0 pause 30 spriteinvisible LAST_TALKED, 9, 8 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 pause 30 spriteinvisible 255, 0, 0 @@ -274,7 +274,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag 112 goto_if_eq SlateportCity_Harbor_EventScript_156258 - compare 0x40a0, 2 + compare_var_to_imm 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closebutton @@ -300,10 +300,10 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 end SlateportCity_Harbor_EventScript_15626F:: @ 815626F - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 checkflag 2052 goto_if_eq SlateportCity_Harbor_EventScript_15629D @@ -333,10 +333,10 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_TOOTH - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 @@ -346,10 +346,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_SCALE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index f9ffba65f..731b3385b 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -5,9 +5,9 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B lock faceplayer msgbox SlateportCity_House1_Text_17D46A, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15569C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special sub_80F9A0C waitstate - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -28,20 +28,20 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialval RESULT, ScriptGetPartyMonSpecies - compare RESULT, SPECIES_EGG + compare_var_to_imm RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C special sub_80BFAE0 special sub_80BFB10 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 specialval RESULT, sub_810F96C special sub_80BFAE0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155730 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -60,7 +60,7 @@ SlateportCity_House1_EventScript_155730:: @ 8155730 call SlateportCity_House1_EventScript_1A0678 specialval RESULT, sub_80BF9B4 special sub_80BFAE0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 release diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/scripts/maps/SlateportCity_House2.inc index 934fae153..6f267d31f 100644 --- a/data/scripts/maps/SlateportCity_House2.inc +++ b/data/scripts/maps/SlateportCity_House2.inc @@ -9,7 +9,7 @@ SlateportCity_House2_EventScript_156399:: @ 8156399 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House2_EventScript_1563B5 msgbox SlateportCity_House2_Text_180567, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 45b69dff2..e8f6d45ac 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -34,7 +34,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoney 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closebutton hidemoney 0, 0 @@ -45,7 +45,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D checkmoney 0x32, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A paymoney 0x32, 0 updatemoney 0, 0 @@ -165,14 +165,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A waitmove 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 giveitem ITEM_TM46 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag 269 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 - compare FACING, 2 + compare_var_to_imm FACING, 2 goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 136054947..3a08fcc2a 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -21,21 +21,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 move 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmove 0 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closebutton move 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmove 0 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 6656e58a4..4a7fc8474 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -33,9 +33,9 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 200 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - compare 0x4002, 5 + compare_var_to_imm 0x4002, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D - compare 0x40b7, 2 + compare_var_to_imm 0x40b7, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 @@ -85,7 +85,7 @@ SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 checkitemspace ITEM_RED_SCARF, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 200 @@ -96,7 +96,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 checkitemspace ITEM_BLUE_SCARF, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 201 @@ -107,7 +107,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 checkitemspace ITEM_PINK_SCARF, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 202 @@ -118,7 +118,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 checkitemspace ITEM_GREEN_SCARF, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 203 @@ -129,7 +129,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 checkitemspace ITEM_YELLOW_SCARF, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 204 @@ -145,7 +145,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 specialval RESULT, CheckLeadMonCool - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 return @@ -155,7 +155,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 specialval RESULT, CheckLeadMonBeauty - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA return @@ -165,7 +165,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 specialval RESULT, CheckLeadMonCute - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 return @@ -175,7 +175,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 specialval RESULT, CheckLeadMonSmart - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 return @@ -185,7 +185,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE specialval RESULT, CheckLeadMonTough - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F return @@ -200,7 +200,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialval RESULT, GetLeadMonFriendshipScore - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A release end @@ -213,7 +213,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A waitmove 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 giveitem ITEM_SOOTHE_BELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag 278 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index d718fed6e..44ee245fd 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -45,7 +45,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 call SootopolisCity_EventScript_1A02C1 movespriteperm 1, 29, 19 movespriteperm 2, 33, 19 - compare 0x405e, 1 + compare_var_to_imm 0x405e, 1 call_if 1, SootopolisCity_EventScript_14D142 return @@ -99,20 +99,20 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B setflag 2258 msgbox SootopolisCity_Text_1C64D0, 4 random 2 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_EventScript_14D1FF - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D220 end SootopolisCity_EventScript_14D1FF:: @ 814D1FF giveitem ITEM_FIGY_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -120,7 +120,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF SootopolisCity_EventScript_14D220:: @ 814D220 giveitem ITEM_IAPAPA_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -128,7 +128,7 @@ SootopolisCity_EventScript_14D220:: @ 814D220 SootopolisCity_EventScript_14D241:: @ 814D241 msgbox SootopolisCity_Text_1C6540, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index d776e8ecf..39bc2d4db 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -19,11 +19,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E - compare 0x4022, 8 + compare_var_to_imm 0x4022, 8 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 - compare 0x4022, 28 + compare_var_to_imm 0x4022, 28 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 - compare 0x4022, 69 + compare_var_to_imm 0x4022, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 setmaptile 8, 4, 519, 0 setmaptile 8, 5, 519, 0 @@ -109,7 +109,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 giveitem ITEM_TM03 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 setflag 172 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 011806291..6315cee85 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -5,9 +5,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 lock faceplayer msgbox SootopolisCity_House2_Text_18FA66, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SootopolisCity_House2_EventScript_15B307 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index f1bf0bf19..156ee232d 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -5,7 +5,7 @@ SootopolisCity_House3_EventScript_15B31A:: @ 815B31A lock faceplayer msgbox SootopolisCity_House3_Text_18FB36, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 1e1b53956..2d6add92d 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -7,11 +7,11 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 checkflag 245 goto_if_eq SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration 117 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag 245 release diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index 662117741..e7ddaa39d 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -9,14 +9,14 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 special sub_80F9A0C waitstate copyvar RESULT, 0x8004 - compare RESULT, 255 + compare_var_to_imm RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B452 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B45C - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B466 release end @@ -39,7 +39,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 giveitem ITEM_ELIXIR - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closebutton release @@ -58,14 +58,14 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 special sub_80F9A0C waitstate copyvar RESULT, 0x8004 - compare RESULT, 255 + compare_var_to_imm RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B4E3 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B4ED - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B4F7 release end @@ -88,7 +88,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 giveitem ITEM_ELIXIR - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closebutton release diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index fc7d811c4..72a11a88b 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -10,7 +10,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 lock faceplayer msgbox SouthernIsland_Exterior_Text_1C5215, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closebutton diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 84e6b93c5..368e26794 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -23,9 +23,9 @@ SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SouthernIsland_Interior_EventScript_160B8F - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SouthernIsland_Interior_EventScript_160B95 end diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 4e2895166..cbb45993a 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -4,9 +4,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 getplayerxy 0x8004, 0x8005 - compare 0x8004, 12 + compare_var_to_imm 0x8004, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare 0x8005, 44 + compare_var_to_imm 0x8005, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 52aca6d12..fee3b1498 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -13,15 +13,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LinkContestRoom1_EventScript_15F5E0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LinkContestRoom1_EventScript_15F5E4 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 call_if 1, LinkContestRoom1_EventScript_15F5E8 - compare RESULT, 3 + compare_var_to_imm RESULT, 3 call_if 1, LinkContestRoom1_EventScript_15F5EC - compare RESULT, 4 + compare_var_to_imm RESULT, 4 call_if 1, LinkContestRoom1_EventScript_15F5F0 return @@ -46,7 +46,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, LinkContestRoom1_EventScript_15F600 end @@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_15F625:: @ 815F625 LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 - compare 0x4000, 8 + compare_var_to_imm 0x4000, 8 goto_if 0, LinkContestRoom1_EventScript_15F630 return @@ -414,9 +414,9 @@ LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9 return diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 00454133d..2443b01b0 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -105,7 +105,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem ITEM_TM45 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag 235 release diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 7ea560d0d..95b82f46a 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -94,7 +94,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, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 6202a8acf..0a74b3c9a 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -26,9 +26,9 @@ SpeakToBard: lock faceplayer msgbox gTextBard_HiImTheBard, MSGBOX_YESNO - compare RESULT, YES + compare_var_to_imm RESULT, YES goto_if_eq yes_hear_song - compare RESULT, NO + compare_var_to_imm RESULT, NO goto_if_eq dont_hear_song end @@ -38,7 +38,7 @@ yes_hear_song: special ScrSpecial_PlayBardSong pause 60 special ScrSpecial_HasBardSongBeenChanged - compare RESULT, FALSE + compare_var_to_imm RESULT, FALSE @ Prompt new lyrics only if song hasn't been changed goto_if_eq prompt_write_lyrics msgbox gTextBard_OhWhatAMovingSong, 4 @@ -52,9 +52,9 @@ dont_hear_song: prompt_write_lyrics: msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO - compare RESULT, YES + compare_var_to_imm RESULT, YES goto_if_eq write_lyrics - compare RESULT, NO + compare_var_to_imm RESULT, NO goto_if_eq dont_write_lyrics end @@ -63,7 +63,7 @@ write_lyrics: call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare RESULT, NO + compare_var_to_imm RESULT, NO goto_if_eq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 setvar 0x8004, 1 @@ -71,7 +71,7 @@ write_lyrics: special ScrSpecial_PlayBardSong pause 60 msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO - compare RESULT, NO + compare_var_to_imm RESULT, NO goto_if_eq write_lyrics @ Keep looping until player responds YES special ScrSpecial_SaveBardSongLyrics msgbox gTextBard_OkayThatsIt, 4 @@ -94,7 +94,7 @@ SpeakToHipster: setflag 2054 msgbox gTextHipster_TheyCallMeTheHipster, 4 special ScrSpecial_GetHipsterSpokenFlag - compare RESULT, FALSE + compare_var_to_imm RESULT, FALSE goto_if_eq hipster_first_time msgbox gTextHipster_TaughtYouAlready, 4 release @@ -102,7 +102,7 @@ SpeakToHipster: hipster_first_time: special ScrSpecial_HipsterTeachWord - compare RESULT, TRUE @ TRUE if player learned a new word + compare_var_to_imm RESULT, TRUE @ TRUE if player learned a new word goto_if_eq teach_new_word msgbox gTextHipster_YouAlreadyKnowALot, 4 release @@ -125,10 +125,10 @@ SpeakToTrader: lock faceplayer msgbox gTextTrader_Introduction, MSGBOX_YESNO - compare RESULT, NO + compare_var_to_imm RESULT, NO goto_if_eq dont_want_to_trade special ScrSpecial_GetTraderTradedFlag - compare RESULT, TRUE + compare_var_to_imm RESULT, TRUE goto_if_eq already_traded message gTextTrader_MenuPrompt waittext @@ -146,15 +146,15 @@ already_traded: do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq cancelled_get_menu - compare 0x8004, 65535 + compare_var_to_imm 0x8004, 65535 goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO - compare RESULT, NO + compare_var_to_imm RESULT, NO goto_if_eq dont_want_item special ScrSpecial_DoesPlayerHaveNoDecorations - compare RESULT, TRUE + compare_var_to_imm RESULT, TRUE goto_if_eq player_has_no_decorations goto do_trader_menu_give end @@ -183,15 +183,15 @@ do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration waitstate - compare 0x8006, 0 + compare_var_to_imm 0x8006, 0 goto_if_eq cancelled_give_menu - compare 0x8006, 65535 + compare_var_to_imm 0x8006, 65535 goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq decorations_full msgbox gTextTrader_SoWellTrade, MSGBOX_YESNO - compare RESULT, NO + compare_var_to_imm RESULT, NO goto_if_eq do_trader_menu_give special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 @@ -225,51 +225,51 @@ SpeakToStoryteller: lock faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO - compare RESULT, NO + compare_var_to_imm RESULT, NO goto_if_eq dont_hear_story specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot - compare RESULT, 0 @ If slot is 0, then the list is empty + compare_var_to_imm RESULT, 0 @ If slot is 0, then the list is empty goto_if_eq no_stories_recorded choose_story: message gTextStoryteller_WhichTale waittext special ScrSpecial_StorytellerStoryListMenu waitstate - compare RESULT, FALSE + compare_var_to_imm RESULT, FALSE goto_if_eq cancel_story_menu setvar 0x8008, 1 special ScrSpecial_StorytellerDisplayStory waittext waitbutton specialval RESULT, ScrSpecial_StorytellerUpdateStat - compare RESULT, FALSE + compare_var_to_imm RESULT, FALSE goto_if_eq no_stat_update goto stat_update cancel_story_menu: - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 goto_if_eq dont_hear_story goto yes_hear_story no_stat_update: msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO - compare RESULT, YES + compare_var_to_imm RESULT, YES goto_if_eq choose_story yes_hear_story: specialval RESULT, ScrSpecial_HasStorytellerAlreadyRecorded - compare RESULT, TRUE + compare_var_to_imm RESULT, TRUE goto_if_eq cant_record_story @ already recorded story specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if_eq cant_record_story @ story list is full goto prompt_record_story no_stories_recorded: msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 prompt_record_story: msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO - compare RESULT, NO + compare_var_to_imm RESULT, NO goto_if_eq dont_hear_story specialval RESULT, ScrSpecial_StorytellerInitializeRandomStat - compare RESULT, TRUE + compare_var_to_imm RESULT, TRUE goto_if_eq stat_update msgbox gTextStoryteller_ImNotSatisfied, 4 closebutton @@ -305,25 +305,25 @@ SpeakToGiddy: lock faceplayer msgbox gTextGiddy_Introduction, MSGBOX_YESNO - compare RESULT, YES + compare_var_to_imm RESULT, YES goto_if_eq yes_hear_giddy - compare RESULT, NO + compare_var_to_imm RESULT, NO goto_if_eq dont_hear_giddy end yes_hear_giddy: special ScrSpecial_GiddyShouldTellAnotherTale - compare RESULT, TRUE + compare_var_to_imm RESULT, TRUE goto_if_eq tell_giddy_tale - compare RESULT, FALSE + compare_var_to_imm RESULT, FALSE goto_if_eq bye_bye end tell_another_giddy_tale: special ScrSpecial_GiddyShouldTellAnotherTale - compare RESULT, TRUE + compare_var_to_imm RESULT, TRUE goto_if_eq also_i_was_thinking - compare RESULT, FALSE + compare_var_to_imm RESULT, FALSE goto_if_eq bye_bye end @@ -337,9 +337,9 @@ tell_giddy_tale: special ShowFieldMessageStringVar4 waittext yesnobox 20, 8 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq tell_another_giddy_tale - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq tell_another_giddy_tale end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 97adca508..4ed0cef11 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -29,11 +29,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB end @@ -83,11 +83,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index bbbc0952d..868873eec 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -8,9 +8,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 move 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmove 0 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closebutton @@ -69,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB setflag 754 setflag 755 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playsfx 9 disappear 0x8008 @@ -252,17 +252,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 lock faceplayer - compare 0x4082, 4 + compare_var_to_imm 0x4082, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - compare 0x408c, 4 + compare_var_to_imm 0x408c, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 checkflag 2059 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D checkflag 82 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 - compare 0x4092, 7 + compare_var_to_imm 0x4092, 7 goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 release @@ -278,7 +278,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 giveitem ITEM_AMULET_COIN - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 setflag 133 @@ -362,13 +362,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmove 0 @@ -378,23 +378,23 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmove 0 pause 20 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 giveitem ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closebutton - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closebutton - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playsfx 8 disappear 0x8009 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 0cf3163fd..8badf3aab 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -39,24 +39,24 @@ SlateportCity_ContestLobby_EventScript_1B7681:: @ 81B7681 VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall msgbox FallarborTown_ContestLobby_Text_1B6E63, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 checkitem ITEM_POKEBLOCK_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780 specialval RESULT, PlayerHasBerries - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialval RESULT, sub_810CA00 - compare RESULT, 65535 + compare_var_to_imm RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF - compare RESULT, 65535 + compare_var_to_imm RESULT, 65535 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -67,9 +67,9 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end @@ -149,9 +149,9 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, 4 specialval RESULT, PlayerHasBerries - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77E6 end @@ -209,23 +209,23 @@ SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall specialval RESULT, PlayerHasBerries - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialval RESULT, sub_810CA00 - compare RESULT, 65535 + compare_var_to_imm RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 - compare RESULT, 65535 + compare_var_to_imm RESULT, 65535 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 msgbox FallarborTown_ContestLobby_Text_1B727C, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end @@ -236,21 +236,21 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 waittext special sub_8083614 waitstate - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7980 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq FallarborTown_ContestLobby_EventScript_1B794C - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7959 - compare RESULT, 5 + compare_var_to_imm RESULT, 5 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7966 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7973 end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 6098c7dce..97572220d 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -14,7 +14,7 @@ EventScript_1C341B: @ 81C341B gUnknown_081C342D:: @ 81C342D lockall msgbox UnknownString_81C34B2, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EventScript_1C3443 releaseall end @@ -43,10 +43,10 @@ gUnknown_081C3459:: @ 81C3459 gUnknown_081C346A:: @ 81C346A lockall special SafariZoneGetPokeblockNameInFeeder - compare RESULT, -1 + compare_var_to_imm RESULT, -1 goto_if 5, EventScript_1C34A9 msgbox UnknownString_81C354E, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EventScript_1C348E releaseall end @@ -55,7 +55,7 @@ EventScript_1C348E: fadescreen 1 special sub_810BAF4 waitstate - compare RESULT, -1 + compare_var_to_imm RESULT, -1 goto_if 5, EventScript_1C34A0 end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index eae7db0c0..80c51484a 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -2,7 +2,7 @@ Route111_EventScript_1A3858:: @ 81A3858 lock faceplayer msgbox Route111_Text_1A3520, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_1A3877 msgbox Route111_Text_1A37B5, 4 release @@ -10,17 +10,17 @@ Route111_EventScript_1A3858:: @ 81A3858 Route111_EventScript_1A3877:: @ 81A3877 giveitem ITEM_TM43 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 closebutton setflag 96 clearflag 948 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, Route111_EventScript_1A38C3 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, Route111_EventScript_1A38C3 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route111_EventScript_1A38CE disappear LAST_TALKED release diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 66a923c5e..9b8dafa9b 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -3,30 +3,30 @@ Event_TV:: @ 81A6E72 inccounter GAME_STAT_WATCHED_TV special sub_80C2014 specialval RESULT, CheckForBigMovieOrEmergencyNewsOnTV - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq EventScript_1A6F01 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EventScript_1A6F0B checkflag 2098 goto_if 0, EventScript_1A6EF1 checkflag 2097 goto_if_eq EventScript_1A6EF1 specialval RESULT, IsTVShowInSearchOfTrainersAiring - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F50 end EventScript_1A6EBB: specialval 0x8004, special_0x44 - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq EventScript_1A6F3F specialval RESULT, special_0x4a - compare RESULT, 255 + compare_var_to_imm RESULT, 255 goto_if_eq EventScript_1A6F3F copyvar 0x8004, RESULT specialval RESULT, sub_80BDA0C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if 5, EventScript_1A6F21 end @@ -59,7 +59,7 @@ EventScript_1A6F21: special DoTVShow waittext waitbutton - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if 5, EventScript_1A6F21 goto EventScript_1A6F37 end @@ -78,7 +78,7 @@ EventScript_1A6F3F: EventScript_1A6F50: special sub_80BECE8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_1A6EBB waittext waitbutton @@ -89,7 +89,7 @@ EventScript_1A6F66: special DoTVShowInSearchOfTrainers waittext waitbutton - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F37 end -- cgit v1.2.3 From 207f8e6a76f6b13855780bb2608be9d8c1f14b15 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:36:39 -0500 Subject: more script command renaming --- data/event_scripts.s | 104 ++++++++++----------- data/field_move_scripts.inc | 2 +- data/scripts/berry_tree.inc | 4 +- data/scripts/cable_club.inc | 12 +-- data/scripts/contest_hall.inc | 80 ++++++++-------- data/scripts/day_care.inc | 38 ++++---- data/scripts/gabby_and_ty.inc | 6 +- data/scripts/magma_chimney.inc | 4 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 4 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 10 +- .../maps/AbandonedShip_HiddenFloorRooms.inc | 24 ++--- data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 4 +- data/scripts/maps/AbandonedShip_Rooms_B1F.inc | 2 +- data/scripts/maps/AbandonedShip_Underwater1.inc | 2 +- data/scripts/maps/AbandonedShip_Underwater2.inc | 2 +- data/scripts/maps/AncientTomb.inc | 4 +- data/scripts/maps/AquaHideout_B2F.inc | 6 +- data/scripts/maps/BattleTower_BattleRoom.inc | 8 +- data/scripts/maps/BattleTower_Elevator.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 24 ++--- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 12 +-- data/scripts/maps/DesertRuins.inc | 4 +- data/scripts/maps/DewfordTown_Gym.inc | 8 +- data/scripts/maps/DewfordTown_House1.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 26 +++--- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 6 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 8 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 6 +- data/scripts/maps/FallarborTown_Mart.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/FortreeCity.inc | 4 +- data/scripts/maps/FortreeCity_House1.inc | 6 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/FortreeCity_House5.inc | 2 +- data/scripts/maps/GraniteCave_B1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 4 +- data/scripts/maps/IslandCave.inc | 6 +- data/scripts/maps/JaggedPass.inc | 4 +- data/scripts/maps/LavaridgeTown.inc | 14 +-- data/scripts/maps/LavaridgeTown_House.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 24 ++--- data/scripts/maps/LilycoveCity_ContestHall.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 42 ++++----- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 2 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 4 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 10 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 6 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 10 +- data/scripts/maps/LilycoveCity_Harbor.inc | 14 +-- data/scripts/maps/LilycoveCity_House1.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 2 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 64 ++++++------- data/scripts/maps/LittlerootTown.inc | 14 +-- .../maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 4 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 14 +-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/scripts/maps/MauvilleCity.inc | 6 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 46 ++++----- data/scripts/maps/MauvilleCity_Gym.inc | 4 +- data/scripts/maps/MauvilleCity_House2.inc | 2 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 4 +- data/scripts/maps/MeteorFalls_1F_2R.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 6 +- data/scripts/maps/MtChimney.inc | 2 +- data/scripts/maps/MtPyre_2F.inc | 2 +- data/scripts/maps/MtPyre_6F.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 10 +- data/scripts/maps/NewMauville_Entrance.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 16 ++-- data/scripts/maps/OldaleTown.inc | 6 +- data/scripts/maps/PacifidlogTown_House2.inc | 14 +-- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- data/scripts/maps/PacifidlogTown_House5.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 10 +- data/scripts/maps/PetalburgCity_Gym.inc | 16 ++-- .../maps/PetalburgCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 6 +- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route102.inc | 2 +- data/scripts/maps/Route103.inc | 18 ++-- data/scripts/maps/Route104.inc | 6 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 2 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 2 +- data/scripts/maps/Route104_Prototype.inc | 4 +- data/scripts/maps/Route106.inc | 2 +- data/scripts/maps/Route107.inc | 2 +- data/scripts/maps/Route109.inc | 6 +- data/scripts/maps/Route110.inc | 30 +++--- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 2 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 14 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 34 +++---- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 8 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 18 ++-- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 20 ++-- data/scripts/maps/Route111.inc | 16 ++-- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route113.inc | 4 +- data/scripts/maps/Route113_GlassWorkshop.inc | 4 +- data/scripts/maps/Route114.inc | 8 +- data/scripts/maps/Route115.inc | 6 +- data/scripts/maps/Route116.inc | 10 +- data/scripts/maps/Route117.inc | 12 +-- data/scripts/maps/Route118.inc | 8 +- data/scripts/maps/Route119.inc | 20 ++-- data/scripts/maps/Route119_House.inc | 2 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/Route120.inc | 18 ++-- data/scripts/maps/Route121.inc | 4 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 4 +- data/scripts/maps/Route123.inc | 4 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 4 +- data/scripts/maps/Route124.inc | 6 +- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route128.inc | 14 +-- data/scripts/maps/Route130.inc | 2 +- data/scripts/maps/Route134.inc | 2 +- data/scripts/maps/RustboroCity.inc | 22 ++--- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 8 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 8 +- data/scripts/maps/RustboroCity_Flat2_1F.inc | 2 +- data/scripts/maps/RustboroCity_House1.inc | 4 +- data/scripts/maps/RustboroCity_House3.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 10 +- data/scripts/maps/SSTidalCorridor.inc | 16 ++-- data/scripts/maps/SafariZone_Southeast.inc | 2 +- data/scripts/maps/SeafloorCavern_Entrance.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 22 ++--- data/scripts/maps/SealedChamber_InnerRoom.inc | 22 ++--- data/scripts/maps/SealedChamber_OuterRoom.inc | 2 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 2 +- data/scripts/maps/SkyPillar_2F.inc | 2 +- data/scripts/maps/SkyPillar_4F.inc | 2 +- data/scripts/maps/SkyPillar_Top.inc | 4 +- data/scripts/maps/SlateportCity.inc | 14 +-- data/scripts/maps/SlateportCity_ContestLobby.inc | 6 +- data/scripts/maps/SlateportCity_Harbor.inc | 6 +- data/scripts/maps/SlateportCity_House1.inc | 6 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 8 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 20 ++-- data/scripts/maps/SootopolisCity.inc | 18 ++-- data/scripts/maps/SootopolisCity_Gym_1F.inc | 18 ++-- data/scripts/maps/SootopolisCity_House1.inc | 2 +- data/scripts/maps/SootopolisCity_House4.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 10 +- data/scripts/maps/Underwater_Route134.inc | 2 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/Underwater_SootopolisCity.inc | 2 +- data/scripts/maps/UnknownMap_25_34.inc | 10 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 6 +- .../maps/VerdanturfTown_FriendshipRatersHouse.inc | 4 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- data/scripts/mauville_man.inc | 14 +-- data/scripts/mystery_event_club.inc | 2 +- data/scripts/players_house.inc | 24 ++--- data/scripts/pokeblocks.inc | 16 ++-- data/scripts/safari_zone.inc | 6 +- data/scripts/tv.inc | 10 +- 177 files changed, 786 insertions(+), 786 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index dae57cfd6..bd14ae5d3 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -386,13 +386,13 @@ gStdScripts_End:: gUnknown_0815F36C:: @ 815F36C lockall - playsfx 2 + playse 2 message UnknownString_81A3A72 doanimation 61 waitstate waittext waitbutton - playsfx 5 + playse 5 goto EventScript_15F384 end @@ -448,12 +448,12 @@ EventScript_15F436: gUnknown_0815F43A:: @ 815F43A lockall message UnknownString_81A3A72 - playsfx 2 + playse 2 doanimation 61 waitstate waittext waitbutton - playsfx 5 + playse 5 goto EventScript_15F452 end @@ -935,7 +935,7 @@ gUnknown_0819F818:: @ 819F818 faceplayer move LAST_TALKED, Movement_19F8F0 waitmove 0 - specialval RESULT, ScrSpecial_HasTrainerBeenFought + specialvar RESULT, ScrSpecial_HasTrainerBeenFought compare_var_to_imm RESULT, 0 goto_if 5, EventScript_19F83F special PlayTrainerEncounterMusic @@ -949,7 +949,7 @@ gUnknown_0819F840:: @ 819F840 lock faceplayer call EventScript_19F8E5 - specialval RESULT, ScrSpecial_HasTrainerBeenFought + specialvar RESULT, ScrSpecial_HasTrainerBeenFought compare_var_to_imm RESULT, 0 goto_if 5, EventScript_19F877 special CheckForAlivePartyMons @@ -978,7 +978,7 @@ gUnknown_0819F878:: @ 819F878 gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 - specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag + specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare_var_to_imm RESULT, 0 goto_if_eq EventScript_19F8AD special PlayTrainerEncounterMusic @@ -995,7 +995,7 @@ EventScript_19F8AD: endtrainerbattle gUnknown_0819F8AE:: @ 819F8AE - specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag + specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare_var_to_imm RESULT, 0 goto_if_eq EventScript_19F8DD special CheckForAlivePartyMons @@ -1035,7 +1035,7 @@ EventScript_19F8F2: waittext waitbutton reptrainerbattle - specialval RESULT, ScrSpecial_GetTrainerBattleMode + specialvar RESULT, ScrSpecial_GetTrainerBattleMode compare_var_to_imm RESULT, 0 goto_if_eq EventScript_19F934 compare_var_to_imm RESULT, 2 @@ -1470,7 +1470,7 @@ dont_heal_party:: @ 819FDC7 return OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE - specialval RESULT, IsPokerusInParty + specialvar RESULT, IsPokerusInParty compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDEA compare_var_to_imm RESULT, 0 @@ -1556,11 +1556,11 @@ Std_ObtainItem_Fail: @ 819FECC return PlayGetItemFanfare: - fanfare 0x172 + playfanfare 0x172 return PlayGetTMHMFanfare: - fanfare 0x174 + playfanfare 0x174 return Std_ObtainDecoration: @ 819FEDA @@ -1578,7 +1578,7 @@ Std_ObtainDecoration_: @ 819FEE8 return Std_ObtainDecoration_Success: @ 819FF03 - fanfare 0x172 + playfanfare 0x172 message Message_ObtainedDecoration waitfanfare waittext @@ -1593,7 +1593,7 @@ Std_ObtainDecoration_Fail: @ 819FF1B Std_FindItem: @ 819FF21 lock faceplayer - checksound + waitse additem 0x8000, 0x8001 copyvar 0x8007, RESULT bufferitem 1, 0x8000 @@ -1622,7 +1622,7 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall - checksound + waitse additem 0x8005, 1 copyvar 0x8007, RESULT bufferitem 0x1, 0x8005 @@ -1675,7 +1675,7 @@ gUnknown_081A0009:: @ 81A0009 lockall setvar 0x8004, 0 special DoPCTurnOnEffect - playsfx 4 + playse 4 msgbox UnknownString_81A09EC, 4 goto EventScript_1A0023 end @@ -1698,7 +1698,7 @@ EventScript_1A0033: end EventScript_1A0070: - playsfx 2 + playse 2 msgbox UnknownString_81A0A54, 4 special PlayerPC waitstate @@ -1706,7 +1706,7 @@ EventScript_1A0070: end EventScript_1A0085: - playsfx 2 + playse 2 checkflag 2123 call_if 0, EventScript_1A00AC checkflag 2123 @@ -1727,7 +1727,7 @@ EventScript_1A00B5: EventScript_1A00BE: setvar 0x8004, 0 - playsfx 3 + playse 3 special DoPCTurnOffEffect releaseall end @@ -1735,7 +1735,7 @@ EventScript_1A00BE: EventScript_1A00CB: checkflag 2052 goto_if 0, EventScript_1A00BE - playsfx 2 + playse 2 special AccessHallOfFamePC waitstate goto EventScript_1A0033 @@ -1797,7 +1797,7 @@ RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 - checkdailyflags + dodailyevents setvar 0x8004, 0 special sub_80FA5BC return @@ -2095,7 +2095,7 @@ MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5 PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5 RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5 SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5 - fanfare 369 + playfanfare 369 waitfanfare return @@ -2104,7 +2104,7 @@ Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA SSTidalRooms_EventScript_1A02CA:: @ 81A02CA fadescreen 1 - fanfare 368 + playfanfare 368 waitfanfare special ScrSpecial_HealPlayerParty fadescreen 0 @@ -2123,14 +2123,14 @@ DewfordTown_EventScript_1A02E7:: @ 81A02E7 Route104_EventScript_1A02E7:: @ 81A02E7 Route109_EventScript_1A02E7:: @ 81A02E7 setflag 0x4001 - playmusic 431, 0 + playbgm 431, 0 return DewfordTown_EventScript_1A02EF:: @ 81A02EF Route104_EventScript_1A02EF:: @ 81A02EF Route109_EventScript_1A02EF:: @ 81A02EF clearflag 0x4001 - fadedefault + fadedefaultbgm return LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4 @@ -2204,7 +2204,7 @@ Route101_EventScript_1A03A5:: @ 81A03A5 EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0 Route101_EventScript_1A03B0:: @ 81A03B0 setvar 0x8004, 0 - specialval RESULT, ScriptGetPokedexInfo + specialvar RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 copyvar 0x800a, RESULT @@ -2215,7 +2215,7 @@ Route101_EventScript_1A03B0:: @ 81A03B0 compare_var_to_imm 0x800a, 0 goto_if_eq Route101_EventScript_1A14DC setvar 0x8004, 1 - specialval RESULT, ScriptGetPokedexInfo + specialvar RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 buffernum 0, 0x8008 @@ -2226,7 +2226,7 @@ Route101_EventScript_1A03B0:: @ 81A03B0 BattleTower_Outside_EventScript_1A040E:: @ 81A040E LilycoveCity_Harbor_EventScript_1A040E:: @ 81A040E SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E - pause 60 + delay 60 move 0x8004, SlateportCity_Harbor_Movement_1A041C waitmove 0 return @@ -2263,14 +2263,14 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 return EventScript_1A0457: @ unreferenced? - pause 30 + delay 30 move 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 waitmove 0 spritevisible 255, 0, 0 - pause 30 + delay 30 move 255, Movement_1A047A waitmove 0 - pause 30 + delay 30 return Movement_1A047A: @@ -2283,14 +2283,14 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C call_if 1, BattleTower_Outside_EventScript_160B2F compare_var_to_imm FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A - pause 30 + delay 30 spriteinvisible 255, 0, 0 call BattleTower_Outside_EventScript_1A040E return CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0 lockall - checksound + waitse pokecry SPECIES_GROUDON_OR_KYOGRE, 2 waitpokecry setvar 0x4005, 1 @@ -2345,9 +2345,9 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD lock faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE - checksound + waitse pokecry SPECIES_ELECTRODE, 2 - pause 40 + delay 40 waitpokecry setflag 977 setflag 2145 @@ -2361,9 +2361,9 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B lock faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE - checksound + waitse pokecry SPECIES_ELECTRODE, 2 - pause 40 + delay 40 waitpokecry setflag 978 setflag 2145 @@ -2444,9 +2444,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3 waitmove 0 move LAST_TALKED, Route119_Movement_1A0662 waitmove 0 - checksound + waitse pokecry SPECIES_KECLEON, 2 - pause 40 + delay 40 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE compare_var_to_imm 0x8004, 1 @@ -2537,7 +2537,7 @@ GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F bufferitem 0, 0x8004 - fanfare 372 + playfanfare 372 message FallarborTown_House1_Text_1A1498 waittext waitfanfare @@ -2550,7 +2550,7 @@ EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 move 255, EverGrandeCity_SidneysRoom_Movement_1A0853 waitmove 0 - playsfx 8 + playse 8 setmaptile 6, 1, 836, 0 setmaptile 6, 2, 837, 0 setmaptile 0, 2, 734, 1 @@ -2572,7 +2572,7 @@ EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 move 255, EverGrandeCity_SidneysRoom_Movement_1A0847 waitmove 0 - playsfx 52 + playse 52 setmaptile 5, 12, 518, 1 setmaptile 6, 12, 518, 1 setmaptile 7, 12, 518, 1 @@ -3711,7 +3711,7 @@ EventScript_1A2DAA: EventScript_1A2DB8: closebutton - playsfx 9 + playse 9 setvar 0x4097, 0 setflag 173 special sub_80BB8CC @@ -3731,7 +3731,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE compare_var_to_imm RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closebutton - playsfx 9 + playse 9 special sub_80BC440 end @@ -3750,7 +3750,7 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 gUnknown_081A2E14:: @ 81A2E14 lockall setvar 0x4097, 1 - playsfx 9 + playse 9 special sub_80BC114 compare_var_to_imm RESULT, 0 goto_if_eq EventScript_1A2E38 @@ -4480,7 +4480,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96 SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer - specialval RESULT, sub_80BF544 + specialvar RESULT, sub_80BF544 compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar 0x8005, 3 @@ -4870,22 +4870,22 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF S_FallDownHole:: @ 81C6BC5 lockall - pause 20 + delay 20 move 255, GraniteCave_B1F_Movement_1C6BF7 waitmove 0 - playsfx 43 - pause 60 + playse 43 + delay 60 warphole UNDEFINED waitstate end gUnknown_081C6BDE:: @ 81C6BDE lockall - pause 20 + delay 20 move 255, GraniteCave_B1F_Movement_1C6BF7 waitmove 0 - playsfx 43 - pause 60 + playse 43 + delay 60 special sp13F_fall_to_last_warp waitstate end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 3716eab3c..ad87919b5 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -87,7 +87,7 @@ DoRockSmashMovement: @ 81B0F0C move LAST_TALKED, RockSmashMovement waitmove 0 disappear LAST_TALKED - specialval RESULT, sub_810F5BC + specialvar RESULT, sub_810F5BC compare_var_to_imm RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 92c5f83b3..573144019 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -21,7 +21,7 @@ Route102_EventScript_1A1533:: @ 81A1533 Route102_EventScript_1A153D:: @ 81A153D lock faceplayer - specialval RESULT, PlayerHasBerries + specialvar RESULT, PlayerHasBerries compare_var_to_imm RESULT, 1 goto_if_eq Route102_EventScript_1A1558 message Route102_Text_1A16B6 @@ -113,7 +113,7 @@ Route102_EventScript_1A161D:: @ 81A161D goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD - fanfare 387 + playfanfare 387 waittext waitfanfare waitbutton diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index a93a5f044..937ede6cf 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -136,7 +136,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 waitmove 0 message OldaleTown_PokemonCenter_2F_Text_1A4E50 waittext - playsfx 21 + playse 21 message OldaleTown_PokemonCenter_2F_Text_1A4E79 waittext move 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 @@ -223,7 +223,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E waittext setmaptile 5, 3, 514, 0 special DrawWholeMapView - pause 60 + delay 60 move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmove 0 closebutton @@ -388,7 +388,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 waittext setmaptile 8, 3, 514, 0 special DrawWholeMapView - pause 60 + delay 60 move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmove 0 closebutton @@ -405,10 +405,10 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 goto OldaleTown_PokemonCenter_2F_EventScript_1A4325 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB - specialval RESULT, CalculatePlayerPartyCount + specialvar RESULT, CalculatePlayerPartyCount compare_var_to_imm RESULT, 2 goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1 - specialval RESULT, GetNameOfEnigmaBerryInPlayerParty + specialvar RESULT, GetNameOfEnigmaBerryInPlayerParty compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A41EE setvar RESULT, 1 @@ -486,7 +486,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 waittext setmaptile 11, 3, 514, 0 special DrawWholeMapView - pause 60 + delay 60 move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmove 0 closebutton diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index afac5e6ed..3588aff89 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -345,13 +345,13 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 waitmove 0 releaseall reappear 13 - playsfx 10 + playse 10 lockall move 0x800b, LinkContestRoom1_Movement_1A5D9C waitmove 0 releaseall addvar 0x8006, -1 - playsfx 15 + playse 15 special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E return @@ -371,14 +371,14 @@ LinkContestRoom1_EventScript_1A5370:: @ 81A5370 LinkContestRoom1_EventScript_1A5377:: @ 81A5377 call LinkContestRoom1_EventScript_1A53B3 call LinkContestRoom1_EventScript_1A53CE - playsfx 223 + playse 223 waittext call LinkContestRoom1_EventScript_1A5A90 move 1, LinkContestRoom1_Movement_1A5D9F waitmove 0 move 2, LinkContestRoom1_Movement_1A5DA1 waitmove 0 - pause 20 + delay 20 move 1, LinkContestRoom1_Movement_1A5D8F move 2, LinkContestRoom1_Movement_1A5D8F waitmove 0 @@ -408,7 +408,7 @@ LinkContestRoom1_EventScript_1A53DF:: @ 81A53DF LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 move 1, LinkContestRoom1_Movement_1A5DAF waitmove 0 - playsfx 223 + playse 223 call LinkContestRoom1_EventScript_1A5AE4 move 9, LinkContestRoom1_Movement_1A5DB7 move 12, LinkContestRoom1_Movement_1A5DBB @@ -621,8 +621,8 @@ LinkContestRoom1_EventScript_1A5760:: @ 81A5760 compare_var_to_imm 0x4001, 1 goto_if_eq LinkContestRoom1_EventScript_1A5783 move 6, LinkContestRoom1_Movement_1A5D8D - playsfx 21 - pause 14 + playse 21 + delay 14 setvar 0x4001, 1 addvar 0x4000, 65535 return @@ -634,8 +634,8 @@ LinkContestRoom1_EventScript_1A5784:: @ 81A5784 compare_var_to_imm 0x4002, 1 goto_if_eq LinkContestRoom1_EventScript_1A57A7 move 12, LinkContestRoom1_Movement_1A5D8D - playsfx 21 - pause 14 + playse 21 + delay 14 setvar 0x4002, 1 addvar 0x4000, 65535 return @@ -647,8 +647,8 @@ LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 compare_var_to_imm 0x4003, 1 goto_if_eq LinkContestRoom1_EventScript_1A57CB move 7, LinkContestRoom1_Movement_1A5D8D - playsfx 21 - pause 14 + playse 21 + delay 14 setvar 0x4003, 1 addvar 0x4000, 65535 return @@ -660,8 +660,8 @@ LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC compare_var_to_imm 0x4004, 1 goto_if_eq LinkContestRoom1_EventScript_1A57EF move 8, LinkContestRoom1_Movement_1A5D8D - playsfx 21 - pause 14 + playse 21 + delay 14 setvar 0x4004, 1 addvar 0x4000, 65535 return @@ -673,8 +673,8 @@ LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 compare_var_to_imm 0x4005, 1 goto_if_eq LinkContestRoom1_EventScript_1A5813 move 9, LinkContestRoom1_Movement_1A5D8D - playsfx 21 - pause 14 + playse 21 + delay 14 setvar 0x4005, 1 addvar 0x4000, 65535 return @@ -686,8 +686,8 @@ LinkContestRoom1_EventScript_1A5814:: @ 81A5814 compare_var_to_imm 0x4006, 1 goto_if_eq LinkContestRoom1_EventScript_1A5837 move 10, LinkContestRoom1_Movement_1A5D8D - playsfx 21 - pause 14 + playse 21 + delay 14 setvar 0x4006, 1 addvar 0x4000, 65535 return @@ -699,8 +699,8 @@ LinkContestRoom1_EventScript_1A5838:: @ 81A5838 compare_var_to_imm 0x4007, 1 goto_if_eq LinkContestRoom1_EventScript_1A585B move 11, LinkContestRoom1_Movement_1A5D8D - playsfx 21 - pause 14 + playse 21 + delay 14 setvar 0x4007, 1 addvar 0x4000, 65535 return @@ -712,8 +712,8 @@ LinkContestRoom1_EventScript_1A585C:: @ 81A585C compare_var_to_imm 0x4008, 1 goto_if_eq LinkContestRoom1_EventScript_1A587F move 15, LinkContestRoom1_Movement_1A5D8D - playsfx 21 - pause 14 + playse 21 + delay 14 setvar 0x4008, 1 addvar 0x4000, 65535 return @@ -805,7 +805,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A setvar 0x4009, 1 showcontestresults setvar 0x4009, 0 - playmusic 439, 0 + playbgm 439, 0 return LinkContestRoom1_EventScript_1A5984:: @ 81A5984 @@ -817,7 +817,7 @@ LinkContestRoom1_EventScript_1A5984:: @ 81A5984 LinkContestRoom1_EventScript_1A5998:: @ 81A5998 message2 LinkContestRoom1_Text_1A6C06 waittext - pause 30 + delay 30 return LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 @@ -829,7 +829,7 @@ LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 message2 LinkContestRoom1_Text_1A6C21 waittext - pause 30 + delay 30 return LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 @@ -841,7 +841,7 @@ LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 message2 LinkContestRoom1_Text_1A6C9D waittext - pause 30 + delay 30 return LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE @@ -853,7 +853,7 @@ LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 message2 LinkContestRoom1_Text_1A6D16 waittext - pause 30 + delay 30 return LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC @@ -890,7 +890,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 call LinkContestRoom1_EventScript_1A5A75 move 0x4003, LinkContestRoom1_Movement_1A5D99 waitmove 0 - playsfx 223 + playse 223 setvar 0x4001, 0 return @@ -913,14 +913,14 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 move 9, LinkContestRoom1_Movement_1A5DB7 move 12, LinkContestRoom1_Movement_1A5DBB move 7, LinkContestRoom1_Movement_1A5DB7 - pause 30 + delay 30 move 10, LinkContestRoom1_Movement_1A5DAF move 11, LinkContestRoom1_Movement_1A5DBB move 6, LinkContestRoom1_Movement_1A5DB3 move 8, LinkContestRoom1_Movement_1A5DAF compare_var_to_imm 0x4001, 4 goto_if 5, LinkContestRoom1_EventScript_1A5A90 - pause 30 + delay 30 return LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 @@ -939,7 +939,7 @@ LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 vspriteface 25, 4 vspriteface 27, 3 vspriteface 28, 4 - pause 10 + delay 10 vspriteface 0, 4 vspriteface 2, 4 vspriteface 4, 4 @@ -955,7 +955,7 @@ LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 vspriteface 25, 2 vspriteface 27, 2 vspriteface 28, 2 - pause 10 + delay 10 vspriteface 1, 2 vspriteface 3, 2 vspriteface 5, 2 @@ -972,7 +972,7 @@ LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 vspriteface 26, 4 vspriteface 29, 3 vspriteface 30, 3 - pause 10 + delay 10 vspriteface 1, 4 vspriteface 3, 4 vspriteface 5, 4 @@ -989,7 +989,7 @@ LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 vspriteface 26, 2 vspriteface 29, 2 vspriteface 30, 2 - pause 10 + delay 10 return LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB @@ -1002,10 +1002,10 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB waittext call LinkContestRoom1_EventScript_1A5C7F call LinkContestRoom1_EventScript_1A5CE5 - playsfx 223 + playse 223 setvar 0x4001, 0 call LinkContestRoom1_EventScript_1A5A90 - pause 30 + delay 30 special sub_80C4CF8 compare_var_to_imm 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 @@ -1014,14 +1014,14 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 inccounter GAME_STAT_WON_CONTEST msgbox LinkContestRoom1_Text_1A6DF1, 3 - pause 90 + delay 90 special sub_80C4CF8 compare_var_to_imm 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 - specialval RESULT, sub_80C4440 + specialvar RESULT, sub_80C4440 compare_var_to_imm RESULT, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C23 return @@ -1050,7 +1050,7 @@ LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46 return LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C - pause 60 + delay 60 call LinkContestRoom1_EventScript_1A5C6A special sub_80C4CF8 compare_var_to_imm 0x8004, 1 @@ -1120,7 +1120,7 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC compare_var_to_imm 0x4088, 2 call_if 1, LinkContestRoom1_EventScript_1A5C42 inccounter GAME_STAT_WON_CONTEST - specialval RESULT, sub_80C4440 + specialvar RESULT, sub_80C4440 compare_var_to_imm RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D5B compare_var_to_imm CONTEST_RANK, 3 @@ -1146,7 +1146,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B setflag 2107 lockall msgbox LinkContestRoom1_Text_1A6D6A, 4 - fanfare 370 + playfanfare 370 msgbox LinkContestRoom1_Text_1A6D96, 4 waitfanfare special sub_80C4858 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index acb87170a..b2d83196e 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -2,7 +2,7 @@ Route117_EventScript_1B222D:: @ 81B222D lock faceplayer special sp0B5_daycare - specialval RESULT, sp0B6_daycare + specialvar RESULT, sp0B6_daycare compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_1B2262 compare_var_to_imm RESULT, 2 @@ -27,7 +27,7 @@ Route117_EventScript_1B2262:: @ 81B2262 end Route117_EventScript_1B2298:: @ 81B2298 - specialval RESULT, CalculatePlayerPartyCount + specialvar RESULT, CalculatePlayerPartyCount compare_var_to_imm RESULT, 6 goto_if 5, Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 @@ -36,7 +36,7 @@ Route117_EventScript_1B2298:: @ 81B2298 Route117_EventScript_1B22B2:: @ 81B22B2 message Route117_Text_1B27A2 - fanfare 367 + playfanfare 367 waitfanfare waittext waitbutton @@ -47,7 +47,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 end Route117_EventScript_1B22CD:: @ 81B22CD - specialval RESULT, sub_8042B4C + specialvar RESULT, sub_8042B4C compare_var_to_imm RESULT, 1 call_if 1, Route117_EventScript_1B22DE return @@ -81,7 +81,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 lock faceplayer - specialval RESULT, sp0B6_daycare + specialvar RESULT, sp0B6_daycare compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2407 compare_var_to_imm RESULT, 2 @@ -96,7 +96,7 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 end Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C - specialval RESULT, sub_8095B6C + specialvar RESULT, sub_8095B6C compare_var_to_imm RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 @@ -105,17 +105,17 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C waitstate compare_var_to_imm 0x8004, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 - specialval RESULT, sub_8095C10 + specialvar RESULT, sub_8095C10 compare_var_to_imm RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD - specialval 0x8005, sub_8042328 - checksound + specialvar 0x8005, sub_8042328 + waitse pokecry 0x8005, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 waitpokecry special Daycare_SendPokemon_Special inccounter GAME_STAT_USED_DAYCARE - specialval RESULT, sp0B6_daycare + specialvar RESULT, sp0B6_daycare compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA release @@ -153,7 +153,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 return Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A - specialval RESULT, sub_80417B8 + specialvar RESULT, sub_80417B8 compare_var_to_imm RESULT, 0 call_if 5, Route117_PokemonDayCare_EventScript_1B2411 return @@ -172,10 +172,10 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B end Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 - specialval RESULT, CalculatePlayerPartyCount + specialvar RESULT, CalculatePlayerPartyCount compare_var_to_imm RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 - specialval RESULT, sp0B6_daycare + specialvar RESULT, sp0B6_daycare setvar 0x8004, 0 compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 @@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 - specialval RESULT, sub_80B7CE8 + specialvar RESULT, sub_80B7CE8 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8041648 + specialvar RESULT, sub_8041648 special sub_80B7D0C - playsfx 95 + playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 - checksound + waitse pokecry RESULT, 0 msgbox Route117_PokemonDayCare_Text_1B2B93, 4 waitpokecry - specialval RESULT, sp0B6_daycare + specialvar RESULT, sp0B6_daycare compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 goto Route117_PokemonDayCare_EventScript_1B23D0 @@ -276,7 +276,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 compare_var_to_imm RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 copyvar 0x8004, RESULT - specialval RESULT, sub_8041648 + specialvar RESULT, sub_8041648 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index a2bae7c46..69580a835 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, GabbyAndTyGetBattleNum + specialvar RESULT, GabbyAndTyGetBattleNum switch RESULT case 0, Route111_EventScript_1AE384 case 1, Route111_EventScript_1AE38A @@ -244,11 +244,11 @@ Route120_EventScript_1AE60F:: @ 81AE60F call_if 1, Route111_EventScript_1AE5FD checkflag 1 goto_if_eq Route111_EventScript_1AE73A - specialval RESULT, GabbyAndTyGetLastQuote + specialvar RESULT, GabbyAndTyGetLastQuote compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 - specialval RESULT, sub_80BDD18 + specialvar RESULT, sub_80BDD18 switch RESULT case 0, Route111_EventScript_1AE6AD case 1, Route111_EventScript_1AE6BB diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 248c9622e..2b3bd61df 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -37,7 +37,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .endif move 2, MtChimney_Movement_1A0839 waitmove 0 - playsfx 21 + playse 21 move 2, MtChimney_Movement_1A0833 waitmove 0 move 2, MtChimney_Movement_1A0835 @@ -58,7 +58,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B3A90, 4 .endif closebutton - pause 30 + delay 30 fadescreen 1 disappear 2 disappear 3 diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index c2f813e88..85531be99 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -4,7 +4,7 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 815E98F .byte 0 AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A - warp4 AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp AbandonedShip_Underwater1, 255, 5, 4 end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 @@ -34,7 +34,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 - playsfx 21 + playse 21 removeitem ITEM_STORAGE_KEY, 1 setflag 239 call AbandonedShip_Corridors_B1F_EventScript_15E9C0 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index c3a48f55d..fe833b47c 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -4,7 +4,7 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 815EB46 .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 - warp4 AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp AbandonedShip_Underwater1, 255, 5, 4 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A @@ -66,7 +66,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playsfx 21 + playse 21 removeitem ITEM_ROOM_1_KEY, 1 setflag 240 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 @@ -82,7 +82,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playsfx 21 + playse 21 removeitem ITEM_ROOM_2_KEY, 1 setflag 241 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playsfx 21 + playse 21 removeitem ITEM_ROOM_4_KEY, 1 setflag 242 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 @@ -114,7 +114,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playsfx 21 + playse 21 removeitem ITEM_ROOM_6_KEY, 1 setflag 243 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index bda0e9603..4f3e0f099 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -38,37 +38,37 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 return AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B - pause 20 + delay 20 setanimation 0, 10 setanimation 1, 10 setanimation 2, 0 doanimation 54 - specialval RESULT, sub_810F4D4 + specialvar RESULT, sub_810F4D4 compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B checkanimation 54 - pause 10 + delay 10 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 - specialval RESULT, sub_810F488 + specialvar RESULT, sub_810F488 compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA - pause 20 + delay 20 compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B checkanimation 54 - pause 10 + delay 10 end AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA end AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB - pause 20 + delay 20 setanimation 0, 8 setanimation 1, 5 setanimation 2, 0 @@ -77,15 +77,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setanimation 1, 3 setanimation 2, 0 doanimation 54 - specialval RESULT, sub_810F4FC + specialvar RESULT, sub_810F4FC compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B checkanimation 54 - pause 10 + delay 10 end AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 - pause 20 + delay 20 setanimation 0, 16 setanimation 1, 3 setanimation 2, 0 @@ -98,11 +98,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setanimation 1, 6 setanimation 2, 0 doanimation 54 - specialval RESULT, sub_810F4B0 + specialvar RESULT, sub_810F4B0 compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B checkanimation 54 - pause 10 + delay 10 end AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 0c223cbaa..4feecded6 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc index 44b8c5f20..218f1a2ca 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 815EA35 .byte 0 AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B - warp4 AbandonedShip_Underwater2, 255, 17, 4 + setdivewarp AbandonedShip_Underwater2, 255, 17, 4 end AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44 diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc index 71d903682..afac470ea 100644 --- a/data/scripts/maps/AbandonedShip_Underwater1.inc +++ b/data/scripts/maps/AbandonedShip_Underwater1.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 815EA57 .byte 0 AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D - warp4 AbandonedShip_HiddenFloorCorridors, 255, 0, 10 + setdivewarp AbandonedShip_HiddenFloorCorridors, 255, 0, 10 end diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/scripts/maps/AbandonedShip_Underwater2.inc index f7b434c07..b8facc4ec 100644 --- a/data/scripts/maps/AbandonedShip_Underwater2.inc +++ b/data/scripts/maps/AbandonedShip_Underwater2.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 815EB37 .byte 0 AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D - warp4 AbandonedShip_Rooms_B1F, 255, 13, 7 + setdivewarp AbandonedShip_Rooms_B1F, 255, 13, 7 end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index deed30c5b..a0f00e877 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -57,9 +57,9 @@ AncientTomb_EventScript_15F042:: @ 815F042 AncientTomb_EventScript_15F050:: @ 815F050 lock faceplayer - checksound + waitse pokecry SPECIES_REGISTEEL, 2 - pause 40 + delay 40 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag 937 diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 845b755b7..9ed2d102c 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -10,7 +10,7 @@ AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall setvar 0x8008, 1 - playsfx 21 + playse 21 move 0x8008, AquaHideout_B2F_Movement_1A0833 waitmove 0 .ifdef SAPPHIRE @@ -43,7 +43,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD move 0x8008, AquaHideout_B2F_Movement_1A0843 .endif waitmove 0 - pause 20 + delay 20 move 0x8008, AquaHideout_B2F_Movement_1A0839 waitmove 0 msgbox AquaHideout_B2F_Text_197162, 4 @@ -60,7 +60,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD .endif waitmove 0 disappear 0x8009 - pause 20 + delay 20 move 0x8008, AquaHideout_B2F_Movement_1A0839 waitmove 0 msgbox AquaHideout_B2F_Text_1971AE, 4 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 750c64b74..60685adad 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -54,7 +54,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special LoadPlayerParty special SavePlayerParty special sub_8135A14 - fanfare 368 + playfanfare 368 waitfanfare special ScrSpecial_HealPlayerParty @@ -108,10 +108,10 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 setvar 0x8004, 2 special sub_8135BA0 message BattleTower_BattleRoom_Text_1C6CE1 - pause 60 + delay 60 waittext - playsfx 55 - checksound + playse 55 + waitse msgbox BattleTower_BattleRoom_Text_1C6D05, 4 BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1 diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index 408e7485e..2c9f12a6e 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -14,7 +14,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 waitmove 0 special sub_810EBEC waitstate - pause 64 + delay 64 move 1, BattleTower_Elevator_Movement_16083D move 255, BattleTower_Elevator_Movement_160841 waitmove 0 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 4caffb405..c4ffe4c32 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -17,7 +17,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag 237 goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialval 0x8007, sub_810F404 + specialvar 0x8007, sub_810F404 compare_var_to_imm 0x8007, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 @@ -25,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialval 0x8007, sub_810F404 + specialvar 0x8007, sub_810F404 compare_var_to_imm 0x8007, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 @@ -84,7 +84,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waittext - fanfare 370 + playfanfare 370 waitfanfare msgbox BattleTower_Lobby_Text_19A719, 4 @@ -100,8 +100,8 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D special sub_8135D84 setvar 0x8004, 3 special sub_8135BA0 - playsfx 55 - checksound + playse 55 + waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar 0x8004, 0 @@ -114,7 +114,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 waittext - fanfare 370 + playfanfare 370 waitfanfare setvar 0x8004, 9 special sub_81358A4 @@ -148,8 +148,8 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 special sub_8135668 setvar 0x8004, 0 special sub_8135BA0 - playsfx 55 - checksound + playse 55 + waitse msgbox BattleTower_Lobby_Text_199FA9, 4 closebutton setvar 0x4000, 5 @@ -166,8 +166,8 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waittext setvar 0x8004, 1 special sub_8135BA0 - playsfx 55 - checksound + playse 55 + waitse setvar 0x8004, 8 setvar 0x8005, 0 special sub_8135668 @@ -241,7 +241,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 special sub_8135668 special LoadPlayerParty closebutton - pause 2 + delay 2 call S_DoSaveDialog setvar 0x4000, 5 hidebox 0, 0, 15, 10 @@ -402,7 +402,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 end BattleTower_Lobby_EventScript_160773:: @ 8160773 - specialval RESULT, sub_810F404 + specialvar RESULT, sub_810F404 compare_var_to_imm RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index beb9ed690..8ef5dc0ad 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -66,7 +66,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 closebutton move LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmove 0 - pause 30 + delay 30 spriteinvisible 5, 26, 4 setvar 0x8004, 4 call BattleTower_Outside_EventScript_1A047C diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index e79dfb3ff..aad189887 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -37,7 +37,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 doweather special WaitWeather waitstate - playsfx 209 + playse 209 setanimation 0, 9 setanimation 1, 13 setanimation 2, 0 @@ -48,24 +48,24 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 .else setvar RESULT, 2 .endif - playsfx 107 + playse 107 special sub_80818A4 waitstate special sub_80818FC waitstate move 1, CaveOfOrigin_B4F_Movement_15DE7D waitmove 0 - pause 60 + delay 60 setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE - checksound + waitse pokecry SPECIES_GROUDON_OR_KYOGRE, 2 - pause 40 + delay 40 waitpokecry setflag 2145 special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag 2145 - specialval RESULT, sub_810E300 + specialvar RESULT, sub_810E300 compare_var_to_imm RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag 816 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index ab094c824..d63398d78 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -57,9 +57,9 @@ DesertRuins_EventScript_15CB77:: @ 815CB77 DesertRuins_EventScript_15CB85:: @ 815CB85 lock faceplayer - checksound + waitse pokecry SPECIES_REGIROCK, 2 - pause 40 + delay 40 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag 935 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 4168acd0c..8f57e549a 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -56,25 +56,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 return DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 - playsfx 35 + playse 35 lighten 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 - playsfx 35 + playse 35 lighten 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C - playsfx 35 + playse 35 lighten 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 - playsfx 35 + playse 35 lighten 0 call DewfordTown_Gym_EventScript_153071 return diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/scripts/maps/DewfordTown_House1.inc index 40e06357c..321e376bd 100644 --- a/data/scripts/maps/DewfordTown_House1.inc +++ b/data/scripts/maps/DewfordTown_House1.inc @@ -12,7 +12,7 @@ DewfordTown_House1_EventScript_152FF8:: @ 8152FF8 DewfordTown_House1_EventScript_153001:: @ 8153001 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox DewfordTown_House1_Text_174CC8, 4 waitpokecry diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index be3557c22..6726686ca 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE lockall move 255, EverGrandeCity_ChampionsRoom_Movement_1A084E waitmove 0 - pause 40 + delay 40 move 255, EverGrandeCity_ChampionsRoom_Movement_15B802 waitmove 0 setvar 0x4001, 1 @@ -38,20 +38,20 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 step_end EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 - playmusic 454, 0 + playbgm 454, 0 msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 - playsfx 8 + playse 8 setmaptile 6, 1, 838, 0 setmaptile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closebutton - playsfx 8 + playse 8 checkgender compare_var_to_imm RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C @@ -67,17 +67,17 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C - playmusic 415, 0 + playbgm 415, 0 return EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 - playmusic 421, 0 + playbgm 421, 0 return EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4 - pause 40 - playsfx 21 + delay 40 + playse 21 move 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 waitmove 0 move 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 @@ -89,8 +89,8 @@ EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4 - pause 40 - playsfx 21 + delay 40 + playse 21 move 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 waitmove 0 move 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 @@ -112,18 +112,18 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, 4 move 1, EverGrandeCity_ChampionsRoom_Movement_1A0841 waitmove 0 - pause 20 + delay 20 move 1, EverGrandeCity_ChampionsRoom_Movement_1A0845 waitmove 0 msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4 closebutton - pause 30 + delay 30 move 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB move 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD move 3, EverGrandeCity_ChampionsRoom_Movement_1A0841 move 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8 waitmove 0 - pause 20 + delay 20 move 255, EverGrandeCity_ChampionsRoom_Movement_1A0845 waitmove 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 1e32394d9..a283c4c2a 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 faceplayer checkflag 1248 goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B - playmusic 450, 0 + playbgm 450, 0 msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 71e80287b..f00f82f2e 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA faceplayer checkflag 1247 goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 - playmusic 450, 0 + playbgm 450, 0 msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 123a7cbe2..458796e0c 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -28,7 +28,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 move 1, EverGrandeCity_HallOfFame_Movement_15BC60 move 255, EverGrandeCity_HallOfFame_Movement_15BC60 waitmove 0 - pause 20 + delay 20 move 1, EverGrandeCity_HallOfFame_Movement_1A0843 move 255, EverGrandeCity_HallOfFame_Movement_1A083F waitmove 0 @@ -37,10 +37,10 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 move 1, EverGrandeCity_HallOfFame_Movement_1A0841 move 255, EverGrandeCity_HallOfFame_Movement_1A0841 waitmove 0 - pause 20 + delay 20 doanimation 62 checkanimation 62 - pause 40 + delay 40 setvar 0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkgender diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 6fb0d7ba4..2b5266ade 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 faceplayer checkflag 1246 goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 - playmusic 450, 0 + playbgm 450, 0 msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 0f0efbd26..04a8b701a 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -56,15 +56,15 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waittext - pause 75 + delay 75 checkflag 2060 goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closebutton move 3, EverGrandeCity_PokemonLeague_Movement_15BB7E move 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmove 0 - pause 10 - fanfare 369 + delay 10 + playfanfare 369 message EverGrandeCity_PokemonLeague_Text_191804 waittext waitfanfare @@ -86,7 +86,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F return EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A - playsfx 32 + playse 32 msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4 releaseall end diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index bc8ad9f5a..564b2b806 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -44,7 +44,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 faceplayer checkflag 1245 goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD - playmusic 450, 0 + playbgm 450, 0 msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 043588ed5..d6d4ffd3b 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -34,7 +34,7 @@ FallarborTown_EventScript_14E81D:: @ 814E81D FallarborTown_EventScript_14E826:: @ 814E826 lock faceplayer - checksound + waitse pokecry SPECIES_AZURILL, 0 msgbox FallarborTown_Text_16C92C, 4 waitpokecry diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 1dddf43de..7a3a8a7c8 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -22,17 +22,17 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall move 1, FallarborTown_ContestLobby_Movement_153A7C waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView move 1, FallarborTown_ContestLobby_Movement_153A7F waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView - pause 20 + delay 20 move 1, FallarborTown_ContestLobby_Movement_153A8C waitmove 0 move 255, FallarborTown_ContestLobby_Movement_153A7A diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc index 4b66546e8..05a3704fe 100644 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ b/data/scripts/maps/FallarborTown_Mart.inc @@ -40,7 +40,7 @@ FallarborTown_Mart_EventScript_1539A5:: @ 81539A5 FallarborTown_Mart_EventScript_1539AE:: @ 81539AE lock faceplayer - checksound + waitse pokecry SPECIES_SKITTY, 0 msgbox FallarborTown_Mart_Text_1770D3, 4 waitpokecry diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index bb924026c..320ba0a3a 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 - playsfx 18 + playse 18 disappear 4 clearflag 870 release diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 565effc66..57405986b 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -75,9 +75,9 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 closebutton move LAST_TALKED, FortreeCity_Movement_1A0662 waitmove 0 - checksound + waitse pokecry SPECIES_KECLEON, 2 - pause 40 + delay 40 waitpokecry move LAST_TALKED, FortreeCity_Movement_14CA13 waitmove 0 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index e0942354d..d21b82e51 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -8,7 +8,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 goto_if_eq FortreeCity_House1_EventScript_157EAD setvar 0x8008, 1 copyvar 0x8004, 0x8008 - specialval RESULT, sub_804D89C + specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare_var_to_imm RESULT, 0 @@ -19,7 +19,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 compare_var_to_imm 0x8004, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar 0x8005, 0x800a - specialval RESULT, sub_804DB2C + specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT compare_var_to_var RESULT, 0x8009 goto_if 5, FortreeCity_House1_EventScript_157E9F @@ -57,7 +57,7 @@ FortreeCity_House1_EventScript_157EB7:: @ 8157EB7 FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House1_Text_185888, 4 waitpokecry diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index c4284b722..bcf2bcd49 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -59,7 +59,7 @@ FortreeCity_House4_Movement_158218:: @ 8158218 FortreeCity_House4_EventScript_15821E:: @ 815821E lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox FortreeCity_House4_Text_18695C, 4 waitpokecry diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/scripts/maps/FortreeCity_House5.inc index 1144a8e81..59f80917e 100644 --- a/data/scripts/maps/FortreeCity_House5.inc +++ b/data/scripts/maps/FortreeCity_House5.inc @@ -12,7 +12,7 @@ FortreeCity_House5_EventScript_15823B:: @ 815823B FortreeCity_House5_EventScript_158244:: @ 8158244 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House5_Text_186A4F, 4 waitpokecry diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index 240de1d98..aa8d705c7 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -6,5 +6,5 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED tileeffect 7 - warp5 GraniteCave_B2F, 255, 0, 0 + setholewarp GraniteCave_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 9473cbe8e..ee1c37dae 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -22,7 +22,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare_var_to_imm FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - playsfx 9 + playse 9 disappear 1 release end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 9eedd4e05..e5782b63e 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -31,7 +31,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 setflag 784 setflag 760 setvar 0x408c, 1 - warpplace LittlerootTown, 255, 3, 10 + setdynamicwarp LittlerootTown, 255, 3, 10 releaseall end @@ -43,7 +43,7 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68 setflag 785 setflag 722 setvar 0x4082, 1 - warpplace LittlerootTown, 255, 12, 10 + setdynamicwarp LittlerootTown, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 73523c460..06524f95e 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -39,7 +39,7 @@ S_OpenRegiceChamber:: @ 815EF19 setmaptile 8, 20, 563, 0 setmaptile 9, 20, 564, 1 special DrawWholeMapView - playsfx SE_BAN + playse SE_BAN setflag 2129 end @@ -77,9 +77,9 @@ IslandCave_EventScript_15EF95:: @ 815EF95 IslandCave_EventScript_15EF9D:: @ 815EF9D lock faceplayer - checksound + waitse pokecry SPECIES_REGICE, 2 - pause 40 + delay 40 waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag 936 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 333ccbaad..98b367006 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index e091ed372..e40a9252a 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -58,11 +58,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED end LavaridgeTown_EventScript_14E56B:: @ 814E56B - playmusic 415, 1 + playbgm 415, 1 return LavaridgeTown_EventScript_14E570:: @ 814E570 - playmusic 421, 1 + playbgm 421, 1 return LavaridgeTown_EventScript_14E575:: @ 814E575 @@ -105,15 +105,15 @@ LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 call_if 1, LavaridgeTown_EventScript_14E64E disappear 8 reappear 7 - pause 30 + delay 30 compare_var_to_imm 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E69A compare_var_to_imm 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 disappear 7 setvar 0x4053, 2 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm compare_var_to_imm 0x8008, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall @@ -236,7 +236,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E step_end LavaridgeTown_EventScript_14E710:: @ 814E710 - specialval RESULT, player_get_direction_lower_nybble + specialvar RESULT, player_get_direction_lower_nybble compare_var_to_imm RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E721 end @@ -282,7 +282,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag 266 - fanfare 370 + playfanfare 370 message LavaridgeTown_Text_16C2EA waitfanfare waittext diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/scripts/maps/LavaridgeTown_House.inc index 944427bb6..dd5a9cc2b 100644 --- a/data/scripts/maps/LavaridgeTown_House.inc +++ b/data/scripts/maps/LavaridgeTown_House.inc @@ -8,7 +8,7 @@ LavaridgeTown_House_EventScript_1538AE:: @ 81538AE LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox LavaridgeTown_House_Text_176D94, 4 waitpokecry diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 801e25396..5b53435d4 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -63,7 +63,7 @@ LilycoveCity_EventScript_14CB2B:: @ 814CB2B LilycoveCity_EventScript_14CB74:: @ 814CB74 lock faceplayer - checkdailyflags + dodailyevents checkflag 2255 goto_if_eq LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 @@ -172,7 +172,7 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79 LilycoveCity_EventScript_14CC82:: @ 814CC82 lockall - specialval 0x8004, sub_80C4D50 + specialvar 0x8004, sub_80C4D50 switch 0x8004 case 0, LilycoveCity_EventScript_14CCA2 msgbox LilycoveCity_Text_168EA4, 4 @@ -255,7 +255,7 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 end LilycoveCity_EventScript_14CD60:: @ 814CD60 - playmusic 415, 1 + playbgm 415, 1 checkflag 286 call_if 1, LilycoveCity_EventScript_14CDB0 checkflag 286 @@ -280,13 +280,13 @@ LilycoveCity_EventScript_14CDB9:: @ 814CDB9 LilycoveCity_EventScript_14CDC2:: @ 814CDC2 setflag 286 msgbox LilycoveCity_Text_167AEB, 4 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm release end LilycoveCity_EventScript_14CDD3:: @ 814CDD3 - playmusic 421, 1 + playbgm 421, 1 checkflag 286 call_if 1, LilycoveCity_EventScript_14CE23 checkflag 286 @@ -311,8 +311,8 @@ LilycoveCity_EventScript_14CE2C:: @ 814CE2C LilycoveCity_EventScript_14CE35:: @ 814CE35 setflag 286 msgbox LilycoveCity_Text_16802C, 4 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm release end @@ -414,14 +414,14 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B closebutton move LAST_TALKED, LilycoveCity_Movement_1A0845 waitmove 0 - pause 50 + delay 50 setanimation 0, 1 doanimation 30 - pause 15 + delay 15 disappear LAST_TALKED checkanimation 30 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm setflag 292 release end diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/scripts/maps/LilycoveCity_ContestHall.inc index 3601cb455..525d57a71 100644 --- a/data/scripts/maps/LilycoveCity_ContestHall.inc +++ b/data/scripts/maps/LilycoveCity_ContestHall.inc @@ -219,7 +219,7 @@ LilycoveCity_ContestHall_EventScript_1592C0:: @ 81592C0 lockall move 29, LilycoveCity_ContestHall_Movement_1A0839 waitmove 0 - pause 25 + delay 25 move 29, LilycoveCity_ContestHall_Movement_1A083D waitmove 0 msgbox LilycoveCity_ContestHall_Text_189DA2, 3 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 4785ffbbb..881a842f1 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -43,7 +43,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE closebutton special sub_80C4CEC setvar 0x4099, 0 - specialval RESULT, GiveMonArtistRibbon + specialvar RESULT, GiveMonArtistRibbon compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 move 4, LilycoveCity_ContestLobby_Movement_158A43 @@ -72,13 +72,13 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 special sub_80C4858 move 4, LilycoveCity_ContestLobby_Movement_158A4E waitmove 0 - playsfx 21 + playse 21 move 4, LilycoveCity_ContestLobby_Movement_1A0833 waitmove 0 move 4, LilycoveCity_ContestLobby_Movement_158A52 waitmove 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - fanfare 370 + playfanfare 370 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -87,7 +87,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 - specialval 0x8004, sub_80C4D50 + specialvar 0x8004, sub_80C4D50 switch 0x8004 case 1, LilycoveCity_ContestLobby_EventScript_1589D6 case 2, LilycoveCity_ContestLobby_EventScript_1589DA @@ -216,7 +216,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE closebutton special sub_80C4CEC setvar 0x4099, 0 - specialval RESULT, GiveMonArtistRibbon + specialvar RESULT, GiveMonArtistRibbon compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 move 11, LilycoveCity_ContestLobby_Movement_158B6D @@ -245,13 +245,13 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 special sub_80C4858 move 11, LilycoveCity_ContestLobby_Movement_158B78 waitmove 0 - playsfx 21 + playse 21 move 11, LilycoveCity_ContestLobby_Movement_1A0833 waitmove 0 move 11, LilycoveCity_ContestLobby_Movement_158B7C waitmove 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - fanfare 370 + playfanfare 370 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -492,28 +492,28 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B lockall message2 LilycoveCity_ContestLobby_Text_1888C6 waittext - pause 20 + delay 20 closebutton move 2, LilycoveCity_ContestLobby_Movement_158E9C waitmove 0 - playsfx 71 + playse 71 setmaptile 9, 2, 545, 1 setmaptile 9, 3, 609, 1 special DrawWholeMapView move 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmove 0 - playsfx 71 + playse 71 setmaptile 9, 2, 721, 1 setmaptile 9, 3, 729, 1 special DrawWholeMapView - pause 20 + delay 20 move 2, LilycoveCity_ContestLobby_Movement_158EAE waitmove 0 move 255, LilycoveCity_ContestLobby_Movement_158E99 waitmove 0 message2 LilycoveCity_ContestLobby_Text_1A6832 waittext - pause 20 + delay 20 closebutton move 2, LilycoveCity_ContestLobby_Movement_158EA4 move 255, LilycoveCity_ContestLobby_Movement_158E8E @@ -568,7 +568,7 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE step_end LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 - specialval RESULT, sub_80C5044 + specialvar RESULT, sub_80C5044 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 setvar 0x800b, 8 @@ -602,31 +602,31 @@ LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 return LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45 - warp3 LinkContestRoom4, 255, 7, 5 + setwarp LinkContestRoom4, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52 - warp3 LinkContestRoom2, 255, 7, 5 + setwarp LinkContestRoom2, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F - warp3 LinkContestRoom6, 255, 7, 5 + setwarp LinkContestRoom6, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C - warp3 LinkContestRoom5, 255, 7, 5 + setwarp LinkContestRoom5, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79 - warp3 LinkContestRoom3, 255, 7, 5 + setwarp LinkContestRoom3, 255, 7, 5 special sub_8081334 waitstate return @@ -635,17 +635,17 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 lockall move 1, LilycoveCity_ContestLobby_Movement_15900B waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView move 1, LilycoveCity_ContestLobby_Movement_15900F waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView - pause 20 + delay 20 move 1, LilycoveCity_ContestLobby_Movement_15901C waitmove 0 move 255, LilycoveCity_ContestLobby_Movement_159008 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 638bf8cf1..aef4bc74a 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -41,7 +41,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D lockall - playsfx 21 + playse 21 move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 waitmove 0 move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 5bdaa610a..98aec1d7a 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 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 checkflag 2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD - specialval RESULT, sub_8090FC0 + specialvar RESULT, sub_8090FC0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release @@ -20,7 +20,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag 2 - fanfare 370 + playfanfare 370 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 2ee04505e..1dd8d5869 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C end LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 - warpplace LilycoveCity_DepartmentStore_1F, 255, 2, 1 + setdynamicwarp LilycoveCity_DepartmentStore_1F, 255, 2, 1 compare_var_to_imm 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 - warpplace LilycoveCity_DepartmentStore_2F, 255, 2, 1 + setdynamicwarp LilycoveCity_DepartmentStore_2F, 255, 2, 1 compare_var_to_imm 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -39,7 +39,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 - warpplace LilycoveCity_DepartmentStore_3F, 255, 2, 1 + setdynamicwarp LilycoveCity_DepartmentStore_3F, 255, 2, 1 compare_var_to_imm 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -48,7 +48,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B - warpplace LilycoveCity_DepartmentStore_4F, 255, 2, 1 + setdynamicwarp LilycoveCity_DepartmentStore_4F, 255, 2, 1 compare_var_to_imm 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -57,7 +57,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E - warpplace LilycoveCity_DepartmentStore_5F, 255, 2, 1 + setdynamicwarp LilycoveCity_DepartmentStore_5F, 255, 2, 1 compare_var_to_imm 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 27d217b40..3295bf6ee 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 updatemoney 0, 0 nop bufferitem 0, 0x4000 - playsfx 106 + playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 additem 0x4000, 1 bufferitem 1, 0x4000 @@ -159,7 +159,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace 0x4000, 1 compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playsfx 106 + playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 bufferitem 1, 0x4000 @@ -171,7 +171,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace 0x4000, 1 compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playsfx 106 + playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 bufferitem 1, 0x4000 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 6c1ecbc1d..9d22e6055 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D55:: @ 8159D55 LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer - checkdailyflags + dodailyevents compare_var_to_imm 0x4045, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag 2250 @@ -25,12 +25,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmove 0 - playsfx 4 + playse 4 special DoLotteryCornerComputerEffect special PickLotteryCornerTicket - pause 220 + delay 220 special EndLotteryCornerComputerEffect - pause 10 + delay 10 move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmove 0 compare_var_to_imm 0x8004, 0 @@ -133,7 +133,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EE9:: @ 8159EE9 LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 lock faceplayer - checksound + waitse pokecry SPECIES_AZUMARILL, 0 msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4 waitpokecry diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 12c880d31..0d9e70a15 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -78,13 +78,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A closebutton move LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmove 0 - pause 30 + delay 30 spriteinvisible LAST_TALKED, 13, 10 compare_var_to_imm FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare_var_to_imm FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE - pause 30 + delay 30 spriteinvisible 255, 0, 0 setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E @@ -116,24 +116,24 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE closebutton move LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmove 0 - pause 30 + delay 30 spriteinvisible LAST_TALKED, 13, 10 - pause 60 + delay 60 reappear 4 - pause 30 + delay 30 move 4, LilycoveCity_Harbor_Movement_1A0839 waitmove 0 msgbox LilycoveCity_Harbor_Text_1C5120, 4 closebutton move 4, LilycoveCity_Harbor_Movement_1A0841 waitmove 0 - pause 30 + delay 30 disappear 4 compare_var_to_imm FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare_var_to_imm FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE - pause 30 + delay 30 spriteinvisible 255, 0, 0 special ScrSpecial_HealPlayerParty setvar 0x8004, 2 diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/scripts/maps/LilycoveCity_House1.inc index 3dae362c1..6440f6d3d 100644 --- a/data/scripts/maps/LilycoveCity_House1.inc +++ b/data/scripts/maps/LilycoveCity_House1.inc @@ -8,7 +8,7 @@ LilycoveCity_House1_EventScript_159B86:: @ 8159B86 LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F lock faceplayer - checksound + waitse pokecry SPECIES_KECLEON, 0 msgbox LilycoveCity_House1_Text_18B82B, 4 waitpokecry diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index e41d61fe8..663b1f25b 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 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 - specialval 0x8004, sub_80C4D50 + specialvar 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 0127761a7..01781f3ca 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 special sub_80FA0DC - fanfare 378 + playfanfare 378 waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 releaseall diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index e097504cf..dba3cf57a 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -70,35 +70,35 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 setvar 0x8004, 8 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar 0x8004, 9 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar 0x8004, 10 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar 0x8004, 11 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar 0x8004, 12 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar 0x8004, 13 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar 0x8004, 14 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar 0x8004, 15 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -150,10 +150,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F special sub_810FDAC compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq 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, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 @@ -190,10 +190,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 special sub_810FDAC compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq 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, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 @@ -230,10 +230,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D special sub_810FDAC compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq 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, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 @@ -270,10 +270,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 special sub_810FDAC compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq 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, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 @@ -308,10 +308,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B faceplayer setvar 0x8004, 11 special sub_810FDAC - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq 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, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 @@ -341,10 +341,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D faceplayer setvar 0x8004, 12 special sub_810FDAC - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq 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, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 @@ -374,10 +374,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF faceplayer setvar 0x8004, 14 special sub_810FDAC - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq 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, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 @@ -407,10 +407,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 faceplayer setvar 0x8004, 15 special sub_810FDAC - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq 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, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq 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 936437fb9..79b89e157 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -81,7 +81,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B setflag 761 - warpmuted LittlerootTown_BrendansHouse_1F, 255, 8, 8 + warpsilent LittlerootTown_BrendansHouse_1F, 255, 8, 8 waitstate releaseall end @@ -92,14 +92,14 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B setflag 762 - warpmuted LittlerootTown_MaysHouse_1F, 255, 2, 8 + warpsilent LittlerootTown_MaysHouse_1F, 255, 2, 8 waitstate releaseall end LittlerootTown_EventScript_14D62B:: @ 814D62B - pause 15 - playsfx 10 + delay 15 + playse 10 move 255, LittlerootTown_Movement_14D6C0 waitmove 0 setdooropened 0x8004, 0x8005 @@ -109,7 +109,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmove 0 setdoorclosed 0x8004, 0x8005 doorchange - pause 10 + delay 10 move 4, LittlerootTown_Movement_14D6AE waitmove 0 msgbox LittlerootTown_Text_16A7C9, 4 @@ -868,7 +868,7 @@ LittlerootTown_EventScript_14DD2B:: @ 814DD2B LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16A8FD, 4 - fanfare 370 + playfanfare 370 message LittlerootTown_Text_16AA32 waitfanfare waittext @@ -876,5 +876,5 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16AA5C, 4 msgbox LittlerootTown_Text_16AB10, 4 closebutton - pause 30 + delay 30 return diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 63e717a51..f0440a49e 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -90,7 +90,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 lockall - playsfx 21 + playse 21 move 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmove 0 move 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 8c0133625..61b981995 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -60,7 +60,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 setvar 0x8004, 1 special DoPCTurnOnEffect - playsfx SE_PC_ON + playse SE_PC_ON msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 special BedroomPC waitstate @@ -69,7 +69,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 gBrendanHouse_TurnPCOff:: @ 8152850 setvar 0x8004, 1 - playsfx SE_PC_OFF + playse SE_PC_OFF special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 73060a055..882c5ede3 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -90,7 +90,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 lockall - playsfx 21 + playse 21 move 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 waitmove 0 move 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index ea6869b1b..b9dca087f 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -37,18 +37,18 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A - playsfx 9 + playse 9 disappear LAST_TALKED setvar 0x408d, 3 setvar 0x4050, 1 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm releaseall end LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4 - playmusic 415, 1 + playbgm 415, 1 move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmove 0 move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4 - playmusic 421, 1 + playbgm 421, 1 move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmove 0 move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 @@ -208,7 +208,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C setvar 0x8004, 2 special DoPCTurnOnEffect - playsfx SE_PC_ON + playse SE_PC_ON msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 special BedroomPC waitstate @@ -217,7 +217,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C gMayHouse_TurnPCOff:: @ 8152C75 setvar 0x8004, 2 - playsfx SE_PC_OFF + playse SE_PC_OFF special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index d34e52f7f..092d50545 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -27,7 +27,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE bufferfirstpoke 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waittext - fanfare 370 + playfanfare 370 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 compare_var_to_imm RESULT, 1 @@ -155,7 +155,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 return LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D - fanfare 370 + playfanfare 370 message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waittext diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index d6cade75d..da0ff3a62 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -95,7 +95,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 msgbox MauvilleCity_Text_165D01, 4 move 6, MauvilleCity_Movement_1A0839 waitmove 0 - playsfx 21 + playse 21 move 6, MauvilleCity_Movement_1A0833 waitmove 0 move 6, MauvilleCity_Movement_1A0835 @@ -121,7 +121,7 @@ MauvilleCity_EventScript_14C187:: @ 814C187 waitmove 0 move 6, MauvilleCity_Movement_1A0843 waitmove 0 - pause 30 + delay 30 move 7, MauvilleCity_Movement_14C2D8 waitmove 0 move 255, MauvilleCity_Movement_1A0845 @@ -140,7 +140,7 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 waitmove 0 move 6, MauvilleCity_Movement_1A0843 waitmove 0 - pause 30 + delay 30 move 7, MauvilleCity_Movement_14C2DC waitmove 0 move 255, MauvilleCity_Movement_1A0845 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 02b0c4bbb..63476bb1a 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE updatemoney 0, 0 nop updatecoins 0, 5 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoney 0, 0 hidecoins 0, 5 @@ -62,7 +62,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 updatemoney 0, 0 nop updatecoins 0, 5 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoney 0, 0 hidecoins 0, 5 @@ -163,7 +163,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 removecoins 1000 adddecor 88 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -179,7 +179,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 removecoins 1000 adddecor 89 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -195,7 +195,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA removecoins 1000 adddecor 90 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -297,7 +297,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C removecoins 1500 additem ITEM_TM32, 1 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 removecoins 3500 additem ITEM_TM29, 1 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 removecoins 4000 additem ITEM_TM35, 1 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA removecoins 4000 additem ITEM_TM24, 1 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 removecoins 4000 additem ITEM_TM13, 1 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -468,7 +468,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C setflag 225 givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 - playsfx 95 + playse 95 goto MauvilleCity_GameCorner_EventScript_1570CA end @@ -525,7 +525,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -536,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -547,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -558,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -569,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -580,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -591,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -602,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -613,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -624,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -635,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -646,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 3255f8459..1030d8f68 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -91,7 +91,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView - playsfx 44 + playse 44 goto MauvilleCity_Gym_EventScript_15661D end @@ -146,7 +146,7 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial2 special MauvilleGymSpecial1 special DrawWholeMapView - playsfx 44 + playse 44 checkflag 99 goto_if_eq MauvilleCity_Gym_EventScript_1566E1 checkflag 99 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 7182a59aa..4308fd5ab 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -14,7 +14,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 end MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 - playsfx 21 + playse 21 move LAST_TALKED, MauvilleCity_House2_Movement_1A0833 waitmove 0 move LAST_TALKED, MauvilleCity_House2_Movement_1A0835 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index d5e1574cc..07e264fa8 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -10,7 +10,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C lockall move 255, MeteorFalls_1F_1R_Movement_1A0845 waitmove 0 - pause 30 + delay 30 move 5, MeteorFalls_1F_1R_Movement_1A0845 waitmove 0 msgbox MeteorFalls_1F_1R_Text_193237, 4 @@ -18,7 +18,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C move 5, MeteorFalls_1F_1R_Movement_1A0841 move 6, MeteorFalls_1F_1R_Movement_1A0841 waitmove 0 - playsfx 21 + playse 21 move 5, MeteorFalls_1F_1R_Movement_1A0833 waitmove 0 move 5, MeteorFalls_1F_1R_Movement_1A0835 diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index e6225bba0..a5c89055b 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 4112a3b15..de38e8fd0 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -94,7 +94,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA MossdeepCity_Gym_EventScript_15A619:: @ 815A619 special DrawWholeMapView - playsfx 36 + playse 36 releaseall end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 8f3d2ebfc..b6fe4fd6e 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, GetPokeblockNameByMonNature + specialvar RESULT, GetPokeblockNameByMonNature compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 9be55e8d0..e3485ae0d 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -12,7 +12,7 @@ MossdeepCity_House2_EventScript_15A872:: @ 815A872 MossdeepCity_House2_EventScript_15A87B:: @ 815A87B lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox MossdeepCity_House2_Text_18D61E, 4 waitpokecry diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 6db52bc42..9b1b17c69 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -34,7 +34,7 @@ MossdeepCity_House4_EventScript_15AB6D:: @ 815AB6D MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 lock faceplayer - checksound + waitse pokecry SPECIES_SKITTY, 0 msgbox MossdeepCity_House4_Text_18E1E1, 4 waitpokecry diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index f5927aa77..40ed4f4ef 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -4,8 +4,8 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 815AB8A MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B lock faceplayer - checkdailyflags - specialval RESULT, GetWeekCount + dodailyevents + specialvar RESULT, GetWeekCount buffernum 0, RESULT compare_var_to_imm RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index c283d0532..d5004c644 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -31,7 +31,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B lockall move 1, MossdeepCity_StevensHouse_Movement_1A083F waitmove 0 - playsfx 21 + playse 21 move 1, MossdeepCity_StevensHouse_Movement_1A0833 waitmove 0 move 1, MossdeepCity_StevensHouse_Movement_1A0835 @@ -44,7 +44,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B setflag 302 msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 closebutton - pause 20 + delay 20 move 1, MossdeepCity_StevensHouse_Movement_15AA76 waitmove 0 setvar 0x40c6, 1 @@ -79,7 +79,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT disappear 2 - fanfare 370 + playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waittext diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 9fa2b77de..578743995 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index c44251af7..8d48dac84 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -6,7 +6,7 @@ MtPyre_2F_MapScripts:: @ 815D36E MtPyre_2F_MapScript1_15D37E:: @ 815D37E tileeffect 7 - warp5 MtPyre_1F, 255, 0, 0 + setholewarp MtPyre_1F, 255, 0, 0 end MtPyre_2F_EventScript_15D389:: @ 815D389 diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 6b85a88c3..5d650a8a6 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index cc66242e3..a558475c5 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -29,7 +29,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 waitmove 0 move 2, MtPyre_Summit_Movement_1A0845 waitmove 0 - pause 50 + delay 50 compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D593 compare_var_to_imm 0x8008, 1 @@ -50,7 +50,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 setflag 916 setflag 917 fadescreen 0 - pause 20 + delay 20 call MtPyre_Summit_EventScript_15D57A compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA @@ -201,10 +201,10 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 closebutton move LAST_TALKED, MtPyre_Summit_Movement_1A0841 waitmove 0 - pause 40 + delay 40 move LAST_TALKED, MtPyre_Summit_Movement_1A0839 waitmove 0 - pause 10 + delay 10 .ifdef SAPPHIRE msgbox UnknownString_81B5762, 4 .else @@ -267,7 +267,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 waitmove 0 move 2, MtPyre_Summit_Movement_1A0845 waitmove 0 - pause 50 + delay 50 compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D75E compare_var_to_imm 0x8008, 1 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 94836d8c4..eb3f63225 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmaptile 4, 1, 716, 0 setmaptile 5, 1, 717, 1 special DrawWholeMapView - playsfx 20 + playse 20 setvar 0x40ba, 1 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 3407c8a01..4fdf02d15 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -31,7 +31,7 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA lockall setvar 0x4001, 1 setvar 0x4002, 0 - playsfx 21 + playse 21 call NewMauville_Inside_EventScript_15E5DA special DrawWholeMapView releaseall @@ -41,7 +41,7 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 lockall setvar 0x4001, 0 setvar 0x4002, 1 - playsfx 21 + playse 21 call NewMauville_Inside_EventScript_15E728 special DrawWholeMapView releaseall @@ -165,9 +165,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE - checksound + waitse pokecry SPECIES_VOLTORB, 2 - pause 40 + delay 40 waitpokecry setflag 974 setflag 2145 @@ -180,9 +180,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE - checksound + waitse pokecry SPECIES_VOLTORB, 2 - pause 40 + delay 40 waitpokecry setflag 975 setflag 2145 @@ -195,9 +195,9 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE - checksound + waitse pokecry SPECIES_VOLTORB, 2 - pause 40 + delay 40 waitpokecry setflag 976 setflag 2145 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index eef21daa7..7cac8011a 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -43,7 +43,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC checkflag 1 goto_if_eq OldaleTown_EventScript_14DE79 setflag 1 - playmusic 420, 0 + playbgm 420, 0 msgbox OldaleTown_Text_16AEF2, 4 closebutton switch FACING @@ -80,7 +80,7 @@ OldaleTown_EventScript_14DE4C:: @ 814DE4C goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 setflag 132 - fadedefault + fadedefaultbgm release end @@ -91,7 +91,7 @@ OldaleTown_EventScript_14DE79:: @ 814DE79 OldaleTown_EventScript_14DE83:: @ 814DE83 msgbox OldaleTown_Text_1A0CC2, 4 - fadedefault + fadedefaultbgm release end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index 07b6150d7..e604a4f33 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -4,7 +4,7 @@ PacifidlogTown_House2_MapScripts:: @ 8154167 PacifidlogTown_House2_EventScript_154168:: @ 8154168 lock faceplayer - checkdailyflags + dodailyevents call PacifidlogTown_House2_EventScript_1541B4 checkflag 299 goto_if_eq PacifidlogTown_House2_EventScript_154254 @@ -13,10 +13,10 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 checkflag 300 call_if 0, PacifidlogTown_House2_EventScript_1541D7 setflag 300 - specialval RESULT, GetLeadMonFriendshipScore + specialvar RESULT, GetLeadMonFriendshipScore compare_var_to_imm RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_1541EC - specialval RESULT, GetLeadMonFriendshipScore + specialvar RESULT, GetLeadMonFriendshipScore compare_var_to_imm RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 @@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag 299 goto_if 0, PacifidlogTown_House2_EventScript_1A14DC - specialval RESULT, sub_810F908 + specialvar RESULT, sub_810F908 compare_var_to_imm RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -71,7 +71,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 end PacifidlogTown_House2_EventScript_154254:: @ 8154254 - specialval RESULT, sub_810F908 + specialvar RESULT, sub_810F908 buffernum 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release @@ -80,7 +80,7 @@ PacifidlogTown_House2_EventScript_154254:: @ 8154254 PacifidlogTown_House2_EventScript_154267:: @ 8154267 lock faceplayer - checksound + waitse pokecry SPECIES_AZURILL, 0 msgbox PacifidlogTown_House2_Text_17938B, 4 waitpokecry @@ -91,7 +91,7 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267 PacifidlogTown_House2_EventScript_154282:: @ 8154282 lock faceplayer - checksound + waitse pokecry SPECIES_AZURILL, 2 msgbox PacifidlogTown_House2_Text_1793CC, 4 waitpokecry diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 3a8dc3b1d..e39db3921 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -8,7 +8,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar 0x8008, 2 copyvar 0x8004, 0x8008 - specialval RESULT, sub_804D89C + specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare_var_to_imm RESULT, 0 @@ -19,7 +19,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E compare_var_to_imm 0x8004, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar 0x8005, 0x800a - specialval RESULT, sub_804DB2C + specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT compare_var_to_var RESULT, 0x8009 goto_if 5, PacifidlogTown_House3_EventScript_15432A diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index 008c2f800..abbf81dd8 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, IsMirageIslandPresent + specialvar RESULT, IsMirageIslandPresent compare_var_to_imm RESULT, 1 goto_if_eq 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 f5b683b34..e1e49096a 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_14B731:: @ 814B731 return PetalburgCity_EventScript_14B739:: @ 814B739 - playmusicbattle 420 + savebgm 420 return PetalburgCity_MapScript2_14B73D:: @ 814B73D @@ -41,7 +41,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 closebutton clearflag 0x4000 setvar 0x4057, 3 - fadedefault + fadedefaultbgm clearflag 0x4001 special LoadPlayerParty setvar 0x4085, 1 @@ -181,8 +181,8 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A PetalburgCity_EventScript_14B866:: @ 814B866 move 9, PetalburgCity_Movement_1A0839 waitmove 0 - playmusic 420, 0 - playsfx 21 + playbgm 420, 0 + playse 21 move 9, PetalburgCity_Movement_1A0833 waitmove 0 move 9, PetalburgCity_Movement_1A0835 @@ -213,7 +213,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866 closebutton move 9, PetalburgCity_Movement_14B9F4 waitmove 0 - fadedefault + fadedefaultbgm releaseall end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index e22f02b50..489a3f8fd 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -84,10 +84,10 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C move 255, PetalburgCity_Gym_Movement_1A0845 move 10, PetalburgCity_Gym_Movement_1545B4 waitmove 0 - playsfx 9 + playse 9 disappear 10 setflag 726 - pause 30 + delay 30 move 255, PetalburgCity_Gym_Movement_1A0841 waitmove 0 msgbox PetalburgCity_Gym_Text_17A2A4, 4 @@ -143,7 +143,7 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E PetalburgCity_Gym_EventScript_154669:: @ 8154669 reappear 10 - playsfx 8 + playse 8 compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE compare_var_to_imm 0x8008, 1 @@ -195,7 +195,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 msgbox PetalburgCity_Gym_Text_17A171, 4 closebutton setflag 0x4001 - playmusic 420, 0 + playbgm 420, 0 compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 compare_var_to_imm 0x8008, 1 @@ -363,7 +363,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D end PetalburgCity_Gym_EventScript_154969:: @ 8154969 - specialval RESULT, IsEnigmaBerryValid + specialvar RESULT, IsEnigmaBerryValid compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 @@ -427,7 +427,7 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C call_if 1, PetalburgCity_Gym_EventScript_154AD2 compare_var_to_imm FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154ADD - pause 70 + delay 70 compare_var_to_imm FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154AE8 compare_var_to_imm FACING, 1 @@ -605,8 +605,8 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 closebutton - pause 30 - warpwalk PetalburgCity_Gym, 255, 32776, 32777 + delay 30 + warpdoor PetalburgCity_Gym, 255, 32776, 32777 waitstate releaseall end diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 0884db479..25783cf33 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, IsStarterInParty + specialvar RESULT, IsStarterInParty compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F release diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index dcf0a27cf..8c90aa09c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -13,7 +13,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 waitmove 0 msgbox PetalburgWoods_Text_194D92, 4 closebutton - playmusic BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, 0 move 3, PetalburgWoods_Movement_15CEC3 waitmove 0 msgbox PetalburgWoods_Text_194DED, 4 @@ -48,7 +48,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 waitmove 0 msgbox PetalburgWoods_Text_194D92, 4 closebutton - playmusic BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, 0 move 3, PetalburgWoods_Movement_15CEC3 waitmove 0 msgbox PetalburgWoods_Text_194DED, 4 @@ -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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index d945aadfc..bfbc9f2bd 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playmusic 410, 1 + playbgm 410, 1 msgbox Route101_Text_16D10E, 4 closebutton movesprite 2, 0, 15 diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 6d6b1c2da..70b750aef 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 328021785..586075465 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -18,7 +18,7 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, 4 - playmusic 415, 1 + playbgm 415, 1 move 2, Route103_Movement_1A0839 waitmove 0 move 2, Route103_Movement_1A0833 @@ -34,7 +34,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, 4 - playmusic 421, 1 + playbgm 421, 1 move 2, Route103_Movement_1A0839 waitmove 0 move 2, Route103_Movement_1A0833 @@ -100,7 +100,7 @@ Route103_EventScript_14ECD9:: @ 814ECD9 Route103_EventScript_14ED0C:: @ 814ED0C move 2, Route103_Movement_14ED67 waitmove 0 - playsfx 10 + playse 10 move 2, Route103_Movement_14ED6B waitmove 0 goto Route103_EventScript_14ED46 @@ -109,7 +109,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C Route103_EventScript_14ED29:: @ 814ED29 move 2, Route103_Movement_14ED71 waitmove 0 - playsfx 10 + playse 10 move 2, Route103_Movement_14ED74 waitmove 0 goto Route103_EventScript_14ED46 @@ -123,8 +123,8 @@ Route103_EventScript_14ED46:: @ 814ED46 setflag 130 setvar 0x40c7, 1 clearflag 979 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm releaseall end @@ -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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 8ab1999e6..58a6704bf 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 751c86825..6428e018b 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -91,7 +91,7 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1 lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox Route104_MrBrineysHouse_Text_191FB9, 4 waitpokecry diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 097e99357..44fb9a082 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -89,7 +89,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA lock faceplayer - checkdailyflags + dodailyevents checkflag 2256 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index e090c4bf2..6103d19ac 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -57,9 +57,9 @@ Route104_Prototype_EventScript_160CF1:: @ 8160CF1 Route104_Prototype_EventScript_160CFB:: @ 8160CFB closebutton - pause 60 + delay 60 fadescreen 1 - pause 60 + delay 60 special DoSoftReset waitstate release diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index a1a13a003..6a0eea00f 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index c33bb7d19..907ac93a2 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index d3baeea34..1846cb2ff 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -359,7 +359,7 @@ Route109_EventScript_14F77F:: @ 814F77F Route109_EventScript_14F788:: @ 814F788 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox Route109_Text_16E5CA, 4 waitpokecry @@ -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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 68a2c6613..9fba68693 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -17,7 +17,7 @@ Route110_MapScript1_14F914:: @ 814F914 end Route110_EventScript_14F92F:: @ 814F92F - playmusicbattle 403 @ Bicycle music + savebgm 403 @ Bicycle music return Route110_MapScript2_14F933:: @ 814F933 @@ -131,7 +131,7 @@ Route110_EventScript_14FA25:: @ 814FA25 Route110_EventScript_14FA2E:: @ 814FA2E lockall - specialval RESULT, GetRecordedCyclingRoadResults + specialvar RESULT, GetRecordedCyclingRoadResults compare_var_to_imm RESULT, 0 goto_if_eq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 @@ -146,7 +146,7 @@ Route110_EventScript_14FA49:: @ 814FA49 Route110_EventScript_14FA53:: @ 814FA53 lock faceplayer - specialval RESULT, GetPlayerAvatarBike + specialvar RESULT, GetPlayerAvatarBike compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FA84 compare_var_to_imm 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 @@ -304,8 +304,8 @@ Route110_EventScript_14FCFB:: @ 814FCFB Route110_EventScript_14FD09:: @ 814FD09 setvar 0x40a9, 3 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm return Route110_EventScript_14FD13:: @ 814FD13 @@ -336,7 +336,7 @@ Route110_EventScript_14FD34:: @ 814FD34 waitmove 0 move 28, Route110_Movement_1A0835 waitmove 0 - pause 30 + delay 30 compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF14 compare_var_to_imm 0x8008, 2 @@ -352,11 +352,11 @@ Route110_EventScript_14FD34:: @ 814FD34 end Route110_EventScript_14FDA7:: @ 814FDA7 - playmusic 415, 1 + playbgm 415, 1 return Route110_EventScript_14FDAC:: @ 814FDAC - playmusic 421, 1 + playbgm 421, 1 return Route110_EventScript_14FDB1:: @ 814FDB1 @@ -435,7 +435,7 @@ Route110_EventScript_14FEB2:: @ 814FEB2 spritebehave 29, 10 disappear 28 reappear 29 - pause 45 + delay 45 compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF35 compare_var_to_imm 0x8008, 2 @@ -444,8 +444,8 @@ Route110_EventScript_14FEB2:: @ 814FEB2 call_if 1, Route110_EventScript_14FF4B disappear 29 setvar 0x4069, 1 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index daa55dc7f..d98662e78 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, GetPlayerAvatarBike @ player state? + specialvar RESULT, GetPlayerAvatarBike @ player state? compare_var_to_imm RESULT, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare_var_to_imm RESULT, 0 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 63e8df87c..204ccc64d 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, GetPlayerAvatarBike + specialvar RESULT, GetPlayerAvatarBike compare_var_to_imm RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag 2091 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 7f4ffdddd..e70dcd749 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -158,12 +158,12 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF call_if 1, Route110_TrickHouseEnd_EventScript_161C8A compare_var_to_imm FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_161C95 - pause 30 + delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 closebutton move 1, Route110_TrickHouseEnd_Movement_1A0839 waitmove 0 - pause 30 + delay 30 msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar 0x40c1, 0 .ifdef SAPPHIRE @@ -182,7 +182,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E move 1, Route110_TrickHouseEnd_Movement_161315 waitmove 0 - playsfx 178 + playse 178 move 1, Route110_TrickHouseEnd_Movement_16131E waitmove 0 disappear 1 @@ -224,20 +224,20 @@ Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall spriteface 1, 3 - playsfx 21 + playse 21 move 1, Route110_TrickHouseEnd_Movement_1A0833 waitmove 0 - pause 20 + delay 20 move 1, Route110_TrickHouseEnd_Movement_161CEA waitmove 0 - playsfx 178 + playse 178 move 255, Route110_TrickHouseEnd_Movement_1A0845 waitmove 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, 4 closebutton move 255, Route110_TrickHouseEnd_Movement_161CE8 waitmove 0 - pause 4 + delay 4 spriteface 1, 4 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 28b1eb0de..6a515e6f3 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -212,15 +212,15 @@ Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall - pause 20 + delay 20 compare_var_to_imm 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton - pause 20 + delay 20 move 1, Route110_TrickHouseEntrance_Movement_161315 waitmove 0 - playsfx 178 + playse 178 move 1, Route110_TrickHouseEntrance_Movement_16131E waitmove 0 disappear 1 @@ -243,7 +243,7 @@ Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A end Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D - playsfx 21 + playse 21 move 255, Route110_TrickHouseEntrance_Movement_1A0833 waitmove 0 move 255, Route110_TrickHouseEntrance_Movement_1A0835 @@ -336,7 +336,7 @@ Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 closebutton move 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmove 0 - playsfx 21 + playse 21 move 1, Route110_TrickHouseEntrance_Movement_1A0833 waitmove 0 move 1, Route110_TrickHouseEntrance_Movement_1A0835 @@ -469,7 +469,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 waitmove 0 move 1, Route110_TrickHouseEntrance_Movement_161315 waitmove 0 - playsfx 178 + playse 178 move 1, Route110_TrickHouseEntrance_Movement_16131E waitmove 0 disappear 1 @@ -503,7 +503,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD setmaptile 5, 1, 537, 0 special DrawWholeMapView - pause 20 + delay 20 move 255, Route110_TrickHouseEntrance_Movement_1A0856 waitmove 0 move 255, Route110_TrickHouseEntrance_Movement_16165E @@ -605,7 +605,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 compare_var_to_imm 0x40AB, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40AB, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -616,7 +616,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 compare_var_to_imm 0x40AC, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40AC, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -627,7 +627,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 compare_var_to_imm 0x40AD, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40AD, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -638,7 +638,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB compare_var_to_imm 0x40AE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40AE, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -649,7 +649,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 compare_var_to_imm 0x40AF, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40AF, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -660,7 +660,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D compare_var_to_imm 0x40B0, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40B0, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -671,7 +671,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 compare_var_to_imm 0x40B1, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40B1, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -682,7 +682,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F compare_var_to_imm 0x40B2, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40B2, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -714,7 +714,7 @@ Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C - fanfare 370 + playfanfare 370 message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare waittext @@ -762,5 +762,5 @@ Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920 setanimation 2, 32774 doanimation 54 checkanimation 54 - pause 10 + delay 10 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 4102bd9ec..6252a96d6 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -36,7 +36,7 @@ Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 lockall setvar 0x4001, 1 - playsfx 21 + playse 21 call Route110_TrickHousePuzzle2_EventScript_161E2C special DrawWholeMapView releaseall @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 lockall setvar 0x4002, 1 - playsfx 21 + playse 21 call Route110_TrickHousePuzzle2_EventScript_161E3F special DrawWholeMapView releaseall @@ -54,7 +54,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 lockall setvar 0x4003, 1 - playsfx 21 + playse 21 call Route110_TrickHousePuzzle2_EventScript_161E52 special DrawWholeMapView releaseall @@ -63,7 +63,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 lockall setvar 0x4004, 1 - playsfx 21 + playse 21 call Route110_TrickHousePuzzle2_EventScript_161E65 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 377791261..705f52455 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -289,7 +289,7 @@ Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF call Route110_TrickHousePuzzle3_EventScript_162612 - playsfx 21 + playse 21 call Route110_TrickHousePuzzle3_EventScript_161F12 goto Route110_TrickHousePuzzle3_EventScript_1626AD end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 67f5bc469..d0ced1ecb 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -160,7 +160,7 @@ Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F setvar 0x4001, 1 setvar 0x4008, 1 - playsfx 21 + playse 21 move 1, Route110_TrickHousePuzzle5_Movement_1A0833 waitmove 0 move 1, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -182,7 +182,7 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 setvar 0x4002, 1 setvar 0x4008, 2 - playsfx 21 + playse 21 move 2, Route110_TrickHousePuzzle5_Movement_1A0833 waitmove 0 move 2, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -204,7 +204,7 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 setvar 0x4003, 1 setvar 0x4008, 3 - playsfx 21 + playse 21 move 3, Route110_TrickHousePuzzle5_Movement_1A0833 waitmove 0 move 3, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -226,7 +226,7 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B setvar 0x4004, 1 setvar 0x4008, 4 - playsfx 21 + playse 21 move 4, Route110_TrickHousePuzzle5_Movement_1A0833 waitmove 0 move 4, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -248,7 +248,7 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F setvar 0x4005, 1 setvar 0x4008, 5 - playsfx 21 + playse 21 move 5, Route110_TrickHousePuzzle5_Movement_1A0833 waitmove 0 move 5, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -388,8 +388,8 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D end Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 - checksound - playsfx 32 + waitse + playse 32 msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4 move 1, Route110_TrickHousePuzzle5_Movement_16309F move 2, Route110_TrickHousePuzzle5_Movement_16309F @@ -407,8 +407,8 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 end Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF - checksound - playsfx 31 + waitse + playse 31 goto Route110_TrickHousePuzzle5_EventScript_162DE9 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 5d635e2c5..ae55a4316 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -120,13 +120,13 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall - pause 32 + delay 32 checkflag 194 call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 checkflag 194 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView - playsfx 36 + playse 36 checkflag 194 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 checkflag 194 @@ -135,13 +135,13 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall - pause 32 + delay 32 checkflag 195 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 checkflag 195 call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView - playsfx 36 + playse 36 checkflag 195 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE checkflag 195 @@ -150,13 +150,13 @@ Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall - pause 32 + delay 32 checkflag 196 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB checkflag 196 call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView - playsfx 36 + playse 36 checkflag 196 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 checkflag 196 @@ -165,13 +165,13 @@ Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall - pause 32 + delay 32 checkflag 197 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE checkflag 197 call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView - playsfx 36 + playse 36 checkflag 197 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 checkflag 197 @@ -180,13 +180,13 @@ Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall - pause 32 + delay 32 checkflag 198 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 checkflag 198 call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView - playsfx 36 + playse 36 checkflag 198 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC checkflag 198 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 7231b427a..fc73716eb 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -59,7 +59,7 @@ Route111_EventScript_150023:: @ 8150023 setflag 963 setflag 964 disappear 34 - pause 30 + delay 30 move 35, Route111_Movement_1500AF waitmove 0 disappear 35 @@ -81,7 +81,7 @@ Route111_EventScript_150069:: @ 8150069 setflag 964 setflag 963 disappear 35 - pause 30 + delay 30 move 34, Route111_Movement_1500AF waitmove 0 disappear 34 @@ -120,7 +120,7 @@ Route111_Movement_1500AF:: @ 81500AF Route111_EventScript_1500C5:: @ 81500C5 lock faceplayer - checkdailyflags + dodailyevents checkflag 2252 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 @@ -222,14 +222,14 @@ Route111_Movement_1501BA:: @ 81501BA Route111_EventScript_1501BC:: @ 81501BC setweather 2 - fademusic 360 + fadenewbgm 360 doweather setvar 0x4003, 0 end Route111_EventScript_1501C9:: @ 81501C9 setweather 8 - fademusic 409 + fadenewbgm 409 doweather 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 9a4c85158..70a6a2869 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index ae08ff5bb..06519867e 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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 f83c5cf23..9774a3a5f 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -197,8 +197,8 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 msgbox Route113_GlassWorkshop_Text_19E827, 4 closebutton fadescreen 1 - playsfx 5 - pause 30 + playse 5 + delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare_var_to_imm 0x8009, 0 diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index d910d3e16..799a115b7 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -4,7 +4,7 @@ Route114_MapScripts:: @ 8150732 Route114_EventScript_150733:: @ 8150733 lock faceplayer - checkdailyflags + dodailyevents checkflag 2251 goto_if_eq Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 @@ -46,7 +46,7 @@ Route114_EventScript_1507B9:: @ 81507B9 Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer - checksound + waitse pokecry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 waitpokecry @@ -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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 711a62e40..64b0a7497 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 838ebe814..c58a3dfb9 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_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BCA - specialval RESULT, sub_810F828 + specialvar RESULT, sub_810F828 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_810F828 + specialvar RESULT, sub_810F828 compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 @@ -180,7 +180,7 @@ Route116_EventScript_150BF4:: @ 8150BF4 end Route116_EventScript_150C03:: @ 8150C03 - pause 20 + delay 20 compare_var_to_imm FACING, 2 call_if 1, Route116_EventScript_150C37 compare_var_to_imm FACING, 1 @@ -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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 2a27c01d7..6d538a872 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index e1b4fd345..7e6543d7f 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -77,10 +77,10 @@ Route118_EventScript_150FE4:: @ 8150FE4 end Route118_EventScript_151004:: @ 8151004 - playsfx 10 + playse 10 move 19, Route118_Movement_15106D waitmove 0 - pause 30 + delay 30 msgbox Route118_Text_170D66, 4 closebutton compare_var_to_imm 0x8008, 0 @@ -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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index cae90cd12..9abb8adf9 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -56,21 +56,21 @@ Route119_EventScript_1511DB:: @ 81511DB call_if 1, Route119_EventScript_151254 compare_var_to_imm RESULT, 1 call_if 1, Route119_EventScript_151259 - pause 65 + delay 65 compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513A6 compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513B1 move 255, Route119_Movement_1A0845 waitmove 0 - pause 30 + delay 30 compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513D2 compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 25 reappear 16 - pause 30 + delay 30 checkgender compare_var_to_imm RESULT, 0 goto_if_eq Route119_EventScript_15125E @@ -80,11 +80,11 @@ Route119_EventScript_1511DB:: @ 81511DB end Route119_EventScript_151254:: @ 8151254 - playmusic 415, 1 + playbgm 415, 1 return Route119_EventScript_151259:: @ 8151259 - playmusic 421, 1 + playbgm 421, 1 return Route119_EventScript_15125E:: @ 815125E @@ -160,15 +160,15 @@ Route119_EventScript_151362:: @ 8151362 call_if 1, Route119_EventScript_1513E1 disappear 16 reappear 25 - pause 30 + delay 30 compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513BC compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513C7 disappear 25 setvar 0x4072, 1 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm releaseall end @@ -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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 diff --git a/data/scripts/maps/Route119_House.inc b/data/scripts/maps/Route119_House.inc index 6395e40eb..ea963dee0 100644 --- a/data/scripts/maps/Route119_House.inc +++ b/data/scripts/maps/Route119_House.inc @@ -8,7 +8,7 @@ Route119_House_EventScript_163DDE:: @ 8163DDE Route119_House_EventScript_163DE7:: @ 8163DE7 lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox Route119_House_Text_19F406, 4 waitpokecry diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index a8fd671bd..54b54dd18 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -40,7 +40,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 closebutton setvar 0x40b3, 1 clearflag 893 - fadedefault + fadedefaultbgm fadescreen 1 setflag 890 disappear 1 @@ -58,7 +58,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A countpokemon compare_var_to_imm RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 - fanfare 370 + playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waittext diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index e736722b5..2e6ae94e5 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -112,7 +112,7 @@ Route120_EventScript_151735:: @ 8151735 Route120_EventScript_151739:: @ 8151739 lock faceplayer - checkdailyflags + dodailyevents checkflag 2254 goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 @@ -120,7 +120,7 @@ Route120_EventScript_151739:: @ 8151739 call_if 1, Route120_EventScript_151841 compare_var_to_imm RESULT, 0 call_if 1, Route120_EventScript_15184A - specialval RESULT, GetPlayerTrainerIdOnesDigit + specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT case 0, Route120_EventScript_1517DC case 5, Route120_EventScript_1517DC @@ -214,16 +214,16 @@ Route120_EventScript_15189D:: @ 815189D call_if 1, Route120_EventScript_15198A move 31, Route120_Movement_1A083F waitmove 0 - pause 20 + delay 20 msgbox Route120_Text_1719D4, 4 closebutton move 30, Route120_Movement_1A0843 waitmove 0 move 30, Route120_Movement_1A0662 waitmove 0 - checksound + waitse pokecry SPECIES_KECLEON, 2 - pause 40 + delay 40 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 @@ -244,10 +244,10 @@ Route120_EventScript_151908:: @ 8151908 closebutton move 31, Route120_Movement_1A0845 waitmove 0 - pause 50 + delay 50 setanimation 0, 1 doanimation 30 - pause 15 + delay 15 disappear 31 checkanimation 30 setmaptile 13, 15, 663, 0 @@ -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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 3af8ff7cf..68c04762f 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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 efc2ab4fb..2fd6e54f6 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -71,7 +71,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 updatemoney 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 - fanfare 370 + playfanfare 370 message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare waittext @@ -90,7 +90,7 @@ Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 countpokemon compare_var_to_imm RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F - specialval RESULT, CheckFreePokemonStorageSpace + specialvar RESULT, CheckFreePokemonStorageSpace compare_var_to_imm RESULT, 1 goto_if_eq 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 f4ba11b0d..6e6cbd506 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 4c35b52ec..ee7bc80cf 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -9,7 +9,7 @@ Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5 Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 lock faceplayer - checkdailyflags + dodailyevents checkflag 2253 goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 @@ -39,7 +39,7 @@ Route123_BerryMastersHouse_EventScript_163A5A:: @ 8163A5A Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 lock faceplayer - checkdailyflags + dodailyevents checkflag 2257 goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index ef9f0ebed..7d7d38ceb 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 7d5fc0376..c62d49117 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 10bb0a1cc..21927ec0f 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -15,7 +15,7 @@ Route128_MapScript2_152135:: @ 8152135 Route128_EventScript_15213F:: @ 815213F lockall - pause 20 + delay 20 .ifndef SAPPHIRE special sub_807E25C waitstate @@ -45,13 +45,13 @@ Route128_EventScript_15213F:: @ 815213F waitmove 0 msgbox Route128_Text_17210B, 4 closebutton - pause 40 + delay 40 move 5, Route128_Movement_152296 move 4, Route128_Movement_152283 waitmove 0 disappear 5 disappear 4 - pause 100 + delay 100 setanimation 0, 1 doanimation 30 checkanimation 30 @@ -76,10 +76,10 @@ Route128_EventScript_15213F:: @ 815213F closebutton move 3, Route128_Movement_1A0845 waitmove 0 - pause 50 + delay 50 setanimation 0, 1 doanimation 30 - pause 15 + delay 15 disappear 3 checkanimation 30 setvar 0x407b, 2 @@ -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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 83b972dbf..3e234667a 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, IsMirageIslandPresent + specialvar RESULT, IsMirageIslandPresent compare_var_to_imm RESULT, 1 goto_if_eq Route130_EventScript_15240C setflag 17 diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc index b1f77fac1..6b4d330d1 100644 --- a/data/scripts/maps/Route134.inc +++ b/data/scripts/maps/Route134.inc @@ -3,7 +3,7 @@ Route134_MapScripts:: @ 81525B5 .byte 0 Route134_MapScript1_1525BB:: @ 81525BB - warp4 Underwater_Route134, 255, 8, 6 + setdivewarp Underwater_Route134, 255, 8, 6 end Route134_EventScript_1525C4:: @ 81525C4 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 1a2afe16d..677838f8a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -333,7 +333,7 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF end RustboroCity_EventScript_14C614:: @ 814C614 - checksound + waitse setvar 0x4001, 4 goto RustboroCity_EventScript_14C77D end @@ -381,7 +381,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 RustboroCity_EventScript_14C691:: @ 814C691 move 9, RustboroCity_Movement_1A0841 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -393,7 +393,7 @@ RustboroCity_EventScript_14C691:: @ 814C691 RustboroCity_EventScript_14C6BD:: @ 814C6BD move 9, RustboroCity_Movement_1A083F waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -405,7 +405,7 @@ RustboroCity_EventScript_14C6BD:: @ 814C6BD RustboroCity_EventScript_14C6E9:: @ 814C6E9 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -417,7 +417,7 @@ RustboroCity_EventScript_14C6E9:: @ 814C6E9 RustboroCity_EventScript_14C715:: @ 814C715 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -476,7 +476,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D setflag 144 setflag 732 setvar 0x405a, 5 - pause 30 + delay 30 warp RustboroCity_DevonCorp_3F, 255, 2, 2 waitstate releaseall @@ -489,7 +489,7 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 RustboroCity_EventScript_14C7FE:: @ 814C7FE move 9, RustboroCity_Movement_1A0841 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -501,7 +501,7 @@ RustboroCity_EventScript_14C7FE:: @ 814C7FE RustboroCity_EventScript_14C82A:: @ 814C82A move 9, RustboroCity_Movement_1A0843 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -513,7 +513,7 @@ RustboroCity_EventScript_14C82A:: @ 814C82A RustboroCity_EventScript_14C856:: @ 814C856 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -525,7 +525,7 @@ RustboroCity_EventScript_14C856:: @ 814C856 RustboroCity_EventScript_14C882:: @ 814C882 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -539,7 +539,7 @@ RustboroCity_EventScript_14C882:: @ 814C882 RustboroCity_EventScript_14C8B8:: @ 814C8B8 move 9, RustboroCity_Movement_1A083F waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 352850d9e..2f3fd5927 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -80,7 +80,7 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 closebutton - playsfx 21 + playse 21 move 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmove 0 move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 @@ -98,7 +98,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE closebutton - playsfx 21 + playse 21 move 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmove 0 move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 @@ -140,7 +140,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 copyvar 0x8004, RESULT setvar 0x40c4, 0 setflag 267 - fanfare 370 + playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waittext @@ -160,7 +160,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 copyvar 0x8004, RESULT setvar 0x40c4, 0 setflag 267 - fanfare 370 + playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waittext diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 78feb0ce5..887299933 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -32,25 +32,25 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 closebutton move 2, RustboroCity_DevonCorp_3F_Movement_157815 waitmove 0 - pause 80 + delay 80 move 2, RustboroCity_DevonCorp_3F_Movement_15781E waitmove 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 closebutton - playmusic 420, 0 + playbgm 420, 0 move 2, RustboroCity_DevonCorp_3F_Movement_157803 move 255, RustboroCity_DevonCorp_3F_Movement_157827 waitmove 0 msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4 closebutton - fadedefault + fadedefaultbgm move 2, RustboroCity_DevonCorp_3F_Movement_157812 move 255, RustboroCity_DevonCorp_3F_Movement_157835 waitmove 0 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 - fanfare 370 + playfanfare 370 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waittext diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/scripts/maps/RustboroCity_Flat2_1F.inc index 5aa91d5d1..f22f6cc90 100644 --- a/data/scripts/maps/RustboroCity_Flat2_1F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_1F_EventScript_157D7A:: @ 8157D7A RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 lock faceplayer - checksound + waitse pokecry SPECIES_SKITTY, 0 msgbox RustboroCity_Flat2_1F_Text_185410, 4 waitpokecry diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 0dd47d2d3..080fc7e18 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -8,7 +8,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D goto_if_eq RustboroCity_House1_EventScript_157D13 setvar 0x8008, 0 copyvar 0x8004, 0x8008 - specialval RESULT, sub_804D89C + specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare_var_to_imm RESULT, 0 @@ -19,7 +19,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D compare_var_to_imm 0x8004, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar 0x8005, 0x800a - specialval RESULT, sub_804DB2C + specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT compare_var_to_var RESULT, 0x8009 goto_if 5, RustboroCity_House1_EventScript_157D05 diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/scripts/maps/RustboroCity_House3.inc index 0e81ed158..b219563be 100644 --- a/data/scripts/maps/RustboroCity_House3.inc +++ b/data/scripts/maps/RustboroCity_House3.inc @@ -12,7 +12,7 @@ RustboroCity_House3_EventScript_157DF6:: @ 8157DF6 RustboroCity_House3_EventScript_157DFF:: @ 8157DFF lock faceplayer - checksound + waitse pokecry SPECIES_PIKACHU, 0 msgbox RustboroCity_House3_Text_18567D, 4 waitpokecry diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index b4546e27a..cfa319bf3 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -148,7 +148,7 @@ RusturfTunnel_EventScript_15C91B:: @ 815C91B return RusturfTunnel_EventScript_15C92D:: @ 815C92D - playsfx 21 + playse 21 move 1, RusturfTunnel_Movement_1A0833 waitmove 0 move 1, RusturfTunnel_Movement_1A0835 @@ -299,7 +299,7 @@ RusturfTunnel_Movement_15C9D3:: @ 815C9D3 RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox RusturfTunnel_Text_194188, 4 waitpokecry @@ -309,7 +309,7 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 RusturfTunnel_EventScript_15C9EA:: @ 815C9EA lock faceplayer - playmusic BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, 0 msgbox RusturfTunnel_Text_19419B, 4 trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 @@ -319,7 +319,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA move 6, RusturfTunnel_Movement_15CAA2 waitmove 0 disappear 6 - pause 50 + delay 50 reappear 5 move 5, RusturfTunnel_Movement_15CAAC waitmove 0 @@ -331,7 +331,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA waitmove 0 message RusturfTunnel_Text_19434F waittext - checksound + waitse pokecry SPECIES_WINGULL, 0 waitbutton waitpokecry diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index da9d31cca..9f86473be 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -13,7 +13,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag setvar 0x40b4, 2 lockall - playsfx 73 + playse 73 msgbox SSTidalCorridor_Text_199007, 4 releaseall end @@ -21,7 +21,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 setvar 0x40b4, 6 lockall - playsfx 73 + playse 73 msgbox SSTidalCorridor_Text_199088, 4 releaseall end @@ -29,14 +29,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag setvar 0x40b4, 7 - playsfx 73 + playse 73 msgbox SSTidalRooms_Text_199007, 4 return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag setvar 0x40b4, 4 - playsfx 73 + playse 73 msgbox SSTidalRooms_Text_1990F8, 4 return @@ -51,7 +51,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag setvar 0x40b4, 3 lockall - playsfx 73 + playse 73 msgbox SSTidalCorridor_Text_199088, 4 releaseall end @@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag setvar 0x40b4, 8 lockall - playsfx 73 + playse 73 msgbox SSTidalCorridor_Text_1990B4, 4 releaseall end @@ -68,7 +68,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag setvar 0x40b4, 8 - playsfx 73 + playse 73 msgbox SSTidalRooms_Text_1990B4, 4 return @@ -87,7 +87,7 @@ SSTidalCorridor_EventScript_15FD96:: @ 815FD96 SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox SSTidalCorridor_Text_199388, 4 waitpokecry diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 8cc342f88..f1c37be5b 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -94,7 +94,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F SafariZone_Southeast_EventScript_160139:: @ 8160139 setvar 0x40a4, 1 special ExitSafariMode - warpwalk Route121_SafariZoneEntrance, 255, 2, 5 + warpdoor Route121_SafariZoneEntrance, 255, 2, 5 waitstate end diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index 0bf99d2ad..787ac6605 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -3,6 +3,6 @@ SeafloorCavern_Entrance_MapScripts:: @ 815DA4A .byte 0 SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 - warp4 Underwater_SeafloorCavern, 255, 6, 5 + setdivewarp Underwater_SeafloorCavern, 255, 6, 5 warp6 Underwater_SeafloorCavern, 255, 6, 5 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 71184346f..fe13664d9 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -78,7 +78,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 0 .endif - playsfx 209 + playse 209 setanimation 0, 16 setanimation 1, 42 setanimation 2, 0 @@ -89,17 +89,17 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 1 .endif - fanfare 388 - playsfx 107 + playfanfare 388 + playse 107 special sub_80818A4 move 0x8004, SeafloorCavern_Room9_Movement_1A0841 move 255, SeafloorCavern_Room9_Movement_1A0841 waitmove 0 - pause 150 + delay 150 disappear 7 reappear 1 waitstate - pause 60 + delay 60 move 1, SeafloorCavern_Room9_Movement_15DD4C waitmove 0 special sub_80818FC @@ -111,12 +111,12 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA move 1, SeafloorCavern_Room9_Movement_15DD57 waitmove 0 disappear 1 - pause 4 + delay 4 setvar 0x8004, 2 setvar 0x8005, 2 special sub_810F758 waitstate - pause 30 + delay 30 setvar 0x8004, 2 setvar 0x8005, 3 setvar 0x8006, 4 @@ -126,7 +126,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4A89, 4 .endif - playsfx 2 + playse 2 move 255, SeafloorCavern_Room9_Movement_1A083F waitmove 0 .ifdef SAPPHIRE @@ -143,8 +143,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4B11, 4 .endif closebutton - playsfx 3 - pause 20 + playse 3 + delay 20 move 0x8004, SeafloorCavern_Room9_Movement_1A0845 waitmove 0 .ifdef SAPPHIRE @@ -167,7 +167,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif - playsfx 21 + playse 21 move 0x8004, SeafloorCavern_Room9_Movement_1A0833 waitmove 0 move 0x8004, SeafloorCavern_Room9_Movement_1A0835 diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 2650f4ab5..929b4d0ca 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -8,29 +8,29 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 hidebox 0, 0, 29, 19 checkflag 228 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 - specialval RESULT, CheckRelicanthWailord + specialvar RESULT, CheckRelicanthWailord compare_var_to_imm RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 - fadeout 0 - playsfx 49 + fadeoutbgm 0 + playse 49 special DoSealedChamberShakingEffect1 waitstate - pause 40 + delay 40 special DoSealedChamberShakingEffect2 waitstate - playsfx 8 - pause 40 + playse 8 + delay 40 special DoSealedChamberShakingEffect2 waitstate - playsfx 8 - pause 40 + playse 8 + delay 40 special DoSealedChamberShakingEffect2 waitstate - playsfx 8 - pause 40 + playse 8 + delay 40 msgbox SealedChamber_InnerRoom_Text_1A138B, 4 closebutton - fadein 0 + fadeinbgm 0 setflag 228 releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index dfa4777fa..091c0e8a4 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -5,7 +5,7 @@ SealedChamber_OuterRoom_MapScripts:: @ 815F0C6 .byte 0 SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 - warp4 Underwater_SealedChamber, 255, 12, 44 + setdivewarp Underwater_SealedChamber, 255, 12, 44 warp6 Underwater_SealedChamber, 255, 12, 44 end diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index bad7397c0..e51817e27 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -19,7 +19,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E072:: @ 815E072 ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer - checkdailyflags + dodailyevents checkflag 2143 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index 62cb389f2..3b3585bf8 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -6,5 +6,5 @@ SkyPillar_2F_MapScripts:: @ 815F2C9 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 tileeffect 7 - warp5 SkyPillar_1F, 255, 0, 0 + setholewarp SkyPillar_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index 5e1f7f4e6..3d535a25a 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -6,5 +6,5 @@ SkyPillar_4F_MapScripts:: @ 815F2E5 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 tileeffect 7 - warp5 SkyPillar_3F, 255, 0, 0 + setholewarp SkyPillar_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index e41d579c0..9a8a57e3f 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -15,9 +15,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 lock faceplayer setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE - checksound + waitse pokecry SPECIES_RAYQUAZA, 2 - pause 40 + delay 40 waitpokecry setflag 773 setflag 2145 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index c43ddfaee..69bd90d75 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -66,14 +66,14 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 faceplayer bufferfirstpoke 0 msgbox SlateportCity_Text_164682, 4 - specialval RESULT, LeadMonHasEffortRibbon + specialvar RESULT, LeadMonHasEffortRibbon compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_EventScript_14BB35 - specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut + specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare_var_to_imm RESULT, 0 call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 - fanfare 370 + playfanfare 370 message SlateportCity_Text_1646DD waitfanfare waittext @@ -493,10 +493,10 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC closebutton move 10, SlateportCity_Movement_1A0843 waitmove 0 - pause 10 + delay 10 move 9, SlateportCity_Movement_1A0845 waitmove 0 - pause 25 + delay 25 move 11, SlateportCity_Movement_14C000 move 255, SlateportCity_Movement_14C00E move 10, SlateportCity_Movement_14BFDD @@ -508,7 +508,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC move 11, SlateportCity_Movement_1A0841 waitmove 0 msgbox SlateportCity_Text_1655E7, 4 - playmusic BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, 0 msgbox SlateportCity_Text_1656BC, 4 move 6, SlateportCity_Movement_1A083F move 1, SlateportCity_Movement_1A083F @@ -519,7 +519,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC move 11, SlateportCity_Movement_1A0845 waitmove 0 msgbox SlateportCity_Text_16578F, 4 - playsfx 21 + playse 21 move 11, SlateportCity_Movement_1A0833 waitmove 0 move 11, SlateportCity_Movement_1A0835 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index b541fb0e8..0f2d03a5a 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -22,17 +22,17 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 lockall move 1, SlateportCity_ContestLobby_Movement_1554CC waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView move 1, SlateportCity_ContestLobby_Movement_1554CF waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView - pause 20 + delay 20 move 1, SlateportCity_ContestLobby_Movement_1554DC waitmove 0 move 255, SlateportCity_ContestLobby_Movement_1554CA diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index be1504415..802906f25 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -16,7 +16,7 @@ SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 return SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 - playmusicbattle BGM_EVIL_TEAM + savebgm BGM_EVIL_TEAM movespriteperm 4, 12, 13 spritebehave 4, 9 setflag 905 @@ -221,13 +221,13 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 closebutton move LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmove 0 - pause 30 + delay 30 spriteinvisible LAST_TALKED, 9, 8 compare_var_to_imm FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF compare_var_to_imm FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 - pause 30 + delay 30 spriteinvisible 255, 0, 0 setvar 0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 731b3385b..e932a58ab 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -27,14 +27,14 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF end SlateportCity_House1_EventScript_1556C9:: @ 81556C9 - specialval RESULT, ScriptGetPartyMonSpecies + specialvar RESULT, ScriptGetPartyMonSpecies compare_var_to_imm RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C special sub_80BFAE0 special sub_80BFB10 compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - specialval RESULT, sub_810F96C + specialvar RESULT, sub_810F96C special sub_80BFAE0 compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 @@ -58,7 +58,7 @@ SlateportCity_House1_EventScript_155726:: @ 8155726 SlateportCity_House1_EventScript_155730:: @ 8155730 msgbox SlateportCity_House1_Text_17D580, 4 call SlateportCity_House1_EventScript_1A0678 - specialval RESULT, sub_80BF9B4 + specialvar RESULT, sub_80BF9B4 special sub_80BFAE0 compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index e8f6d45ac..0c75b2b9d 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -157,8 +157,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C31:: @ 8155C31 SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A lock faceplayer - pause 8 - playsfx 21 + delay 8 + playse 21 move 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 waitmove 0 move 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 @@ -180,7 +180,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 move 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmove 0 setflag 965 - playsfx 9 + playse 9 disappear 13 release end @@ -189,7 +189,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD move 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmove 0 setflag 965 - playsfx 9 + playse 9 disappear 13 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 3a08fcc2a..709d3f1d6 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -11,7 +11,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 closebutton - playmusic BGM_EVIL_TEAM, 1 + playbgm BGM_EVIL_TEAM, 1 reappear 3 move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 waitmove 0 @@ -45,7 +45,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmove 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4 - playmusicbattle 0 + savebgm 0 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 move 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF waitmove 0 @@ -54,7 +54,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmove 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4 closebutton - pause 35 + delay 35 reappear 2 move 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 move 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE @@ -73,7 +73,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 disappear 3 disappear 4 fadescreen 0 - pause 30 + delay 30 setflag 883 move 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmove 0 @@ -84,7 +84,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 closebutton move 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmove 0 - playsfx 9 + playse 9 disappear 1 setflag 900 setflag 149 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 4a7fc8474..80ee23d43 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, CheckLeadMonCool + specialvar RESULT, CheckLeadMonCool compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 return @@ -154,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 return SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 - specialval RESULT, CheckLeadMonBeauty + specialvar RESULT, CheckLeadMonBeauty compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA return @@ -164,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA return SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 - specialval RESULT, CheckLeadMonCute + specialvar RESULT, CheckLeadMonCute compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 return @@ -174,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 return SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 - specialval RESULT, CheckLeadMonSmart + specialvar RESULT, CheckLeadMonSmart compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 return @@ -184,7 +184,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 return SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE - specialval RESULT, CheckLeadMonTough + specialvar RESULT, CheckLeadMonTough compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F return @@ -199,14 +199,14 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 checkflag 278 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 - specialval RESULT, GetLeadMonFriendshipScore + specialvar RESULT, GetLeadMonFriendshipScore compare_var_to_imm RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A release end SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A - playsfx 21 + playse 21 move LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 waitmove 0 move LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 @@ -235,7 +235,7 @@ SlateportCity_PokemonFanClub_EventScript_155A88:: @ 8155A88 SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 lock faceplayer - checksound + waitse pokecry SPECIES_SKITTY, 0 msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4 waitpokecry @@ -245,7 +245,7 @@ SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox SlateportCity_PokemonFanClub_Text_17E164, 4 waitpokecry @@ -255,7 +255,7 @@ SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 lock faceplayer - checksound + waitse pokecry SPECIES_AZUMARILL, 0 msgbox SlateportCity_PokemonFanClub_Text_17E178, 4 waitpokecry diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 44ee245fd..14bece069 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -62,7 +62,7 @@ SootopolisCity_EventScript_14D159:: @ 814D159 return SootopolisCity_MapScript1_14D165:: @ 814D165 - warp4 Underwater_SootopolisCity, 255, 9, 6 + setdivewarp Underwater_SootopolisCity, 255, 9, 6 end SootopolisCity_EventScript_14D16E:: @ 814D16E @@ -90,7 +90,7 @@ SootopolisCity_EventScript_14D196:: @ 814D196 SootopolisCity_EventScript_14D19F:: @ 814D19F lock faceplayer - checkdailyflags + dodailyevents special GetPlayerBigGuyGirlString checkflag 2258 goto_if_eq SootopolisCity_EventScript_14D241 @@ -216,7 +216,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 move 10, SootopolisCity_Movement_1A083F move 255, SootopolisCity_Movement_1A0843 waitmove 0 - playsfx 21 + playse 21 move 10, SootopolisCity_Movement_1A0833 waitmove 0 move 10, SootopolisCity_Movement_1A0835 @@ -237,7 +237,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169E82, 4 .endif - playsfx 21 + playse 21 move 5, SootopolisCity_Movement_1A0833 waitmove 0 move 5, SootopolisCity_Movement_1A0835 @@ -248,7 +248,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 msgbox SootopolisCity_Text_169F3C, 4 .endif closebutton - pause 30 + delay 30 move 5, SootopolisCity_Movement_14D46A move 10, SootopolisCity_Movement_14D41D move 255, SootopolisCity_Movement_14D445 @@ -256,7 +256,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 move 5, SootopolisCity_Movement_1A0843 move 255, SootopolisCity_Movement_1A0843 waitmove 0 - pause 30 + delay 30 move 10, SootopolisCity_Movement_1A0845 waitmove 0 .ifdef SAPPHIRE @@ -265,7 +265,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 msgbox SootopolisCity_Text_169F6B, 4 .endif closebutton - pause 30 + delay 30 move 5, SootopolisCity_Movement_14D47C move 255, SootopolisCity_Movement_14D457 move 10, SootopolisCity_Movement_14D42D @@ -460,10 +460,10 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD closebutton move LAST_TALKED, SootopolisCity_Movement_1A0845 waitmove 0 - pause 50 + delay 50 setanimation 0, 1 doanimation 30 - pause 15 + delay 15 disappear LAST_TALKED checkanimation 30 release diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 39bc2d4db..1df729aad 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -48,35 +48,35 @@ SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 addvar 0x4022, 1 - pause 40 - playsfx 40 + delay 40 + playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC addvar 0x4022, 1 - pause 40 - playsfx 40 + delay 40 + playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 addvar 0x4022, 1 - pause 40 - playsfx 40 + delay 40 + playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 lockall - pause 20 + delay 20 move 255, SootopolisCity_Gym_1F_Movement_15AFFD waitmove 0 - playsfx 43 - pause 60 + playse 43 + delay 60 warphole SootopolisCity_Gym_B1F waitstate end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index e01a00d97..ccfec8036 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -21,7 +21,7 @@ SootopolisCity_House1_EventScript_15B2C7:: @ 815B2C7 SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 lock faceplayer - checksound + waitse pokecry SPECIES_KECLEON, 0 msgbox SootopolisCity_House1_Text_18FA50, 4 waitpokecry diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/scripts/maps/SootopolisCity_House4.inc index ee3bfe61b..ac9a641d6 100644 --- a/data/scripts/maps/SootopolisCity_House4.inc +++ b/data/scripts/maps/SootopolisCity_House4.inc @@ -12,7 +12,7 @@ SootopolisCity_House4_EventScript_15B356:: @ 815B356 SootopolisCity_House4_EventScript_15B35F:: @ 815B35F lock faceplayer - checksound + waitse pokecry SPECIES_AZUMARILL, 0 msgbox SootopolisCity_House4_Text_18FDD8, 4 waitpokecry diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 72a11a88b..2965b6748 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -16,7 +16,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 closebutton move LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmove 0 - pause 30 + delay 30 spriteinvisible 1, 26, 9 setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 368e26794..e50b29d76 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -52,17 +52,17 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 special SpawnCameraDummy move 127, SouthernIsland_Interior_Movement_160C12 waitmove 0 - pause 50 - checksound + delay 50 + waitse pokecry SPECIES_LATIAS_OR_LATIOS, 0 - pause 30 + delay 30 waitpokecry reappear 2 - pause 30 + delay 30 move 127, SouthernIsland_Interior_Movement_160C16 move 2, SouthernIsland_Interior_Movement_160C22 waitmove 0 - pause 50 + delay 50 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag 911 diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/scripts/maps/Underwater_Route134.inc index ee79f9799..bbe7e1ce2 100644 --- a/data/scripts/maps/Underwater_Route134.inc +++ b/data/scripts/maps/Underwater_Route134.inc @@ -3,5 +3,5 @@ Underwater_Route134_MapScripts:: @ 815F071 .byte 0 Underwater_Route134_MapScript1_15F077:: @ 815F077 - warp4 Route134, 255, 60, 31 + setdivewarp Route134, 255, 60, 31 end diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 8ef61d0f0..3d2fe81b2 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -35,7 +35,7 @@ Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 return Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 - warp4 SeafloorCavern_Entrance, 255, 10, 17 + setdivewarp SeafloorCavern_Entrance, 255, 10, 17 end Underwater_SeafloorCavern_EventScript_15DA3F:: @ 815DA3F diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index cbb45993a..6d263690d 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -11,11 +11,11 @@ Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 - warp4 Route134, 255, 60, 31 + setdivewarp Route134, 255, 60, 31 end Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF - warp4 SealedChamber_OuterRoom, 255, 10, 19 + setdivewarp SealedChamber_OuterRoom, 255, 10, 19 end Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc index 624c2c83e..c9405dfd7 100644 --- a/data/scripts/maps/Underwater_SootopolisCity.inc +++ b/data/scripts/maps/Underwater_SootopolisCity.inc @@ -3,5 +3,5 @@ Underwater_SootopolisCity_MapScripts:: @ 815CAE4 .byte 0 Underwater_SootopolisCity_MapScript1_15CAEA:: @ 815CAEA - warp4 SootopolisCity, 255, 29, 53 + setdivewarp SootopolisCity, 255, 29, 53 end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index fee3b1498..0bf09e41e 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -26,23 +26,23 @@ LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 - playmusicbattle 393 + savebgm 393 return LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4 - playmusicbattle 394 + savebgm 394 return LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8 - playmusicbattle 395 + savebgm 395 return LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC - playmusicbattle 396 + savebgm 396 return LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 - playmusicbattle 440 + savebgm 440 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 2443b01b0..e3aa13eb2 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -22,17 +22,17 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 lockall move 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView move 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView - pause 20 + delay 20 move 1, VerdanturfTown_ContestLobby_Movement_153E35 waitmove 0 move 255, VerdanturfTown_ContestLobby_Movement_153E23 diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index 5453fb42c..0dcad8f62 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, GetLeadMonFriendshipScore + specialvar RESULT, GetLeadMonFriendshipScore switch RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154093 case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_15409D @@ -55,7 +55,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540CF:: @ 81540CF VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 lock faceplayer - checksound + waitse pokecry SPECIES_PIKACHU, 0 msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4 waitpokecry diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 95b82f46a..78c246eb0 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, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 0a74b3c9a..1881bc242 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -36,7 +36,7 @@ yes_hear_song: setvar 0x8004, 0 @ Give the player ear rape special ScrSpecial_PlayBardSong - pause 60 + delay 60 special ScrSpecial_HasBardSongBeenChanged compare_var_to_imm RESULT, FALSE @ Prompt new lyrics only if song hasn't been changed @@ -69,7 +69,7 @@ write_lyrics: setvar 0x8004, 1 @ Give the player ear rape again special ScrSpecial_PlayBardSong - pause 60 + delay 60 msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO compare_var_to_imm RESULT, NO goto_if_eq write_lyrics @ Keep looping until player responds YES @@ -227,7 +227,7 @@ SpeakToStoryteller: msgbox gTextStoryteller_Introduction, MSGBOX_YESNO compare_var_to_imm RESULT, NO goto_if_eq dont_hear_story - specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot + specialvar RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare_var_to_imm RESULT, 0 @ If slot is 0, then the list is empty goto_if_eq no_stories_recorded choose_story: @@ -241,7 +241,7 @@ choose_story: special ScrSpecial_StorytellerDisplayStory waittext waitbutton - specialval RESULT, ScrSpecial_StorytellerUpdateStat + specialvar RESULT, ScrSpecial_StorytellerUpdateStat compare_var_to_imm RESULT, FALSE goto_if_eq no_stat_update goto stat_update @@ -255,10 +255,10 @@ no_stat_update: compare_var_to_imm RESULT, YES goto_if_eq choose_story yes_hear_story: - specialval RESULT, ScrSpecial_HasStorytellerAlreadyRecorded + specialvar RESULT, ScrSpecial_HasStorytellerAlreadyRecorded compare_var_to_imm RESULT, TRUE goto_if_eq cant_record_story @ already recorded story - specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot + specialvar RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare_var_to_imm RESULT, 4 goto_if_eq cant_record_story @ story list is full goto prompt_record_story @@ -268,7 +268,7 @@ prompt_record_story: msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO compare_var_to_imm RESULT, NO goto_if_eq dont_hear_story - specialval RESULT, ScrSpecial_StorytellerInitializeRandomStat + specialvar RESULT, ScrSpecial_StorytellerInitializeRandomStat compare_var_to_imm RESULT, TRUE goto_if_eq stat_update msgbox gTextStoryteller_ImNotSatisfied, 4 diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 4ed0cef11..ed21a1869 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -46,7 +46,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB setvar 0x8004, 0 special sub_80EB7C4 waittext - pause 80 + delay 80 msgbox PetalburgCity_PokemonCenter_1F_Text_1B2137, 4 release end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 868873eec..512272e05 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -63,7 +63,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4 call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B - pause 30 + delay 30 setvar 0x4092, 6 setflag 81 setflag 754 @@ -73,7 +73,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 - playsfx 9 + playse 9 disappear 0x8008 releaseall end @@ -160,7 +160,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D move 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC waitmove 0 - playmusic 453, 0 + playbgm 453, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4 closebutton move 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB @@ -185,7 +185,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D move 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 waitmove 0 - playmusic 453, 0 + playbgm 453, 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4 closebutton move 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE @@ -206,7 +206,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D - playsfx 21 + playse 21 move 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmove 0 move 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835 @@ -220,10 +220,10 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE move 255, LittlerootTown_BrendansHouse_1F_Movement_1A0841 waitmove 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4 - fadedefault + fadedefaultbgm special TurnOffTVScreen setflag 2096 - pause 35 + delay 35 return LittlerootTown_BrendansHouse_1F_Movement_1B6BDB:: @ 81B6BDB @@ -312,7 +312,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6:: @ 81B6CA6 LittlerootTown_MaysHouse_1F_EventScript_1B6CA6:: @ 81B6CA6 lock faceplayer - checksound + waitse pokecry SPECIES_MACHOKE, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, 4 waitpokecry @@ -323,7 +323,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9:: @ 81B6CB9 LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9 lock faceplayer - checksound + waitse pokecry SPECIES_MACHOKE, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172831, 4 waitpokecry @@ -372,12 +372,12 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmove 0 - playsfx 21 + playse 21 move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmove 0 move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmove 0 - pause 20 + delay 20 compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD compare_var_to_imm 0x8008, 1 @@ -396,7 +396,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B - playsfx 8 + playse 8 disappear 0x8009 setflag 291 setvar 0x4082, 4 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 8badf3aab..61a484b4c 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_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780 - specialval RESULT, PlayerHasBerries + specialvar RESULT, PlayerHasBerries compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 - specialval RESULT, sub_810CA00 + specialvar RESULT, sub_810CA00 compare_var_to_imm RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF compare_var_to_imm RESULT, 65535 @@ -75,7 +75,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 - checkdailyflags + dodailyevents checkflag 2241 goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 @@ -148,7 +148,7 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 lock faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, 4 - specialval RESULT, PlayerHasBerries + specialvar RESULT, PlayerHasBerries compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC compare_var_to_imm RESULT, 0 @@ -161,7 +161,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC end FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 - checkdailyflags + dodailyevents checkflag 2241 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 @@ -208,13 +208,13 @@ LilycoveCity_ContestLobby_EventScript_1B783B:: @ 81B783B SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall - specialval RESULT, PlayerHasBerries + specialvar RESULT, PlayerHasBerries compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 - specialval RESULT, sub_810CA00 + specialvar RESULT, sub_810CA00 compare_var_to_imm RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 compare_var_to_imm RESULT, 65535 @@ -321,7 +321,7 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 fadescreen 1 - specialval RESULT, GetLinkPartnerNames + specialvar RESULT, GetLinkPartnerNames copyvar 0x8008, RESULT copyvar 0x8004, 0x8008 special SpawnBerryBlenderLinkPlayerSprites diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 97572220d..01fdf3c03 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,7 +1,7 @@ gUnknown_081C340A:: @ 81C340A setvar 0x40a4, 1 special ExitSafariMode - warp3 Route121_SafariZoneEntrance, 255, 2, 5 + setwarp Route121_SafariZoneEntrance, 255, 2, 5 end EventScript_1C341B: @ 81C341B @@ -24,7 +24,7 @@ EventScript_1C3443: gUnknown_081C3448:: @ 81C3448 lockall - playsfx 73 + playse 73 message UnknownString_81C34E4 waittext waitbutton @@ -33,7 +33,7 @@ gUnknown_081C3448:: @ 81C3448 gUnknown_081C3459:: @ 81C3459 lockall - playsfx 73 + playse 73 message UnknownString_81C3514 waittext waitbutton diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 9b8dafa9b..a2348315f 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -2,7 +2,7 @@ Event_TV:: @ 81A6E72 lockall inccounter GAME_STAT_WATCHED_TV special sub_80C2014 - specialval RESULT, CheckForBigMovieOrEmergencyNewsOnTV + specialvar RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare_var_to_imm RESULT, 2 goto_if_eq EventScript_1A6F01 compare_var_to_imm RESULT, 1 @@ -11,21 +11,21 @@ Event_TV:: @ 81A6E72 goto_if 0, EventScript_1A6EF1 checkflag 2097 goto_if_eq EventScript_1A6EF1 - specialval RESULT, IsTVShowInSearchOfTrainersAiring + specialvar RESULT, IsTVShowInSearchOfTrainersAiring compare_var_to_imm RESULT, 1 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F50 end EventScript_1A6EBB: - specialval 0x8004, special_0x44 + specialvar 0x8004, special_0x44 compare_var_to_imm 0x8004, 255 goto_if_eq EventScript_1A6F3F - specialval RESULT, special_0x4a + specialvar RESULT, special_0x4a compare_var_to_imm RESULT, 255 goto_if_eq EventScript_1A6F3F copyvar 0x8004, RESULT - specialval RESULT, sub_80BDA0C + specialvar RESULT, sub_80BDA0C compare_var_to_imm RESULT, 0 goto_if 5, EventScript_1A6F21 end -- cgit v1.2.3 From 598756eaa47b523bd557a619e05cb23399ac02e5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:57:54 -0500 Subject: more script command renaming --- data/event_scripts.s | 64 +++--- data/field_move_scripts.inc | 8 +- data/scripts/cable_club.inc | 76 +++---- data/scripts/contest_hall.inc | 178 ++++++++-------- data/scripts/day_care.inc | 4 +- data/scripts/gabby_and_ty.inc | 16 +- data/scripts/magma_chimney.inc | 36 ++-- data/scripts/maps/AquaHideout_B2F.inc | 34 +-- data/scripts/maps/BattleTower_BattleRoom.inc | 28 +-- data/scripts/maps/BattleTower_Corridor.inc | 12 +- data/scripts/maps/BattleTower_Elevator.inc | 12 +- data/scripts/maps/BattleTower_Lobby.inc | 12 +- data/scripts/maps/BattleTower_Outside.inc | 4 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 8 +- data/scripts/maps/DewfordTown.inc | 40 ++-- data/scripts/maps/DewfordTown_Hall.inc | 32 +-- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 72 +++---- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 30 +-- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 22 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 22 +- data/scripts/maps/FallarborTown_House2.inc | 4 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 8 +- data/scripts/maps/FortreeCity.inc | 8 +- data/scripts/maps/FortreeCity_House4.inc | 16 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 8 +- data/scripts/maps/LavaridgeTown.inc | 34 +-- data/scripts/maps/LilycoveCity.inc | 12 +- data/scripts/maps/LilycoveCity_ContestHall.inc | 112 +++++----- data/scripts/maps/LilycoveCity_ContestLobby.inc | 100 ++++----- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 46 ++--- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 8 +- data/scripts/maps/LilycoveCity_Harbor.inc | 24 +-- data/scripts/maps/LilycoveCity_House3.inc | 12 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 22 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 30 +-- .../maps/LilycoveCity_MoveDeletersHouse.inc | 4 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 26 +-- data/scripts/maps/LittlerootTown.inc | 230 ++++++++++----------- .../maps/LittlerootTown_BrendansHouse_1F.inc | 24 +-- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 24 +-- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 48 ++--- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 12 +- data/scripts/maps/MauvilleCity.inc | 88 ++++---- data/scripts/maps/MauvilleCity_GameCorner.inc | 4 +- data/scripts/maps/MauvilleCity_House2.inc | 8 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 82 ++++---- data/scripts/maps/MossdeepCity.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 30 +-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 8 +- data/scripts/maps/MossdeepCity_Gym.inc | 32 +-- data/scripts/maps/MossdeepCity_House2.inc | 8 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 8 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 20 +- data/scripts/maps/MtChimney_CableCarStation.inc | 12 +- data/scripts/maps/MtPyre_Summit.inc | 76 +++---- data/scripts/maps/NewMauville_Entrance.inc | 4 +- data/scripts/maps/OldaleTown.inc | 64 +++--- data/scripts/maps/PetalburgCity.inc | 88 ++++---- data/scripts/maps/PetalburgCity_Gym.inc | 142 ++++++------- data/scripts/maps/PetalburgWoods.inc | 84 ++++---- data/scripts/maps/Route101.inc | 44 ++-- data/scripts/maps/Route103.inc | 40 ++-- data/scripts/maps/Route104.inc | 26 +-- data/scripts/maps/Route109.inc | 42 ++-- data/scripts/maps/Route110.inc | 56 ++--- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 4 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 4 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 44 ++-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 64 +++--- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 192 ++++++++--------- data/scripts/maps/Route111.inc | 80 +++---- .../maps/Route111_WinstrateFamilysHouse.inc | 4 +- data/scripts/maps/Route112_CableCarStation.inc | 12 +- data/scripts/maps/Route116.inc | 22 +- data/scripts/maps/Route118.inc | 36 ++-- data/scripts/maps/Route119.inc | 28 +-- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/Route120.inc | 30 +-- data/scripts/maps/Route121.inc | 8 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 16 +- data/scripts/maps/Route128.inc | 60 +++--- data/scripts/maps/RustboroCity.inc | 192 ++++++++--------- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 16 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 32 +-- data/scripts/maps/RustboroCity_PokemonSchool.inc | 16 +- data/scripts/maps/RusturfTunnel.inc | 112 +++++----- data/scripts/maps/SafariZone_Southeast.inc | 24 +-- data/scripts/maps/SeafloorCavern_Room9.inc | 76 +++---- data/scripts/maps/SlateportCity.inc | 88 ++++---- data/scripts/maps/SlateportCity_ContestHall.inc | 40 ++-- data/scripts/maps/SlateportCity_ContestLobby.inc | 26 +-- data/scripts/maps/SlateportCity_Harbor.inc | 60 +++--- .../maps/SlateportCity_OceanicMuseum_1F.inc | 32 +-- .../maps/SlateportCity_OceanicMuseum_2F.inc | 74 +++---- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 8 +- .../maps/SlateportCity_SternsShipyard_1F.inc | 28 +-- data/scripts/maps/SootopolisCity.inc | 70 +++---- data/scripts/maps/SootopolisCity_Gym_1F.inc | 4 +- data/scripts/maps/SouthernIsland_Exterior.inc | 12 +- data/scripts/maps/SouthernIsland_Interior.inc | 10 +- data/scripts/maps/VerdanturfTown.inc | 8 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 22 +- data/scripts/maps/VictoryRoad_1F.inc | 16 +- data/scripts/players_house.inc | 156 +++++++------- data/scripts/pokeblocks.inc | 22 +- data/scripts/secret_power_tm.inc | 8 +- 107 files changed, 2128 insertions(+), 2128 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index bd14ae5d3..f31a00e2a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -933,8 +933,8 @@ gUnknown_0819F80B:: @ 819F80B gUnknown_0819F818:: @ 819F818 lock faceplayer - move LAST_TALKED, Movement_19F8F0 - waitmove 0 + applymovement LAST_TALKED, Movement_19F8F0 + waitmovement 0 specialvar RESULT, ScrSpecial_HasTrainerBeenFought compare_var_to_imm RESULT, 0 goto_if 5, EventScript_19F83F @@ -970,8 +970,8 @@ EventScript_19F877: endtrainerbattle gUnknown_0819F878:: @ 819F878 - move LAST_TALKED, Movement_19F8F0 - waitmove 0 + applymovement LAST_TALKED, Movement_19F8F0 + waitmovement 0 special PlayTrainerEncounterMusic reptrainerbattle endtrainerbattle @@ -1022,8 +1022,8 @@ EventScript_19F8DE: end EventScript_19F8E5: - move LAST_TALKED, Movement_19F8F0 - waitmove 0 + applymovement LAST_TALKED, Movement_19F8F0 + waitmovement 0 return Movement_19F8F0:: @@ -1443,12 +1443,12 @@ do_heal_party:: @ 819FD7C inccounter GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon waittext - move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F - waitmove 0 + applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F + waitmovement 0 doanimation 25 checkanimation 25 - move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 - waitmove 0 + applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 + waitmovement 0 special ScrSpecial_HealPlayerParty checkflag 273 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE @@ -1458,8 +1458,8 @@ do_heal_party:: @ 819FD7C OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 message gText_NurseJoy_ThankYouForWaiting waittext - move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4 - waitmove 0 + applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4 + waitmovement 0 message gText_NurseJoy_WeHopeToSeeYouAgain waittext return @@ -2227,8 +2227,8 @@ BattleTower_Outside_EventScript_1A040E:: @ 81A040E LilycoveCity_Harbor_EventScript_1A040E:: @ 81A040E SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E delay 60 - move 0x8004, SlateportCity_Harbor_Movement_1A041C - waitmove 0 + applymovement 0x8004, SlateportCity_Harbor_Movement_1A041C + waitmovement 0 return SlateportCity_Harbor_Movement_1A041C:: @ 81A041C @@ -2264,12 +2264,12 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 EventScript_1A0457: @ unreferenced? delay 30 - move 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 + waitmovement 0 spritevisible 255, 0, 0 delay 30 - move 255, Movement_1A047A - waitmove 0 + applymovement 255, Movement_1A047A + waitmovement 0 delay 30 return @@ -2440,10 +2440,10 @@ Route119_EventScript_1A05AE:: @ 81A05AE Route119_EventScript_1A05C3:: @ 81A05C3 msgbox Route119_Text_171BF6, 4 closebutton - move LAST_TALKED, Route119_Movement_1A0839 - waitmove 0 - move LAST_TALKED, Route119_Movement_1A0662 - waitmove 0 + applymovement LAST_TALKED, Route119_Movement_1A0839 + waitmovement 0 + applymovement LAST_TALKED, Route119_Movement_1A0662 + waitmovement 0 waitse pokecry SPECIES_KECLEON, 2 delay 40 @@ -2548,8 +2548,8 @@ EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_GlaciasRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 - move 255, EverGrandeCity_SidneysRoom_Movement_1A0853 - waitmove 0 + applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 + waitmovement 0 playse 8 setmaptile 6, 1, 836, 0 setmaptile 6, 2, 837, 0 @@ -2570,8 +2570,8 @@ EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_GlaciasRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 - move 255, EverGrandeCity_SidneysRoom_Movement_1A0847 - waitmove 0 + applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 + waitmovement 0 playse 52 setmaptile 5, 12, 518, 1 setmaptile 6, 12, 518, 1 @@ -3724,8 +3724,8 @@ EventScript_1A2DB8: end SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE - move 255, SecretBase_RedCave1_Movement_1A2E11 - waitmove 0 + applymovement 255, SecretBase_RedCave1_Movement_1A2E11 + waitmovement 0 setvar 0x4097, 1 msgbox SecretBase_RedCave1_Text_198F89, 5 compare_var_to_imm RESULT, 1 @@ -4871,8 +4871,8 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF S_FallDownHole:: @ 81C6BC5 lockall delay 20 - move 255, GraniteCave_B1F_Movement_1C6BF7 - waitmove 0 + applymovement 255, GraniteCave_B1F_Movement_1C6BF7 + waitmovement 0 playse 43 delay 60 warphole UNDEFINED @@ -4882,8 +4882,8 @@ S_FallDownHole:: @ 81C6BC5 gUnknown_081C6BDE:: @ 81C6BDE lockall delay 20 - move 255, GraniteCave_B1F_Movement_1C6BF7 - waitmove 0 + applymovement 255, GraniteCave_B1F_Movement_1C6BF7 + waitmovement 0 playse 43 delay 60 special sp13F_fall_to_last_warp diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index ad87919b5..ac70163aa 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -26,8 +26,8 @@ S_UseCut:: @ 81B0E16 end DoTreeCutMovement: @ 81B0E21 - move LAST_TALKED, TreeCutMovement @ tree cut animation - waitmove 0 + applymovement LAST_TALKED, TreeCutMovement @ tree cut animation + waitmovement 0 disappear LAST_TALKED @ tree disappears releaseall end @@ -84,8 +84,8 @@ S_UseRockSmash:: @ 81B0F01 end DoRockSmashMovement: @ 81B0F0C - move LAST_TALKED, RockSmashMovement - waitmove 0 + applymovement LAST_TALKED, RockSmashMovement + waitmovement 0 disappear LAST_TALKED specialvar RESULT, sub_810F5BC compare_var_to_imm RESULT, 1 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 937ede6cf..605846334 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -88,12 +88,12 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 special CloseLink setvar 0x4087, 0 - move 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 - waitmove 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 + waitmovement 0 compare_var_to_imm 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 - move 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 - waitmove 0 + applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 + waitmovement 0 OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 return @@ -103,17 +103,17 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA setvar 0x4087, 0 compare_var_to_imm 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C - move 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 - waitmove 0 - move 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 - waitmove 0 - move 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 - waitmove 0 + applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 + waitmovement 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 + waitmovement 0 + applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 + waitmovement 0 return OldaleTown_PokemonCenter_2F_EventScript_1A3E0C:: @ 81A3E0C - move 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 - waitmove 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 + waitmovement 0 return OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 @@ -130,19 +130,19 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 setvar 0x4087, 0 compare_var_to_imm 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C - move 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 - waitmove 0 - move 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 - waitmove 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 + waitmovement 0 + applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 + waitmovement 0 message OldaleTown_PokemonCenter_2F_Text_1A4E50 waittext playse 21 message OldaleTown_PokemonCenter_2F_Text_1A4E79 waittext - move 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 - waitmove 0 - move 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 - waitmove 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 + waitmovement 0 + applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 + waitmovement 0 return OldaleTown_PokemonCenter_2F_EventScript_1A3E7B:: @ 81A3E7B @@ -224,15 +224,15 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E setmaptile 5, 3, 514, 0 special DrawWholeMapView delay 60 - move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 - waitmove 0 + applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 + waitmovement 0 closebutton - move 255, OldaleTown_PokemonCenter_2F_Movement_1A435B - waitmove 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B + waitmovement 0 setdooropened 5, 1 doorchange - move 255, OldaleTown_PokemonCenter_2F_Movement_1A435F - waitmove 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F + waitmovement 0 spriteinvisible 255, 0, 0 setdoorclosed 5, 1 doorchange @@ -389,15 +389,15 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 setmaptile 8, 3, 514, 0 special DrawWholeMapView delay 60 - move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 - waitmove 0 + applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 + waitmovement 0 closebutton - move 255, OldaleTown_PokemonCenter_2F_Movement_1A435B - waitmove 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B + waitmovement 0 setdooropened 8, 1 doorchange - move 255, OldaleTown_PokemonCenter_2F_Movement_1A435F - waitmove 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F + waitmovement 0 spriteinvisible 255, 0, 0 setdoorclosed 8, 1 doorchange @@ -487,15 +487,15 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 setmaptile 11, 3, 514, 0 special DrawWholeMapView delay 60 - move LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 - waitmove 0 + applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 + waitmovement 0 closebutton - move 255, OldaleTown_PokemonCenter_2F_Movement_1A435B - waitmove 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B + waitmovement 0 setdooropened 11, 1 doorchange - move 255, OldaleTown_PokemonCenter_2F_Movement_1A435F - waitmove 0 + applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F + waitmovement 0 spriteinvisible 255, 0, 0 setdoorclosed 11, 1 doorchange diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 3588aff89..836fa10dd 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -188,10 +188,10 @@ FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D LinkContestRoom1_EventScript_1A514D:: @ 81A514D setvar 0x8006, 0 lockall - move 14, LinkContestRoom1_Movement_1A5DBF - waitmove 0 - move 1, LinkContestRoom1_Movement_1A5D85 - waitmove 0 + applymovement 14, LinkContestRoom1_Movement_1A5DBF + waitmovement 0 + applymovement 1, LinkContestRoom1_Movement_1A5D85 + waitmovement 0 releaseall call LinkContestRoom1_EventScript_1A51A0 call LinkContestRoom1_EventScript_1A51EA @@ -264,8 +264,8 @@ LinkContestRoom1_EventScript_1A5245:: @ 81A5245 bufferstd 2, 0x8009 call LinkContestRoom1_EventScript_1A525F lockall - move 1, LinkContestRoom1_Movement_1A5D87 - waitmove 0 + applymovement 1, LinkContestRoom1_Movement_1A5D87 + waitmovement 0 releaseall return @@ -306,32 +306,32 @@ LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE LinkContestRoom1_EventScript_1A52DB:: @ 81A52DB lockall - move 3, LinkContestRoom1_Movement_1A5DCE - waitmove 0 + applymovement 3, LinkContestRoom1_Movement_1A5DCE + waitmovement 0 releaseall setvar 0x800b, 3 return LinkContestRoom1_EventScript_1A52ED:: @ 81A52ED lockall - move 4, LinkContestRoom1_Movement_1A5DDA - waitmove 0 + applymovement 4, LinkContestRoom1_Movement_1A5DDA + waitmovement 0 releaseall setvar 0x800b, 4 return LinkContestRoom1_EventScript_1A52FF:: @ 81A52FF lockall - move 5, LinkContestRoom1_Movement_1A5DE2 - waitmove 0 + applymovement 5, LinkContestRoom1_Movement_1A5DE2 + waitmovement 0 releaseall setvar 0x800b, 5 return LinkContestRoom1_EventScript_1A5311:: @ 81A5311 lockall - move 14, LinkContestRoom1_Movement_1A5DEA - waitmove 0 + applymovement 14, LinkContestRoom1_Movement_1A5DEA + waitmovement 0 releaseall setvar 0x800b, 14 return @@ -341,14 +341,14 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 addvar 0x8006, 1 buffernum 1, 0x8006 lockall - move 0x800b, LinkContestRoom1_Movement_1A5D9C - waitmove 0 + applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C + waitmovement 0 releaseall reappear 13 playse 10 lockall - move 0x800b, LinkContestRoom1_Movement_1A5D9C - waitmove 0 + applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C + waitmovement 0 releaseall addvar 0x8006, -1 playse 15 @@ -374,14 +374,14 @@ LinkContestRoom1_EventScript_1A5377:: @ 81A5377 playse 223 waittext call LinkContestRoom1_EventScript_1A5A90 - move 1, LinkContestRoom1_Movement_1A5D9F - waitmove 0 - move 2, LinkContestRoom1_Movement_1A5DA1 - waitmove 0 + applymovement 1, LinkContestRoom1_Movement_1A5D9F + waitmovement 0 + applymovement 2, LinkContestRoom1_Movement_1A5DA1 + waitmovement 0 delay 20 - move 1, LinkContestRoom1_Movement_1A5D8F - move 2, LinkContestRoom1_Movement_1A5D8F - waitmove 0 + applymovement 1, LinkContestRoom1_Movement_1A5D8F + applymovement 2, LinkContestRoom1_Movement_1A5D8F + waitmovement 0 return LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3 @@ -406,26 +406,26 @@ LinkContestRoom1_EventScript_1A53DF:: @ 81A53DF return LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 - move 1, LinkContestRoom1_Movement_1A5DAF - waitmove 0 + applymovement 1, LinkContestRoom1_Movement_1A5DAF + waitmovement 0 playse 223 call LinkContestRoom1_EventScript_1A5AE4 - move 9, LinkContestRoom1_Movement_1A5DB7 - move 12, LinkContestRoom1_Movement_1A5DBB - move 7, LinkContestRoom1_Movement_1A5DB7 - waitmove 0 - move 1, LinkContestRoom1_Movement_1A5DB7 - waitmove 0 - move 10, LinkContestRoom1_Movement_1A5DAF - move 11, LinkContestRoom1_Movement_1A5DBB - move 6, LinkContestRoom1_Movement_1A5DB3 - move 8, LinkContestRoom1_Movement_1A5DAF - waitmove 0 - move 1, LinkContestRoom1_Movement_1A5DC1 - waitmove 0 - move 1, LinkContestRoom1_Movement_1A5DCA - move 2, LinkContestRoom1_Movement_1A5DC5 - waitmove 0 + applymovement 9, LinkContestRoom1_Movement_1A5DB7 + applymovement 12, LinkContestRoom1_Movement_1A5DBB + applymovement 7, LinkContestRoom1_Movement_1A5DB7 + waitmovement 0 + applymovement 1, LinkContestRoom1_Movement_1A5DB7 + waitmovement 0 + applymovement 10, LinkContestRoom1_Movement_1A5DAF + applymovement 11, LinkContestRoom1_Movement_1A5DBB + applymovement 6, LinkContestRoom1_Movement_1A5DB3 + applymovement 8, LinkContestRoom1_Movement_1A5DAF + waitmovement 0 + applymovement 1, LinkContestRoom1_Movement_1A5DC1 + waitmovement 0 + applymovement 1, LinkContestRoom1_Movement_1A5DCA + applymovement 2, LinkContestRoom1_Movement_1A5DC5 + waitmovement 0 releaseall return @@ -482,7 +482,7 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB call_if 1, LinkContestRoom1_EventScript_1A585C compare_var_to_imm 0x4000, 0 goto_if 2, LinkContestRoom1_EventScript_1A54EB - waitmove 0 + waitmovement 0 return LinkContestRoom1_EventScript_1A555A:: @ 81A555A @@ -620,7 +620,7 @@ LinkContestRoom1_EventScript_1A575A:: @ 81A575A LinkContestRoom1_EventScript_1A5760:: @ 81A5760 compare_var_to_imm 0x4001, 1 goto_if_eq LinkContestRoom1_EventScript_1A5783 - move 6, LinkContestRoom1_Movement_1A5D8D + applymovement 6, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 setvar 0x4001, 1 @@ -633,7 +633,7 @@ LinkContestRoom1_EventScript_1A5783:: @ 81A5783 LinkContestRoom1_EventScript_1A5784:: @ 81A5784 compare_var_to_imm 0x4002, 1 goto_if_eq LinkContestRoom1_EventScript_1A57A7 - move 12, LinkContestRoom1_Movement_1A5D8D + applymovement 12, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 setvar 0x4002, 1 @@ -646,7 +646,7 @@ LinkContestRoom1_EventScript_1A57A7:: @ 81A57A7 LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 compare_var_to_imm 0x4003, 1 goto_if_eq LinkContestRoom1_EventScript_1A57CB - move 7, LinkContestRoom1_Movement_1A5D8D + applymovement 7, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 setvar 0x4003, 1 @@ -659,7 +659,7 @@ LinkContestRoom1_EventScript_1A57CB:: @ 81A57CB LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC compare_var_to_imm 0x4004, 1 goto_if_eq LinkContestRoom1_EventScript_1A57EF - move 8, LinkContestRoom1_Movement_1A5D8D + applymovement 8, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 setvar 0x4004, 1 @@ -672,7 +672,7 @@ LinkContestRoom1_EventScript_1A57EF:: @ 81A57EF LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 compare_var_to_imm 0x4005, 1 goto_if_eq LinkContestRoom1_EventScript_1A5813 - move 9, LinkContestRoom1_Movement_1A5D8D + applymovement 9, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 setvar 0x4005, 1 @@ -685,7 +685,7 @@ LinkContestRoom1_EventScript_1A5813:: @ 81A5813 LinkContestRoom1_EventScript_1A5814:: @ 81A5814 compare_var_to_imm 0x4006, 1 goto_if_eq LinkContestRoom1_EventScript_1A5837 - move 10, LinkContestRoom1_Movement_1A5D8D + applymovement 10, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 setvar 0x4006, 1 @@ -698,7 +698,7 @@ LinkContestRoom1_EventScript_1A5837:: @ 81A5837 LinkContestRoom1_EventScript_1A5838:: @ 81A5838 compare_var_to_imm 0x4007, 1 goto_if_eq LinkContestRoom1_EventScript_1A585B - move 11, LinkContestRoom1_Movement_1A5D8D + applymovement 11, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 setvar 0x4007, 1 @@ -711,7 +711,7 @@ LinkContestRoom1_EventScript_1A585B:: @ 81A585B LinkContestRoom1_EventScript_1A585C:: @ 81A585C compare_var_to_imm 0x4008, 1 goto_if_eq LinkContestRoom1_EventScript_1A587F - move 15, LinkContestRoom1_Movement_1A5D8D + applymovement 15, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 setvar 0x4008, 1 @@ -735,49 +735,49 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 LinkContestRoom1_EventScript_1A58BA:: @ 81A58BA lockall - move 0x800b, LinkContestRoom1_Movement_1A5DD4 - waitmove 0 + applymovement 0x800b, LinkContestRoom1_Movement_1A5DD4 + waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58C7:: @ 81A58C7 lockall - move 0x800b, LinkContestRoom1_Movement_1A5DDE - waitmove 0 + applymovement 0x800b, LinkContestRoom1_Movement_1A5DDE + waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58D4:: @ 81A58D4 lockall - move 0x800b, LinkContestRoom1_Movement_1A5DE6 - waitmove 0 + applymovement 0x800b, LinkContestRoom1_Movement_1A5DE6 + waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58E1:: @ 81A58E1 lockall - move 0x800b, LinkContestRoom1_Movement_1A5DF0 - waitmove 0 + applymovement 0x800b, LinkContestRoom1_Movement_1A5DF0 + waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE lockall - move 1, LinkContestRoom1_Movement_1A5DA3 - waitmove 0 + applymovement 1, LinkContestRoom1_Movement_1A5DA3 + waitmovement 0 call LinkContestRoom1_EventScript_1A5930 waittext - move 1, LinkContestRoom1_Movement_1A5D91 - move 2, LinkContestRoom1_Movement_1A5D95 - waitmove 0 + applymovement 1, LinkContestRoom1_Movement_1A5D91 + applymovement 2, LinkContestRoom1_Movement_1A5D95 + waitmovement 0 releaseall setvar 0x4009, 1 startcontest setvar 0x4009, 0 lockall - move 1, LinkContestRoom1_Movement_1A5D95 - move 2, LinkContestRoom1_Movement_1A5D91 - waitmove 0 + applymovement 1, LinkContestRoom1_Movement_1A5D95 + applymovement 2, LinkContestRoom1_Movement_1A5D91 + waitmovement 0 releaseall return @@ -794,12 +794,12 @@ LinkContestRoom1_EventScript_1A5944:: @ 81A5944 LinkContestRoom1_EventScript_1A594A:: @ 81A594A call LinkContestRoom1_EventScript_1A5984 call LinkContestRoom1_EventScript_1A59A2 - move 1, LinkContestRoom1_Movement_1A5D8B - waitmove 0 + applymovement 1, LinkContestRoom1_Movement_1A5D8B + waitmovement 0 call LinkContestRoom1_EventScript_1A59C0 call LinkContestRoom1_EventScript_1A59DE - move 1, LinkContestRoom1_Movement_1A5D8F - waitmove 0 + applymovement 1, LinkContestRoom1_Movement_1A5D8F + waitmovement 0 closebutton releaseall setvar 0x4009, 1 @@ -888,8 +888,8 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 buffernum 1, 0x8005 addvar 0x8005, -1 call LinkContestRoom1_EventScript_1A5A75 - move 0x4003, LinkContestRoom1_Movement_1A5D99 - waitmove 0 + applymovement 0x4003, LinkContestRoom1_Movement_1A5D99 + waitmovement 0 playse 223 setvar 0x4001, 0 return @@ -910,14 +910,14 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 lockall compare_var_to_imm 0x4088, 1 call_if 2, LinkContestRoom1_EventScript_1A5AE4 - move 9, LinkContestRoom1_Movement_1A5DB7 - move 12, LinkContestRoom1_Movement_1A5DBB - move 7, LinkContestRoom1_Movement_1A5DB7 + applymovement 9, LinkContestRoom1_Movement_1A5DB7 + applymovement 12, LinkContestRoom1_Movement_1A5DBB + applymovement 7, LinkContestRoom1_Movement_1A5DB7 delay 30 - move 10, LinkContestRoom1_Movement_1A5DAF - move 11, LinkContestRoom1_Movement_1A5DBB - move 6, LinkContestRoom1_Movement_1A5DB3 - move 8, LinkContestRoom1_Movement_1A5DAF + applymovement 10, LinkContestRoom1_Movement_1A5DAF + applymovement 11, LinkContestRoom1_Movement_1A5DBB + applymovement 6, LinkContestRoom1_Movement_1A5DB3 + applymovement 8, LinkContestRoom1_Movement_1A5DAF compare_var_to_imm 0x4001, 4 goto_if 5, LinkContestRoom1_EventScript_1A5A90 delay 30 @@ -1083,29 +1083,29 @@ LinkContestRoom1_EventScript_1A5C7F:: @ 81A5C7F LinkContestRoom1_EventScript_1A5CB1:: @ 81A5CB1 lockall - move 0x4003, LinkContestRoom1_Movement_1A5DF6 - waitmove 0 + applymovement 0x4003, LinkContestRoom1_Movement_1A5DF6 + waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CBE:: @ 81A5CBE lockall - move 0x4003, LinkContestRoom1_Movement_1A5DFA - waitmove 0 + applymovement 0x4003, LinkContestRoom1_Movement_1A5DFA + waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CCB:: @ 81A5CCB lockall - move 0x4003, LinkContestRoom1_Movement_1A5DA5 - waitmove 0 + applymovement 0x4003, LinkContestRoom1_Movement_1A5DA5 + waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 lockall - move 0x4003, LinkContestRoom1_Movement_1A5DA9 - waitmove 0 + applymovement 0x4003, LinkContestRoom1_Movement_1A5DA9 + waitmovement 0 releaseall return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index b2d83196e..ed515d15b 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -204,8 +204,8 @@ Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 end Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE - move 1, Route117_PokemonDayCare_Movement_1B2543 - waitmove 0 + applymovement 1, Route117_PokemonDayCare_Movement_1B2543 + waitmovement 0 specialvar RESULT, sub_8041648 special sub_80B7D0C playse 95 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 69580a835..b8c284fec 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -215,20 +215,20 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 end Route111_EventScript_1AE5E0:: @ 81AE5E0 - move 0x8004, Route111_Movement_1AE699 - waitmove 0 + applymovement 0x8004, Route111_Movement_1AE699 + waitmovement 0 return Route111_EventScript_1AE5EB:: @ 81AE5EB - move 0x8004, Route111_Movement_1AE69B - move 0x8005, Route111_Movement_1A0841 - waitmove 0 + applymovement 0x8004, Route111_Movement_1AE69B + applymovement 0x8005, Route111_Movement_1A0841 + waitmovement 0 return Route111_EventScript_1AE5FD:: @ 81AE5FD - move 0x8004, Route111_Movement_1AE69D - move 0x8005, Route111_Movement_1A083F - waitmove 0 + applymovement 0x8004, Route111_Movement_1AE69D + applymovement 0x8005, Route111_Movement_1A083F + waitmovement 0 return Route111_EventScript_1AE60F:: @ 81AE60F diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 2b3bd61df..f373a76a6 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -6,8 +6,8 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 checkflag 219 call_if 1, MtChimney_EventScript_1B2CC2 closebutton - move 1, MtChimney_Movement_1A083D - waitmove 0 + applymovement 1, MtChimney_Movement_1A083D + waitmovement 0 setflag 219 release end @@ -35,13 +35,13 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .else msgbox MtChimney_Text_1B37BB, 4 .endif - move 2, MtChimney_Movement_1A0839 - waitmove 0 + applymovement 2, MtChimney_Movement_1A0839 + waitmovement 0 playse 21 - move 2, MtChimney_Movement_1A0833 - waitmove 0 - move 2, MtChimney_Movement_1A0835 - waitmove 0 + applymovement 2, MtChimney_Movement_1A0833 + waitmovement 0 + applymovement 2, MtChimney_Movement_1A0835 + waitmovement 0 .ifdef SAPPHIRE msgbox MtChimney_Text_1B2ED9, 4 .else @@ -71,8 +71,8 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB call_if 1, MtChimney_EventScript_1B2D7D compare_var_to_imm FACING, 2 call_if 1, MtChimney_EventScript_1B2D88 - move 255, MtChimney_Movement_1A083F - waitmove 0 + applymovement 255, MtChimney_Movement_1A083F + waitmovement 0 .ifdef SAPPHIRE msgbox MtChimney_Text_1B3608, 4 .else @@ -92,21 +92,21 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB end MtChimney_EventScript_1B2D7D:: @ 81B2D7D - move 1, MtChimney_Movement_15D025 - waitmove 0 + applymovement 1, MtChimney_Movement_15D025 + waitmovement 0 return MtChimney_EventScript_1B2D88:: @ 81B2D88 - move 1, MtChimney_Movement_15D036 - waitmove 0 + applymovement 1, MtChimney_Movement_15D036 + waitmovement 0 return MtChimney_EventScript_1B2D93:: @ 81B2D93 - move 1, MtChimney_Movement_15D02D - waitmove 0 + applymovement 1, MtChimney_Movement_15D02D + waitmovement 0 return MtChimney_EventScript_1B2D9E:: @ 81B2D9E - move 1, MtChimney_Movement_15D03E - waitmove 0 + applymovement 1, MtChimney_Movement_15D03E + waitmovement 0 return diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 9ed2d102c..b08a68d1b 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -11,14 +11,14 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall setvar 0x8008, 1 playse 21 - move 0x8008, AquaHideout_B2F_Movement_1A0833 - waitmove 0 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0833 + waitmovement 0 .ifdef SAPPHIRE - move 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 .else - move 0x8008, AquaHideout_B2F_Movement_1A0841 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0841 .endif - waitmove 0 + waitmovement 0 setvar 0x4001, 1 releaseall end @@ -38,31 +38,31 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD setvar 0x8009, 3 .endif .ifdef SAPPHIRE - move 0x8008, Movement_1A083F + applymovement 0x8008, Movement_1A083F .else - move 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 .endif - waitmove 0 + waitmovement 0 delay 20 - move 0x8008, AquaHideout_B2F_Movement_1A0839 - waitmove 0 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 closebutton .ifdef SAPPHIRE - move 0x8008, Movement_1A083F + applymovement 0x8008, Movement_1A083F .else - move 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 .endif .ifdef SAPPHIRE - move 0x8009, AquaHideout_B2F_Movement_15D958 + applymovement 0x8009, AquaHideout_B2F_Movement_15D958 .else - move 0x8009, AquaHideout_B2F_Movement_15D95D + applymovement 0x8009, AquaHideout_B2F_Movement_15D95D .endif - waitmove 0 + waitmovement 0 disappear 0x8009 delay 20 - move 0x8008, AquaHideout_B2F_Movement_1A0839 - waitmove 0 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag 112 setflag 852 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 60685adad..bbc3360a8 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -8,14 +8,14 @@ BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1 BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB setvar 0x4000, 1 - move 255, BattleTower_BattleRoom_Movement_160AB7 - waitmove 0 + applymovement 255, BattleTower_BattleRoom_Movement_160AB7 + waitmovement 0 BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special sub_81347F8 reappear 1 - move 1, BattleTower_BattleRoom_Movement_160AC0 - waitmove 0 + applymovement 1, BattleTower_BattleRoom_Movement_160AC0 + waitmovement 0 special sub_8135474 msgbox 0x20234cc, 4 waittext @@ -43,13 +43,13 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special sub_8135668 switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 - move 1, BattleTower_BattleRoom_Movement_160AC6 - waitmove 0 + applymovement 1, BattleTower_BattleRoom_Movement_160AC6 + waitmovement 0 disappear 1 - move 2, BattleTower_BattleRoom_Movement_160ACB - waitmove 0 - move 255, BattleTower_BattleRoom_Movement_160ABC - waitmove 0 + applymovement 2, BattleTower_BattleRoom_Movement_160ACB + waitmovement 0 + applymovement 255, BattleTower_BattleRoom_Movement_160ABC + waitmovement 0 msgbox BattleTower_BattleRoom_Text_19ACDC, 4 special LoadPlayerParty special SavePlayerParty @@ -81,10 +81,10 @@ BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C closebutton - move 255, BattleTower_BattleRoom_Movement_160ABE - waitmove 0 - move 2, BattleTower_BattleRoom_Movement_160AD0 - waitmove 0 + applymovement 255, BattleTower_BattleRoom_Movement_160ABE + waitmovement 0 + applymovement 2, BattleTower_BattleRoom_Movement_160AD0 + waitmovement 0 goto BattleTower_BattleRoom_EventScript_1608FA BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 4b3dae8f8..26570cd66 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -23,15 +23,15 @@ BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar 0x4000, 1 compare_var_to_imm 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 - move 1, BattleTower_Corridor_Movement_1608D5 - move 255, BattleTower_Corridor_Movement_1608D4 - waitmove 0 + applymovement 1, BattleTower_Corridor_Movement_1608D5 + applymovement 255, BattleTower_Corridor_Movement_1608D4 + waitmovement 0 goto BattleTower_Corridor_EventScript_1608C2 BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 - move 1, BattleTower_Corridor_Movement_1608D2 - move 255, BattleTower_Corridor_Movement_1608D1 - waitmove 0 + applymovement 1, BattleTower_Corridor_Movement_1608D2 + applymovement 255, BattleTower_Corridor_Movement_1608D1 + waitmovement 0 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 setvar 0x4000, 0 diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index 2c9f12a6e..fe55b50db 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -9,15 +9,15 @@ BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 setvar 0x4000, 1 - move 1, BattleTower_Elevator_Movement_160835 - move 255, BattleTower_Elevator_Movement_160839 - waitmove 0 + applymovement 1, BattleTower_Elevator_Movement_160835 + applymovement 255, BattleTower_Elevator_Movement_160839 + waitmovement 0 special sub_810EBEC waitstate delay 64 - move 1, BattleTower_Elevator_Movement_16083D - move 255, BattleTower_Elevator_Movement_160841 - waitmove 0 + applymovement 1, BattleTower_Elevator_Movement_16083D + applymovement 255, BattleTower_Elevator_Movement_160841 + waitmovement 0 setvar 0x4000, 0 warp BattleTower_Corridor, 255, 8, 1 waitstate diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index c4ffe4c32..bd4f4ecd1 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -293,14 +293,14 @@ BattleTower_Lobby_EventScript_160662:: @ 8160662 end BattleTower_Lobby_EventScript_160664:: @ 8160664 - move 1, BattleTower_Lobby_Movement_160693 - move 255, BattleTower_Lobby_Movement_160693 - waitmove 0 + applymovement 1, BattleTower_Lobby_Movement_160693 + applymovement 255, BattleTower_Lobby_Movement_160693 + waitmovement 0 setdooropened 6, 1 doorchange - move 1, BattleTower_Lobby_Movement_160697 - move 255, BattleTower_Lobby_Movement_16069A - waitmove 0 + applymovement 1, BattleTower_Lobby_Movement_160697 + applymovement 255, BattleTower_Lobby_Movement_16069A + waitmovement 0 setdoorclosed 6, 1 doorchange return diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 8ef5dc0ad..2f88db2db 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -64,8 +64,8 @@ BattleTower_Outside_EventScript_160226:: @ 8160226 BattleTower_Outside_EventScript_160232:: @ 8160232 closebutton - move LAST_TALKED, BattleTower_Outside_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 + waitmovement 0 delay 30 spriteinvisible 5, 26, 4 setvar 0x8004, 4 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index aad189887..4d27844a7 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -25,8 +25,8 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 lockall - move 255, CaveOfOrigin_B4F_Movement_1A0841 - waitmove 0 + applymovement 255, CaveOfOrigin_B4F_Movement_1A0841 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4F03, 4 .else @@ -53,8 +53,8 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 waitstate special sub_80818FC waitstate - move 1, CaveOfOrigin_B4F_Movement_15DE7D - waitmove 0 + applymovement 1, CaveOfOrigin_B4F_Movement_15DE7D + waitmovement 0 delay 60 setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE waitse diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 8e442e46f..f8265d1cf 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -120,20 +120,20 @@ DewfordTown_EventScript_14E151:: @ 814E151 call DewfordTown_EventScript_1A010C spritelevelup 2, 0, 11, 0 spritelevelup 255, 0, 11, 0 - move 2, DewfordTown_Movement_14E40E - waitmove 0 + applymovement 2, DewfordTown_Movement_14E40E + waitmovement 0 disappear 2 - move 255, DewfordTown_Movement_14E402 - waitmove 0 + applymovement 255, DewfordTown_Movement_14E402 + waitmovement 0 spriteinvisible 255, 0, 11 call DewfordTown_EventScript_1A02E7 - move 4, DewfordTown_Movement_14E293 - move 255, DewfordTown_Movement_14E293 - waitmove 0 + applymovement 4, DewfordTown_Movement_14E293 + applymovement 255, DewfordTown_Movement_14E293 + waitmovement 0 spritevisible 255, 0, 19 call DewfordTown_EventScript_1A02EF - move 255, DewfordTown_Movement_14E405 - waitmove 0 + applymovement 255, DewfordTown_Movement_14E405 + waitmovement 0 spritevisible 255, 0, 19 clearflag 739 clearflag 881 @@ -152,25 +152,25 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 call DewfordTown_EventScript_1A010C spritelevelup 2, 0, 11, 0 spritelevelup 255, 0, 11, 1 - move 2, DewfordTown_Movement_14E40E - waitmove 0 + applymovement 2, DewfordTown_Movement_14E40E + waitmovement 0 disappear 2 - move 255, DewfordTown_Movement_14E402 - waitmove 0 + applymovement 255, DewfordTown_Movement_14E402 + waitmovement 0 spriteinvisible 255, 0, 11 call DewfordTown_EventScript_1A02E7 - move 4, DewfordTown_Movement_14E356 - move 255, DewfordTown_Movement_14E356 - waitmove 0 + applymovement 4, DewfordTown_Movement_14E356 + applymovement 255, DewfordTown_Movement_14E356 + waitmovement 0 call DewfordTown_EventScript_1A02EF spritevisible 255, 0, 24 - move 255, DewfordTown_Movement_14E409 - waitmove 0 + applymovement 255, DewfordTown_Movement_14E409 + waitmovement 0 movespriteperm 2, 21, 26 reappear 2 spritelevelup 2, 0, 24, 0 - move 2, DewfordTown_Movement_14E410 - waitmove 0 + applymovement 2, DewfordTown_Movement_14E410 + waitmovement 0 clearflag 741 reappear 1 clearflag 744 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 39bcb0236..0b19ef92d 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -53,8 +53,8 @@ DewfordTown_Hall_EventScript_15330A:: @ 815330A call DewfordTown_Hall_EventScript_1A0102 msgbox DewfordTown_Hall_Text_17570D, 4 closebutton - move 4, DewfordTown_Hall_Movement_1A0841 - waitmove 0 + applymovement 4, DewfordTown_Hall_Movement_1A0841 + waitmovement 0 release end @@ -64,8 +64,8 @@ DewfordTown_Hall_EventScript_153326:: @ 8153326 call DewfordTown_Hall_EventScript_1A0102 msgbox DewfordTown_Hall_Text_17574C, 4 closebutton - move 5, DewfordTown_Hall_Movement_1A0841 - waitmove 0 + applymovement 5, DewfordTown_Hall_Movement_1A0841 + waitmovement 0 release end @@ -189,8 +189,8 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC return DewfordTown_Hall_EventScript_1534FD:: @ 81534FD - move 8, DewfordTown_Hall_Movement_153599 - waitmove 0 + applymovement 8, DewfordTown_Hall_Movement_153599 + waitmovement 0 compare_var_to_imm 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E compare_var_to_imm 0x8008, 1 @@ -200,16 +200,16 @@ DewfordTown_Hall_EventScript_1534FD:: @ 81534FD DewfordTown_Hall_EventScript_15351E:: @ 815351E compare_var_to_imm FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1534FC - move 255, DewfordTown_Hall_Movement_1A0843 - waitmove 0 + applymovement 255, DewfordTown_Hall_Movement_1A0843 + waitmovement 0 return DewfordTown_Hall_EventScript_153534:: @ 8153534 return DewfordTown_Hall_EventScript_153535:: @ 8153535 - move 7, DewfordTown_Hall_Movement_15359B - waitmove 0 + applymovement 7, DewfordTown_Hall_Movement_15359B + waitmovement 0 compare_var_to_imm 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 compare_var_to_imm 0x8008, 1 @@ -224,20 +224,20 @@ DewfordTown_Hall_EventScript_153556:: @ 8153556 return DewfordTown_Hall_EventScript_15356D:: @ 815356D - move 255, DewfordTown_Hall_Movement_1A0841 - waitmove 0 + applymovement 255, DewfordTown_Hall_Movement_1A0841 + waitmovement 0 return DewfordTown_Hall_EventScript_153578:: @ 8153578 - move 255, DewfordTown_Hall_Movement_1A0845 - waitmove 0 + applymovement 255, DewfordTown_Hall_Movement_1A0845 + waitmovement 0 return DewfordTown_Hall_EventScript_153583:: @ 8153583 compare_var_to_imm FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1534FC - move 255, DewfordTown_Hall_Movement_1A083F - waitmove 0 + applymovement 255, DewfordTown_Hall_Movement_1A083F + waitmovement 0 return DewfordTown_Hall_Movement_153599:: @ 8153599 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 6726686ca..45df01e78 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -22,11 +22,11 @@ EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE lockall - move 255, EverGrandeCity_ChampionsRoom_Movement_1A084E - waitmove 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A084E + waitmovement 0 delay 40 - move 255, EverGrandeCity_ChampionsRoom_Movement_15B802 - waitmove 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802 + waitmovement 0 setvar 0x4001, 1 goto EverGrandeCity_ChampionsRoom_EventScript_15B805 releaseall @@ -78,10 +78,10 @@ EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4 delay 40 playse 21 - move 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 - waitmove 0 - move 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 - waitmove 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 + waitmovement 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 + waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 msgbox EverGrandeCity_ChampionsRoom_Text_191268, 4 goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 @@ -91,10 +91,10 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4 delay 40 playse 21 - move 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 - waitmove 0 - move 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 - waitmove 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 + waitmovement 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 + waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 msgbox EverGrandeCity_ChampionsRoom_Text_191305, 4 goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 @@ -103,29 +103,29 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 closebutton reappear 3 - move 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 - waitmove 0 - move 255, EverGrandeCity_ChampionsRoom_Movement_1A0843 - waitmove 0 + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 + waitmovement 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843 + waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_19134D, 4 call EverGrandeCity_ChampionsRoom_EventScript_1A03B0 msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, 4 - move 1, EverGrandeCity_ChampionsRoom_Movement_1A0841 - waitmove 0 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0841 + waitmovement 0 delay 20 - move 1, EverGrandeCity_ChampionsRoom_Movement_1A0845 - waitmove 0 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845 + waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4 closebutton delay 30 - move 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB - move 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD - move 3, EverGrandeCity_ChampionsRoom_Movement_1A0841 - move 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8 - waitmove 0 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_1A0841 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8 + waitmovement 0 delay 20 - move 255, EverGrandeCity_ChampionsRoom_Movement_1A0845 - waitmove 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845 + waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkgender compare_var_to_imm RESULT, 0 @@ -133,9 +133,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 compare_var_to_imm RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closebutton - move 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF - move 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 - waitmove 0 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 + waitmovement 0 setflag 781 warp EverGrandeCity_HallOfFame, 255, 7, 16 waitstate @@ -151,15 +151,15 @@ EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4 return EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD - move 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6 - waitmove 0 - move 255, EverGrandeCity_ChampionsRoom_Movement_1A083F - waitmove 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6 + waitmovement 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A083F + waitmovement 0 return EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2 - move 2, EverGrandeCity_ChampionsRoom_Movement_15B9EF - waitmove 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9EF + waitmovement 0 return EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 458796e0c..0bb327fd4 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -17,26 +17,26 @@ EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 lockall - move 1, EverGrandeCity_HallOfFame_Movement_15BC59 - move 255, EverGrandeCity_HallOfFame_Movement_15BC59 - waitmove 0 - move 1, EverGrandeCity_HallOfFame_Movement_1A0843 - move 255, EverGrandeCity_HallOfFame_Movement_1A083F - waitmove 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC59 + applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC59 + waitmovement 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843 + applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F + waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_191841, 4 closebutton - move 1, EverGrandeCity_HallOfFame_Movement_15BC60 - move 255, EverGrandeCity_HallOfFame_Movement_15BC60 - waitmove 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60 + applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60 + waitmovement 0 delay 20 - move 1, EverGrandeCity_HallOfFame_Movement_1A0843 - move 255, EverGrandeCity_HallOfFame_Movement_1A083F - waitmove 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843 + applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F + waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_1918D7, 4 closebutton - move 1, EverGrandeCity_HallOfFame_Movement_1A0841 - move 255, EverGrandeCity_HallOfFame_Movement_1A0841 - waitmove 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0841 + applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841 + waitmovement 0 delay 20 doanimation 62 checkanimation 62 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 04a8b701a..93f9c5fcb 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -60,9 +60,9 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 checkflag 2060 goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closebutton - move 3, EverGrandeCity_PokemonLeague_Movement_15BB7E - move 4, EverGrandeCity_PokemonLeague_Movement_15BB81 - waitmove 0 + applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E + applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 + waitmovement 0 delay 10 playfanfare 369 message EverGrandeCity_PokemonLeague_Text_191804 @@ -76,13 +76,13 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 end EverGrandeCity_PokemonLeague_EventScript_15BB34:: @ 815BB34 - move 255, EverGrandeCity_PokemonLeague_Movement_15BB76 - waitmove 0 + applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB76 + waitmovement 0 return EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F - move 255, EverGrandeCity_PokemonLeague_Movement_15BB7A - waitmove 0 + applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB7A + waitmovement 0 return EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A @@ -92,12 +92,12 @@ EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A end EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57 - move LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839 + waitmovement 0 msgbox EverGrandeCity_PokemonLeague_Text_191804, 4 closebutton - move LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D + waitmovement 0 releaseall end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 7a3a8a7c8..a629acaf9 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -20,28 +20,28 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall - move 1, FallarborTown_ContestLobby_Movement_153A7C - waitmove 0 + applymovement 1, FallarborTown_ContestLobby_Movement_153A7C + waitmovement 0 playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView - move 1, FallarborTown_ContestLobby_Movement_153A7F - waitmove 0 + applymovement 1, FallarborTown_ContestLobby_Movement_153A7F + waitmovement 0 playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView delay 20 - move 1, FallarborTown_ContestLobby_Movement_153A8C - waitmove 0 - move 255, FallarborTown_ContestLobby_Movement_153A7A - waitmove 0 + applymovement 1, FallarborTown_ContestLobby_Movement_153A8C + waitmovement 0 + applymovement 255, FallarborTown_ContestLobby_Movement_153A7A + waitmovement 0 msgbox FallarborTown_ContestLobby_Text_1A6832, 4 closebutton - move 1, FallarborTown_ContestLobby_Movement_153A83 - move 255, FallarborTown_ContestLobby_Movement_153A70 - waitmove 0 + applymovement 1, FallarborTown_ContestLobby_Movement_153A83 + applymovement 255, FallarborTown_ContestLobby_Movement_153A70 + waitmovement 0 releaseall return diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 74674d3df..f25f02da5 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -3,8 +3,8 @@ FallarborTown_House2_MapScripts:: @ 8153C90 FallarborTown_House2_EventScript_153C91:: @ 8153C91 lockall - move 1, FallarborTown_House2_Movement_1A0839 - waitmove 0 + applymovement 1, FallarborTown_House2_Movement_1A0839 + waitmovement 0 checkflag 1 goto_if_eq FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 320ba0a3a..abe0ac7c6 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -34,14 +34,14 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 end FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49 - move 4, FallarborTown_PokemonCenter_1F_Movement_153B74 - waitmove 0 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B74 + waitmovement 0 goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 - move 4, FallarborTown_PokemonCenter_1F_Movement_153B81 - waitmove 0 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B81 + waitmovement 0 goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 57405986b..c63273d5b 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -73,14 +73,14 @@ FortreeCity_EventScript_14C9CF:: @ 814C9CF FortreeCity_EventScript_14C9E4:: @ 814C9E4 msgbox FortreeCity_Text_1678CB, 4 closebutton - move LAST_TALKED, FortreeCity_Movement_1A0662 - waitmove 0 + applymovement LAST_TALKED, FortreeCity_Movement_1A0662 + waitmovement 0 waitse pokecry SPECIES_KECLEON, 2 delay 40 waitpokecry - move LAST_TALKED, FortreeCity_Movement_14CA13 - waitmove 0 + applymovement LAST_TALKED, FortreeCity_Movement_14CA13 + waitmovement 0 disappear LAST_TALKED setflag 295 release diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index bcf2bcd49..f13b29249 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -17,22 +17,22 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 closebutton setflag 222 clearflag 934 - move 3, FortreeCity_House4_Movement_158218 - waitmove 0 + applymovement 3, FortreeCity_House4_Movement_158218 + waitmovement 0 disappear 3 releaseall end FortreeCity_House4_EventScript_1581C2:: @ 81581C2 - move LAST_TALKED, FortreeCity_House4_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + waitmovement 0 msgbox FortreeCity_House4_Text_18684E, 4 releaseall end FortreeCity_House4_EventScript_1581D6:: @ 81581D6 - move LAST_TALKED, FortreeCity_House4_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 giveitem ITEM_MENTAL_HERB compare_var_to_imm RESULT, 0 @@ -42,8 +42,8 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 end FortreeCity_House4_EventScript_158204:: @ 8158204 - move LAST_TALKED, FortreeCity_House4_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + waitmovement 0 msgbox FortreeCity_House4_Text_186924, 4 releaseall end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index ee1c37dae..ed6a1a784 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -28,13 +28,13 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA end GraniteCave_StevensRoom_EventScript_15CC6D:: @ 815CC6D - move 1, GraniteCave_StevensRoom_Movement_15CC8C - waitmove 0 + applymovement 1, GraniteCave_StevensRoom_Movement_15CC8C + waitmovement 0 return GraniteCave_StevensRoom_EventScript_15CC78:: @ 815CC78 - move 1, GraniteCave_StevensRoom_Movement_15CC93 - waitmove 0 + applymovement 1, GraniteCave_StevensRoom_Movement_15CC93 + waitmovement 0 return GraniteCave_StevensRoom_EventScript_15CC83:: @ 815CC83 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index e40a9252a..d35fcaae5 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -32,17 +32,17 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED setdooropened 12, 15 doorchange reappear 8 - move 8, LavaridgeTown_Movement_14E70E - waitmove 0 + applymovement 8, LavaridgeTown_Movement_14E70E + waitmovement 0 setdoorclosed 12, 15 doorchange - move 8, LavaridgeTown_Movement_1A083F - waitmove 0 - move 255, LavaridgeTown_Movement_1A0843 - move 8, LavaridgeTown_Movement_1A0833 - waitmove 0 - move 8, LavaridgeTown_Movement_1A0835 - waitmove 0 + applymovement 8, LavaridgeTown_Movement_1A083F + waitmovement 0 + applymovement 255, LavaridgeTown_Movement_1A0843 + applymovement 8, LavaridgeTown_Movement_1A0833 + waitmovement 0 + applymovement 8, LavaridgeTown_Movement_1A0835 + waitmovement 0 checkgender compare_var_to_imm RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B @@ -155,13 +155,13 @@ LavaridgeTown_EventScript_14E68A:: @ 814E68A return LavaridgeTown_EventScript_14E68F:: @ 814E68F - move 8, LavaridgeTown_Movement_14E6E8 - waitmove 0 + applymovement 8, LavaridgeTown_Movement_14E6E8 + waitmovement 0 return LavaridgeTown_EventScript_14E69A:: @ 814E69A - move 7, LavaridgeTown_Movement_14E6EF - waitmove 0 + applymovement 7, LavaridgeTown_Movement_14E6EF + waitmovement 0 return LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 @@ -176,13 +176,13 @@ LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 return LavaridgeTown_EventScript_14E6D2:: @ 814E6D2 - move 7, LavaridgeTown_Movement_14E6FA - waitmove 0 + applymovement 7, LavaridgeTown_Movement_14E6FA + waitmovement 0 return LavaridgeTown_EventScript_14E6DD:: @ 814E6DD - move 7, LavaridgeTown_Movement_14E703 - waitmove 0 + applymovement 7, LavaridgeTown_Movement_14E703 + waitmovement 0 return LavaridgeTown_Movement_14E6E8:: @ 814E6E8 diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 5b53435d4..b8410429b 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -214,11 +214,11 @@ LilycoveCity_EventScript_14CCE5:: @ 814CCE5 checkflag 218 goto_if_eq LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 - move LAST_TALKED, LilycoveCity_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_Text_168675, 4 - move LAST_TALKED, LilycoveCity_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_Movement_1A083D + waitmovement 0 setflag 218 releaseall end @@ -412,8 +412,8 @@ LilycoveCity_EventScript_14CF62:: @ 814CF62 LilycoveCity_EventScript_14CF6B:: @ 814CF6B closebutton - move LAST_TALKED, LilycoveCity_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 + waitmovement 0 delay 50 setanimation 0, 1 doanimation 30 diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/scripts/maps/LilycoveCity_ContestHall.inc index 525d57a71..944857a21 100644 --- a/data/scripts/maps/LilycoveCity_ContestHall.inc +++ b/data/scripts/maps/LilycoveCity_ContestHall.inc @@ -22,48 +22,48 @@ LilycoveCity_ContestHall_EventScript_1590B6:: @ 81590B6 LilycoveCity_ContestHall_EventScript_1590BF:: @ 81590BF msgbox LilycoveCity_ContestHall_Text_189301, 2 lockall - move 4, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 4, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1590D4:: @ 81590D4 msgbox LilycoveCity_ContestHall_Text_189366, 2 lockall - move 5, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 5, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1590E9:: @ 81590E9 msgbox LilycoveCity_ContestHall_Text_1893CE, 2 lockall - move 6, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 6, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1590FE:: @ 81590FE msgbox LilycoveCity_ContestHall_Text_189463, 2 lockall - move 7, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 7, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159113:: @ 8159113 msgbox LilycoveCity_ContestHall_Text_189512, 2 lockall - move 8, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 8, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159128:: @ 8159128 msgbox LilycoveCity_ContestHall_Text_18956B, 2 lockall - move 9, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 9, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end @@ -74,154 +74,154 @@ LilycoveCity_ContestHall_EventScript_15913D:: @ 815913D LilycoveCity_ContestHall_EventScript_159146:: @ 8159146 msgbox LilycoveCity_ContestHall_Text_189617, 2 lockall - move 12, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 12, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_15915B:: @ 815915B msgbox LilycoveCity_ContestHall_Text_1896BE, 2 lockall - move 22, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 22, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159170:: @ 8159170 msgbox LilycoveCity_ContestHall_Text_1896FE, 2 lockall - move 11, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 11, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159185:: @ 8159185 msgbox LilycoveCity_ContestHall_Text_189771, 2 lockall - move 13, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 13, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_15919A:: @ 815919A msgbox LilycoveCity_ContestHall_Text_1897AA, 2 lockall - move 14, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 14, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1591AF:: @ 81591AF msgbox LilycoveCity_ContestHall_Text_18980B, 2 lockall - move 15, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 15, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1591C4:: @ 81591C4 msgbox LilycoveCity_ContestHall_Text_189874, 2 lockall - move 16, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 16, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1591D9:: @ 81591D9 msgbox LilycoveCity_ContestHall_Text_18990A, 2 lockall - move 17, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 17, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1591EE:: @ 81591EE msgbox LilycoveCity_ContestHall_Text_189981, 2 lockall - move 18, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 18, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159203:: @ 8159203 msgbox LilycoveCity_ContestHall_Text_189A1D, 2 lockall - move 19, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 19, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159218:: @ 8159218 msgbox LilycoveCity_ContestHall_Text_189A82, 2 lockall - move 21, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 21, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_15922D:: @ 815922D msgbox LilycoveCity_ContestHall_Text_189AE1, 2 lockall - move 20, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 20, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159242:: @ 8159242 msgbox LilycoveCity_ContestHall_Text_189B4E, 2 lockall - move 23, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 23, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159257:: @ 8159257 msgbox LilycoveCity_ContestHall_Text_189BBF, 2 lockall - move 24, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 24, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_15926C:: @ 815926C msgbox LilycoveCity_ContestHall_Text_189C29, 2 lockall - move 25, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 25, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159281:: @ 8159281 msgbox LilycoveCity_ContestHall_Text_189C67, 2 lockall - move 26, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 26, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159296:: @ 8159296 msgbox LilycoveCity_ContestHall_Text_189CB3, 2 lockall - move 27, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 27, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1592AB:: @ 81592AB msgbox LilycoveCity_ContestHall_Text_189D11, 2 lockall - move 28, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 28, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1592C0:: @ 81592C0 lockall - move 29, LilycoveCity_ContestHall_Movement_1A0839 - waitmove 0 + applymovement 29, LilycoveCity_ContestHall_Movement_1A0839 + waitmovement 0 delay 25 - move 29, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 29, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 msgbox LilycoveCity_ContestHall_Text_189DA2, 3 releaseall end @@ -229,16 +229,16 @@ LilycoveCity_ContestHall_EventScript_1592C0:: @ 81592C0 LilycoveCity_ContestHall_EventScript_1592E2:: @ 81592E2 msgbox LilycoveCity_ContestHall_Text_189E5F, 2 lockall - move 31, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 31, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1592F7:: @ 81592F7 msgbox LilycoveCity_ContestHall_Text_189DF3, 2 lockall - move 30, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 30, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 881a842f1..d775fd440 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -21,10 +21,10 @@ LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 lockall reappear 4 - move 4, LilycoveCity_ContestLobby_Movement_158A3B - waitmove 4 - move 255, LilycoveCity_ContestLobby_Movement_158A4C - waitmove 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B + waitmovement 4 + applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C + waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_18890F, 4 lockall fadescreen 1 @@ -46,8 +46,8 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE specialvar RESULT, GiveMonArtistRibbon compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 - move 4, LilycoveCity_ContestLobby_Movement_158A43 - waitmove 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 + waitmovement 0 disappear 4 call LilycoveCity_ContestLobby_EventScript_158994 call LilycoveCity_ContestLobby_EventScript_1589EA @@ -60,8 +60,8 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton - move 4, LilycoveCity_ContestLobby_Movement_158A43 - waitmove 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 + waitmovement 0 setvar 0x4099, 0 disappear 4 releaseall @@ -70,13 +70,13 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 inccounter GAME_STAT_RECEIVED_RIBBONS special sub_80C4858 - move 4, LilycoveCity_ContestLobby_Movement_158A4E - waitmove 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E + waitmovement 0 playse 21 - move 4, LilycoveCity_ContestLobby_Movement_1A0833 - waitmove 0 - move 4, LilycoveCity_ContestLobby_Movement_158A52 - waitmove 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833 + waitmovement 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 + waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 playfanfare 370 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 @@ -196,10 +196,10 @@ LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A lockall reappear 11 - move 11, LilycoveCity_ContestLobby_Movement_158B64 - waitmove 11 - move 255, LilycoveCity_ContestLobby_Movement_158B76 - waitmove 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B64 + waitmovement 11 + applymovement 255, LilycoveCity_ContestLobby_Movement_158B76 + waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_18890F, 4 lockall fadescreen 1 @@ -219,8 +219,8 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE specialvar RESULT, GiveMonArtistRibbon compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 - move 11, LilycoveCity_ContestLobby_Movement_158B6D - waitmove 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D + waitmovement 0 disappear 11 call LilycoveCity_ContestLobby_EventScript_158994 call LilycoveCity_ContestLobby_EventScript_1589EA @@ -233,8 +233,8 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton - move 11, LilycoveCity_ContestLobby_Movement_158B6D - waitmove 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D + waitmovement 0 setvar 0x4099, 0 disappear 11 releaseall @@ -243,13 +243,13 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 inccounter GAME_STAT_RECEIVED_RIBBONS special sub_80C4858 - move 11, LilycoveCity_ContestLobby_Movement_158B78 - waitmove 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B78 + waitmovement 0 playse 21 - move 11, LilycoveCity_ContestLobby_Movement_1A0833 - waitmove 0 - move 11, LilycoveCity_ContestLobby_Movement_158B7C - waitmove 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833 + waitmovement 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C + waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 playfanfare 370 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 @@ -494,30 +494,30 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B waittext delay 20 closebutton - move 2, LilycoveCity_ContestLobby_Movement_158E9C - waitmove 0 + applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C + waitmovement 0 playse 71 setmaptile 9, 2, 545, 1 setmaptile 9, 3, 609, 1 special DrawWholeMapView - move 2, LilycoveCity_ContestLobby_Movement_158EA0 - waitmove 0 + applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 + waitmovement 0 playse 71 setmaptile 9, 2, 721, 1 setmaptile 9, 3, 729, 1 special DrawWholeMapView delay 20 - move 2, LilycoveCity_ContestLobby_Movement_158EAE - waitmove 0 - move 255, LilycoveCity_ContestLobby_Movement_158E99 - waitmove 0 + applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE + waitmovement 0 + applymovement 255, LilycoveCity_ContestLobby_Movement_158E99 + waitmovement 0 message2 LilycoveCity_ContestLobby_Text_1A6832 waittext delay 20 closebutton - move 2, LilycoveCity_ContestLobby_Movement_158EA4 - move 255, LilycoveCity_ContestLobby_Movement_158E8E - waitmove 0 + applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4 + applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E + waitmovement 0 releaseall return @@ -633,28 +633,28 @@ LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79 LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 lockall - move 1, LilycoveCity_ContestLobby_Movement_15900B - waitmove 0 + applymovement 1, LilycoveCity_ContestLobby_Movement_15900B + waitmovement 0 playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView - move 1, LilycoveCity_ContestLobby_Movement_15900F - waitmove 0 + applymovement 1, LilycoveCity_ContestLobby_Movement_15900F + waitmovement 0 playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView delay 20 - move 1, LilycoveCity_ContestLobby_Movement_15901C - waitmove 0 - move 255, LilycoveCity_ContestLobby_Movement_159008 - waitmove 0 + applymovement 1, LilycoveCity_ContestLobby_Movement_15901C + waitmovement 0 + applymovement 255, LilycoveCity_ContestLobby_Movement_159008 + waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_1A6832, 4 closebutton - move 1, LilycoveCity_ContestLobby_Movement_159013 - move 255, LilycoveCity_ContestLobby_Movement_158FFE - waitmove 0 + applymovement 1, LilycoveCity_ContestLobby_Movement_159013 + applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE + waitmovement 0 releaseall return diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index aef4bc74a..f6fb499a3 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -8,53 +8,53 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 checkflag 2061 goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, 4 closebutton - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CCE, 4 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, 4 closebutton - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186E57, 4 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, 4 closebutton - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D lockall playse 21 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 - waitmove 0 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 - waitmove 0 - move 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845 - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 + waitmovement 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 + waitmovement 0 + applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845 + waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, 4 closebutton - move 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A - waitmove 0 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839C - waitmove 0 + applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A + waitmovement 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839C + waitmovement 0 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 1dd8d5869..fdf1c76e3 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -72,8 +72,8 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1 LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 hidebox 0, 0, 29, 19 - move LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 + waitmovement 0 special sub_810EBEC waitstate setflag 2 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 9d22e6055..4ee36a21d 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -23,16 +23,16 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E copyvar 0x8008, RESULT special sub_810F9AC msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 - move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 - waitmove 0 + applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 + waitmovement 0 playse 4 special DoLotteryCornerComputerEffect special PickLotteryCornerTicket delay 220 special EndLotteryCornerComputerEffect delay 10 - move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 - waitmove 0 + applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 inccounter GAME_STAT_WON_POKEMON_LOTTERY diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 0d9e70a15..8998d6268 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -76,8 +76,8 @@ LilycoveCity_Harbor_EventScript_15997E:: @ 815997E LilycoveCity_Harbor_EventScript_15998A:: @ 815998A msgbox LilycoveCity_Harbor_Text_18B4B3, 4 closebutton - move LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 13, 10 compare_var_to_imm FACING, 2 @@ -91,13 +91,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A return LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE - move 255, LilycoveCity_Harbor_Movement_159A86 - waitmove 0 + applymovement 255, LilycoveCity_Harbor_Movement_159A86 + waitmovement 0 return LilycoveCity_Harbor_EventScript_1599D9:: @ 81599D9 - move 255, LilycoveCity_Harbor_Movement_159A89 - waitmove 0 + applymovement 255, LilycoveCity_Harbor_Movement_159A89 + waitmovement 0 return LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 @@ -114,19 +114,19 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closebutton - move LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 13, 10 delay 60 reappear 4 delay 30 - move 4, LilycoveCity_Harbor_Movement_1A0839 - waitmove 0 + applymovement 4, LilycoveCity_Harbor_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_Harbor_Text_1C5120, 4 closebutton - move 4, LilycoveCity_Harbor_Movement_1A0841 - waitmove 0 + applymovement 4, LilycoveCity_Harbor_Movement_1A0841 + waitmovement 0 delay 30 disappear 4 compare_var_to_imm FACING, 2 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 62455f547..452c0567f 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -15,16 +15,16 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closebutton - move LAST_TALKED, LilycoveCity_House3_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + waitmovement 0 release end LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D msgbox LilycoveCity_House3_Text_18B9DC, 4 closebutton - move LAST_TALKED, LilycoveCity_House3_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + waitmovement 0 release end @@ -33,8 +33,8 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32 faceplayer msgbox LilycoveCity_House3_Text_18BD64, 4 closebutton - move LAST_TALKED, LilycoveCity_House3_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 236d48f65..7611b0ef5 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15841C:: @ 815841C LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 lockall - move 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839 + applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839 message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 waittext multichoice 20, 8, 16, 1 @@ -36,8 +36,8 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158477:: @ 8158477 LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, 3 - move 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC - waitmove 0 + applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC + waitmovement 0 disappear 2 switch FACING case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD @@ -47,24 +47,24 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD lockall - move 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504 - waitmove 0 + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504 + waitmovement 0 warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 waitstate end LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2 lockall - move 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE - waitmove 0 + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE + waitmovement 0 warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 waitstate end LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 lockall - move 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501 - waitmove 0 + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501 + waitmovement 0 warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 waitstate end @@ -152,8 +152,8 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158585:: @ 8158585 LilycoveCity_LilycoveMuseum_1F_EventScript_15858E:: @ 815858E msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B04, 2 lockall - move 8, LilycoveCity_LilycoveMuseum_1F_Movement_1A083D - waitmove 0 + applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_1A083D + waitmovement 0 releaseall end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 663b1f25b..6fb0f07b1 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -67,19 +67,19 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A lockall - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 - move 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 - waitmove 0 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C42, 3 - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 - waitmove 0 - move 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 - waitmove 0 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + waitmovement 0 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C64, 3 - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 - waitmove 0 - move 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 - waitmove 0 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + waitmovement 0 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, 3 copyvar 0x4094, 0x1 releaseall @@ -113,16 +113,16 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15872C:: @ 815872C end LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 - waitmove 0 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, 4 - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188041, 4 goto LilycoveCity_LilycoveMuseum_2F_EventScript_15875C end LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 givedecoration 44 compare_var_to_imm RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 01781f3ca..978eb6569 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -3,8 +3,8 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE lockall - move 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839 - waitmove 0 + applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, 5 switch RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_159ADE diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index dba3cf57a..eb1882043 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -9,21 +9,21 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395 LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F lockall - move 1, LilycoveCity_PokemonTrainerFanClub_Movement_1A0845 - waitmove 0 + applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_1A0845 + waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1D6, 4 - move 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402 - move 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA - waitmove 0 - move 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A0843 - waitmove 0 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402 + applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA + waitmovement 0 + applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A0843 + waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1E8, 4 - move 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409 - waitmove 0 - move 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A083F - waitmove 0 - move 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C - waitmove 0 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409 + waitmovement 0 + applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A083F + waitmovement 0 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C + waitmovement 0 setvar 0x4095, 2 releaseall end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 79b89e157..e3f9b1dc7 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -100,28 +100,28 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D LittlerootTown_EventScript_14D62B:: @ 814D62B delay 15 playse 10 - move 255, LittlerootTown_Movement_14D6C0 - waitmove 0 + applymovement 255, LittlerootTown_Movement_14D6C0 + waitmovement 0 setdooropened 0x8004, 0x8005 doorchange reappear 4 - move 4, LittlerootTown_Movement_14D6AC - waitmove 0 + applymovement 4, LittlerootTown_Movement_14D6AC + waitmovement 0 setdoorclosed 0x8004, 0x8005 doorchange delay 10 - move 4, LittlerootTown_Movement_14D6AE - waitmove 0 + applymovement 4, LittlerootTown_Movement_14D6AE + waitmovement 0 msgbox LittlerootTown_Text_16A7C9, 4 closebutton - move 4, LittlerootTown_Movement_14D6B1 - move 255, LittlerootTown_Movement_14D6B8 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14D6B1 + applymovement 255, LittlerootTown_Movement_14D6B8 + waitmovement 0 setdooropened 0x8004, 0x8005 doorchange - move 4, LittlerootTown_Movement_14D6B5 - move 255, LittlerootTown_Movement_14D6BD - waitmove 0 + applymovement 4, LittlerootTown_Movement_14D6B5 + applymovement 255, LittlerootTown_Movement_14D6BD + waitmovement 0 setflag 752 setvar 0x4092, 3 spriteinvisible 255, 0, 0 @@ -200,8 +200,8 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF LittlerootTown_EventScript_14D708:: @ 814D708 msgbox LittlerootTown_Text_16AD82, 4 closebutton - move 1, LittlerootTown_Movement_1A083D - waitmove 0 + applymovement 1, LittlerootTown_Movement_1A083D + waitmovement 0 setvar 0x4050, 2 release end @@ -219,20 +219,20 @@ LittlerootTown_EventScript_14D72F:: @ 814D72F LittlerootTown_EventScript_14D739:: @ 814D739 lockall - move 1, LittlerootTown_Movement_14D779 - waitmove 0 + applymovement 1, LittlerootTown_Movement_14D779 + waitmovement 0 call LittlerootTown_EventScript_14D755 - move 1, LittlerootTown_Movement_14D789 - waitmove 0 + applymovement 1, LittlerootTown_Movement_14D789 + waitmovement 0 releaseall end LittlerootTown_EventScript_14D755:: @ 814D755 msgbox LittlerootTown_Text_16ACEB, 4 closebutton - move 1, LittlerootTown_Movement_14D787 - move 255, LittlerootTown_Movement_14D793 - waitmove 0 + applymovement 1, LittlerootTown_Movement_14D787 + applymovement 255, LittlerootTown_Movement_14D793 + waitmovement 0 msgbox LittlerootTown_Text_16AD3C, 4 closebutton return @@ -277,11 +277,11 @@ LittlerootTown_Movement_14D793:: @ 814D793 LittlerootTown_EventScript_14D797:: @ 814D797 lockall - move 1, LittlerootTown_Movement_14D7B3 - waitmove 0 + applymovement 1, LittlerootTown_Movement_14D7B3 + waitmovement 0 call LittlerootTown_EventScript_14D755 - move 1, LittlerootTown_Movement_14D7C0 - waitmove 0 + applymovement 1, LittlerootTown_Movement_14D7C0 + waitmovement 0 releaseall end @@ -311,14 +311,14 @@ LittlerootTown_Movement_14D7C0:: @ 814D7C0 LittlerootTown_EventScript_14D7C7:: @ 814D7C7 lockall - move 1, LittlerootTown_Movement_1A0843 - waitmove 0 - move 255, LittlerootTown_Movement_1A083F - waitmove 0 + applymovement 1, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 msgbox LittlerootTown_Text_16AD82, 4 closebutton - move 1, LittlerootTown_Movement_1A083D - waitmove 0 + applymovement 1, LittlerootTown_Movement_1A083D + waitmovement 0 setvar 0x4050, 2 releaseall end @@ -443,13 +443,13 @@ LittlerootTown_EventScript_14D931:: @ 814D931 return LittlerootTown_EventScript_14D93C:: @ 814D93C - move 4, LittlerootTown_Movement_1A0843 - waitmove 0 + applymovement 4, LittlerootTown_Movement_1A0843 + waitmovement 0 return LittlerootTown_EventScript_14D947:: @ 814D947 - move 4, LittlerootTown_Movement_1A083F - waitmove 0 + applymovement 4, LittlerootTown_Movement_1A083F + waitmovement 0 return LittlerootTown_EventScript_14D952:: @ 814D952 @@ -483,73 +483,73 @@ LittlerootTown_EventScript_14D995:: @ 814D995 return LittlerootTown_EventScript_14D9D8:: @ 814D9D8 - move 255, LittlerootTown_Movement_1A0845 - waitmove 0 - move 4, LittlerootTown_Movement_14DC76 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0845 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC76 + waitmovement 0 return LittlerootTown_EventScript_14D9ED:: @ 814D9ED - move 255, LittlerootTown_Movement_1A0845 - waitmove 0 - move 4, LittlerootTown_Movement_14DC7D - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0845 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC7D + waitmovement 0 return LittlerootTown_EventScript_14DA02:: @ 814DA02 - move 255, LittlerootTown_Movement_1A083F - waitmove 0 - move 4, LittlerootTown_Movement_14DC84 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC84 + waitmovement 0 return LittlerootTown_EventScript_14DA17:: @ 814DA17 - move 255, LittlerootTown_Movement_1A083F - waitmove 0 - move 4, LittlerootTown_Movement_14DC89 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC89 + waitmovement 0 return LittlerootTown_EventScript_14DA2C:: @ 814DA2C - move 255, LittlerootTown_Movement_1A083F - waitmove 0 - move 4, LittlerootTown_Movement_14DC8F - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC8F + waitmovement 0 return LittlerootTown_EventScript_14DA41:: @ 814DA41 - move 255, LittlerootTown_Movement_1A083F - waitmove 0 - move 4, LittlerootTown_Movement_14DC92 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC92 + waitmovement 0 return LittlerootTown_EventScript_14DA56:: @ 814DA56 - move 255, LittlerootTown_Movement_1A0843 - waitmove 0 - move 4, LittlerootTown_Movement_14DC96 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC96 + waitmovement 0 return LittlerootTown_EventScript_14DA6B:: @ 814DA6B - move 255, LittlerootTown_Movement_1A0843 - waitmove 0 - move 4, LittlerootTown_Movement_14DC9A - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC9A + waitmovement 0 return LittlerootTown_EventScript_14DA80:: @ 814DA80 - move 255, LittlerootTown_Movement_1A0843 - waitmove 0 - move 4, LittlerootTown_Movement_14DC9D - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC9D + waitmovement 0 return LittlerootTown_EventScript_14DA95:: @ 814DA95 - move 255, LittlerootTown_Movement_1A0843 - waitmove 0 - move 4, LittlerootTown_Movement_14DCA3 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DCA3 + waitmovement 0 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA @@ -583,106 +583,106 @@ LittlerootTown_EventScript_14DAED:: @ 814DAED return LittlerootTown_EventScript_14DB30:: @ 814DB30 - move 4, LittlerootTown_Movement_14DCA8 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCA8 + waitmovement 0 return LittlerootTown_EventScript_14DB3B:: @ 814DB3B - move 4, LittlerootTown_Movement_14DCAE - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCAE + waitmovement 0 return LittlerootTown_EventScript_14DB46:: @ 814DB46 - move 4, LittlerootTown_Movement_14DCB4 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCB4 + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DB6C:: @ 814DB6C - move 4, LittlerootTown_Movement_14DCBA - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCBA + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DB92:: @ 814DB92 - move 4, LittlerootTown_Movement_14DCC1 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCC1 + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 - move 4, LittlerootTown_Movement_14DCC5 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCC5 + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DBDE:: @ 814DBDE - move 4, LittlerootTown_Movement_14DCCA - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCCA + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DC04:: @ 814DC04 - move 4, LittlerootTown_Movement_14DCCF - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCCF + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DC2A:: @ 814DC2A - move 4, LittlerootTown_Movement_14DCD3 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCD3 + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DC50:: @ 814DC50 - move 4, LittlerootTown_Movement_14DCDA - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCDA + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange @@ -847,12 +847,12 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 - move 4, LittlerootTown_Movement_1A0841 - waitmove 0 + applymovement 4, LittlerootTown_Movement_1A0841 + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index f0440a49e..7f3f3f5cf 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -62,9 +62,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA lockall msgbox LittlerootTown_BrendansHouse_1F_Text_172574, 4 closebutton - move 255, LittlerootTown_BrendansHouse_1F_Movement_152720 - move 1, LittlerootTown_BrendansHouse_1F_Movement_152720 - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 + applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 + waitmovement 0 warp LittlerootTown_BrendansHouse_2F, 255, 7, 1 waitstate releaseall @@ -91,13 +91,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 lockall playse 21 - move 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 - waitmove 0 - move 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 - waitmove 0 - move 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F - move 4, LittlerootTown_BrendansHouse_1F_Movement_152782 - waitmove 0 + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + waitmovement 0 + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_152782 + waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 setflag 87 @@ -118,7 +118,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall setvar 0x8004, 1 setvar 0x8005, 0 - move 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F - waitmove 0 + applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F + waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 882c5ede3..022e98b2a 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -62,9 +62,9 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 lockall msgbox LittlerootTown_MaysHouse_1F_Text_172574, 4 closebutton - move 255, LittlerootTown_MaysHouse_1F_Movement_15295E - move 1, LittlerootTown_MaysHouse_1F_Movement_15295E - waitmove 0 + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E + applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E + waitmovement 0 warp LittlerootTown_MaysHouse_2F, 255, 1, 1 waitstate releaseall @@ -91,13 +91,13 @@ LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 lockall playse 21 - move 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 - waitmove 0 - move 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 - waitmove 0 - move 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 - move 4, LittlerootTown_MaysHouse_1F_Movement_1529C0 - waitmove 0 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 + waitmovement 0 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 + waitmovement 0 + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1529C0 + waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4 setflag 87 @@ -165,7 +165,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 lockall setvar 0x8004, 1 setvar 0x8005, 1 - move 0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 - waitmove 0 + applymovement 0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 + waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index b9dca087f..cf2033919 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -49,12 +49,12 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4 playbgm 415, 1 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 - waitmove 0 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 - waitmove 0 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 + waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closebutton compare_var_to_imm FACING, 4 @@ -66,29 +66,29 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 return LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11 + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152B34:: @ 8152B34 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4 playbgm 421, 1 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 - waitmove 0 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 - waitmove 0 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 + waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closebutton compare_var_to_imm FACING, 4 @@ -100,18 +100,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A return LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30 + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25 + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + waitmovement 0 checkgender compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 092d50545..d6576be92 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -67,8 +67,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A lockall - move 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B - waitmove 0 + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B + waitmovement 0 goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA end @@ -119,10 +119,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA msgbox LittlerootTown_ProfessorBirchsLab_Text_17411F, 4 call LittlerootTown_ProfessorBirchsLab_EventScript_152E6D msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, 4 - move 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97 - waitmove 0 - move 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 - waitmove 0 + applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97 + waitmovement 0 + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 + waitmovement 0 checkgender compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index da0ff3a62..6ebd36749 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -71,16 +71,16 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4 goto_if_eq MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 closebutton - move 7, MauvilleCity_Movement_1A083D - waitmove 0 + applymovement 7, MauvilleCity_Movement_1A083D + waitmovement 0 release end MauvilleCity_EventScript_14C0E4:: @ 814C0E4 msgbox MauvilleCity_Text_165E45, 4 closebutton - move 7, MauvilleCity_Movement_1A083D - waitmove 0 + applymovement 7, MauvilleCity_Movement_1A083D + waitmovement 0 release end @@ -88,18 +88,18 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall checkflag 284 goto_if_eq MauvilleCity_EventScript_14C292 - move 6, MauvilleCity_Movement_1A0843 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 msgbox MauvilleCity_Text_165BE3, 4 msgbox MauvilleCity_Text_165C57, 4 msgbox MauvilleCity_Text_165D01, 4 - move 6, MauvilleCity_Movement_1A0839 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0839 + waitmovement 0 playse 21 - move 6, MauvilleCity_Movement_1A0833 - waitmove 0 - move 6, MauvilleCity_Movement_1A0835 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0833 + waitmovement 0 + applymovement 6, MauvilleCity_Movement_1A0835 + waitmovement 0 msgbox MauvilleCity_Text_165D50, 5 goto MauvilleCity_EventScript_14C154 end @@ -116,40 +116,40 @@ MauvilleCity_EventScript_14C154:: @ 814C154 end MauvilleCity_EventScript_14C187:: @ 814C187 - move 6, MauvilleCity_Movement_14C2AA - move 7, MauvilleCity_Movement_14C2CC - waitmove 0 - move 6, MauvilleCity_Movement_1A0843 - waitmove 0 + applymovement 6, MauvilleCity_Movement_14C2AA + applymovement 7, MauvilleCity_Movement_14C2CC + waitmovement 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 delay 30 - move 7, MauvilleCity_Movement_14C2D8 - waitmove 0 - move 255, MauvilleCity_Movement_1A0845 - waitmove 0 + applymovement 7, MauvilleCity_Movement_14C2D8 + waitmovement 0 + applymovement 255, MauvilleCity_Movement_1A0845 + waitmovement 0 msgbox MauvilleCity_Text_1660FA, 4 closebutton - move 6, MauvilleCity_Movement_14C2B6 - move 7, MauvilleCity_Movement_14C2DF - waitmove 0 + applymovement 6, MauvilleCity_Movement_14C2B6 + applymovement 7, MauvilleCity_Movement_14C2DF + waitmovement 0 goto MauvilleCity_EventScript_14C22B end MauvilleCity_EventScript_14C1D9:: @ 814C1D9 - move 6, MauvilleCity_Movement_14C2B0 - move 7, MauvilleCity_Movement_14C2D2 - waitmove 0 - move 6, MauvilleCity_Movement_1A0843 - waitmove 0 + applymovement 6, MauvilleCity_Movement_14C2B0 + applymovement 7, MauvilleCity_Movement_14C2D2 + waitmovement 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 delay 30 - move 7, MauvilleCity_Movement_14C2DC - waitmove 0 - move 255, MauvilleCity_Movement_1A0845 - waitmove 0 + applymovement 7, MauvilleCity_Movement_14C2DC + waitmovement 0 + applymovement 255, MauvilleCity_Movement_1A0845 + waitmovement 0 msgbox MauvilleCity_Text_1660FA, 4 closebutton - move 6, MauvilleCity_Movement_14C2C1 - move 7, MauvilleCity_Movement_14C2E8 - waitmove 0 + applymovement 6, MauvilleCity_Movement_14C2C1 + applymovement 7, MauvilleCity_Movement_14C2E8 + waitmovement 0 goto MauvilleCity_EventScript_14C22B end @@ -165,14 +165,14 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B MauvilleCity_EventScript_14C23C:: @ 814C23C msgbox MauvilleCity_Text_165F0D, 4 trainerbattle 3, OPPONENT_WALLY_2, 0, MauvilleCity_Text_165F38 - move 6, MauvilleCity_Movement_1A0843 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 msgbox MauvilleCity_Text_165F85, 4 - move 6, MauvilleCity_Movement_1A0839 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0839 + waitmovement 0 msgbox MauvilleCity_Text_165FB3, 4 - move 6, MauvilleCity_Movement_1A0843 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 msgbox MauvilleCity_Text_166050, 4 return @@ -183,8 +183,8 @@ MauvilleCity_EventScript_14C285:: @ 814C285 end MauvilleCity_EventScript_14C292:: @ 814C292 - move 6, MauvilleCity_Movement_1A0839 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0839 + waitmovement 0 msgbox MauvilleCity_Text_165EE2, 5 goto MauvilleCity_EventScript_14C154 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 63476bb1a..bc49cd481 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -500,8 +500,8 @@ MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8 MauvilleCity_GameCorner_EventScript_157108:: @ 8157108 closebutton - move LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 4308fd5ab..3f9ba59f3 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -15,10 +15,10 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 playse 21 - move LAST_TALKED, MauvilleCity_House2_Movement_1A0833 - waitmove 0 - move LAST_TALKED, MauvilleCity_House2_Movement_1A0835 - waitmove 0 + applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 + waitmovement 0 msgbox MauvilleCity_House2_Text_1824D8, 5 compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_15731B diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 07e264fa8..8d78d1496 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -8,72 +8,72 @@ MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496 MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C lockall - move 255, MeteorFalls_1F_1R_Movement_1A0845 - waitmove 0 + applymovement 255, MeteorFalls_1F_1R_Movement_1A0845 + waitmovement 0 delay 30 - move 5, MeteorFalls_1F_1R_Movement_1A0845 - waitmove 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A0845 + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193237, 4 closebutton - move 5, MeteorFalls_1F_1R_Movement_1A0841 - move 6, MeteorFalls_1F_1R_Movement_1A0841 - waitmove 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A0841 + applymovement 6, MeteorFalls_1F_1R_Movement_1A0841 + waitmovement 0 playse 21 - move 5, MeteorFalls_1F_1R_Movement_1A0833 - waitmove 0 - move 5, MeteorFalls_1F_1R_Movement_1A0835 - waitmove 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A0833 + waitmovement 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A0835 + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193268, 4 closebutton - move 5, MeteorFalls_1F_1R_Movement_15C5EE - waitmove 0 + applymovement 5, MeteorFalls_1F_1R_Movement_15C5EE + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1932C5, 4 closebutton - move 255, MeteorFalls_1F_1R_Movement_1A083F - move 5, MeteorFalls_1F_1R_Movement_1A083F - move 6, MeteorFalls_1F_1R_Movement_1A083F - waitmove 0 + applymovement 255, MeteorFalls_1F_1R_Movement_1A083F + applymovement 5, MeteorFalls_1F_1R_Movement_1A083F + applymovement 6, MeteorFalls_1F_1R_Movement_1A083F + waitmovement 0 reappear 7 reappear 8 reappear 9 - move 7, MeteorFalls_1F_1R_Movement_15C608 - move 8, MeteorFalls_1F_1R_Movement_15C60F - move 9, MeteorFalls_1F_1R_Movement_15C617 - waitmove 0 - move 5, MeteorFalls_1F_1R_Movement_1A083F - move 6, MeteorFalls_1F_1R_Movement_1A083F - waitmove 0 + applymovement 7, MeteorFalls_1F_1R_Movement_15C608 + applymovement 8, MeteorFalls_1F_1R_Movement_15C60F + applymovement 9, MeteorFalls_1F_1R_Movement_15C617 + waitmovement 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A083F + applymovement 6, MeteorFalls_1F_1R_Movement_1A083F + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193320, 4 closebutton - move 255, MeteorFalls_1F_1R_Movement_15C64F - move 5, MeteorFalls_1F_1R_Movement_15C5F1 - move 6, MeteorFalls_1F_1R_Movement_15C5FC - waitmove 0 + applymovement 255, MeteorFalls_1F_1R_Movement_15C64F + applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1 + applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC + waitmovement 0 disappear 5 disappear 6 - move 7, MeteorFalls_1F_1R_Movement_15C628 - waitmove 0 + applymovement 7, MeteorFalls_1F_1R_Movement_15C628 + waitmovement 0 .ifdef SAPPHIRE msgbox MeteorFalls_1F_1R_Text_1933EC, 4 .else msgbox MeteorFalls_1F_1R_Text_193584, 4 .endif closebutton - move 8, MeteorFalls_1F_1R_Movement_15C639 - move 9, MeteorFalls_1F_1R_Movement_15C64A - waitmove 0 + applymovement 8, MeteorFalls_1F_1R_Movement_15C639 + applymovement 9, MeteorFalls_1F_1R_Movement_15C64A + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193720, 4 - move 7, MeteorFalls_1F_1R_Movement_1A0845 - waitmove 0 + applymovement 7, MeteorFalls_1F_1R_Movement_1A0845 + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193747, 4 - move 7, MeteorFalls_1F_1R_Movement_1A083F - waitmove 0 + applymovement 7, MeteorFalls_1F_1R_Movement_1A083F + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1937AA, 4 closebutton - move 7, MeteorFalls_1F_1R_Movement_15C61F - move 8, MeteorFalls_1F_1R_Movement_15C62E - move 9, MeteorFalls_1F_1R_Movement_15C63E - waitmove 0 + applymovement 7, MeteorFalls_1F_1R_Movement_15C61F + applymovement 8, MeteorFalls_1F_1R_Movement_15C62E + applymovement 9, MeteorFalls_1F_1R_Movement_15C63E + waitmovement 0 disappear 7 disappear 8 disappear 9 diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index d01c85ff3..cd5d9840f 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -60,8 +60,8 @@ MossdeepCity_EventScript_14D011:: @ 814D011 lock faceplayer msgbox MossdeepCity_Text_16944E, 4 - move LAST_TALKED, MossdeepCity_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 453b611cc..8d889a7d6 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -42,13 +42,13 @@ MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 lockall - move 255, MossdeepCity_GameCorner_1F_Movement_15AD3D - waitmove 0 - move 1, MossdeepCity_GameCorner_1F_Movement_15AD3F - waitmove 0 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AD3D + waitmovement 0 + applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F + waitmovement 0 moveoffscreen 1 - move 255, MossdeepCity_GameCorner_1F_Movement_1A0841 - waitmove 0 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 + waitmovement 0 compare_var_to_imm 0x40c0, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 compare_var_to_imm 0x40c0, 2 @@ -136,21 +136,21 @@ MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5 return MossdeepCity_GameCorner_1F_EventScript_15AE04:: @ 815AE04 - move LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 - move 255, MossdeepCity_GameCorner_1F_Movement_15AE3A - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3A + waitmovement 0 return MossdeepCity_GameCorner_1F_EventScript_15AE16:: @ 815AE16 - move LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49 - move 255, MossdeepCity_GameCorner_1F_Movement_15AE3E - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3E + waitmovement 0 return MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28 - move LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 - move 255, MossdeepCity_GameCorner_1F_Movement_15AE42 - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE42 + waitmovement 0 return MossdeepCity_GameCorner_1F_Movement_15AE3A:: @ 815AE3A diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index a7ae2f947..29400a80b 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -13,8 +13,8 @@ MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E lockall - move 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 - waitmove 0 + applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 + waitmovement 0 special sub_81360C0 msgbox 0x20234cc, 4 closebutton @@ -30,8 +30,8 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton special ScrSpecial_HealPlayerParty - move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF - waitmove 0 + applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF + waitmovement 0 special LoadPlayerParty setvar 0x4001, 1 warp MossdeepCity_GameCorner_1F, 255, 3, 1 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index de38e8fd0..838b7fd14 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -85,8 +85,8 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA checkflag 100 goto_if_eq MossdeepCity_Gym_EventScript_15A621 setflag 100 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 5, 5, 516, 0 setmaptile 2, 7, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -100,8 +100,8 @@ MossdeepCity_Gym_EventScript_15A619:: @ 815A619 MossdeepCity_Gym_EventScript_15A621:: @ 815A621 clearflag 100 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 5, 5, 524, 0 setmaptile 2, 7, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -112,8 +112,8 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 checkflag 101 goto_if_eq MossdeepCity_Gym_EventScript_15A675 setflag 101 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 8, 14, 516, 0 setmaptile 8, 10, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -121,8 +121,8 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 MossdeepCity_Gym_EventScript_15A675:: @ 815A675 clearflag 101 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 8, 14, 517, 0 setmaptile 8, 10, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -133,8 +133,8 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A checkflag 102 goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 setflag 102 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 15, 17, 524, 0 setmaptile 17, 15, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -142,8 +142,8 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 clearflag 102 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 15, 17, 516, 0 setmaptile 17, 15, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -154,8 +154,8 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE checkflag 103 goto_if_eq MossdeepCity_Gym_EventScript_15A71D setflag 103 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 1, 23, 525, 0 setmaptile 5, 24, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -163,8 +163,8 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D clearflag 103 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 1, 23, 516, 0 setmaptile 5, 24, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index e3485ae0d..660bc2c06 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -28,13 +28,13 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B end MossdeepCity_House2_EventScript_15A8AE:: @ 815A8AE - move 3, MossdeepCity_House2_Movement_15A8C4 - waitmove 0 + applymovement 3, MossdeepCity_House2_Movement_15A8C4 + waitmovement 0 return MossdeepCity_House2_EventScript_15A8B9:: @ 815A8B9 - move 3, MossdeepCity_House2_Movement_15A8CB - waitmove 0 + applymovement 3, MossdeepCity_House2_Movement_15A8CB + waitmovement 0 return MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 40ed4f4ef..b328a6784 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -12,8 +12,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B compare_var_to_imm RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closebutton - move LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D + waitmovement 0 release end @@ -57,7 +57,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, 4 closebutton - move LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index d5004c644..31a9efcea 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -29,15 +29,15 @@ MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01 MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B lockall - move 1, MossdeepCity_StevensHouse_Movement_1A083F - waitmove 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F + waitmovement 0 playse 21 - move 1, MossdeepCity_StevensHouse_Movement_1A0833 - waitmove 0 - move 1, MossdeepCity_StevensHouse_Movement_1A0835 - waitmove 0 - move 1, MossdeepCity_StevensHouse_Movement_15AA6E - waitmove 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833 + waitmovement 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835 + waitmovement 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E + waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 giveitem ITEM_HM08 setflag 123 @@ -45,8 +45,8 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 closebutton delay 20 - move 1, MossdeepCity_StevensHouse_Movement_15AA76 - waitmove 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76 + waitmovement 0 setvar 0x40c6, 1 releaseall end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index b61097fdc..43dee22b4 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -19,9 +19,9 @@ MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 lockall - move 255, MtChimney_CableCarStation_Movement_15C1B4 - move 1, MtChimney_CableCarStation_Movement_15C1AA - waitmove 0 + applymovement 255, MtChimney_CableCarStation_Movement_15C1B4 + applymovement 1, MtChimney_CableCarStation_Movement_15C1AA + waitmovement 0 setvar 0x40a3, 0 movespriteperm 1, 6, 7 spritebehave 1, 8 @@ -41,9 +41,9 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C msgbox MtChimney_CableCarStation_Text_1925A9, 4 closebutton - move 1, MtChimney_CableCarStation_Movement_15C1A5 - move 255, MtChimney_CableCarStation_Movement_15C1AF - waitmove 0 + applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 + applymovement 255, MtChimney_CableCarStation_Movement_15C1AF + waitmovement 0 setvar 0x8004, 1 setvar 0x40a3, 2 inccounter GAME_STAT_RODE_CABLE_CAR diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index a558475c5..44d0760df 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -25,10 +25,10 @@ MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 end MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 - move 255, MtPyre_Summit_Movement_1A0841 - waitmove 0 - move 2, MtPyre_Summit_Movement_1A0845 - waitmove 0 + applymovement 255, MtPyre_Summit_Movement_1A0841 + waitmovement 0 + applymovement 2, MtPyre_Summit_Movement_1A0845 + waitmovement 0 delay 50 compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D593 @@ -78,35 +78,35 @@ MtPyre_Summit_EventScript_15D57A:: @ 815D57A return MtPyre_Summit_EventScript_15D593:: @ 815D593 - move 2, MtPyre_Summit_Movement_15D5E9 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D5E9 + waitmovement 0 return MtPyre_Summit_EventScript_15D59E:: @ 815D59E return MtPyre_Summit_EventScript_15D59F:: @ 815D59F - move 2, MtPyre_Summit_Movement_15D5EC - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D5EC + waitmovement 0 return MtPyre_Summit_EventScript_15D5AA:: @ 815D5AA - move 3, MtPyre_Summit_Movement_15D5DF - waitmove 0 - move 255, MtPyre_Summit_Movement_1A0843 - waitmove 0 + applymovement 3, MtPyre_Summit_Movement_15D5DF + waitmovement 0 + applymovement 255, MtPyre_Summit_Movement_1A0843 + waitmovement 0 return MtPyre_Summit_EventScript_15D5BF:: @ 815D5BF - move 3, MtPyre_Summit_Movement_15D5E3 - waitmove 0 + applymovement 3, MtPyre_Summit_Movement_15D5E3 + waitmovement 0 return MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA - move 3, MtPyre_Summit_Movement_15D5E5 - waitmove 0 - move 255, MtPyre_Summit_Movement_1A083F - waitmove 0 + applymovement 3, MtPyre_Summit_Movement_15D5E5 + waitmovement 0 + applymovement 255, MtPyre_Summit_Movement_1A083F + waitmovement 0 return MtPyre_Summit_Movement_15D5DF:: @ 815D5DF @@ -199,11 +199,11 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 setvar 0x8004, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F closebutton - move LAST_TALKED, MtPyre_Summit_Movement_1A0841 - waitmove 0 + applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 + waitmovement 0 delay 40 - move LAST_TALKED, MtPyre_Summit_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0839 + waitmovement 0 delay 10 .ifdef SAPPHIRE msgbox UnknownString_81B5762, 4 @@ -263,10 +263,10 @@ MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 end MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 - move 255, MtPyre_Summit_Movement_1A0841 - waitmove 0 - move 2, MtPyre_Summit_Movement_1A0845 - waitmove 0 + applymovement 255, MtPyre_Summit_Movement_1A0841 + waitmovement 0 + applymovement 2, MtPyre_Summit_Movement_1A0845 + waitmovement 0 delay 50 compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D75E @@ -292,33 +292,33 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 end MtPyre_Summit_EventScript_15D75E:: @ 815D75E - move 2, MtPyre_Summit_Movement_15D7A0 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7A0 + waitmovement 0 return MtPyre_Summit_EventScript_15D769:: @ 815D769 - move 2, MtPyre_Summit_Movement_15D7A3 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7A3 + waitmovement 0 return MtPyre_Summit_EventScript_15D774:: @ 815D774 - move 2, MtPyre_Summit_Movement_15D7A4 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7A4 + waitmovement 0 return MtPyre_Summit_EventScript_15D77F:: @ 815D77F - move 2, MtPyre_Summit_Movement_15D7A7 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7A7 + waitmovement 0 return MtPyre_Summit_EventScript_15D78A:: @ 815D78A - move 2, MtPyre_Summit_Movement_15D7B0 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7B0 + waitmovement 0 return MtPyre_Summit_EventScript_15D795:: @ 815D795 - move 2, MtPyre_Summit_Movement_15D7B9 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7B9 + waitmovement 0 return MtPyre_Summit_Movement_15D7A0:: @ 815D7A0 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index eb3f63225..7eb3769cc 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -23,8 +23,8 @@ NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC lockall - move 255, NewMauville_Entrance_Movement_1A0841 - waitmove 0 + applymovement 255, NewMauville_Entrance_Movement_1A0841 + waitmovement 0 msgbox NewMauville_Entrance_Text_1982C0, 4 checkitem ITEM_BASEMENT_KEY, 1 compare_var_to_imm RESULT, 0 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 7cac8011a..0afc63220 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -53,23 +53,23 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC end OldaleTown_EventScript_14DE07:: @ 814DE07 - move 2, OldaleTown_Movement_14DE97 - move 255, OldaleTown_Movement_14DEC1 - waitmove 0 + applymovement 2, OldaleTown_Movement_14DE97 + applymovement 255, OldaleTown_Movement_14DEC1 + waitmovement 0 goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE1E:: @ 814DE1E - move 2, OldaleTown_Movement_14DEA2 - move 255, OldaleTown_Movement_14DECB - waitmove 0 + applymovement 2, OldaleTown_Movement_14DEA2 + applymovement 255, OldaleTown_Movement_14DECB + waitmovement 0 goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE35:: @ 814DE35 - move 255, OldaleTown_Movement_14DEB9 - move 2, OldaleTown_Movement_14DE8E - waitmove 0 + applymovement 255, OldaleTown_Movement_14DEB9 + applymovement 2, OldaleTown_Movement_14DE8E + waitmovement 0 goto OldaleTown_EventScript_14DE4C end @@ -199,20 +199,20 @@ OldaleTown_EventScript_14DEDF:: @ 814DEDF goto_if_eq OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closebutton - move 3, OldaleTown_Movement_1A083D - waitmove 0 + applymovement 3, OldaleTown_Movement_1A083D + waitmovement 0 release end OldaleTown_EventScript_14DEFF:: @ 814DEFF lockall - move 255, OldaleTown_Movement_14DFEC - move 3, OldaleTown_Movement_14DFEF - waitmove 0 + applymovement 255, OldaleTown_Movement_14DFEC + applymovement 3, OldaleTown_Movement_14DFEF + waitmovement 0 msgbox OldaleTown_Text_16B045, 4 closebutton - move 3, OldaleTown_Movement_14DFF5 - waitmove 0 + applymovement 3, OldaleTown_Movement_14DFF5 + waitmovement 0 releaseall end @@ -223,35 +223,35 @@ OldaleTown_EventScript_14DF26:: @ 814DF26 OldaleTown_EventScript_14DF30:: @ 814DF30 lockall - move 4, OldaleTown_Movement_1A0839 - waitmove 0 + applymovement 4, OldaleTown_Movement_1A0839 + waitmovement 0 goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF41:: @ 814DF41 lockall - move 4, OldaleTown_Movement_14DFDE - waitmove 0 - move 255, OldaleTown_Movement_1A0843 - waitmove 0 + applymovement 4, OldaleTown_Movement_14DFDE + waitmovement 0 + applymovement 255, OldaleTown_Movement_1A0843 + waitmovement 0 goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF5C:: @ 814DF5C lockall - move 4, OldaleTown_Movement_14DFE1 - waitmove 0 - move 255, OldaleTown_Movement_1A0843 - waitmove 0 + applymovement 4, OldaleTown_Movement_14DFE1 + waitmovement 0 + applymovement 255, OldaleTown_Movement_1A0843 + waitmovement 0 goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF77:: @ 814DF77 lockall - move 4, OldaleTown_Movement_14DFE3 - waitmove 0 - move 255, OldaleTown_Movement_1A0843 - waitmove 0 + applymovement 4, OldaleTown_Movement_14DFE3 + waitmovement 0 + applymovement 255, OldaleTown_Movement_1A0843 + waitmovement 0 goto OldaleTown_EventScript_14DF92 end @@ -275,8 +275,8 @@ OldaleTown_EventScript_14DFB8:: @ 814DFB8 OldaleTown_EventScript_14DFC6:: @ 814DFC6 closebutton - move 4, OldaleTown_Movement_14DFE5 - waitmove 0 + applymovement 4, OldaleTown_Movement_14DFE5 + waitmovement 0 disappear 4 setvar 0x40c7, 2 setflag 979 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index e1e49096a..4dca1fdb8 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -28,15 +28,15 @@ PetalburgCity_EventScript_14B747:: @ 814B747 setflag 0x4000 special SavePlayerParty special PutZigzagoonInPlayerParty - move 2, PetalburgCity_Movement_14B7ED - move 255, PetalburgCity_Movement_14B7CC - waitmove 0 + applymovement 2, PetalburgCity_Movement_14B7ED + applymovement 255, PetalburgCity_Movement_14B7CC + waitmovement 0 msgbox PetalburgCity_Text_16D361, 4 special ScrSpecial_StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_16D3DE, 4 - movecoords 2, PetalburgCity_Movement_1A083F, 0, 0 - waitmovexy 0, 0, 2 + applymovement 2, PetalburgCity_Movement_1A083F, 0, 0 + waitmovement 0, 0, 2 msgbox PetalburgCity_Text_16D408, 4 closebutton clearflag 0x4000 @@ -55,8 +55,8 @@ PetalburgCity_EventScript_14B7AC:: @ 814B7AC faceplayer msgbox PetalburgCity_Text_164490, 4 closebutton - move 3, PetalburgCity_Movement_1A083D - waitmove 0 + applymovement 3, PetalburgCity_Movement_1A083D + waitmovement 0 release end @@ -179,14 +179,14 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A end PetalburgCity_EventScript_14B866:: @ 814B866 - move 9, PetalburgCity_Movement_1A0839 - waitmove 0 + applymovement 9, PetalburgCity_Movement_1A0839 + waitmovement 0 playbgm 420, 0 playse 21 - move 9, PetalburgCity_Movement_1A0833 - waitmove 0 - move 9, PetalburgCity_Movement_1A0835 - waitmove 0 + applymovement 9, PetalburgCity_Movement_1A0833 + waitmovement 0 + applymovement 9, PetalburgCity_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B91B compare_var_to_imm 0x8008, 1 @@ -206,65 +206,65 @@ PetalburgCity_EventScript_14B866:: @ 814B866 compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 - move 9, PetalburgCity_Movement_1A0843 - move 255, PetalburgCity_Movement_1A0843 - waitmove 0 + applymovement 9, PetalburgCity_Movement_1A0843 + applymovement 255, PetalburgCity_Movement_1A0843 + waitmovement 0 msgbox PetalburgCity_Text_164449, 4 closebutton - move 9, PetalburgCity_Movement_14B9F4 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9F4 + waitmovement 0 fadedefaultbgm releaseall end PetalburgCity_EventScript_14B91B:: @ 814B91B - move 9, PetalburgCity_Movement_14B9B1 - waitmove 0 - move 255, PetalburgCity_Movement_1A0845 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9B1 + waitmovement 0 + applymovement 255, PetalburgCity_Movement_1A0845 + waitmovement 0 return PetalburgCity_EventScript_14B930:: @ 814B930 - move 9, PetalburgCity_Movement_14B9B6 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9B6 + waitmovement 0 return PetalburgCity_EventScript_14B93B:: @ 814B93B - move 9, PetalburgCity_Movement_14B9B9 - waitmove 0 - move 255, PetalburgCity_Movement_1A0841 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9B9 + waitmovement 0 + applymovement 255, PetalburgCity_Movement_1A0841 + waitmovement 0 return PetalburgCity_EventScript_14B950:: @ 814B950 - move 9, PetalburgCity_Movement_14B9BE - waitmove 0 - move 255, PetalburgCity_Movement_1A0841 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9BE + waitmovement 0 + applymovement 255, PetalburgCity_Movement_1A0841 + waitmovement 0 return PetalburgCity_EventScript_14B965:: @ 814B965 - move 9, PetalburgCity_Movement_14B9C4 - move 255, PetalburgCity_Movement_14BA01 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9C4 + applymovement 255, PetalburgCity_Movement_14BA01 + waitmovement 0 return PetalburgCity_EventScript_14B977:: @ 814B977 - move 9, PetalburgCity_Movement_14B9CF - move 255, PetalburgCity_Movement_14BA0B - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9CF + applymovement 255, PetalburgCity_Movement_14BA0B + waitmovement 0 return PetalburgCity_EventScript_14B989:: @ 814B989 - move 9, PetalburgCity_Movement_14B9DD - move 255, PetalburgCity_Movement_14BA18 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9DD + applymovement 255, PetalburgCity_Movement_14BA18 + waitmovement 0 return PetalburgCity_EventScript_14B99B:: @ 814B99B - move 9, PetalburgCity_Movement_14B9E8 - move 255, PetalburgCity_Movement_14BA22 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9E8 + applymovement 255, PetalburgCity_Movement_14BA22 + waitmovement 0 return @ 814B9AD diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 489a3f8fd..f4598403f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -81,15 +81,15 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C msgbox PetalburgCity_Gym_Text_17A196, 4 msgbox PetalburgCity_Gym_Text_17A1B0, 4 closebutton - move 255, PetalburgCity_Gym_Movement_1A0845 - move 10, PetalburgCity_Gym_Movement_1545B4 - waitmove 0 + applymovement 255, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_1545B4 + waitmovement 0 playse 9 disappear 10 setflag 726 delay 30 - move 255, PetalburgCity_Gym_Movement_1A0841 - waitmove 0 + applymovement 255, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 msgbox PetalburgCity_Gym_Text_17A2A4, 4 setvar 0x4085, 2 releaseall @@ -218,102 +218,102 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 end PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE - move 1, PetalburgCity_Gym_Movement_1A0845 - move 10, PetalburgCity_Gym_Movement_154B27 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_154B27 + waitmovement 0 return PetalburgCity_Gym_EventScript_154800:: @ 8154800 - move 10, PetalburgCity_Gym_Movement_154B1D - waitmove 0 - move 1, PetalburgCity_Gym_Movement_1A0843 - move 255, PetalburgCity_Gym_Movement_1A0843 - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_154B1D + waitmovement 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + applymovement 255, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 return PetalburgCity_Gym_EventScript_15481C:: @ 815481C - move 1, PetalburgCity_Gym_Movement_1A0845 - move 255, PetalburgCity_Gym_Movement_1A0845 - move 10, PetalburgCity_Gym_Movement_154B27 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 255, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_154B27 + waitmovement 0 return PetalburgCity_Gym_EventScript_154835:: @ 8154835 - move 1, PetalburgCity_Gym_Movement_1A0845 - move 10, PetalburgCity_Gym_Movement_154B3E - move 255, PetalburgCity_Gym_Movement_154B4D - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_154B3E + applymovement 255, PetalburgCity_Gym_Movement_154B4D + waitmovement 0 return PetalburgCity_Gym_EventScript_15484E:: @ 815484E - move 10, PetalburgCity_Gym_Movement_154B2E - move 255, PetalburgCity_Gym_Movement_154B45 - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_154B2E + applymovement 255, PetalburgCity_Gym_Movement_154B45 + waitmovement 0 return PetalburgCity_Gym_EventScript_154860:: @ 8154860 - move 10, PetalburgCity_Gym_Movement_154B3E - move 255, PetalburgCity_Gym_Movement_154B57 - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_154B3E + applymovement 255, PetalburgCity_Gym_Movement_154B57 + waitmovement 0 return PetalburgCity_Gym_EventScript_154872:: @ 8154872 - move 10, PetalburgCity_Gym_Movement_154B36 - move 255, PetalburgCity_Gym_Movement_154B5F - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_154B36 + applymovement 255, PetalburgCity_Gym_Movement_154B5F + waitmovement 0 return PetalburgCity_Gym_EventScript_154884:: @ 8154884 - move 1, PetalburgCity_Gym_Movement_1A0841 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 return PetalburgCity_Gym_EventScript_15488F:: @ 815488F - move 1, PetalburgCity_Gym_Movement_1A0845 - move 255, PetalburgCity_Gym_Movement_1A0841 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 255, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1 - move 1, PetalburgCity_Gym_Movement_1A0843 - move 255, PetalburgCity_Gym_Movement_1A083F - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + applymovement 255, PetalburgCity_Gym_Movement_1A083F + waitmovement 0 return PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3 - move 1, PetalburgCity_Gym_Movement_1A083F - move 255, PetalburgCity_Gym_Movement_1A0843 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A083F + applymovement 255, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548C5:: @ 81548C5 - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548D0:: @ 81548D0 - move 1, PetalburgCity_Gym_Movement_1A0843 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548DB:: @ 81548DB - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548E6:: @ 81548E6 - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548F1:: @ 81548F1 - move 10, PetalburgCity_Gym_Movement_1A0839 - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_1A0839 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548FC:: @ 81548FC - move 10, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_154907:: @ 8154907 @@ -340,8 +340,8 @@ PetalburgCity_Gym_EventScript_15492F:: @ 815492F return PetalburgCity_Gym_EventScript_154930:: @ 8154930 - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_15493B:: @ 815493B @@ -441,43 +441,43 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C end PetalburgCity_Gym_EventScript_154ABC:: @ 8154ABC - move 1, PetalburgCity_Gym_Movement_1A0841 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 return PetalburgCity_Gym_EventScript_154AC7:: @ 8154AC7 - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_154AD2:: @ 8154AD2 - move 1, PetalburgCity_Gym_Movement_1A083F - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A083F + waitmovement 0 return PetalburgCity_Gym_EventScript_154ADD:: @ 8154ADD - move 1, PetalburgCity_Gym_Movement_1A0843 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 return PetalburgCity_Gym_EventScript_154AE8:: @ 8154AE8 - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_154AF3:: @ 8154AF3 - move 1, PetalburgCity_Gym_Movement_1A0841 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 return PetalburgCity_Gym_EventScript_154AFE:: @ 8154AFE - move 1, PetalburgCity_Gym_Movement_1A0843 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 return PetalburgCity_Gym_EventScript_154B09:: @ 8154B09 - move 1, PetalburgCity_Gym_Movement_1A083F - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A083F + waitmovement 0 return @ 8154B14 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 8c90aa09c..8f34eecc6 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -9,74 +9,74 @@ PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2 PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 lockall call PetalburgWoods_EventScript_15CDE6 - move 4, PetalburgWoods_Movement_15CE89 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE89 + waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closebutton playbgm BGM_EVIL_TEAM, 0 - move 3, PetalburgWoods_Movement_15CEC3 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEC3 + waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 closebutton - move 3, PetalburgWoods_Movement_15CEB0 - waitmove 0 - move 4, PetalburgWoods_Movement_1A0841 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEB0 + waitmovement 0 + applymovement 4, PetalburgWoods_Movement_1A0841 + waitmovement 0 msgbox PetalburgWoods_Text_194E6B, 4 closebutton - move 4, PetalburgWoods_Movement_15CE9E - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE9E + waitmovement 0 msgbox PetalburgWoods_Text_194E9A, 4 - move 3, PetalburgWoods_Movement_15CEC8 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEC8 + waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 - move 3, PetalburgWoods_Movement_15CEB3 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEB3 + waitmovement 0 call PetalburgWoods_EventScript_15CDFA - move 4, PetalburgWoods_Movement_15CE80 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE80 + waitmovement 0 goto PetalburgWoods_EventScript_15CE69 end PetalburgWoods_EventScript_15CD42:: @ 815CD42 lockall call PetalburgWoods_EventScript_15CDE6 - move 4, PetalburgWoods_Movement_15CE8E - waitmove 0 - move 255, PetalburgWoods_Movement_1A083F - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE8E + waitmovement 0 + applymovement 255, PetalburgWoods_Movement_1A083F + waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closebutton playbgm BGM_EVIL_TEAM, 0 - move 3, PetalburgWoods_Movement_15CEC3 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEC3 + waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 closebutton - move 3, PetalburgWoods_Movement_15CEBF - waitmove 0 - move 4, PetalburgWoods_Movement_1A0841 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEBF + waitmovement 0 + applymovement 4, PetalburgWoods_Movement_1A0841 + waitmovement 0 msgbox PetalburgWoods_Text_194E6B, 4 closebutton - move 4, PetalburgWoods_Movement_15CEA4 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CEA4 + waitmovement 0 msgbox PetalburgWoods_Text_194E9A, 4 - move 255, PetalburgWoods_Movement_1A0841 - waitmove 0 + applymovement 255, PetalburgWoods_Movement_1A0841 + waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 - move 3, PetalburgWoods_Movement_15CEB3 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEB3 + waitmovement 0 call PetalburgWoods_EventScript_15CDFA - move 4, PetalburgWoods_Movement_15CE95 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE95 + waitmovement 0 goto PetalburgWoods_EventScript_15CE69 end PetalburgWoods_EventScript_15CDE6:: @ 815CDE6 - move 4, PetalburgWoods_Movement_15CE73 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE73 + waitmovement 0 msgbox PetalburgWoods_Text_194D71, 4 closebutton return @@ -84,11 +84,11 @@ PetalburgWoods_EventScript_15CDE6:: @ 815CDE6 PetalburgWoods_EventScript_15CDFA:: @ 815CDFA msgbox PetalburgWoods_Text_194FA4, 4 closebutton - move 3, PetalburgWoods_Movement_15CEB7 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEB7 + waitmovement 0 disappear 3 - move 255, PetalburgWoods_Movement_1A0845 - waitmove 0 + applymovement 255, PetalburgWoods_Movement_1A0845 + waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 giveitem ITEM_GREAT_BALL compare_var_to_imm RESULT, 0 @@ -103,8 +103,8 @@ PetalburgWoods_EventScript_15CE3F:: @ 815CE3F PetalburgWoods_EventScript_15CE4D:: @ 815CE4D msgbox PetalburgWoods_Text_19510A, 4 - move 4, PetalburgWoods_Movement_15CEA8 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CEA8 + waitmovement 0 msgbox PetalburgWoods_Text_195153, 4 closebutton return diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index bfbc9f2bd..35fbaf744 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -23,18 +23,18 @@ Route101_EventScript_14E948:: @ 814E948 closebutton movesprite 2, 0, 15 movesprite 4, 0, 16 - move 255, Route101_Movement_14EA2C - move 2, Route101_Movement_14EA50 - move 4, Route101_Movement_14EA1F - waitmove 0 - move 4, Route101_Movement_14EA00 - move 2, Route101_Movement_14EA31 - waitmove 0 - move 2, Route101_Movement_1A0843 - waitmove 0 - move 4, Route101_Movement_14EA27 - move 2, Route101_Movement_14EA58 - waitmove 0 + applymovement 255, Route101_Movement_14EA2C + applymovement 2, Route101_Movement_14EA50 + applymovement 4, Route101_Movement_14EA1F + waitmovement 0 + applymovement 4, Route101_Movement_14EA00 + applymovement 2, Route101_Movement_14EA31 + waitmovement 0 + applymovement 2, Route101_Movement_1A0843 + waitmovement 0 + applymovement 4, Route101_Movement_14EA27 + applymovement 2, Route101_Movement_14EA58 + waitmovement 0 msgbox Route101_Text_16D119, 4 closebutton setvar 0x4060, 2 @@ -45,8 +45,8 @@ Route101_EventScript_14E9B8:: @ 814E9B8 lockall msgbox Route101_Text_16D15E, 4 closebutton - move 255, Route101_Movement_14E9FA - waitmove 0 + applymovement 255, Route101_Movement_14E9FA + waitmovement 0 releaseall end @@ -54,8 +54,8 @@ Route101_EventScript_14E9CE:: @ 814E9CE lockall msgbox Route101_Text_16D15E, 4 closebutton - move 255, Route101_Movement_14E9FC - waitmove 0 + applymovement 255, Route101_Movement_14E9FC + waitmovement 0 releaseall end @@ -63,8 +63,8 @@ Route101_EventScript_14E9E4:: @ 814E9E4 lockall msgbox Route101_Text_16D15E, 4 closebutton - move 255, Route101_Movement_14E9FE - waitmove 0 + applymovement 255, Route101_Movement_14E9FE + waitmovement 0 releaseall end @@ -222,12 +222,12 @@ Route101_EventScript_14EA7F:: @ 814EA7F fadescreen 1 disappear 4 movesprite 255, 6, 13 - move 255, Route101_Movement_1A083F - waitmove 0 + applymovement 255, Route101_Movement_1A083F + waitmovement 0 special ScrSpecial_ChooseStarter waitstate - move 2, Route101_Movement_14EAD7 - waitmove 0 + applymovement 2, Route101_Movement_14EAD7 + waitmovement 0 msgbox Route101_Text_16D191, 4 special ScrSpecial_HealPlayerParty setflag 720 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 586075465..102d2aa0c 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -19,12 +19,12 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, 4 playbgm 415, 1 - move 2, Route103_Movement_1A0839 - waitmove 0 - move 2, Route103_Movement_1A0833 - waitmove 0 - move 2, Route103_Movement_1A0835 - waitmove 0 + applymovement 2, Route103_Movement_1A0839 + waitmovement 0 + applymovement 2, Route103_Movement_1A0833 + waitmovement 0 + applymovement 2, Route103_Movement_1A0835 + waitmovement 0 msgbox Route103_Text_16D5B6, 4 switch 0x4023 case 0, Route103_EventScript_14EC5D @@ -35,12 +35,12 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, 4 playbgm 421, 1 - move 2, Route103_Movement_1A0839 - waitmove 0 - move 2, Route103_Movement_1A0833 - waitmove 0 - move 2, Route103_Movement_1A0835 - waitmove 0 + applymovement 2, Route103_Movement_1A0839 + waitmovement 0 + applymovement 2, Route103_Movement_1A0833 + waitmovement 0 + applymovement 2, Route103_Movement_1A0835 + waitmovement 0 msgbox Route103_Text_16D7A9, 4 switch 0x4023 case 0, Route103_EventScript_14EC8D @@ -98,20 +98,20 @@ Route103_EventScript_14ECD9:: @ 814ECD9 end Route103_EventScript_14ED0C:: @ 814ED0C - move 2, Route103_Movement_14ED67 - waitmove 0 + applymovement 2, Route103_Movement_14ED67 + waitmovement 0 playse 10 - move 2, Route103_Movement_14ED6B - waitmove 0 + applymovement 2, Route103_Movement_14ED6B + waitmovement 0 goto Route103_EventScript_14ED46 end Route103_EventScript_14ED29:: @ 814ED29 - move 2, Route103_Movement_14ED71 - waitmove 0 + applymovement 2, Route103_Movement_14ED71 + waitmovement 0 playse 10 - move 2, Route103_Movement_14ED74 - waitmove 0 + applymovement 2, Route103_Movement_14ED74 + waitmovement 0 goto Route103_EventScript_14ED46 end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 58a6704bf..d9f65a382 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -126,28 +126,28 @@ Route104_EventScript_14EFCC:: @ 814EFCC Route104_EventScript_14EFD5:: @ 814EFD5 spritelevelup 8, 0, 19, 0 spritelevelup 255, 0, 19, 0 - move 8, Route104_Movement_14F16C - waitmove 0 + applymovement 8, Route104_Movement_14F16C + waitmovement 0 disappear 8 - move 255, Route104_Movement_14F162 - waitmove 0 + applymovement 255, Route104_Movement_14F162 + waitmovement 0 spriteinvisible 255, 0, 19 call Route104_EventScript_1A02E7 - move 7, Route104_Movement_14F09F - move 255, Route104_Movement_14F09F - waitmove 0 - move 255, Route104_Movement_14F166 - waitmove 0 + applymovement 7, Route104_Movement_14F09F + applymovement 255, Route104_Movement_14F09F + waitmovement 0 + applymovement 255, Route104_Movement_14F166 + waitmovement 0 call Route104_EventScript_1A02EF spritevisible 255, 0, 11 - move 255, Route104_Movement_14F168 - waitmove 0 + applymovement 255, Route104_Movement_14F168 + waitmovement 0 movespriteperm 2, 12, 8 reappear 2 spritelevelup 2, 0, 11, 0 clearflag 740 - move 2, Route104_Movement_14F16F - waitmove 0 + applymovement 2, Route104_Movement_14F16F + waitmovement 0 reappear 4 clearflag 743 call Route104_EventScript_1A02EF diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 1846cb2ff..bd5116a43 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -5,8 +5,8 @@ Route109_EventScript_14F4D3:: @ 814F4D3 call Route109_EventScript_1A010C spritelevelup 2, 0, 24, 0 spritelevelup 255, 0, 24, 0 - move 2, Route109_Movement_14F67B - waitmove 0 + applymovement 2, Route109_Movement_14F67B + waitmovement 0 disappear 2 switch FACING case 1, Route109_EventScript_14F518 @@ -15,40 +15,40 @@ Route109_EventScript_14F4D3:: @ 814F4D3 end Route109_EventScript_14F518:: @ 814F518 - move 255, Route109_Movement_14F66D - waitmove 0 + applymovement 255, Route109_Movement_14F66D + waitmovement 0 goto Route109_EventScript_14F548 end Route109_EventScript_14F528:: @ 814F528 - move 255, Route109_Movement_14F675 - waitmove 0 + applymovement 255, Route109_Movement_14F675 + waitmovement 0 goto Route109_EventScript_14F548 end Route109_EventScript_14F538:: @ 814F538 - move 255, Route109_Movement_14F678 - waitmove 0 + applymovement 255, Route109_Movement_14F678 + waitmovement 0 goto Route109_EventScript_14F548 end Route109_EventScript_14F548:: @ 814F548 spriteinvisible 255, 0, 24 call Route109_EventScript_1A02E7 - move 1, Route109_Movement_14F5BF - move 255, Route109_Movement_14F5BF - waitmove 0 + applymovement 1, Route109_Movement_14F5BF + applymovement 255, Route109_Movement_14F5BF + waitmovement 0 call Route109_EventScript_1A02EF spritevisible 255, 0, 11 - move 255, Route109_Movement_14F670 - waitmove 0 + applymovement 255, Route109_Movement_14F670 + waitmovement 0 reappear 4 clearflag 743 movespriteperm 2, 12, 8 reappear 2 spritelevelup 2, 0, 11, 0 - move 2, Route109_Movement_14F67D - waitmove 0 + applymovement 2, Route109_Movement_14F67D + waitmovement 0 clearflag 740 setflag 744 spriteinvisible 1, 0, 24 @@ -319,8 +319,8 @@ Route109_EventScript_14F70E:: @ 814F70E faceplayer msgbox Route109_Text_16E405, 4 closebutton - move LAST_TALKED, Route109_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route109_Movement_1A083D + waitmovement 0 release end @@ -335,16 +335,16 @@ Route109_EventScript_14F725:: @ 814F725 compare_var_to_imm RESULT, 0 goto_if_eq Route109_EventScript_1A029B closebutton - move LAST_TALKED, Route109_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route109_Movement_1A083D + waitmovement 0 setflag 280 release end Route109_EventScript_14F762:: @ 814F762 msgbox Route109_Text_16E446, 4 - move LAST_TALKED, Route109_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route109_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 9fba68693..e4582e08e 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -33,8 +33,8 @@ Route110_EventScript_14F946:: @ 814F946 lock faceplayer msgbox Route110_Text_16E6C0, 4 - move LAST_TALKED, Route110_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 release end @@ -42,8 +42,8 @@ Route110_EventScript_14F95C:: @ 814F95C lock faceplayer msgbox Route110_Text_16E6F2, 4 - move LAST_TALKED, Route110_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 release end @@ -51,8 +51,8 @@ Route110_EventScript_14F972:: @ 814F972 lock faceplayer msgbox Route110_Text_16E729, 4 - move LAST_TALKED, Route110_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 release end @@ -60,8 +60,8 @@ Route110_EventScript_14F988:: @ 814F988 lock faceplayer msgbox Route110_Text_16E76A, 4 - move LAST_TALKED, Route110_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 release end @@ -254,8 +254,8 @@ Route110_EventScript_14FC10:: @ 814FC10 Route110_EventScript_14FC27:: @ 814FC27 lockall - move 21, Route110_Movement_1A0843 - waitmove 0 + applymovement 21, Route110_Movement_1A0843 + waitmovement 0 call Route110_EventScript_14FC39 releaseall end @@ -330,12 +330,12 @@ Route110_EventScript_14FD34:: @ 814FD34 call_if 1, Route110_EventScript_14FDA7 compare_var_to_imm RESULT, 1 call_if 1, Route110_EventScript_14FDAC - move 28, Route110_Movement_1A0845 - waitmove 0 - move 28, Route110_Movement_1A0833 - waitmove 0 - move 28, Route110_Movement_1A0835 - waitmove 0 + applymovement 28, Route110_Movement_1A0845 + waitmovement 0 + applymovement 28, Route110_Movement_1A0833 + waitmovement 0 + applymovement 28, Route110_Movement_1A0835 + waitmovement 0 delay 30 compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF14 @@ -450,33 +450,33 @@ Route110_EventScript_14FEB2:: @ 814FEB2 end Route110_EventScript_14FF14:: @ 814FF14 - move 28, Route110_Movement_14FF6E - waitmove 0 + applymovement 28, Route110_Movement_14FF6E + waitmovement 0 return Route110_EventScript_14FF1F:: @ 814FF1F - move 28, Route110_Movement_14FF72 - waitmove 0 + applymovement 28, Route110_Movement_14FF72 + waitmovement 0 return Route110_EventScript_14FF2A:: @ 814FF2A - move 28, Route110_Movement_14FF74 - waitmove 0 + applymovement 28, Route110_Movement_14FF74 + waitmovement 0 return Route110_EventScript_14FF35:: @ 814FF35 - move 29, Route110_Movement_14FF78 - waitmove 0 + applymovement 29, Route110_Movement_14FF78 + waitmovement 0 return Route110_EventScript_14FF40:: @ 814FF40 - move 29, Route110_Movement_14FF80 - waitmove 0 + applymovement 29, Route110_Movement_14FF80 + waitmovement 0 return Route110_EventScript_14FF4B:: @ 814FF4B - move 29, Route110_Movement_14FF89 - waitmove 0 + applymovement 29, Route110_Movement_14FF89 + waitmovement 0 return Route110_EventScript_14FF56:: @ 814FF56 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index d98662e78..c2900de22 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -42,8 +42,8 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 @ You don't have a bike! msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4 closebutton - move 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538 - waitmove 0 + applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538 + waitmovement 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 204ccc64d..c385a7bc9 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -21,8 +21,8 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6 msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, 4 closebutton - move 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB - waitmove 0 + applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB + waitmovement 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index e70dcd749..61c0e65a6 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -161,8 +161,8 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 closebutton - move 1, Route110_TrickHouseEnd_Movement_1A0839 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0839 + waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar 0x40c1, 0 @@ -180,11 +180,11 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF end Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E - move 1, Route110_TrickHouseEnd_Movement_161315 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_161315 + waitmovement 0 playse 178 - move 1, Route110_TrickHouseEnd_Movement_16131E - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_16131E + waitmovement 0 disappear 1 addvar 0x4044, 1 return @@ -202,41 +202,41 @@ Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61 return Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74 - move 1, Route110_TrickHouseEnd_Movement_1A0845 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0845 + waitmovement 0 return Route110_TrickHouseEnd_EventScript_161C7F:: @ 8161C7F - move 1, Route110_TrickHouseEnd_Movement_1A0841 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0841 + waitmovement 0 return Route110_TrickHouseEnd_EventScript_161C8A:: @ 8161C8A - move 1, Route110_TrickHouseEnd_Movement_1A083F - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A083F + waitmovement 0 return Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 - move 1, Route110_TrickHouseEnd_Movement_1A0843 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0843 + waitmovement 0 return Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall spriteface 1, 3 playse 21 - move 1, Route110_TrickHouseEnd_Movement_1A0833 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0833 + waitmovement 0 delay 20 - move 1, Route110_TrickHouseEnd_Movement_161CEA - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_161CEA + waitmovement 0 playse 178 - move 255, Route110_TrickHouseEnd_Movement_1A0845 - waitmove 0 + applymovement 255, Route110_TrickHouseEnd_Movement_1A0845 + waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, 4 closebutton - move 255, Route110_TrickHouseEnd_Movement_161CE8 - waitmove 0 + applymovement 255, Route110_TrickHouseEnd_Movement_161CE8 + waitmovement 0 delay 4 spriteface 1, 4 releaseall diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 6a515e6f3..4e60c9fc1 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -218,11 +218,11 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton delay 20 - move 1, Route110_TrickHouseEntrance_Movement_161315 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_161315 + waitmovement 0 playse 178 - move 1, Route110_TrickHouseEntrance_Movement_16131E - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_16131E + waitmovement 0 disappear 1 setvar 0x40a7, 1 setvar 0x40a6, 0 @@ -244,10 +244,10 @@ Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D playse 21 - move 255, Route110_TrickHouseEntrance_Movement_1A0833 - waitmove 0 - move 255, Route110_TrickHouseEntrance_Movement_1A0835 - waitmove 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833 + waitmovement 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD compare_var_to_imm 0x4044, 1 @@ -334,22 +334,22 @@ Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327 Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 msgbox Route110_TrickHouseEntrance_Text_19BF19, 4 closebutton - move 1, Route110_TrickHouseEntrance_Movement_1A0839 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + waitmovement 0 playse 21 - move 1, Route110_TrickHouseEntrance_Movement_1A0833 - waitmove 0 - move 1, Route110_TrickHouseEntrance_Movement_1A0835 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833 + waitmovement 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835 + waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19BFAB, 4 - move 1, Route110_TrickHouseEntrance_Movement_1A0841 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 + waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E - move 1, Route110_TrickHouseEntrance_Movement_1A0839 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 compare_var_to_imm 0x4044, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE @@ -440,14 +440,14 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502 setvar 0x40c1, 0 setvar 0x40a7, 3 - move 1, Route110_TrickHouseEntrance_Movement_1A0841 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 + waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 - move 1, Route110_TrickHouseEntrance_Movement_1A0839 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, 4 .ifdef SAPPHIRE givedecoration 32 @@ -465,13 +465,13 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 msgbox Route110_TrickHouseEntrance_Text_19C17E, 4 closebutton - move 1, Route110_TrickHouseEntrance_Movement_16309F - waitmove 0 - move 1, Route110_TrickHouseEntrance_Movement_161315 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_16309F + waitmovement 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_161315 + waitmovement 0 playse 178 - move 1, Route110_TrickHouseEntrance_Movement_16131E - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_16131E + waitmovement 0 disappear 1 setvar 0x40c1, 0 setvar 0x40a7, 5 @@ -504,10 +504,10 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD setmaptile 5, 1, 537, 0 special DrawWholeMapView delay 20 - move 255, Route110_TrickHouseEntrance_Movement_1A0856 - waitmove 0 - move 255, Route110_TrickHouseEntrance_Movement_16165E - waitmove 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856 + waitmovement 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_16165E + waitmovement 0 switch 0x4044 case 0, Route110_TrickHouseEntrance_EventScript_161660 case 1, Route110_TrickHouseEntrance_EventScript_16166B diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index d0ced1ecb..c99158dbd 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -25,8 +25,8 @@ Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7 Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall - move 1, Route110_TrickHousePuzzle5_Movement_1A0839 - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x4001, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 @@ -35,8 +35,8 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall - move 2, Route110_TrickHousePuzzle5_Movement_1A0839 - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x4002, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 @@ -45,8 +45,8 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall - move 3, Route110_TrickHousePuzzle5_Movement_1A0839 - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x4003, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 @@ -55,8 +55,8 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall - move 4, Route110_TrickHousePuzzle5_Movement_1A0839 - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x4004, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 @@ -65,8 +65,8 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall - move 5, Route110_TrickHousePuzzle5_Movement_1A0839 - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x4005, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 @@ -161,10 +161,10 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F setvar 0x4001, 1 setvar 0x4008, 1 playse 21 - move 1, Route110_TrickHousePuzzle5_Movement_1A0833 - waitmove 0 - move 1, Route110_TrickHousePuzzle5_Movement_1A0835 - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare_var_to_imm 0x4009, 2 @@ -183,10 +183,10 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 setvar 0x4002, 1 setvar 0x4008, 2 playse 21 - move 2, Route110_TrickHousePuzzle5_Movement_1A0833 - waitmove 0 - move 2, Route110_TrickHousePuzzle5_Movement_1A0835 - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B compare_var_to_imm 0x4009, 2 @@ -205,10 +205,10 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 setvar 0x4003, 1 setvar 0x4008, 3 playse 21 - move 3, Route110_TrickHousePuzzle5_Movement_1A0833 - waitmove 0 - move 3, Route110_TrickHousePuzzle5_Movement_1A0835 - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare_var_to_imm 0x4009, 2 @@ -227,10 +227,10 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B setvar 0x4004, 1 setvar 0x4008, 4 playse 21 - move 4, Route110_TrickHousePuzzle5_Movement_1A0833 - waitmove 0 - move 4, Route110_TrickHousePuzzle5_Movement_1A0835 - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare_var_to_imm 0x4009, 2 @@ -249,10 +249,10 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F setvar 0x4005, 1 setvar 0x4008, 5 playse 21 - move 5, Route110_TrickHousePuzzle5_Movement_1A0833 - waitmove 0 - move 5, Route110_TrickHousePuzzle5_Movement_1A0835 - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B compare_var_to_imm 0x4009, 2 @@ -391,13 +391,13 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 waitse playse 32 msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4 - move 1, Route110_TrickHousePuzzle5_Movement_16309F - move 2, Route110_TrickHousePuzzle5_Movement_16309F - move 3, Route110_TrickHousePuzzle5_Movement_16309F - move 4, Route110_TrickHousePuzzle5_Movement_16309F - move 5, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 3, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 4, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 5, Route110_TrickHousePuzzle5_Movement_16309F msgbox Route110_TrickHousePuzzle5_Text_19D5ED, 4 - waitmove 0 + waitmovement 0 closebutton msgbox Route110_TrickHousePuzzle5_Text_19D615, 4 closebutton @@ -496,153 +496,153 @@ Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B return Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43 - move 1, Route110_TrickHousePuzzle5_Movement_16308D - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F4E:: @ 8162F4E - move 2, Route110_TrickHousePuzzle5_Movement_16308D - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F59:: @ 8162F59 - move 3, Route110_TrickHousePuzzle5_Movement_16308D - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F64:: @ 8162F64 - move 4, Route110_TrickHousePuzzle5_Movement_16308D - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F6F:: @ 8162F6F - move 5, Route110_TrickHousePuzzle5_Movement_16308D - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F7A:: @ 8162F7A - move 1, Route110_TrickHousePuzzle5_Movement_16308F - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F85:: @ 8162F85 - move 2, Route110_TrickHousePuzzle5_Movement_16308F - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F90:: @ 8162F90 - move 3, Route110_TrickHousePuzzle5_Movement_16308F - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F9B:: @ 8162F9B - move 4, Route110_TrickHousePuzzle5_Movement_16308F - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FA6:: @ 8162FA6 - move 5, Route110_TrickHousePuzzle5_Movement_16308F - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FB1:: @ 8162FB1 - move 1, Route110_TrickHousePuzzle5_Movement_163092 - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FBC:: @ 8162FBC - move 2, Route110_TrickHousePuzzle5_Movement_163092 - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FC7:: @ 8162FC7 - move 3, Route110_TrickHousePuzzle5_Movement_163092 - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FD2:: @ 8162FD2 - move 4, Route110_TrickHousePuzzle5_Movement_163092 - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FDD:: @ 8162FDD - move 5, Route110_TrickHousePuzzle5_Movement_163092 - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FE8:: @ 8162FE8 - move 1, Route110_TrickHousePuzzle5_Movement_163096 - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FF3:: @ 8162FF3 - move 2, Route110_TrickHousePuzzle5_Movement_163096 - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FFE:: @ 8162FFE - move 3, Route110_TrickHousePuzzle5_Movement_163096 - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163009:: @ 8163009 - move 4, Route110_TrickHousePuzzle5_Movement_163096 - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163014:: @ 8163014 - move 5, Route110_TrickHousePuzzle5_Movement_163096 - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_16301F:: @ 816301F - move 1, Route110_TrickHousePuzzle5_Movement_163098 - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_16302A:: @ 816302A - move 2, Route110_TrickHousePuzzle5_Movement_163098 - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163035:: @ 8163035 - move 3, Route110_TrickHousePuzzle5_Movement_163098 - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163040:: @ 8163040 - move 4, Route110_TrickHousePuzzle5_Movement_163098 - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_16304B:: @ 816304B - move 5, Route110_TrickHousePuzzle5_Movement_163098 - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163056:: @ 8163056 - move 1, Route110_TrickHousePuzzle5_Movement_16309B - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163061:: @ 8163061 - move 2, Route110_TrickHousePuzzle5_Movement_16309B - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_16306C:: @ 816306C - move 3, Route110_TrickHousePuzzle5_Movement_16309B - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163077:: @ 8163077 - move 4, Route110_TrickHousePuzzle5_Movement_16309B - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163082:: @ 8163082 - move 5, Route110_TrickHousePuzzle5_Movement_16309B - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 return Route110_TrickHousePuzzle5_Movement_16308D:: @ 816308D diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index fc73716eb..35c60cf8f 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -60,8 +60,8 @@ Route111_EventScript_150023:: @ 8150023 setflag 964 disappear 34 delay 30 - move 35, Route111_Movement_1500AF - waitmove 0 + applymovement 35, Route111_Movement_1500AF + waitmovement 0 disappear 35 releaseall end @@ -82,8 +82,8 @@ Route111_EventScript_150069:: @ 8150069 setflag 963 disappear 35 delay 30 - move 34, Route111_Movement_1500AF - waitmove 0 + applymovement 34, Route111_Movement_1500AF + waitmovement 0 disappear 34 releaseall end @@ -185,23 +185,23 @@ Route111_EventScript_150151:: @ 8150151 end Route111_EventScript_150188:: @ 8150188 - move 255, Route111_Movement_1501B4 - waitmove 0 + applymovement 255, Route111_Movement_1501B4 + waitmovement 0 return Route111_EventScript_150193:: @ 8150193 - move 255, Route111_Movement_1501B6 - waitmove 0 + applymovement 255, Route111_Movement_1501B6 + waitmovement 0 return Route111_EventScript_15019E:: @ 815019E - move 255, Route111_Movement_1501B8 - waitmove 0 + applymovement 255, Route111_Movement_1501B8 + waitmovement 0 return Route111_EventScript_1501A9:: @ 81501A9 - move 255, Route111_Movement_1501BA - waitmove 0 + applymovement 255, Route111_Movement_1501BA + waitmovement 0 return Route111_Movement_1501B4:: @ 81501B4 @@ -247,67 +247,67 @@ Route111_EventScript_1501D1:: @ 81501D1 Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F7B3, 4 trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2 - move 1, Route111_Movement_1A0841 - waitmove 0 + applymovement 1, Route111_Movement_1A0841 + waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F7FF, 4 closebutton - move 1, Route111_Movement_150356 - waitmove 0 + applymovement 1, Route111_Movement_150356 + waitmovement 0 disappear 1 call Route111_EventScript_15034F - move 255, Route111_Movement_15035B - waitmove 0 + applymovement 255, Route111_Movement_15035B + waitmovement 0 call Route111_EventScript_150348 reappear 2 - move 2, Route111_Movement_150359 - waitmove 0 + applymovement 2, Route111_Movement_150359 + waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F82D, 4 trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6 - move 2, Route111_Movement_1A0841 - waitmove 0 + applymovement 2, Route111_Movement_1A0841 + waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F8D5, 4 closebutton - move 2, Route111_Movement_150356 - waitmove 0 + applymovement 2, Route111_Movement_150356 + waitmovement 0 disappear 2 call Route111_EventScript_15034F - move 255, Route111_Movement_15035B - waitmove 0 + applymovement 255, Route111_Movement_15035B + waitmovement 0 call Route111_EventScript_150348 reappear 3 - move 3, Route111_Movement_150359 - waitmove 0 + applymovement 3, Route111_Movement_150359 + waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F90E, 4 trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956 - move 3, Route111_Movement_1A0841 - waitmove 0 + applymovement 3, Route111_Movement_1A0841 + waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F96C, 4 closebutton - move 3, Route111_Movement_150356 - waitmove 0 + applymovement 3, Route111_Movement_150356 + waitmovement 0 disappear 3 call Route111_EventScript_15034F - move 255, Route111_Movement_15035B - waitmove 0 + applymovement 255, Route111_Movement_15035B + waitmovement 0 call Route111_EventScript_150348 reappear 4 - move 4, Route111_Movement_150359 - waitmove 0 + applymovement 4, Route111_Movement_150359 + waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F991, 4 trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC msgbox Route111_Text_16FA22, 4 closebutton - move 4, Route111_Movement_1A0841 - waitmove 0 + applymovement 4, Route111_Movement_1A0841 + waitmovement 0 call Route111_EventScript_150348 - move 4, Route111_Movement_150356 - waitmove 0 + applymovement 4, Route111_Movement_150356 + waitmovement 0 disappear 4 call Route111_EventScript_15034F release diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index b5b6056f4..7742d3507 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -54,7 +54,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 closebutton - move 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D - waitmove 0 + applymovement 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index d2d01f253..dfa1fecd6 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -20,9 +20,9 @@ Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E Route112_CableCarStation_EventScript_15C068:: @ 815C068 lockall - move 255, Route112_CableCarStation_Movement_15C0F5 - move 1, Route112_CableCarStation_Movement_15C0EB - waitmove 0 + applymovement 255, Route112_CableCarStation_Movement_15C0F5 + applymovement 1, Route112_CableCarStation_Movement_15C0EB + waitmovement 0 setvar 0x40a3, 0 movespriteperm 1, 6, 7 spritebehave 1, 8 @@ -42,9 +42,9 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD msgbox Route112_CableCarStation_Text_1925A9, 4 closebutton - move 1, Route112_CableCarStation_Movement_15C0E6 - move 255, Route112_CableCarStation_Movement_15C0F0 - waitmove 0 + applymovement 1, Route112_CableCarStation_Movement_15C0E6 + applymovement 255, Route112_CableCarStation_Movement_15C0F0 + waitmovement 0 setvar 0x8004, 0 setvar 0x40a3, 1 inccounter GAME_STAT_RODE_CABLE_CAR diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index c58a3dfb9..61ccb6632 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -63,13 +63,13 @@ Route116_EventScript_150A94:: @ 8150A94 end Route116_EventScript_150AEE:: @ 8150AEE - move LAST_TALKED, Route116_Movement_150B1C - waitmove 0 + applymovement LAST_TALKED, Route116_Movement_150B1C + waitmovement 0 return Route116_EventScript_150AF9:: @ 8150AF9 - move LAST_TALKED, Route116_Movement_150B25 - waitmove 0 + applymovement LAST_TALKED, Route116_Movement_150B25 + waitmovement 0 return Route116_EventScript_150B04:: @ 8150B04 @@ -136,9 +136,9 @@ Route116_EventScript_150B5D:: @ 8150B5D Route116_EventScript_150B6E:: @ 8150B6E lockall - move 11, Route116_Movement_1A0843 - move 255, Route116_Movement_1A083F - waitmove 0 + applymovement 11, Route116_Movement_1A0843 + applymovement 255, Route116_Movement_1A083F + waitmovement 0 msgbox Route116_Text_17032A, 4 setvar 0x406f, 2 releaseall @@ -194,13 +194,13 @@ Route116_EventScript_150C03:: @ 8150C03 end Route116_EventScript_150C37:: @ 8150C37 - move LAST_TALKED, Route116_Movement_150C4D - waitmove 0 + applymovement LAST_TALKED, Route116_Movement_150C4D + waitmovement 0 return Route116_EventScript_150C42:: @ 8150C42 - move LAST_TALKED, Route116_Movement_150C57 - waitmove 0 + applymovement LAST_TALKED, Route116_Movement_150C57 + waitmovement 0 return Route116_Movement_150C4D:: @ 8150C4D diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 7e6543d7f..8c91e7da4 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -51,35 +51,35 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall setvar 0x8008, 0 - move 255, Route118_Movement_1A0841 - waitmove 0 - move 19, Route118_Movement_151069 - waitmove 0 + applymovement 255, Route118_Movement_1A0841 + waitmovement 0 + applymovement 19, Route118_Movement_151069 + waitmovement 0 goto Route118_EventScript_151004 end Route118_EventScript_150FCE:: @ 8150FCE lockall setvar 0x8008, 1 - move 255, Route118_Movement_1A0841 - waitmove 0 + applymovement 255, Route118_Movement_1A0841 + waitmovement 0 goto Route118_EventScript_151004 end Route118_EventScript_150FE4:: @ 8150FE4 lockall setvar 0x8008, 2 - move 255, Route118_Movement_1A0841 - waitmove 0 - move 19, Route118_Movement_15106B - waitmove 0 + applymovement 255, Route118_Movement_1A0841 + waitmovement 0 + applymovement 19, Route118_Movement_15106B + waitmovement 0 goto Route118_EventScript_151004 end Route118_EventScript_151004:: @ 8151004 playse 10 - move 19, Route118_Movement_15106D - waitmove 0 + applymovement 19, Route118_Movement_15106D + waitmovement 0 delay 30 msgbox Route118_Text_170D66, 4 closebutton @@ -95,18 +95,18 @@ Route118_EventScript_151004:: @ 8151004 end Route118_EventScript_151048:: @ 8151048 - move 19, Route118_Movement_151071 - waitmove 0 + applymovement 19, Route118_Movement_151071 + waitmovement 0 return Route118_EventScript_151053:: @ 8151053 - move 19, Route118_Movement_15107C - waitmove 0 + applymovement 19, Route118_Movement_15107C + waitmovement 0 return Route118_EventScript_15105E:: @ 815105E - move 19, Route118_Movement_151086 - waitmove 0 + applymovement 19, Route118_Movement_151086 + waitmovement 0 return Route118_Movement_151069:: @ 8151069 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 9abb8adf9..5b0f61387 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -61,8 +61,8 @@ Route119_EventScript_1511DB:: @ 81511DB call_if 1, Route119_EventScript_1513A6 compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513B1 - move 255, Route119_Movement_1A0845 - waitmove 0 + applymovement 255, Route119_Movement_1A0845 + waitmovement 0 delay 30 compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513D2 @@ -173,23 +173,23 @@ Route119_EventScript_151362:: @ 8151362 end Route119_EventScript_1513A6:: @ 81513A6 - move 25, Route119_Movement_1513F0 - waitmove 0 + applymovement 25, Route119_Movement_1513F0 + waitmovement 0 return Route119_EventScript_1513B1:: @ 81513B1 - move 25, Route119_Movement_1513FA - waitmove 0 + applymovement 25, Route119_Movement_1513FA + waitmovement 0 return Route119_EventScript_1513BC:: @ 81513BC - move 25, Route119_Movement_151405 - waitmove 0 + applymovement 25, Route119_Movement_151405 + waitmovement 0 return Route119_EventScript_1513C7:: @ 81513C7 - move 25, Route119_Movement_15140F - waitmove 0 + applymovement 25, Route119_Movement_15140F + waitmovement 0 return Route119_EventScript_1513D2:: @ 81513D2 @@ -355,8 +355,8 @@ Route119_EventScript_1515C5:: @ 81515C5 faceplayer msgbox Route119_Text_171520, 4 closebutton - move LAST_TALKED, Route119_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route119_Movement_1A083D + waitmovement 0 release end @@ -365,8 +365,8 @@ Route119_EventScript_1515DC:: @ 81515DC faceplayer msgbox Route119_Text_17157C, 4 closebutton - move LAST_TALKED, Route119_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route119_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 54b54dd18..b903d7063 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -47,8 +47,8 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 disappear 2 disappear 3 fadescreen 0 - move 5, Route119_WeatherInstitute_2F_Movement_163DC8 - waitmove 0 + applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8 + waitmovement 0 moveoffscreen 5 goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 2e6ae94e5..7c1968aa5 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -212,15 +212,15 @@ Route120_EventScript_15189D:: @ 815189D call_if 1, Route120_EventScript_15197F compare_var_to_imm FACING, 3 call_if 1, Route120_EventScript_15198A - move 31, Route120_Movement_1A083F - waitmove 0 + applymovement 31, Route120_Movement_1A083F + waitmovement 0 delay 20 msgbox Route120_Text_1719D4, 4 closebutton - move 30, Route120_Movement_1A0843 - waitmove 0 - move 30, Route120_Movement_1A0662 - waitmove 0 + applymovement 30, Route120_Movement_1A0843 + waitmovement 0 + applymovement 30, Route120_Movement_1A0662 + waitmovement 0 waitse pokecry SPECIES_KECLEON, 2 delay 40 @@ -234,16 +234,16 @@ Route120_EventScript_15189D:: @ 815189D end Route120_EventScript_151908:: @ 8151908 - move 31, Route120_Movement_1A0845 - move 255, Route120_Movement_1A0841 - waitmove 0 + applymovement 31, Route120_Movement_1A0845 + applymovement 255, Route120_Movement_1A0841 + waitmovement 0 msgbox Route120_Text_171A40, 4 giveitem ITEM_DEVON_SCOPE setflag 285 msgbox Route120_Text_171B0E, 4 closebutton - move 31, Route120_Movement_1A0845 - waitmove 0 + applymovement 31, Route120_Movement_1A0845 + waitmovement 0 delay 50 setanimation 0, 1 doanimation 30 @@ -259,13 +259,13 @@ Route120_EventScript_151908:: @ 8151908 end Route120_EventScript_15197F:: @ 815197F - move 255, Route120_Movement_1A083F - waitmove 0 + applymovement 255, Route120_Movement_1A083F + waitmovement 0 return Route120_EventScript_15198A:: @ 815198A - move 255, Route120_Movement_151995 - waitmove 0 + applymovement 255, Route120_Movement_151995 + waitmovement 0 return Route120_Movement_151995:: @ 8151995 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 68c04762f..562f122e3 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -22,10 +22,10 @@ Route121_EventScript_151B25:: @ 8151B25 lockall msgbox Route121_Text_171C8F, 4 closebutton - move 12, Route121_Movement_151B57 - move 13, Route121_Movement_151B60 - move 14, Route121_Movement_151B69 - waitmove 0 + applymovement 12, Route121_Movement_151B57 + applymovement 13, Route121_Movement_151B60 + applymovement 14, Route121_Movement_151B69 + waitmovement 0 disappear 12 disappear 13 disappear 14 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 2fd6e54f6..52f0e5c44 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -8,8 +8,8 @@ Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329 Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 lockall - move 255, Route121_SafariZoneEntrance_Movement_15C348 - waitmove 0 + applymovement 255, Route121_SafariZoneEntrance_Movement_15C348 + waitmovement 0 special ExitSafariMode setvar 0x40a4, 0 releaseall @@ -47,8 +47,8 @@ Route121_SafariZoneEntrance_EventScript_15C379:: @ 815C379 Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 lockall - move 255, Route121_SafariZoneEntrance_Movement_1A0841 - waitmove 0 + applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841 + waitmovement 0 showmoney 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 @@ -78,8 +78,8 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 msgbox Route121_SafariZoneEntrance_Text_1C392D, 4 closebutton hidemoney 0, 0 - move 255, Route121_SafariZoneEntrance_Movement_15C47E - waitmove 0 + applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E + waitmovement 0 special EnterSafariMode setvar 0x40a4, 2 warp SafariZone_Southeast, 255, 32, 33 @@ -113,8 +113,8 @@ Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C closebutton hidemoney 0, 0 - move 255, Route121_SafariZoneEntrance_Movement_15C47C - waitmove 0 + applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C + waitmovement 0 releaseall end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 21927ec0f..0ce76670f 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -20,35 +20,35 @@ Route128_EventScript_15213F:: @ 815213F special sub_807E25C waitstate .endif - move 4, Route128_Movement_152271 - waitmove 0 + applymovement 4, Route128_Movement_152271 + waitmovement 0 msgbox Route128_Text_171EE0, 4 - move 4, Route128_Movement_152279 - waitmove 0 + applymovement 4, Route128_Movement_152279 + waitmovement 0 msgbox Route128_Text_171F35, 4 closebutton - move 5, Route128_Movement_152293 - waitmove 0 - move 4, Route128_Movement_1A0841 - waitmove 0 + applymovement 5, Route128_Movement_152293 + waitmovement 0 + applymovement 4, Route128_Movement_1A0841 + waitmovement 0 msgbox Route128_Text_171F4B, 4 closebutton - move 5, Route128_Movement_1522A1 - waitmove 0 - move 255, Route128_Movement_1A0841 - waitmove 0 + applymovement 5, Route128_Movement_1522A1 + waitmovement 0 + applymovement 255, Route128_Movement_1A0841 + waitmovement 0 msgbox Route128_Text_172008, 4 closebutton - move 4, Route128_Movement_15227E - move 255, Route128_Movement_1A083F - move 5, Route128_Movement_152290 - waitmove 0 + applymovement 4, Route128_Movement_15227E + applymovement 255, Route128_Movement_1A083F + applymovement 5, Route128_Movement_152290 + waitmovement 0 msgbox Route128_Text_17210B, 4 closebutton delay 40 - move 5, Route128_Movement_152296 - move 4, Route128_Movement_152283 - waitmove 0 + applymovement 5, Route128_Movement_152296 + applymovement 4, Route128_Movement_152283 + waitmovement 0 disappear 5 disappear 4 delay 100 @@ -56,26 +56,26 @@ Route128_EventScript_15213F:: @ 815213F doanimation 30 checkanimation 30 reappear 3 - move 3, Route128_Movement_15226F - waitmove 0 - move 255, Route128_Movement_1A0843 - waitmove 0 + applymovement 3, Route128_Movement_15226F + waitmovement 0 + applymovement 255, Route128_Movement_1A0843 + waitmovement 0 msgbox Route128_Text_172181, 4 closebutton - move 3, Route128_Movement_15226D - move 255, Route128_Movement_1A0841 - waitmove 0 + applymovement 3, Route128_Movement_15226D + applymovement 255, Route128_Movement_1A0841 + waitmovement 0 .ifdef SAPPHIRE msgbox Route128_Text_1721A2, 4 .else msgbox Route128_Text_1722A1, 4 .endif - move 3, Route128_Movement_1A0845 - waitmove 0 + applymovement 3, Route128_Movement_1A0845 + waitmovement 0 msgbox Route128_Text_1723BE, 4 closebutton - move 3, Route128_Movement_1A0845 - waitmove 0 + applymovement 3, Route128_Movement_1A0845 + waitmovement 0 delay 50 setanimation 0, 1 doanimation 30 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 677838f8a..ddd58be1a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -101,8 +101,8 @@ RustboroCity_EventScript_14C449:: @ 814C449 lock faceplayer msgbox RustboroCity_Text_166D59, 4 - move 7, RustboroCity_Movement_1A083D - waitmove 0 + applymovement 7, RustboroCity_Movement_1A083D + waitmovement 0 release end @@ -110,8 +110,8 @@ RustboroCity_EventScript_14C45F:: @ 814C45F lock faceplayer msgbox RustboroCity_Text_166DB0, 4 - move 8, RustboroCity_Movement_1A083D - waitmove 0 + applymovement 8, RustboroCity_Movement_1A083D + waitmovement 0 release end @@ -167,15 +167,15 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 closebutton reappear 10 reappear 9 - move 10, RustboroCity_Movement_14C5C2 - waitmove 0 + applymovement 10, RustboroCity_Movement_14C5C2 + waitmovement 0 disappear 10 - move 9, RustboroCity_Movement_14C5D3 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5D3 + waitmovement 0 msgbox RustboroCity_Text_166E7E, 4 closebutton - move 9, RustboroCity_Movement_14C5DB - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5DB + waitmovement 0 disappear 9 movespriteperm 9, 30, 10 clearflag 732 @@ -200,30 +200,30 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 return @ 814C56F - move 9, RustboroCity_Movement_14C5E3 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5E3 + waitmovement 0 return @ 814C57A - move 9, RustboroCity_Movement_14C5E7 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5E7 + waitmovement 0 return @ 814C585 - move 9, RustboroCity_Movement_14C5EC - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5EC + waitmovement 0 return @ 814C590 - move 9, RustboroCity_Movement_14C5F1 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5F1 + waitmovement 0 return @ 814C59B - move 9, RustboroCity_Movement_14C5F7 - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5F7 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return @ 814C5B0 @@ -379,53 +379,53 @@ RustboroCity_EventScript_14C650:: @ 814C650 end RustboroCity_EventScript_14C691:: @ 814C691 - move 9, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0841 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0845 + waitmovement 0 return RustboroCity_EventScript_14C6BD:: @ 814C6BD - move 9, RustboroCity_Movement_1A083F - waitmove 0 + applymovement 9, RustboroCity_Movement_1A083F + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0843 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0843 + waitmovement 0 return RustboroCity_EventScript_14C6E9:: @ 814C6E9 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_EventScript_14C715:: @ 814C715 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 9, RustboroCity_Movement_14C74B - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 9, RustboroCity_Movement_14C74B + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_Movement_14C74B:: @ 814C74B @@ -487,63 +487,63 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 return RustboroCity_EventScript_14C7FE:: @ 814C7FE - move 9, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0841 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0845 + waitmovement 0 return RustboroCity_EventScript_14C82A:: @ 814C82A - move 9, RustboroCity_Movement_1A0843 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0843 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A083F - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A083F + waitmovement 0 return RustboroCity_EventScript_14C856:: @ 814C856 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_EventScript_14C882:: @ 814C882 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 9, RustboroCity_Movement_14C74B - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 9, RustboroCity_Movement_14C74B + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_EventScript_14C8B8:: @ 814C8B8 - move 9, RustboroCity_Movement_1A083F - waitmove 0 + applymovement 9, RustboroCity_Movement_1A083F + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 return RustboroCity_EventScript_14C8DA:: @ 814C8DA diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 2f3fd5927..d5b3b03c7 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -81,10 +81,10 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 closebutton playse 21 - move 5, RustboroCity_DevonCorp_2F_Movement_1A0833 - waitmove 0 - move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 - waitmove 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 + waitmovement 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 + waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 @@ -99,10 +99,10 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE closebutton playse 21 - move 5, RustboroCity_DevonCorp_2F_Movement_1A0833 - waitmove 0 - move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 - waitmove 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 + waitmovement 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 + waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 887299933..12cf2f6c8 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -30,23 +30,23 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 lockall msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4 closebutton - move 2, RustboroCity_DevonCorp_3F_Movement_157815 - waitmove 0 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815 + waitmovement 0 delay 80 - move 2, RustboroCity_DevonCorp_3F_Movement_15781E - waitmove 0 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E + waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 closebutton playbgm 420, 0 - move 2, RustboroCity_DevonCorp_3F_Movement_157803 - move 255, RustboroCity_DevonCorp_3F_Movement_157827 - waitmove 0 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 + applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 + waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4 closebutton fadedefaultbgm - move 2, RustboroCity_DevonCorp_3F_Movement_157812 - move 255, RustboroCity_DevonCorp_3F_Movement_157835 - waitmove 0 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812 + applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 + waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 @@ -152,8 +152,8 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closebutton - move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + waitmovement 0 release end @@ -165,16 +165,16 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 closebutton - move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + waitmovement 0 release end RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4 closebutton - move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 5f4de010e..cd71e8bba 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -88,27 +88,27 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closebutton - move LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + waitmovement 0 setflag 275 release end RustboroCity_PokemonSchool_EventScript_157B1E:: @ 8157B1E - move LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60 - waitmove 0 + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60 + waitmovement 0 return RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29 - move LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49 - waitmove 0 + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49 + waitmovement 0 return RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 msgbox RustboroCity_PokemonSchool_Text_184737, 4 closebutton - move LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + waitmovement 0 release end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index cfa319bf3..922ad27e1 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -24,8 +24,8 @@ RusturfTunnel_EventScript_15C782:: @ 815C782 faceplayer msgbox RusturfTunnel_Text_194766, 4 closebutton - move LAST_TALKED, RusturfTunnel_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + waitmovement 0 release end @@ -37,16 +37,16 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 setflag 1 msgbox RusturfTunnel_Text_1944C5, 4 closebutton - move LAST_TALKED, RusturfTunnel_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + waitmovement 0 release end RusturfTunnel_EventScript_15C7BC:: @ 815C7BC msgbox RusturfTunnel_Text_1945B2, 4 closebutton - move LAST_TALKED, RusturfTunnel_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + waitmovement 0 release end @@ -87,37 +87,37 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 end RusturfTunnel_EventScript_15C880:: @ 815C880 - move 255, RusturfTunnel_Movement_15C96A - move 1, RusturfTunnel_Movement_15C98F - waitmove 0 + applymovement 255, RusturfTunnel_Movement_15C96A + applymovement 1, RusturfTunnel_Movement_15C98F + waitmovement 0 return RusturfTunnel_EventScript_15C892:: @ 815C892 - move 255, RusturfTunnel_Movement_15C96D - move 1, RusturfTunnel_Movement_15C994 - waitmove 0 - move 10, RusturfTunnel_Movement_1A0845 - waitmove 0 + applymovement 255, RusturfTunnel_Movement_15C96D + applymovement 1, RusturfTunnel_Movement_15C994 + waitmovement 0 + applymovement 10, RusturfTunnel_Movement_1A0845 + waitmovement 0 return RusturfTunnel_EventScript_15C8AE:: @ 815C8AE - move 255, RusturfTunnel_Movement_15C96D - move 1, RusturfTunnel_Movement_15C994 - waitmove 0 - move 10, RusturfTunnel_Movement_1A0845 - waitmove 0 + applymovement 255, RusturfTunnel_Movement_15C96D + applymovement 1, RusturfTunnel_Movement_15C994 + waitmovement 0 + applymovement 10, RusturfTunnel_Movement_1A0845 + waitmovement 0 return RusturfTunnel_EventScript_15C8CA:: @ 815C8CA - move 1, RusturfTunnel_Movement_1A0841 - waitmove 0 - move 255, RusturfTunnel_Movement_1A0845 - waitmove 0 + applymovement 1, RusturfTunnel_Movement_1A0841 + waitmovement 0 + applymovement 255, RusturfTunnel_Movement_1A0845 + waitmovement 0 return RusturfTunnel_EventScript_15C8DF:: @ 815C8DF - move 1, RusturfTunnel_Movement_15C970 - waitmove 0 + applymovement 1, RusturfTunnel_Movement_15C970 + waitmovement 0 return RusturfTunnel_EventScript_15C8EA:: @ 815C8EA @@ -125,34 +125,34 @@ RusturfTunnel_EventScript_15C8EA:: @ 815C8EA RusturfTunnel_EventScript_15C8EB:: @ 815C8EB closebutton - move 1, RusturfTunnel_Movement_15C98D - waitmove 0 + applymovement 1, RusturfTunnel_Movement_15C98D + waitmovement 0 return RusturfTunnel_EventScript_15C8F7:: @ 815C8F7 - move 10, RusturfTunnel_Movement_15C945 - move 1, RusturfTunnel_Movement_15C973 - waitmove 0 + applymovement 10, RusturfTunnel_Movement_15C945 + applymovement 1, RusturfTunnel_Movement_15C973 + waitmovement 0 return RusturfTunnel_EventScript_15C909:: @ 815C909 - move 10, RusturfTunnel_Movement_15C951 - move 1, RusturfTunnel_Movement_15C980 - waitmove 0 + applymovement 10, RusturfTunnel_Movement_15C951 + applymovement 1, RusturfTunnel_Movement_15C980 + waitmovement 0 return RusturfTunnel_EventScript_15C91B:: @ 815C91B - move 10, RusturfTunnel_Movement_15C951 - move 1, RusturfTunnel_Movement_15C980 - waitmove 0 + applymovement 10, RusturfTunnel_Movement_15C951 + applymovement 1, RusturfTunnel_Movement_15C980 + waitmovement 0 return RusturfTunnel_EventScript_15C92D:: @ 815C92D playse 21 - move 1, RusturfTunnel_Movement_1A0833 - waitmove 0 - move 1, RusturfTunnel_Movement_1A0835 - waitmove 0 + applymovement 1, RusturfTunnel_Movement_1A0833 + waitmovement 0 + applymovement 1, RusturfTunnel_Movement_1A0835 + waitmovement 0 return RusturfTunnel_Movement_15C945:: @ 815C945 @@ -281,9 +281,9 @@ RusturfTunnel_EventScript_15C9AB:: @ 815C9AB lockall msgbox RusturfTunnel_Text_194159, 4 closebutton - move 6, RusturfTunnel_Movement_15C9D3 - move 7, RusturfTunnel_Movement_15C9D3 - waitmove 0 + applymovement 6, RusturfTunnel_Movement_15C9D3 + applymovement 7, RusturfTunnel_Movement_15C9D3 + waitmovement 0 moveoffscreen 6 moveoffscreen 7 setvar 0x409a, 3 @@ -315,20 +315,20 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA msgbox RusturfTunnel_Text_194274, 4 giveitem ITEM_DEVON_GOODS closebutton - move 255, RusturfTunnel_Movement_15CA99 - move 6, RusturfTunnel_Movement_15CAA2 - waitmove 0 + applymovement 255, RusturfTunnel_Movement_15CA99 + applymovement 6, RusturfTunnel_Movement_15CAA2 + waitmovement 0 disappear 6 delay 50 reappear 5 - move 5, RusturfTunnel_Movement_15CAAC - waitmove 0 - move 255, RusturfTunnel_Movement_15CA9F - move 5, RusturfTunnel_Movement_15CAC0 - waitmove 0 + applymovement 5, RusturfTunnel_Movement_15CAAC + waitmovement 0 + applymovement 255, RusturfTunnel_Movement_15CA9F + applymovement 5, RusturfTunnel_Movement_15CAC0 + waitmovement 0 msgbox RusturfTunnel_Text_19432A, 4 - move 5, RusturfTunnel_Movement_1A0839 - waitmove 0 + applymovement 5, RusturfTunnel_Movement_1A0839 + waitmovement 0 message RusturfTunnel_Text_19434F waittext waitse @@ -336,9 +336,9 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA waitbutton waitpokecry closebutton - move 5, RusturfTunnel_Movement_15CAB4 - move 7, RusturfTunnel_Movement_15CAC3 - waitmove 0 + applymovement 5, RusturfTunnel_Movement_15CAB4 + applymovement 7, RusturfTunnel_Movement_15CAC3 + waitmovement 0 disappear 5 disappear 7 clearflag 142 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index f1c37be5b..b735a87b2 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -10,10 +10,10 @@ SafariZone_Southeast_MapScript2_160041:: @ 8160041 SafariZone_Southeast_EventScript_16004B:: @ 816004B lockall setvar 0x4001, 0 - move 255, SafariZone_Southeast_Movement_160087 - waitmove 0 - move 1, SafariZone_Southeast_Movement_160089 - waitmove 0 + applymovement 255, SafariZone_Southeast_Movement_160087 + waitmovement 0 + applymovement 1, SafariZone_Southeast_Movement_160089 + waitmovement 0 movespriteperm 1, 32, 34 setvar 0x40a4, 0 releaseall @@ -76,18 +76,18 @@ SafariZone_Southeast_EventScript_1600E0:: @ 81600E0 end SafariZone_Southeast_EventScript_160105:: @ 8160105 - move 1, SafariZone_Southeast_Movement_160150 - waitmove 0 - move 255, SafariZone_Southeast_Movement_16014B - waitmove 0 + applymovement 1, SafariZone_Southeast_Movement_160150 + waitmovement 0 + applymovement 255, SafariZone_Southeast_Movement_16014B + waitmovement 0 goto SafariZone_Southeast_EventScript_160139 end SafariZone_Southeast_EventScript_16011F:: @ 816011F - move 1, SafariZone_Southeast_Movement_160153 - waitmove 0 - move 255, SafariZone_Southeast_Movement_16014D - waitmove 0 + applymovement 1, SafariZone_Southeast_Movement_160153 + waitmovement 0 + applymovement 255, SafariZone_Southeast_Movement_16014D + waitmovement 0 goto SafariZone_Southeast_EventScript_160139 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index fe13664d9..087c1caf7 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -18,10 +18,10 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar 0x8005, 3 setvar 0x8006, 4 setvar 0x8007, 5 - move 255, SeafloorCavern_Room9_Movement_1A0841 - waitmove 0 - move 255, SeafloorCavern_Room9_Movement_15DD68 - waitmove 0 + applymovement 255, SeafloorCavern_Room9_Movement_1A0841 + waitmovement 0 + applymovement 255, SeafloorCavern_Room9_Movement_15DD68 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41B8, 4 .else @@ -29,24 +29,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .endif closebutton reappear 0x8004 - move 255, SeafloorCavern_Room9_Movement_1A083F - waitmove 0 - move 0x8004, SeafloorCavern_Room9_Movement_15DD36 - waitmove 0 + applymovement 255, SeafloorCavern_Room9_Movement_1A083F + waitmovement 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD36 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41D5, 4 .else msgbox SeafloorCavern_Room9_Text_1B486C, 4 .endif - move 0x8004, SeafloorCavern_Room9_Movement_1A0841 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4201, 4 .else msgbox SeafloorCavern_Room9_Text_1B4897, 4 .endif - move 0x8004, SeafloorCavern_Room9_Movement_1A0839 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0839 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4289, 4 .else @@ -92,24 +92,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA playfanfare 388 playse 107 special sub_80818A4 - move 0x8004, SeafloorCavern_Room9_Movement_1A0841 - move 255, SeafloorCavern_Room9_Movement_1A0841 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841 + applymovement 255, SeafloorCavern_Room9_Movement_1A0841 + waitmovement 0 delay 150 disappear 7 reappear 1 waitstate delay 60 - move 1, SeafloorCavern_Room9_Movement_15DD4C - waitmove 0 + applymovement 1, SeafloorCavern_Room9_Movement_15DD4C + waitmovement 0 special sub_80818FC waitstate setvar 0x8004, 1 setvar 0x8005, 1 special sub_810F758 waitstate - move 1, SeafloorCavern_Room9_Movement_15DD57 - waitmove 0 + applymovement 1, SeafloorCavern_Room9_Movement_15DD57 + waitmovement 0 disappear 1 delay 4 setvar 0x8004, 2 @@ -127,16 +127,16 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4A89, 4 .endif playse 2 - move 255, SeafloorCavern_Room9_Movement_1A083F - waitmove 0 + applymovement 255, SeafloorCavern_Room9_Movement_1A083F + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4443, 4 .else msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 .endif closebutton - move 0x8004, SeafloorCavern_Room9_Movement_15DD41 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD41 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B447A, 4 .else @@ -145,8 +145,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA closebutton playse 3 delay 20 - move 0x8004, SeafloorCavern_Room9_Movement_1A0845 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0845 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B45C6, 4 .else @@ -156,22 +156,22 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA reappear 0x8005 reappear 0x8006 reappear 0x8007 - move 0x8007, SeafloorCavern_Room9_Movement_15DD63 - move 0x8006, SeafloorCavern_Room9_Movement_15DD63 - move 0x8005, SeafloorCavern_Room9_Movement_15DD5A - waitmove 0 - move 0x8004, SeafloorCavern_Room9_Movement_1A083F - waitmove 0 + applymovement 0x8007, SeafloorCavern_Room9_Movement_15DD63 + applymovement 0x8006, SeafloorCavern_Room9_Movement_15DD63 + applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD5A + waitmovement 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A083F + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B464D, 4 .else msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif playse 21 - move 0x8004, SeafloorCavern_Room9_Movement_1A0833 - waitmove 0 - move 0x8004, SeafloorCavern_Room9_Movement_1A0835 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0833 + waitmovement 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0835 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4723, 4 .else @@ -183,9 +183,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif closebutton - move 0x8005, SeafloorCavern_Room9_Movement_15DD60 - move 0x8004, SeafloorCavern_Room9_Movement_15DD46 - waitmove 0 + applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD60 + applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD46 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4818, 4 .else diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 69bd90d75..02ab6c28c 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -308,8 +308,8 @@ SlateportCity_EventScript_14BD3A:: @ 814BD3A faceplayer msgbox SlateportCity_Text_164C64, 4 closebutton - move 5, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 5, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -318,8 +318,8 @@ SlateportCity_EventScript_14BD51:: @ 814BD51 faceplayer msgbox SlateportCity_Text_164C9F, 4 closebutton - move 19, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 19, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -328,8 +328,8 @@ SlateportCity_EventScript_14BD68:: @ 814BD68 faceplayer msgbox SlateportCity_Text_164CE8, 4 closebutton - move 20, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 20, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -338,8 +338,8 @@ SlateportCity_EventScript_14BD7F:: @ 814BD7F faceplayer msgbox SlateportCity_Text_164D2B, 4 closebutton - move 27, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 27, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -348,8 +348,8 @@ SlateportCity_EventScript_14BD96:: @ 814BD96 faceplayer msgbox SlateportCity_Text_164D92, 4 closebutton - move 28, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 28, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -358,8 +358,8 @@ SlateportCity_EventScript_14BDAD:: @ 814BDAD faceplayer msgbox SlateportCity_Text_164DD5, 4 closebutton - move 29, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 29, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -368,8 +368,8 @@ SlateportCity_EventScript_14BDC4:: @ 814BDC4 faceplayer msgbox SlateportCity_Text_164DF4, 4 closebutton - move 30, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 30, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -378,8 +378,8 @@ SlateportCity_EventScript_14BDDB:: @ 814BDDB faceplayer msgbox SlateportCity_Text_164E46, 4 closebutton - move 31, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 31, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -491,47 +491,47 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC msgbox SlateportCity_Text_165498, 4 msgbox SlateportCity_Text_1654E0, 4 closebutton - move 10, SlateportCity_Movement_1A0843 - waitmove 0 + applymovement 10, SlateportCity_Movement_1A0843 + waitmovement 0 delay 10 - move 9, SlateportCity_Movement_1A0845 - waitmove 0 + applymovement 9, SlateportCity_Movement_1A0845 + waitmovement 0 delay 25 - move 11, SlateportCity_Movement_14C000 - move 255, SlateportCity_Movement_14C00E - move 10, SlateportCity_Movement_14BFDD - move 9, SlateportCity_Movement_14BFEA - waitmove 0 + applymovement 11, SlateportCity_Movement_14C000 + applymovement 255, SlateportCity_Movement_14C00E + applymovement 10, SlateportCity_Movement_14BFDD + applymovement 9, SlateportCity_Movement_14BFEA + waitmovement 0 disappear 10 disappear 9 msgbox SlateportCity_Text_16558D, 4 - move 11, SlateportCity_Movement_1A0841 - waitmove 0 + applymovement 11, SlateportCity_Movement_1A0841 + waitmovement 0 msgbox SlateportCity_Text_1655E7, 4 playbgm BGM_EVIL_TEAM, 0 msgbox SlateportCity_Text_1656BC, 4 - move 6, SlateportCity_Movement_1A083F - move 1, SlateportCity_Movement_1A083F - move 7, SlateportCity_Movement_14BFCD - move 3, SlateportCity_Movement_1A0831 - move 2, SlateportCity_Movement_14BFD5 - waitmove 0 - move 11, SlateportCity_Movement_1A0845 - waitmove 0 + applymovement 6, SlateportCity_Movement_1A083F + applymovement 1, SlateportCity_Movement_1A083F + applymovement 7, SlateportCity_Movement_14BFCD + applymovement 3, SlateportCity_Movement_1A0831 + applymovement 2, SlateportCity_Movement_14BFD5 + waitmovement 0 + applymovement 11, SlateportCity_Movement_1A0845 + waitmovement 0 msgbox SlateportCity_Text_16578F, 4 playse 21 - move 11, SlateportCity_Movement_1A0833 - waitmove 0 - move 11, SlateportCity_Movement_1A0835 - waitmove 0 + applymovement 11, SlateportCity_Movement_1A0833 + waitmovement 0 + applymovement 11, SlateportCity_Movement_1A0835 + waitmovement 0 msgbox SlateportCity_Text_1657FA, 4 - move 11, SlateportCity_Movement_1A0839 - waitmove 0 + applymovement 11, SlateportCity_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_Text_16583A, 4 closebutton - move 11, SlateportCity_Movement_14BFFB - move 255, SlateportCity_Movement_14C008 - waitmove 0 + applymovement 11, SlateportCity_Movement_14BFFB + applymovement 255, SlateportCity_Movement_14C008 + waitmovement 0 disappear 11 clearflag 841 clearflag 848 diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index d30089fbb..74eaf27fe 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -31,80 +31,80 @@ SlateportCity_ContestHall_EventScript_155595:: @ 8155595 SlateportCity_ContestHall_EventScript_15559F:: @ 815559F msgbox SlateportCity_ContestHall_Text_17CEF3, 2 lockall - move 3, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 3, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_1555B4:: @ 81555B4 msgbox SlateportCity_ContestHall_Text_17CFA7, 2 lockall - move 4, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 4, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_1555C9:: @ 81555C9 msgbox SlateportCity_ContestHall_Text_17D054, 2 lockall - move 5, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 5, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_1555DE:: @ 81555DE msgbox SlateportCity_ContestHall_Text_17D07F, 2 lockall - move 6, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 6, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_1555F3:: @ 81555F3 msgbox SlateportCity_ContestHall_Text_17D0F9, 2 lockall - move 7, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 7, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_155608:: @ 8155608 msgbox SlateportCity_ContestHall_Text_17D222, 2 lockall - move 8, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 8, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_15561D:: @ 815561D msgbox SlateportCity_ContestHall_Text_17D39A, 2 lockall - move 9, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 9, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_155632:: @ 8155632 msgbox SlateportCity_ContestHall_Text_17D3F0, 2 lockall - move 10, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 10, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_155647:: @ 8155647 msgbox SlateportCity_ContestHall_Text_17D300, 2 lockall - move 12, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 12, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_15565C:: @ 815565C msgbox SlateportCity_ContestHall_Text_17D27F, 2 lockall - move 11, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 11, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 0f2d03a5a..c43b64288 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -20,28 +20,28 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 lockall - move 1, SlateportCity_ContestLobby_Movement_1554CC - waitmove 0 + applymovement 1, SlateportCity_ContestLobby_Movement_1554CC + waitmovement 0 playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView - move 1, SlateportCity_ContestLobby_Movement_1554CF - waitmove 0 + applymovement 1, SlateportCity_ContestLobby_Movement_1554CF + waitmovement 0 playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView delay 20 - move 1, SlateportCity_ContestLobby_Movement_1554DC - waitmove 0 - move 255, SlateportCity_ContestLobby_Movement_1554CA - waitmove 0 + applymovement 1, SlateportCity_ContestLobby_Movement_1554DC + waitmovement 0 + applymovement 255, SlateportCity_ContestLobby_Movement_1554CA + waitmovement 0 msgbox SlateportCity_ContestLobby_Text_1A6832, 4 closebutton - move 1, SlateportCity_ContestLobby_Movement_1554D3 - move 255, SlateportCity_ContestLobby_Movement_1554C0 - waitmove 0 + applymovement 1, SlateportCity_ContestLobby_Movement_1554D3 + applymovement 255, SlateportCity_ContestLobby_Movement_1554C0 + waitmovement 0 releaseall return @@ -103,8 +103,8 @@ SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall checkflag 95 goto_if_eq SlateportCity_ContestLobby_EventScript_155526 - move 7, SlateportCity_ContestLobby_Movement_1A0839 - waitmove 0 + applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 giveitem ITEM_POKEBLOCK_CASE setflag 95 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 802906f25..0e0b5da1f 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -43,22 +43,22 @@ SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall setvar 0x8008, 3 - move 255, SlateportCity_Harbor_Movement_1560C2 - waitmove 0 + applymovement 255, SlateportCity_Harbor_Movement_1560C2 + waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 - move 7, SlateportCity_Harbor_Movement_1A0845 - waitmove 0 - move 255, SlateportCity_Harbor_Movement_1A0841 - waitmove 0 + applymovement 7, SlateportCity_Harbor_Movement_1A0845 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0841 + waitmovement 0 msgbox SlateportCity_Harbor_Text_17FD7D, 4 closebutton - move 6, SlateportCity_Harbor_Movement_15609B - move 7, SlateportCity_Harbor_Movement_15609B - move 8, SlateportCity_Harbor_Movement_1560A5 - waitmove 0 + applymovement 6, SlateportCity_Harbor_Movement_15609B + applymovement 7, SlateportCity_Harbor_Movement_15609B + applymovement 8, SlateportCity_Harbor_Movement_1560A5 + waitmovement 0 disappear 6 disappear 7 disappear 8 @@ -81,24 +81,24 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 end SlateportCity_Harbor_EventScript_15605C:: @ 815605C - move 4, SlateportCity_Harbor_Movement_1560B3 - waitmove 0 - move 255, SlateportCity_Harbor_Movement_1A0845 - waitmove 0 + applymovement 4, SlateportCity_Harbor_Movement_1560B3 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0845 + waitmovement 0 return SlateportCity_Harbor_EventScript_156071:: @ 8156071 - move 4, SlateportCity_Harbor_Movement_1560B9 - waitmove 0 - move 255, SlateportCity_Harbor_Movement_1A0843 - waitmove 0 + applymovement 4, SlateportCity_Harbor_Movement_1560B9 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0843 + waitmovement 0 return SlateportCity_Harbor_EventScript_156086:: @ 8156086 - move 4, SlateportCity_Harbor_Movement_1560BE - waitmove 0 - move 255, SlateportCity_Harbor_Movement_1A0843 - waitmove 0 + applymovement 4, SlateportCity_Harbor_Movement_1560BE + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0843 + waitmovement 0 return SlateportCity_Harbor_Movement_15609B:: @ 815609B @@ -219,8 +219,8 @@ SlateportCity_Harbor_EventScript_15618A:: @ 815618A SlateportCity_Harbor_EventScript_156196:: @ 8156196 msgbox SlateportCity_Harbor_Text_17FBB6, 4 closebutton - move LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 - waitmove 0 + applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 + waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 9, 8 compare_var_to_imm FACING, 2 @@ -239,13 +239,13 @@ SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA end SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4 - move 255, SlateportCity_Harbor_Movement_1561FA - waitmove 0 + applymovement 255, SlateportCity_Harbor_Movement_1561FA + waitmovement 0 return SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF - move 255, SlateportCity_Harbor_Movement_1561FD - waitmove 0 + applymovement 255, SlateportCity_Harbor_Movement_1561FD + waitmovement 0 return SlateportCity_Harbor_Movement_1561FA:: @ 81561FA @@ -278,8 +278,8 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closebutton - move LAST_TALKED, SlateportCity_Harbor_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 0c75b2b9d..575538286 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -18,15 +18,15 @@ SlateportCity_OceanicMuseum_1F_EventScript_155ADB:: @ 8155ADB SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4 lockall - move 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F + waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 lockall - move 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843 - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843 + waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end @@ -38,8 +38,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closebutton hidemoney 0, 0 - move 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D + waitmovement 0 releaseall end @@ -62,8 +62,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closebutton hidemoney 0, 0 - move 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D + waitmovement 0 releaseall end @@ -159,10 +159,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A faceplayer delay 8 playse 21 - move 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 - waitmove 0 - move 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 - waitmove 0 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 + waitmovement 0 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 + waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 giveitem ITEM_TM46 compare_var_to_imm RESULT, 0 @@ -177,8 +177,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A end SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 - move 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 - waitmove 0 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 + waitmovement 0 setflag 965 playse 9 disappear 13 @@ -186,8 +186,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 end SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD - move 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC - waitmove 0 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC + waitmovement 0 setflag 965 playse 9 disappear 13 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 709d3f1d6..1f6aa3c2d 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -13,14 +13,14 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 closebutton playbgm BGM_EVIL_TEAM, 1 reappear 3 - move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 - waitmove 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 + waitmovement 0 reappear 4 - move 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3 - waitmove 0 - move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 - move 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 - waitmove 0 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3 + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 + waitmovement 0 compare_var_to_imm FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 compare_var_to_imm FACING, 4 @@ -31,8 +31,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closebutton - move 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 - waitmove 0 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 + waitmovement 0 compare_var_to_imm FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare_var_to_imm FACING, 3 @@ -40,28 +40,28 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closebutton - move 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF - waitmove 0 - move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2 - waitmove 0 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2 + waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4 savebgm 0 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 - move 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF - waitmove 0 - move 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 - move 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841 - waitmove 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841 + waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4 closebutton delay 35 reappear 2 - move 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 - move 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE - waitmove 0 + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE + waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, 4 - move 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6 - waitmove 0 + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6 + waitmovement 0 .ifdef SAPPHIRE msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, 4 .else @@ -75,15 +75,15 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 fadescreen 0 delay 30 setflag 883 - move 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 + waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 setvar 0x8004, 269 call SlateportCity_OceanicMuseum_2F_EventScript_1A067F msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 closebutton - move 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 - waitmove 0 + applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 + waitmovement 0 playse 9 disappear 1 setflag 900 @@ -94,23 +94,23 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 end SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62 - move 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F + waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D - move 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F - waitmove 0 + applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F + waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_155E78:: @ 8155E78 - move 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E + waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83 - move 255, SlateportCity_OceanicMuseum_2F_Movement_155E92 - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E92 + waitmovement 0 return SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E @@ -266,7 +266,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4 closebutton - move LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 80ee23d43..882e865ee 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -207,10 +207,10 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A playse 21 - move LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 - waitmove 0 - move LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 - waitmove 0 + applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 + waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 giveitem ITEM_SOOTHE_BELL compare_var_to_imm RESULT, 0 diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index d585fb94c..3c988d084 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -12,44 +12,44 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 checkflag 148 goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 - move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C1EC, 4 closebutton - move 1, SlateportCity_SternsShipyard_1F_Movement_1A083D - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D + waitmovement 0 setflag 148 setflag 882 releaseall end SlateportCity_SternsShipyard_1F_EventScript_155388:: @ 8155388 - move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C472, 4 releaseall end SlateportCity_SternsShipyard_1F_EventScript_15539C:: @ 815539C - move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C3F7, 4 releaseall end SlateportCity_SternsShipyard_1F_EventScript_1553B0:: @ 81553B0 - move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C2F2, 4 closebutton - move 1, SlateportCity_SternsShipyard_1F_Movement_1A083D - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_SternsShipyard_1F_EventScript_1553CF:: @ 81553CF - move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C360, 4 releaseall end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 14bece069..6006ac2ef 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -213,35 +213,35 @@ ClosedSootopolisGymDoorScript:: @ 814D2FF SootopolisCity_EventScript_14D308:: @ 814D308 lockall - move 10, SootopolisCity_Movement_1A083F - move 255, SootopolisCity_Movement_1A0843 - waitmove 0 + applymovement 10, SootopolisCity_Movement_1A083F + applymovement 255, SootopolisCity_Movement_1A0843 + waitmovement 0 playse 21 - move 10, SootopolisCity_Movement_1A0833 - waitmove 0 - move 10, SootopolisCity_Movement_1A0835 - waitmove 0 - move 10, SootopolisCity_Movement_14D413 - waitmove 0 + applymovement 10, SootopolisCity_Movement_1A0833 + waitmovement 0 + applymovement 10, SootopolisCity_Movement_1A0835 + waitmovement 0 + applymovement 10, SootopolisCity_Movement_14D413 + waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169988, 4 .else msgbox SootopolisCity_Text_169E0F, 4 .endif closebutton - move 10, SootopolisCity_Movement_14D417 - move 255, SootopolisCity_Movement_14D440 - waitmove 10 + applymovement 10, SootopolisCity_Movement_14D417 + applymovement 255, SootopolisCity_Movement_14D440 + waitmovement 10 .ifdef SAPPHIRE msgbox SootopolisCity_Text_1699FD, 4 .else msgbox SootopolisCity_Text_169E82, 4 .endif playse 21 - move 5, SootopolisCity_Movement_1A0833 - waitmove 0 - move 5, SootopolisCity_Movement_1A0835 - waitmove 0 + applymovement 5, SootopolisCity_Movement_1A0833 + waitmovement 0 + applymovement 5, SootopolisCity_Movement_1A0835 + waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169AB7, 4 .else @@ -249,16 +249,16 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .endif closebutton delay 30 - move 5, SootopolisCity_Movement_14D46A - move 10, SootopolisCity_Movement_14D41D - move 255, SootopolisCity_Movement_14D445 - waitmove 0 - move 5, SootopolisCity_Movement_1A0843 - move 255, SootopolisCity_Movement_1A0843 - waitmove 0 + applymovement 5, SootopolisCity_Movement_14D46A + applymovement 10, SootopolisCity_Movement_14D41D + applymovement 255, SootopolisCity_Movement_14D445 + waitmovement 0 + applymovement 5, SootopolisCity_Movement_1A0843 + applymovement 255, SootopolisCity_Movement_1A0843 + waitmovement 0 delay 30 - move 10, SootopolisCity_Movement_1A0845 - waitmove 0 + applymovement 10, SootopolisCity_Movement_1A0845 + waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169AE7, 4 .else @@ -266,19 +266,19 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .endif closebutton delay 30 - move 5, SootopolisCity_Movement_14D47C - move 255, SootopolisCity_Movement_14D457 - move 10, SootopolisCity_Movement_14D42D - waitmove 0 - move 5, SootopolisCity_Movement_1A083F - waitmove 0 + applymovement 5, SootopolisCity_Movement_14D47C + applymovement 255, SootopolisCity_Movement_14D457 + applymovement 10, SootopolisCity_Movement_14D42D + waitmovement 0 + applymovement 5, SootopolisCity_Movement_1A083F + waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169BC7, 4 .else msgbox SootopolisCity_Text_16A06C, 4 .endif - move 255, SootopolisCity_Movement_1A083F - waitmove 0 + applymovement 255, SootopolisCity_Movement_1A083F + waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169C99, 4 .else @@ -458,8 +458,8 @@ SootopolisCity_EventScript_14D498:: @ 814D498 SootopolisCity_EventScript_14D4AD:: @ 814D4AD msgbox SootopolisCity_Text_16A33E, 4 closebutton - move LAST_TALKED, SootopolisCity_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 + waitmovement 0 delay 50 setanimation 0, 1 doanimation 30 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 1df729aad..d6c7958b6 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -73,8 +73,8 @@ SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 lockall delay 20 - move 255, SootopolisCity_Gym_1F_Movement_15AFFD - waitmove 0 + applymovement 255, SootopolisCity_Gym_1F_Movement_15AFFD + waitmovement 0 playse 43 delay 60 warphole SootopolisCity_Gym_B1F diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 2965b6748..a45b0b556 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -14,8 +14,8 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closebutton - move LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 + waitmovement 0 delay 30 spriteinvisible 1, 26, 9 setvar 0x8004, 2 @@ -31,13 +31,13 @@ SouthernIsland_Exterior_EventScript_160B25:: @ 8160B25 end BattleTower_Outside_EventScript_160B2F:: @ 8160B2F - move 255, BattleTower_Outside_Movement_160B45 - waitmove 0 + applymovement 255, BattleTower_Outside_Movement_160B45 + waitmovement 0 return BattleTower_Outside_EventScript_160B3A:: @ 8160B3A - move 255, BattleTower_Outside_Movement_160B47 - waitmove 0 + applymovement 255, BattleTower_Outside_Movement_160B47 + waitmovement 0 return BattleTower_Outside_Movement_160B45:: @ 8160B45 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index e50b29d76..d30f8cee4 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -50,8 +50,8 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 goto_if 0, SouthernIsland_Interior_EventScript_160C08 setflag 206 special SpawnCameraDummy - move 127, SouthernIsland_Interior_Movement_160C12 - waitmove 0 + applymovement 127, SouthernIsland_Interior_Movement_160C12 + waitmovement 0 delay 50 waitse pokecry SPECIES_LATIAS_OR_LATIOS, 0 @@ -59,9 +59,9 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 waitpokecry reappear 2 delay 30 - move 127, SouthernIsland_Interior_Movement_160C16 - move 2, SouthernIsland_Interior_Movement_160C22 - waitmove 0 + applymovement 127, SouthernIsland_Interior_Movement_160C16 + applymovement 2, SouthernIsland_Interior_Movement_160C22 + waitmovement 0 delay 50 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index 66aa080ba..3e8f02302 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -14,15 +14,15 @@ VerdanturfTown_EventScript_14E866:: @ 814E866 checkflag 199 goto_if_eq VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 - move 2, VerdanturfTown_Movement_1A083D - waitmove 0 + applymovement 2, VerdanturfTown_Movement_1A083D + waitmovement 0 release end VerdanturfTown_EventScript_14E885:: @ 814E885 msgbox VerdanturfTown_Text_16CBCE, 4 - move 2, VerdanturfTown_Movement_1A083D - waitmove 0 + applymovement 2, VerdanturfTown_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index e3aa13eb2..52de0db78 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -20,28 +20,28 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 lockall - move 1, VerdanturfTown_ContestLobby_Movement_153E25 - waitmove 0 + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 + waitmovement 0 playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView - move 1, VerdanturfTown_ContestLobby_Movement_153E28 - waitmove 0 + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 + waitmovement 0 playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView delay 20 - move 1, VerdanturfTown_ContestLobby_Movement_153E35 - waitmove 0 - move 255, VerdanturfTown_ContestLobby_Movement_153E23 - waitmove 0 + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35 + waitmovement 0 + applymovement 255, VerdanturfTown_ContestLobby_Movement_153E23 + waitmovement 0 msgbox VerdanturfTown_ContestLobby_Text_1A6832, 4 closebutton - move 1, VerdanturfTown_ContestLobby_Movement_153E2C - move 255, VerdanturfTown_ContestLobby_Movement_153E19 - waitmove 0 + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E2C + applymovement 255, VerdanturfTown_ContestLobby_Movement_153E19 + waitmovement 0 releaseall return diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 78c246eb0..7bbcf6a41 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -14,30 +14,30 @@ VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 lockall reappear 4 - move 4, VictoryRoad_1F_Movement_15DF07 - waitmove 0 + applymovement 4, VictoryRoad_1F_Movement_15DF07 + waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB lockall reappear 4 - move 4, VictoryRoad_1F_Movement_15DF13 - waitmove 0 + applymovement 4, VictoryRoad_1F_Movement_15DF13 + waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF lockall reappear 4 - move 4, VictoryRoad_1F_Movement_15DF1E - waitmove 0 + applymovement 4, VictoryRoad_1F_Movement_15DF1E + waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 - move 255, VictoryRoad_1F_Movement_1A083F - waitmove 0 + applymovement 255, VictoryRoad_1F_Movement_1A083F + waitmovement 0 msgbox VictoryRoad_1F_Text_19782B, 4 trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 512272e05..bb890ebcb 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -6,8 +6,8 @@ LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950 LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956 LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 - move 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 - waitmove 0 + applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x8005, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F compare_var_to_imm 0x8005, 1 @@ -15,20 +15,20 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closebutton setvar 0x4092, 4 - move 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 - move 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 + applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + waitmovement 0 releaseall end LittlerootTown_BrendansHouse_1F_EventScript_1B699F:: @ 81B699F - move 255, LittlerootTown_BrendansHouse_1F_Movement_1A0843 - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A0843 + waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA - move 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + waitmovement 0 return LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5 @@ -39,9 +39,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 msgbox LittlerootTown_BrendansHouse_1F_Text_172531, 4 closebutton - move 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 - move 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC - waitmove 0 + applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC + waitmovement 0 releaseall end @@ -81,27 +81,27 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 setvar 0x8008, 14 reappear 0x8008 - move 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 - waitmove 0 - move 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 - waitmove 0 + applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 + waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 closebutton - move 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 - waitmove 0 + applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 setvar 0x8008, 14 reappear 0x8008 - move 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD - waitmove 0 - move 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F - waitmove 0 + applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F + waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 closebutton - move 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 - waitmove 0 + applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91 @@ -155,70 +155,70 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 end LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF - move 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0843 - waitmove 0 + applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0843 + waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D - move 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC + waitmovement 0 playbgm 453, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4 closebutton - move 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB - waitmove 0 - move 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 - waitmove 0 + applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 + waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE - move 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, 4 msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4 closebutton setvar 0x4001, 1 - move 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 - waitmove 0 + applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 + waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8 end LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E - move 0x8005, LittlerootTown_MaysHouse_1F_Movement_1A083F - waitmove 0 + applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1A083F + waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D - move 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 - waitmove 0 + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 + waitmovement 0 playbgm 453, 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4 closebutton - move 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE - waitmove 0 - move 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA - waitmove 0 + applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE + waitmovement 0 + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA + waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6BBE - move 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 - waitmove 0 + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 + waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, 4 msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4 closebutton setvar 0x4001, 1 - move 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 - waitmove 0 + applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 + waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B6AB8 end LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D playse 21 - move 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0833 - waitmove 0 - move 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835 - waitmove 0 + applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + waitmovement 0 + applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, 4 closebutton return LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE - move 255, LittlerootTown_BrendansHouse_1F_Movement_1A0841 - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4 fadedefaultbgm special TurnOffTVScreen @@ -370,13 +370,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 - move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 - waitmove 0 + applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + waitmovement 0 playse 21 - move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0833 - waitmove 0 - move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 - waitmove 0 + applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + waitmovement 0 + applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + waitmovement 0 delay 20 compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD @@ -417,45 +417,45 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD:: @ 81B6DBD return LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD:: @ 81B6DCD - move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 - waitmove 0 + applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 + waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8:: @ 81B6DD8 - move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 - waitmove 0 + applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 + waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3:: @ 81B6DE3 - move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 - waitmove 0 + applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 + waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE:: @ 81B6DEE - move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3B - waitmove 0 + applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3B + waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9:: @ 81B6DF9 - move 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F - move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F + applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D + waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B:: @ 81B6E0B - move 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F - move 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F + applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 + waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D:: @ 81B6E1D - move 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E49 - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E49 + waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28 - move 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E54 - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E54 + waitmovement 0 return LittlerootTown_BrendansHouse_1F_Movement_1B6E33:: @ 81B6E33 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 61a484b4c..5f185c8ff 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,35 +1,35 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 setvar 0x8008, 4 setvar 0x8009, 1 - move 0x8008, FallarborTown_ContestLobby_Movement_1B7821 - waitmove 0 + applymovement 0x8008, FallarborTown_ContestLobby_Movement_1B7821 + waitmovement 0 goto FallarborTown_ContestLobby_EventScript_1B7681 end SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E setvar 0x8008, 2 setvar 0x8009, 2 - move 6, SlateportCity_ContestLobby_Movement_1A083D - move 0x8008, SlateportCity_ContestLobby_Movement_1B7821 - waitmove 0 + applymovement 6, SlateportCity_ContestLobby_Movement_1A083D + applymovement 0x8008, SlateportCity_ContestLobby_Movement_1B7821 + waitmovement 0 goto SlateportCity_ContestLobby_EventScript_1B7681 end VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F setvar 0x8008, 2 setvar 0x8009, 1 - move 0x8008, VerdanturfTown_ContestLobby_Movement_1B7821 - waitmove 0 + applymovement 0x8008, VerdanturfTown_ContestLobby_Movement_1B7821 + waitmovement 0 goto VerdanturfTown_ContestLobby_EventScript_1B7681 end LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 setvar 0x8008, 3 setvar 0x8009, 3 - move 9, LilycoveCity_ContestLobby_Movement_1A083D - move 10, LilycoveCity_ContestLobby_Movement_1A083D - move 0x8008, LilycoveCity_ContestLobby_Movement_1B7821 - waitmove 0 + applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D + applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D + applymovement 0x8008, LilycoveCity_ContestLobby_Movement_1B7821 + waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 80c51484a..ac033506b 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -27,13 +27,13 @@ Route111_EventScript_1A3877:: @ 81A3877 end Route111_EventScript_1A38C3:: @ 81A38C3 - move LAST_TALKED, Route111_Movement_1A38E3 - waitmove 0 + applymovement LAST_TALKED, Route111_Movement_1A38E3 + waitmovement 0 return Route111_EventScript_1A38CE:: @ 81A38CE - move LAST_TALKED, Route111_Movement_1A38EF - waitmove 0 + applymovement LAST_TALKED, Route111_Movement_1A38EF + waitmovement 0 return Route111_EventScript_1A38D9:: @ 81A38D9 -- cgit v1.2.3 From 9458b3fad18eea3fbd9168a88dd33e8aa10abcda Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 26 Sep 2017 14:09:41 -0500 Subject: single compare macro --- data/event_scripts.s | 368 ++++++++++----------- data/field_move_scripts.inc | 28 +- data/scripts/berry_tree.inc | 24 +- data/scripts/cable_club.inc | 100 +++--- data/scripts/contest_hall.inc | 210 ++++++------ data/scripts/day_care.inc | 56 ++-- data/scripts/gabby_and_ty.inc | 18 +- data/scripts/magma_chimney.inc | 8 +- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 2 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 8 +- .../maps/AbandonedShip_HiddenFloorRooms.inc | 16 +- data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 4 +- data/scripts/maps/BattleTower_Corridor.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 30 +- data/scripts/maps/BattleTower_Outside.inc | 6 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DewfordTown.inc | 20 +- data/scripts/maps/DewfordTown_Gym.inc | 18 +- data/scripts/maps/DewfordTown_Hall.inc | 24 +- data/scripts/maps/DewfordTown_House2.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 12 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 4 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 6 +- data/scripts/maps/FallarborTown_House2.inc | 10 +- data/scripts/maps/FortreeCity.inc | 4 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 6 +- data/scripts/maps/FortreeCity_House2.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 10 +- data/scripts/maps/InsideOfTruck.inc | 4 +- data/scripts/maps/JaggedPass.inc | 6 +- data/scripts/maps/LavaridgeTown.inc | 52 +-- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 4 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 18 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 42 +-- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 10 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 30 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 22 +- data/scripts/maps/LilycoveCity_Harbor.inc | 16 +- data/scripts/maps/LilycoveCity_House2.inc | 2 +- data/scripts/maps/LilycoveCity_House3.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 8 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 8 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 76 ++--- data/scripts/maps/LittlerootTown.inc | 96 +++--- .../maps/LittlerootTown_BrendansHouse_1F.inc | 10 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 12 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 16 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 28 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 28 +- data/scripts/maps/MauvilleCity.inc | 8 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 16 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 86 ++--- data/scripts/maps/MauvilleCity_Gym.inc | 12 +- data/scripts/maps/MauvilleCity_House2.inc | 6 +- data/scripts/maps/MeteorFalls_1F_2R.inc | 6 +- data/scripts/maps/MossdeepCity.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 28 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 2 +- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 6 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 8 +- data/scripts/maps/MtChimney.inc | 12 +- data/scripts/maps/MtChimney_CableCarStation.inc | 6 +- data/scripts/maps/MtPyre_1F.inc | 2 +- data/scripts/maps/MtPyre_6F.inc | 2 +- data/scripts/maps/MtPyre_Exterior.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 36 +- data/scripts/maps/NewMauville_Entrance.inc | 6 +- data/scripts/maps/NewMauville_Inside.inc | 8 +- data/scripts/maps/OldaleTown.inc | 6 +- data/scripts/maps/PacifidlogTown_House2.inc | 10 +- data/scripts/maps/PacifidlogTown_House3.inc | 6 +- data/scripts/maps/PacifidlogTown_House4.inc | 4 +- data/scripts/maps/PacifidlogTown_House5.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 20 +- data/scripts/maps/PetalburgCity_Gym.inc | 170 +++++----- .../maps/PetalburgCity_PokemonCenter_1F.inc | 8 +- data/scripts/maps/PetalburgWoods.inc | 6 +- data/scripts/maps/Route102.inc | 2 +- data/scripts/maps/Route103.inc | 10 +- data/scripts/maps/Route104.inc | 12 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 8 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 10 +- data/scripts/maps/Route106.inc | 2 +- data/scripts/maps/Route107.inc | 2 +- data/scripts/maps/Route109.inc | 8 +- data/scripts/maps/Route109_SeashoreHouse.inc | 8 +- data/scripts/maps/Route110.inc | 42 +-- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 8 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 26 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 120 +++---- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 10 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 42 +-- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 102 +++--- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 6 +- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 2 +- data/scripts/maps/Route111.inc | 34 +- data/scripts/maps/Route111_OldLadysRestStop.inc | 8 +- .../maps/Route111_WinstrateFamilysHouse.inc | 2 +- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 6 +- data/scripts/maps/Route113.inc | 8 +- data/scripts/maps/Route113_GlassWorkshop.inc | 52 +-- data/scripts/maps/Route114.inc | 8 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 2 +- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 4 +- data/scripts/maps/Route114_LanettesHouse.inc | 6 +- data/scripts/maps/Route115.inc | 6 +- data/scripts/maps/Route116.inc | 28 +- data/scripts/maps/Route117.inc | 12 +- data/scripts/maps/Route118.inc | 14 +- data/scripts/maps/Route119.inc | 34 +- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 6 +- data/scripts/maps/Route120.inc | 40 +-- data/scripts/maps/Route121.inc | 4 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 12 +- data/scripts/maps/Route123.inc | 8 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 32 +- data/scripts/maps/Route124.inc | 6 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 20 +- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route128.inc | 4 +- data/scripts/maps/Route130.inc | 2 +- data/scripts/maps/RustboroCity.inc | 28 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 34 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 4 +- data/scripts/maps/RustboroCity_House1.inc | 6 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 6 +- data/scripts/maps/RusturfTunnel.inc | 24 +- data/scripts/maps/SSTidalCorridor.inc | 12 +- data/scripts/maps/SSTidalRooms.inc | 2 +- data/scripts/maps/SafariZone_Southeast.inc | 6 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 2 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 20 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 12 +- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 4 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 2 +- data/scripts/maps/SlateportCity.inc | 24 +- data/scripts/maps/SlateportCity_ContestHall.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 34 +- data/scripts/maps/SlateportCity_House1.inc | 20 +- data/scripts/maps/SlateportCity_House2.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 10 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 28 +- data/scripts/maps/SootopolisCity.inc | 14 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 +- data/scripts/maps/SootopolisCity_House2.inc | 4 +- data/scripts/maps/SootopolisCity_House3.inc | 2 +- data/scripts/maps/SootopolisCity_House6.inc | 4 +- data/scripts/maps/SootopolisCity_House8.inc | 20 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 18 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- data/scripts/mauville_man.inc | 74 ++--- data/scripts/mystery_event_club.inc | 12 +- data/scripts/players_house.inc | 38 +-- data/scripts/pokeblocks.inc | 44 +-- data/scripts/safari_zone.inc | 8 +- data/scripts/secret_power_tm.inc | 10 +- data/scripts/tv.inc | 18 +- 186 files changed, 1701 insertions(+), 1701 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index f31a00e2a..0db608cd5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -430,7 +430,7 @@ EventScript_15F3E2: EventScript_15F419: msgbox UnknownString_81A38FB, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F384 closebutton special SecretBasePC_PackUp @@ -476,13 +476,13 @@ gUnknown_0815F49A:: @ 815F49A EventScript_15F4A1: special sub_80BC56C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_15F4E0 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_15F503 special sub_80BC224 msgbox UnknownString_81A3958, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A22, 3 special sub_80BC5BC @@ -492,7 +492,7 @@ EventScript_15F4A1: EventScript_15F4E0: msgbox UnknownString_81A3982, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 special sub_80BC5BC @@ -526,13 +526,13 @@ gUnknown_0815F523:: @ 815F523 gUnknown_0815F528:: @ 815F528 special GetShieldToyTVDecorationInfo - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_15F558 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_15F561 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_15F56A - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq EventScript_15F573 end @@ -936,7 +936,7 @@ gUnknown_0819F818:: @ 819F818 applymovement LAST_TALKED, Movement_19F8F0 waitmovement 0 specialvar RESULT, ScrSpecial_HasTrainerBeenFought - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F83F special PlayTrainerEncounterMusic special sub_8082524 @@ -950,10 +950,10 @@ gUnknown_0819F840:: @ 819F840 faceplayer call EventScript_19F8E5 specialvar RESULT, ScrSpecial_HasTrainerBeenFought - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F877 special CheckForAlivePartyMons - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F870 special PlayTrainerEncounterMusic special sub_8082524 @@ -979,7 +979,7 @@ gUnknown_0819F878:: @ 819F878 gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_19F8AD special PlayTrainerEncounterMusic special sub_8082524 @@ -996,10 +996,10 @@ EventScript_19F8AD: gUnknown_0819F8AE:: @ 819F8AE specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_19F8DD special CheckForAlivePartyMons - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_19F8DE special PlayTrainerEncounterMusic special sub_8082524 @@ -1036,15 +1036,15 @@ EventScript_19F8F2: waitbutton reptrainerbattle specialvar RESULT, ScrSpecial_GetTrainerBattleMode - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_19F934 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_19F936 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_19F936 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_19F936 - compare_var_to_imm RESULT, 8 + compare RESULT, 8 goto_if_eq EventScript_19F936 EventScript_19F934: @@ -1335,11 +1335,11 @@ EventScript_19FC84: return gUnknown_0819FC9F:: @ 819FC9F - compare_var_to_imm 0x4096, 1 + compare 0x4096, 1 goto_if_eq EventScript_19FCC1 - compare_var_to_imm 0x4096, 2 + compare 0x4096, 2 goto_if_eq EventScript_19FCD7 - compare_var_to_imm 0x4096, 3 + compare 0x4096, 3 goto_if_eq EventScript_19FCF0 end @@ -1433,9 +1433,9 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B lock faceplayer msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq do_heal_party - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq dont_heal_party end @@ -1471,9 +1471,9 @@ dont_heal_party:: @ 819FDC7 OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE specialvar RESULT, IsPokerusInParty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDEA - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1498,9 +1498,9 @@ Std_ObtainItem_: @ 819FE07 bufferitem 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket - compare_var_to_imm 0x8007, 0x1 + compare 0x8007, 0x1 call_if 1, Std_ObtainItem_Success - compare_var_to_imm 0x8007, 0x0 + compare 0x8007, 0x0 call_if 1, Std_ObtainItem_Fail return @@ -1515,31 +1515,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstd 2, 0xE - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstd 2, 0xF - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstd 2, 0x10 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstd 2, 0x11 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstd 2, 0x12 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, PlayGetItemFanfare return @@ -1571,9 +1571,9 @@ Std_ObtainDecoration: @ 819FEDA Std_ObtainDecoration_: @ 819FEE8 bufferdecor 1, 0x8000 - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, Std_ObtainDecoration_Success - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 call_if 1, Std_ObtainDecoration_Fail return @@ -1599,9 +1599,9 @@ Std_FindItem: @ 819FF21 bufferitem 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 call_if 1, Std_FindItem_Success - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 call_if 1, Std_FindItem_Fail release return @@ -1628,9 +1628,9 @@ HiddenItemScript:: @ 819FF7B bufferitem 0x1, 0x8005 checkitemtype 0x8005 call GetItem_HandlePocket - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq HiddenItemScript_Success - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 goto_if_eq HiddenItemScript_Fail end @@ -1654,9 +1654,9 @@ UnusedMixRecordsScript: @ 819FFD5 lock faceplayer msgbox UnusedMixRecordsPromptText, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq UnusedMixRecordsScript_Yes - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq UnusedMixRecordsScript_Done goto UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA @@ -1811,13 +1811,13 @@ Route109_EventScript_1A010C:: @ 81A010C UseSurfScript:: @ 81A0117 checkattack MOVE_SURF - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq UseSurfScript_NoMon bufferpartypoke 0, RESULT setanimation 0, RESULT lockall msgbox UseSurfPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq UseSurfScript_No msgbox UsedSurfText, 4 doanimation 9 @@ -1836,9 +1836,9 @@ Route110_EventScript_1A014E:: @ 81A014E Route119_EventScript_1A014E:: @ 81A014E RustboroCity_EventScript_1A014E:: @ 81A014E checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_1A0166 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_1A016C end @@ -1854,9 +1854,9 @@ LavaridgeTown_EventScript_1A0172:: @ 81A0172 Route110_EventScript_1A0172:: @ 81A0172 Route119_EventScript_1A0172:: @ 81A0172 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_1A018A - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_1A0190 end @@ -2136,23 +2136,23 @@ Route109_EventScript_1A02EF:: @ 81A02EF LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A02F4:: @ 81A02F4 Route103_EventScript_1A02F4:: @ 81A02F4 - compare_var_to_imm 0x4085, 0 + compare 0x4085, 0 goto_if_eq Route101_EventScript_1A14DC - compare_var_to_imm 0x4049, 0 + compare 0x4049, 0 call_if 1, Route101_EventScript_1A0358 - compare_var_to_imm 0x4049, 1 + compare 0x4049, 1 call_if 1, Route101_EventScript_1A0358 - compare_var_to_imm 0x4049, 2 + compare 0x4049, 2 call_if 1, Route101_EventScript_1A0365 - compare_var_to_imm 0x4049, 3 + compare 0x4049, 3 call_if 1, Route101_EventScript_1A0365 - compare_var_to_imm 0x4049, 4 + compare 0x4049, 4 call_if 1, Route101_EventScript_1A0372 - compare_var_to_imm 0x4049, 5 + compare 0x4049, 5 call_if 1, Route101_EventScript_1A0372 - compare_var_to_imm 0x4049, 6 + compare 0x4049, 6 call_if 1, Route101_EventScript_1A0358 - compare_var_to_imm 0x4049, 7 + compare 0x4049, 7 call_if 1, Route101_EventScript_1A0358 return @@ -2183,7 +2183,7 @@ Route103_EventScript_1A037F:: @ 81A037F lock faceplayer msgbox Route101_Text_1C4449, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route101_EventScript_1A039B call Route101_EventScript_1A03B0 release @@ -2212,7 +2212,7 @@ Route101_EventScript_1A03B0:: @ 81A03B0 buffernum 1, 0x8009 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 - compare_var_to_imm 0x800a, 0 + compare 0x800a, 0 goto_if_eq Route101_EventScript_1A14DC setvar 0x8004, 1 specialvar RESULT, ScriptGetPokedexInfo @@ -2279,9 +2279,9 @@ Movement_1A047A: BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, BattleTower_Outside_EventScript_160B2F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A delay 30 spriteinvisible 255, 0, 0 @@ -2424,7 +2424,7 @@ Route119_EventScript_1A0587:: @ 81A0587 Route119_EventScript_1A0594:: @ 81A0594 Route120_EventScript_1A0594:: @ 81A0594 checkitem ITEM_DEVON_SCOPE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1A05AE msgbox Route119_Text_171B93, 4 release @@ -2432,7 +2432,7 @@ Route120_EventScript_1A0594:: @ 81A0594 Route119_EventScript_1A05AE:: @ 81A05AE msgbox Route119_Text_171BB6, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1A05C3 release end @@ -2449,19 +2449,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 delay 40 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, Route119_EventScript_1A0646 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, Route119_EventScript_1A064A - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, Route119_EventScript_1A064E - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 call_if 1, Route119_EventScript_1A0652 - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 call_if 1, Route119_EventScript_1A0656 - compare_var_to_imm 0x8004, 6 + compare 0x8004, 6 call_if 1, Route119_EventScript_1A065A - compare_var_to_imm 0x8004, 7 + compare 0x8004, 7 call_if 1, Route119_EventScript_1A065E setflag 2145 dowildbattle @@ -3253,7 +3253,7 @@ gUnknown_081A14B8:: @ 81A14B8 lockall special ExecuteWhiteOut waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A14CA releaseall end @@ -3597,32 +3597,32 @@ SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4 gUnknown_081A2C51:: @ 81A2C51 special sub_80BB70C special sub_80BB63C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A2E45 checkattack MOVE_SECRET_POWER setanimation 0, RESULT bufferattack 1, MOVE_SECRET_POWER - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 2 + compare 0x8007, 2 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 3 + compare 0x8007, 3 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 4 + compare 0x8007, 4 goto_if_eq EventScript_1A2CB0 - compare_var_to_imm 0x8007, 5 + compare 0x8007, 5 goto_if_eq EventScript_1A2D08 - compare_var_to_imm 0x8007, 6 + compare 0x8007, 6 goto_if_eq EventScript_1A2D60 end EventScript_1A2CB0: lockall - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2CF1 bufferpartypoke 0, RESULT msgbox UnknownString_8198F34, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3649,11 +3649,11 @@ EventScript_1A2CFA: EventScript_1A2D08: lockall - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2D49 bufferpartypoke 0, RESULT msgbox UnknownString_81A197B, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3680,11 +3680,11 @@ EventScript_1A2D52: EventScript_1A2D60: lockall - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2DA1 bufferpartypoke 0, RESULT msgbox UnknownString_81A1A4B, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closebutton @@ -3728,7 +3728,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE waitmovement 0 setvar 0x4097, 1 msgbox SecretBase_RedCave1_Text_198F89, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closebutton playse 9 @@ -3752,7 +3752,7 @@ gUnknown_081A2E14:: @ 81A2E14 setvar 0x4097, 1 playse 9 special sub_80BC114 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2E38 clearflag 173 special sub_80BBAF0 @@ -3769,57 +3769,57 @@ EventScript_1A2E38: EventScript_1A2E45: checkattack MOVE_SECRET_POWER - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq EventScript_1A2EF7 setanimation 0, RESULT setorcopyvar 0x8004, RESULT lockall special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UnknownString_81A38FB, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A fadescreen 1 special sub_80BC50C closebutton fadescreen 0 msgbox UnknownString_81A3CC9, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A2F3A bufferpartypoke 0, 0x8004 bufferattack 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closebutton closebutton - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 2 + compare 0x8007, 2 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 3 + compare 0x8007, 3 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 4 + compare 0x8007, 4 goto_if_eq gUnknown_081A2CE6 - compare_var_to_imm 0x8007, 5 + compare 0x8007, 5 goto_if_eq gUnknown_081A2D3E - compare_var_to_imm 0x8007, 6 + compare 0x8007, 6 goto_if_eq gUnknown_081A2D96 releaseall end EventScript_1A2EF7:: - compare_var_to_imm 0x8007, 1 + compare 0x8007, 1 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 2 + compare 0x8007, 2 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 3 + compare 0x8007, 3 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 4 + compare 0x8007, 4 goto_if_eq EventScript_1A2CF1 - compare_var_to_imm 0x8007, 5 + compare 0x8007, 5 goto_if_eq EventScript_1A2D49 - compare_var_to_imm 0x8007, 6 + compare 0x8007, 6 goto_if_eq EventScript_1A2DA1 end @@ -3872,10 +3872,10 @@ gUnknown_081A2F8A:: @ 81A2F8A EventScript_1A2F95: special sub_8100A7C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A2FBF addvar 0x8004, 1 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 goto_if_eq EventScript_1A2F95 disappear 0x8006 setflag 0x8005 @@ -3910,42 +3910,42 @@ SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 special sub_80BCE90 - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3032 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30AE - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 goto_if_eq SecretBase_RedCave1_EventScript_1A312A - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 goto_if_eq SecretBase_RedCave1_EventScript_1A31A6 - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 goto_if_eq SecretBase_RedCave1_EventScript_1A3222 - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 goto_if_eq SecretBase_RedCave1_EventScript_1A329E - compare_var_to_imm 0x8004, 6 + compare 0x8004, 6 goto_if_eq SecretBase_RedCave1_EventScript_1A331A - compare_var_to_imm 0x8004, 7 + compare 0x8004, 7 goto_if_eq SecretBase_RedCave1_EventScript_1A3396 - compare_var_to_imm 0x8004, 8 + compare 0x8004, 8 goto_if_eq SecretBase_RedCave1_EventScript_1A3412 - compare_var_to_imm 0x8004, 9 + compare 0x8004, 9 goto_if_eq SecretBase_RedCave1_EventScript_1A348E end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3086 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1AEA, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A308F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1B83, 4 @@ -3970,17 +3970,17 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3102 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1E67, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A310B hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1F04, 4 @@ -4005,17 +4005,17 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A317E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock faceplayer msgbox SecretBase_RedCave1_Text_1A218F, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3187 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2220, 4 @@ -4040,17 +4040,17 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A31FA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock faceplayer msgbox SecretBase_RedCave1_Text_1A24E1, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3203 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A256F, 4 @@ -4075,17 +4075,17 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3276 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2830, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A327F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A28D7, 4 @@ -4110,17 +4110,17 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock faceplayer msgbox SecretBase_RedCave1_Text_1A1CB2, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A32FB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1D48, 4 @@ -4145,17 +4145,17 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A336E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock faceplayer msgbox SecretBase_RedCave1_Text_1A2026, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3377 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2095, 4 @@ -4180,17 +4180,17 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A33EA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock faceplayer msgbox SecretBase_RedCave1_Text_1A236A, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2405, 4 @@ -4215,17 +4215,17 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A3466 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2663, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A346F hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2710, 4 @@ -4250,17 +4250,17 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E checkflag 2052 goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock faceplayer msgbox SecretBase_RedCave1_Text_1A2A13, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 special sub_80BCE4C call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A34EB hidebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2AE2, 4 @@ -4381,13 +4381,13 @@ SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar 0x8005, 1 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar 0x8009, 0x8006 msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4399,9 +4399,9 @@ SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEC3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4426,24 +4426,24 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 faceplayer setvar 0x8005, 2 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 checkflag 105 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag 105 msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4455,9 +4455,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF83 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4481,17 +4481,17 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer specialvar RESULT, sub_80BF544 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar 0x8005, 3 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar 0x8009, 0x8006 msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 end @@ -4527,14 +4527,14 @@ SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4 setvar 0x8006, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4 copyvar 0x8007, 0x800a @@ -4562,13 +4562,13 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar 0x8005, 6 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar 0x8009, 0x8006 msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4580,9 +4580,9 @@ FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE137 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4601,7 +4601,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 setflag 2 @@ -4618,11 +4618,11 @@ FallarborTown_ContestLobby_EventScript_1AE188:: @ 81AE188 LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 - compare_var_to_imm 0x4086, 2 + compare 0x4086, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar 0x8005, 6 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE switch 0x4088 case 0, FallarborTown_ContestLobby_EventScript_1AE1FE @@ -4659,13 +4659,13 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar 0x8005, 7 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar 0x8009, 0x8006 msgbox BattleTower_Lobby_Text_1A776D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE241 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE297 end @@ -4674,9 +4674,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 waittext multichoice 19, 8, 45, 1 copyvar 0x8008, RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, BattleTower_Lobby_EventScript_1AE2A1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 setvar 0x8004, 12 @@ -4684,9 +4684,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2B3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 end @@ -4704,7 +4704,7 @@ BattleTower_Lobby_EventScript_1AE2AA:: @ 81AE2AA return BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 setflag 2 @@ -4724,11 +4724,11 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 end BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED - compare_var_to_imm 0x40bc, 0 + compare 0x40bc, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar 0x8005, 7 special sub_80BF2C4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F clearflag 918 return @@ -4790,11 +4790,11 @@ Text_RepelWoreOff: @ 81C33EF MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 event_96 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA @@ -4802,11 +4802,11 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 event_96 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index ac70163aa..7df5ac90f 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -3,13 +3,13 @@ S_CuttableTree:: @ 81B0DCC checkflag 2055 goto_if 0, CannotUseCut checkattack MOVE_CUT - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_CUT msgbox UseCutPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -61,13 +61,13 @@ S_BreakableRock:: @ 81B0EB7 checkflag 2057 goto_if 0, CannotUseRockSmash checkattack MOVE_ROCK_SMASH - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT bufferpartypoke 0, RESULT bufferattack 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closebutton @@ -88,10 +88,10 @@ DoRockSmashMovement: @ 81B0F0C waitmovement 0 disappear LAST_TALKED specialvar RESULT, sub_810F5BC - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoRockSmashMovement_Done waitstate releaseall @@ -130,11 +130,11 @@ S_PushableBoulder:: @ 81B0FCB checkflag 2089 goto_if_eq AlreadyUsedStrength checkattack 70 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseStrength setanimation 0, RESULT msgbox UseStrengthPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Strength_ChoseNo closebutton doanimation 40 @@ -191,12 +191,12 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows bufferpartypoke 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 doanimation 43 @@ -224,13 +224,13 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall checkattack MOVE_DIVE - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq CannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Dive_Done msgbox UsedDiveText, 4 doanimation 44 @@ -247,13 +247,13 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive bufferpartypoke 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 doanimation 44 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 573144019..0ed7749bc 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -22,7 +22,7 @@ Route102_EventScript_1A153D:: @ 81A153D lock faceplayer specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_1A1558 message Route102_Text_1A16B6 waittext @@ -32,9 +32,9 @@ Route102_EventScript_1A153D:: @ 81A153D Route102_EventScript_1A1558:: @ 81A1558 msgbox Route102_Text_1A16CD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_1A1577 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route102_EventScript_1A1593 end @@ -43,7 +43,7 @@ Route102_EventScript_1A1577:: @ 81A1577 closebutton special sub_80B4EE4 waitstate - compare_var_to_imm ITEM_ID, 0 + compare ITEM_ID, 0 goto_if_eq Route102_EventScript_1A1593 removeitem ITEM_ID, 1 call Route102_EventScript_1A16A9 @@ -82,9 +82,9 @@ Route102_EventScript_1A15BC:: @ 81A15BC goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 goto_if_eq Route102_EventScript_1A15F2 - compare_var_to_imm 0x8005, 4 + compare 0x8005, 4 goto_if_eq Route102_EventScript_1A15EB buffertext 1, Route102_Text_1A17B7 return @@ -102,14 +102,14 @@ Route102_EventScript_1A15F9:: @ 81A15F9 lock faceplayer msgbox Route102_Text_1A17C0, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_1A161D - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route102_EventScript_1A164B Route102_EventScript_1A161D:: @ 81A161D special FieldObjectInteractionPickBerryTree - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD @@ -146,12 +146,12 @@ gUnknown_081A1654:: @ 81A1654 Route102_EventScript_1A165F:: @ 81A165F checkitem ITEM_WAILMER_PAIL, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route102_EventScript_1A168D msgbox Route102_Text_1A18E6, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_1A1693 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route102_EventScript_1A168D Route102_EventScript_1A168D:: @ 81A168D diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 605846334..b25bc12bd 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -39,15 +39,15 @@ RustboroCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SlateportCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 - compare_var_to_imm 0x4087, 1 + compare 0x4087, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare_var_to_imm 0x4087, 2 + compare 0x4087, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare_var_to_imm 0x4087, 5 + compare 0x4087, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare_var_to_imm 0x4087, 3 + compare 0x4087, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D74 - compare_var_to_imm 0x4087, 4 + compare 0x4087, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D7E end @@ -90,7 +90,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 setvar 0x4087, 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 @@ -101,7 +101,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA special CloseLink setvar 0x4087, 0 - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 @@ -128,7 +128,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 special CloseLink setvar 0x4087, 0 - compare_var_to_imm 0x8007, 0 + compare 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 waitmovement 0 @@ -192,26 +192,26 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext special sub_808347C waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3F5E - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4068 - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E @@ -237,7 +237,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E setdoorclosed 5, 1 doorchange release - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp warp SingleBattleColosseum, 255, 6, 8 @@ -281,7 +281,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 setvar 0x8004, 2 return @@ -352,33 +352,33 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A40FA OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA call OldaleTown_PokemonCenter_2F_EventScript_1A41BB - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext special sub_80834E4 waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4166 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A432D - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 @@ -406,10 +406,10 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB specialvar RESULT, CalculatePlayerPartyCount - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1 specialvar RESULT, GetNameOfEnigmaBerryInPlayerParty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A41EE setvar RESULT, 1 return @@ -449,14 +449,14 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waittext @@ -464,19 +464,19 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 waitstate special sub_80835D8 waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4294 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4301 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A430D - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A432D - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42E9 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 @@ -619,7 +619,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 fadescreen 1 special sub_80C5568 waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 0 special sub_8083B90 @@ -630,7 +630,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E fadescreen 1 special sub_80C5568 waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 1 special sub_8083B90 @@ -641,7 +641,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 fadescreen 1 special sub_80C5568 waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 2 special sub_8083B90 @@ -652,7 +652,7 @@ DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4 fadescreen 1 special sub_80C5568 waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF setvar 0x8005, 3 special sub_8083B90 @@ -690,7 +690,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 setvar 0x8005, 0 special sub_80B929C waitstate - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -698,7 +698,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D setvar 0x8005, 1 special sub_80B929C waitstate - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -706,7 +706,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 setvar 0x8005, 2 special sub_80B929C waitstate - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -714,7 +714,7 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 setvar 0x8005, 3 special sub_80B929C waitstate - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -770,7 +770,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD end RecordCorner_EventScript_1A44BC:: @ 81A44BC - compare_var_to_imm 0x4000, 0 + compare 0x4000, 0 goto_if 5, RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 @@ -791,7 +791,7 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6 TradeRoom_PromptToCancelLink:: @ 81A44E5 msgbox TradeRoom_WillLinkBeTerminated, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq TradeRoom_TerminateLink hidebox 0, 0, 29, 19 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 836fa10dd..acf5597ea 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -5,16 +5,16 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD - compare_var_to_imm 0x408a, 0 + compare 0x408a, 0 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F bufferstd 0, 0x800b msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1 setflag 1 goto FallarborTown_ContestLobby_EventScript_1A4F8F @@ -25,7 +25,7 @@ FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD return FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 - compare_var_to_imm CONTEST_RANK, 0 + compare CONTEST_RANK, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EF6 msgbox FallarborTown_ContestLobby_Text_1A6340, 4 releaseall @@ -33,7 +33,7 @@ FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 msgbox FallarborTown_ContestLobby_Text_1A64F4, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F13 msgbox FallarborTown_ContestLobby_Text_1A65EA, 4 releaseall @@ -63,7 +63,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 giveitem ITEM_LUXURY_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 setvar 0x408a, 0 closebutton @@ -120,18 +120,18 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 choosecontestpkmn - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50C8 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50D7 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq FallarborTown_ContestLobby_EventScript_1A50FB - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq FallarborTown_ContestLobby_EventScript_1A511F - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq FallarborTown_ContestLobby_EventScript_1A512E end @@ -270,7 +270,7 @@ LinkContestRoom1_EventScript_1A5245:: @ 81A5245 return LinkContestRoom1_EventScript_1A525F:: @ 81A525F - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5273 msgbox LinkContestRoom1_Text_1A68F0, 3 return @@ -287,20 +287,20 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A53E5 call LinkContestRoom1_EventScript_1A5880 addvar 0x8006, 1 - compare_var_to_imm 0x8006, 4 + compare 0x8006, 4 goto_if 5, LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 setvar 0x4001, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE - compare_var_to_imm 0x8006, 0 + compare 0x8006, 0 goto_if_eq LinkContestRoom1_EventScript_1A52DB - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 goto_if_eq LinkContestRoom1_EventScript_1A52ED - compare_var_to_imm 0x8006, 2 + compare 0x8006, 2 goto_if_eq LinkContestRoom1_EventScript_1A52FF - compare_var_to_imm 0x8006, 3 + compare 0x8006, 3 goto_if_eq LinkContestRoom1_EventScript_1A5311 return @@ -357,7 +357,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 return LinkContestRoom1_EventScript_1A535E:: @ 81A535E - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5370 message LinkContestRoom1_Text_1A6A04 waittext @@ -385,7 +385,7 @@ LinkContestRoom1_EventScript_1A5377:: @ 81A5377 return LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A53C7 msgbox LinkContestRoom1_Text_1A6A1F, 4 return @@ -396,7 +396,7 @@ LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7 return LinkContestRoom1_EventScript_1A53CE:: @ 81A53CE - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A53DF message LinkContestRoom1_Text_1A6AE1 return @@ -431,15 +431,15 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 LinkContestRoom1_EventScript_1A5455:: @ 81A5455 special sub_80C47A0 - compare_var_to_imm 0x4088, 1 + compare 0x4088, 1 call_if 1, LinkContestRoom1_EventScript_1A555A - compare_var_to_imm 0x4088, 2 + compare 0x4088, 2 call_if 1, LinkContestRoom1_EventScript_1A55B8 - compare_var_to_imm 0x4088, 3 + compare 0x4088, 3 call_if 1, LinkContestRoom1_EventScript_1A5616 - compare_var_to_imm 0x4088, 4 + compare 0x4088, 4 call_if 1, LinkContestRoom1_EventScript_1A5674 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 call_if 1, LinkContestRoom1_EventScript_1A56D2 setvar 0x4001, 9 setvar 0x4002, 9 @@ -449,7 +449,7 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 setvar 0x4006, 9 setvar 0x4007, 9 setvar 0x4008, 9 - compare_var_to_imm 0x4000, 0 + compare 0x4000, 0 call_if 2, LinkContestRoom1_EventScript_1A54EB setvar 0x4001, 0 setvar 0x4002, 0 @@ -464,123 +464,123 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB setvar RESULT, 8 special ScriptRandom - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LinkContestRoom1_EventScript_1A5760 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LinkContestRoom1_EventScript_1A5784 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, LinkContestRoom1_EventScript_1A57A8 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 call_if 1, LinkContestRoom1_EventScript_1A57CC - compare_var_to_imm RESULT, 4 + compare RESULT, 4 call_if 1, LinkContestRoom1_EventScript_1A57F0 - compare_var_to_imm RESULT, 5 + compare RESULT, 5 call_if 1, LinkContestRoom1_EventScript_1A5814 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 call_if 1, LinkContestRoom1_EventScript_1A5838 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 call_if 1, LinkContestRoom1_EventScript_1A585C - compare_var_to_imm 0x4000, 0 + compare 0x4000, 0 goto_if 2, LinkContestRoom1_EventScript_1A54EB waitmovement 0 return LinkContestRoom1_EventScript_1A555A:: @ 81A555A - compare_var_to_imm 0x8004, 80 + compare 0x8004, 80 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare_var_to_imm 0x8004, 70 + compare 0x8004, 70 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare_var_to_imm 0x8004, 60 + compare 0x8004, 60 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare_var_to_imm 0x8004, 50 + compare 0x8004, 50 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare_var_to_imm 0x8004, 40 + compare 0x8004, 40 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare_var_to_imm 0x8004, 30 + compare 0x8004, 30 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare_var_to_imm 0x8004, 20 + compare 0x8004, 20 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare_var_to_imm 0x8004, 10 + compare 0x8004, 10 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 - compare_var_to_imm 0x8004, 230 + compare 0x8004, 230 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare_var_to_imm 0x8004, 210 + compare 0x8004, 210 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare_var_to_imm 0x8004, 190 + compare 0x8004, 190 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare_var_to_imm 0x8004, 170 + compare 0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare_var_to_imm 0x8004, 150 + compare 0x8004, 150 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare_var_to_imm 0x8004, 130 + compare 0x8004, 130 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare_var_to_imm 0x8004, 110 + compare 0x8004, 110 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare_var_to_imm 0x8004, 90 + compare 0x8004, 90 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 - compare_var_to_imm 0x8004, 380 + compare 0x8004, 380 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare_var_to_imm 0x8004, 350 + compare 0x8004, 350 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare_var_to_imm 0x8004, 320 + compare 0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare_var_to_imm 0x8004, 290 + compare 0x8004, 290 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare_var_to_imm 0x8004, 260 + compare 0x8004, 260 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare_var_to_imm 0x8004, 230 + compare 0x8004, 230 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare_var_to_imm 0x8004, 200 + compare 0x8004, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare_var_to_imm 0x8004, 170 + compare 0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 - compare_var_to_imm 0x8004, 600 + compare 0x8004, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare_var_to_imm 0x8004, 560 + compare 0x8004, 560 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare_var_to_imm 0x8004, 520 + compare 0x8004, 520 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare_var_to_imm 0x8004, 480 + compare 0x8004, 480 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare_var_to_imm 0x8004, 440 + compare 0x8004, 440 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare_var_to_imm 0x8004, 400 + compare 0x8004, 400 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare_var_to_imm 0x8004, 360 + compare 0x8004, 360 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare_var_to_imm 0x8004, 320 + compare 0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 - compare_var_to_imm 0x8004, 600 + compare 0x8004, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare_var_to_imm 0x8004, 550 + compare 0x8004, 550 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare_var_to_imm 0x8004, 500 + compare 0x8004, 500 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare_var_to_imm 0x8004, 450 + compare 0x8004, 450 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare_var_to_imm 0x8004, 400 + compare 0x8004, 400 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare_var_to_imm 0x8004, 300 + compare 0x8004, 300 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare_var_to_imm 0x8004, 200 + compare 0x8004, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare_var_to_imm 0x8004, 100 + compare 0x8004, 100 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar 0x4000, 0 return @@ -618,7 +618,7 @@ LinkContestRoom1_EventScript_1A575A:: @ 81A575A return LinkContestRoom1_EventScript_1A5760:: @ 81A5760 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq LinkContestRoom1_EventScript_1A5783 applymovement 6, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -631,7 +631,7 @@ LinkContestRoom1_EventScript_1A5783:: @ 81A5783 return LinkContestRoom1_EventScript_1A5784:: @ 81A5784 - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 goto_if_eq LinkContestRoom1_EventScript_1A57A7 applymovement 12, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -644,7 +644,7 @@ LinkContestRoom1_EventScript_1A57A7:: @ 81A57A7 return LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 - compare_var_to_imm 0x4003, 1 + compare 0x4003, 1 goto_if_eq LinkContestRoom1_EventScript_1A57CB applymovement 7, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -657,7 +657,7 @@ LinkContestRoom1_EventScript_1A57CB:: @ 81A57CB return LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC - compare_var_to_imm 0x4004, 1 + compare 0x4004, 1 goto_if_eq LinkContestRoom1_EventScript_1A57EF applymovement 8, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -670,7 +670,7 @@ LinkContestRoom1_EventScript_1A57EF:: @ 81A57EF return LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 - compare_var_to_imm 0x4005, 1 + compare 0x4005, 1 goto_if_eq LinkContestRoom1_EventScript_1A5813 applymovement 9, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -683,7 +683,7 @@ LinkContestRoom1_EventScript_1A5813:: @ 81A5813 return LinkContestRoom1_EventScript_1A5814:: @ 81A5814 - compare_var_to_imm 0x4006, 1 + compare 0x4006, 1 goto_if_eq LinkContestRoom1_EventScript_1A5837 applymovement 10, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -696,7 +696,7 @@ LinkContestRoom1_EventScript_1A5837:: @ 81A5837 return LinkContestRoom1_EventScript_1A5838:: @ 81A5838 - compare_var_to_imm 0x4007, 1 + compare 0x4007, 1 goto_if_eq LinkContestRoom1_EventScript_1A585B applymovement 11, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -709,7 +709,7 @@ LinkContestRoom1_EventScript_1A585B:: @ 81A585B return LinkContestRoom1_EventScript_1A585C:: @ 81A585C - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 goto_if_eq LinkContestRoom1_EventScript_1A587F applymovement 15, LinkContestRoom1_Movement_1A5D8D playse 21 @@ -782,7 +782,7 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE return LinkContestRoom1_EventScript_1A5930:: @ 81A5930 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5944 msgbox LinkContestRoom1_Text_1A6AF5, 3 return @@ -809,7 +809,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A return LinkContestRoom1_EventScript_1A5984:: @ 81A5984 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5998 msgbox LinkContestRoom1_Text_1A6C06, 4 return @@ -821,7 +821,7 @@ LinkContestRoom1_EventScript_1A5998:: @ 81A5998 return LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A59B6 msgbox LinkContestRoom1_Text_1A6C21, 4 return @@ -833,7 +833,7 @@ LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 return LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A59D4 msgbox LinkContestRoom1_Text_1A6C9D, 4 return @@ -845,7 +845,7 @@ LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 return LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A59F2 msgbox LinkContestRoom1_Text_1A6D16, 4 return @@ -895,7 +895,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 return LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5A89 msgbox LinkContestRoom1_Text_1A6D3C, 4 return @@ -908,7 +908,7 @@ LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 addvar 0x4001, 1 lockall - compare_var_to_imm 0x4088, 1 + compare 0x4088, 1 call_if 2, LinkContestRoom1_EventScript_1A5AE4 applymovement 9, LinkContestRoom1_Movement_1A5DB7 applymovement 12, LinkContestRoom1_Movement_1A5DBB @@ -918,7 +918,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 applymovement 11, LinkContestRoom1_Movement_1A5DBB applymovement 6, LinkContestRoom1_Movement_1A5DB3 applymovement 8, LinkContestRoom1_Movement_1A5DAF - compare_var_to_imm 0x4001, 4 + compare 0x4001, 4 goto_if 5, LinkContestRoom1_EventScript_1A5A90 delay 30 return @@ -993,7 +993,7 @@ LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 return LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB - compare_var_to_imm 0x4088, 5 + compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 checkflag 2 @@ -1007,7 +1007,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB call LinkContestRoom1_EventScript_1A5A90 delay 30 special sub_80C4CF8 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return @@ -1016,24 +1016,24 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 msgbox LinkContestRoom1_Text_1A6DF1, 3 delay 90 special sub_80C4CF8 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 specialvar RESULT, sub_80C4440 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C23 return LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 special sub_80C47C0 - compare_var_to_imm 0x8005, 3 + compare 0x8005, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C32 return LinkContestRoom1_EventScript_1A5C32:: @ 81A5C32 - compare_var_to_imm CONTEST_RANK, 3 + compare CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C41 setflag 2 return @@ -1053,7 +1053,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C delay 60 call LinkContestRoom1_EventScript_1A5C6A special sub_80C4CF8 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C64 closebutton return @@ -1065,7 +1065,7 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A special sub_80C496C special sub_80C47C0 - compare_var_to_var 0x8004, 0x8005 + compare 0x8004, 0x8005 goto_if_eq LinkContestRoom1_EventScript_1A5C7C return @@ -1111,19 +1111,19 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 special sub_80C47C0 - compare_var_to_imm 0x8005, 3 + compare 0x8005, 3 goto_if_eq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 return LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC - compare_var_to_imm 0x4088, 2 + compare 0x4088, 2 call_if 1, LinkContestRoom1_EventScript_1A5C42 inccounter GAME_STAT_WON_CONTEST specialvar RESULT, sub_80C4440 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D5B - compare_var_to_imm CONTEST_RANK, 3 + compare CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5D3B msgbox LinkContestRoom1_Text_1A6DF1, 3 return @@ -1135,7 +1135,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B giveitem ITEM_LUXURY_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D2D msgbox LinkContestRoom1_Text_1A6DF1, 3 return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index ed515d15b..62a2d6224 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -3,11 +3,11 @@ Route117_EventScript_1B222D:: @ 81B222D faceplayer special sp0B5_daycare specialvar RESULT, sp0B6_daycare - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_1B2262 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_EventScript_1B22E7 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq Route117_EventScript_1B22FE msgbox Route117_Text_1B25CB, 4 release @@ -15,10 +15,10 @@ Route117_EventScript_1B222D:: @ 81B222D Route117_EventScript_1B2262:: @ 81B2262 msgbox Route117_Text_1B2659, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B28C4, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 clearflag 134 @@ -28,7 +28,7 @@ Route117_EventScript_1B2262:: @ 81B2262 Route117_EventScript_1B2298:: @ 81B2298 specialvar RESULT, CalculatePlayerPartyCount - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if 5, Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 release @@ -48,7 +48,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 Route117_EventScript_1B22CD:: @ 81B22CD specialvar RESULT, sub_8042B4C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route117_EventScript_1B22DE return @@ -82,14 +82,14 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 lock faceplayer specialvar RESULT, sp0B6_daycare - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2407 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B242B - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq Route117_PokemonDayCare_EventScript_1B2558 msgbox Route117_PokemonDayCare_Text_1B28F2, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2A14, 4 release @@ -97,16 +97,16 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C specialvar RESULT, sub_8095B6C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 fadescreen 1 special ChooseSendDaycareMon waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 specialvar RESULT, sub_8095C10 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialvar 0x8005, sub_8042328 waitse @@ -116,7 +116,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C special Daycare_SendPokemon_Special inccounter GAME_STAT_USED_DAYCARE specialvar RESULT, sp0B6_daycare - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA release end @@ -128,7 +128,7 @@ Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0 Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -154,7 +154,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A specialvar RESULT, sub_80417B8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 5, Route117_PokemonDayCare_EventScript_1B2411 return @@ -163,26 +163,26 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B setvar 0x8004, 0 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 specialvar RESULT, CalculatePlayerPartyCount - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 specialvar RESULT, sp0B6_daycare setvar 0x8004, 0 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 special ShowDaycareLevelMenu waitstate copyvar 0x8004, RESULT - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 goto Route117_PokemonDayCare_EventScript_1B24A8 end @@ -190,14 +190,14 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 special sub_8041770 msgbox Route117_PokemonDayCare_Text_1B2B49, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 specialvar RESULT, sub_80B7CE8 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 release @@ -215,14 +215,14 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE msgbox Route117_PokemonDayCare_Text_1B2B93, 4 waitpokecry specialvar RESULT, sp0B6_daycare - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 goto Route117_PokemonDayCare_EventScript_1B23D0 end Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520 msgbox Route117_PokemonDayCare_Text_1B2A4F, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -264,7 +264,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 setvar 0x8004, 1 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release @@ -273,7 +273,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 @ 81B2591 special ShowDaycareLevelMenu waitstate - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 copyvar 0x8004, RESULT specialvar RESULT, sub_8041648 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index b8c284fec..cad2c6a48 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -202,11 +202,11 @@ Route120_EventScript_1AE582:: @ 81AE582 Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route111_EventScript_1AE5E0 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route111_EventScript_1AE5EB - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route111_EventScript_1AE5FD checkflag 1 goto_if_eq Route111_EventScript_1AE73A @@ -236,16 +236,16 @@ Route118_EventScript_1AE60F:: @ 81AE60F Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route111_EventScript_1AE5E0 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route111_EventScript_1AE5EB - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route111_EventScript_1AE5FD checkflag 1 goto_if_eq Route111_EventScript_1AE73A specialvar RESULT, GabbyAndTyGetLastQuote - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 specialvar RESULT, sub_80BDD18 @@ -300,14 +300,14 @@ Route111_EventScript_1AE6E5:: @ 81AE6E5 end Route111_EventScript_1AE6F3:: @ 81AE6F3 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 setvar 0x8004, 10 call Route111_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 special sub_80BDC14 diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index f373a76a6..01bdb7c31 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -67,9 +67,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB fadescreen 0 movespriteperm 1, 10, 12 reappear 1 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, MtChimney_EventScript_1B2D7D - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, MtChimney_EventScript_1B2D88 applymovement 255, MtChimney_Movement_1A083F waitmovement 0 @@ -79,9 +79,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B3FFE, 4 .endif closebutton - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, MtChimney_EventScript_1B2D93 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, MtChimney_EventScript_1B2D9E disappear 1 setflag 927 diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index 97871a9f5..eb912028a 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 checkflag 294 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 checkflag 1078 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 85531be99..f3c3c0aa0 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -31,7 +31,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 checkflag 239 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse 21 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index fe833b47c..29a89a620 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -63,7 +63,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 checkflag 240 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A checkflag 241 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 @@ -95,7 +95,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 checkflag 242 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 @@ -111,7 +111,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 checkflag 243 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 4f3e0f099..cc9074e35 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -10,11 +10,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 setvar 0x4001, 1 getplayerxy 0x4002, 0x4003 setvar 0x4004, 1 - compare_var_to_imm 0x4002, 21 + compare 0x4002, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 - compare_var_to_imm 0x4002, 36 + compare 0x4002, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F - compare_var_to_imm 0x4003, 2 + compare 0x4003, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 switch 0x4004 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B @@ -44,7 +44,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setanimation 2, 0 doanimation 54 specialvar RESULT, sub_810F4D4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B checkanimation 54 delay 10 @@ -55,10 +55,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 specialvar RESULT, sub_810F488 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B checkanimation 54 delay 10 @@ -78,7 +78,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setanimation 2, 0 doanimation 54 specialvar RESULT, sub_810F4FC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B checkanimation 54 delay 10 @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setanimation 2, 0 doanimation 54 specialvar RESULT, sub_810F4B0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B checkanimation 54 delay 10 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 4feecded6..5e8ab1062 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -4,7 +4,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 end @@ -17,7 +17,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 end diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 26570cd66..9d4fbc844 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmaptile 12, 0, 519, 0 setmaptile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar 0x4000, 1 - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 applymovement 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index bd4f4ecd1..61b2da5e7 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -18,7 +18,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C checkflag 237 goto_if_eq BattleTower_Lobby_EventScript_1602CD specialvar 0x8007, sub_810F404 - compare_var_to_imm 0x8007, 50 + compare 0x8007, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC @@ -26,7 +26,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialvar 0x8007, sub_810F404 - compare_var_to_imm 0x8007, 100 + compare 0x8007, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC @@ -77,10 +77,10 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 waittext setvar 0x8004, 0 special sub_81358A4 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special sub_8135E50 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waittext @@ -91,7 +91,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar 0x8004, 8 special sub_81358A4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waittext @@ -118,7 +118,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitfanfare setvar 0x8004, 9 special sub_81358A4 - compare_var_to_imm RESULT, 49 + compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -186,7 +186,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E faceplayer setvar 0x8004, 0 special sub_81358A4 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty msgbox BattleTower_Lobby_Text_199F2C, 4 @@ -209,7 +209,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D setvar 0x8004, 1 copyvar 0x8005, RESULT @@ -219,7 +219,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA fadescreen 1 special ChooseBattleTowerPlayerParty waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16064F msgbox BattleTower_Lobby_Text_199FDA, 5 switch RESULT @@ -245,7 +245,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 call S_DoSaveDialog setvar 0x4000, 5 hidebox 0, 0, 15, 10 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 inccounter GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty @@ -347,9 +347,9 @@ BattleTower_Lobby_EventScript_1606CC:: @ 81606CC call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160701 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_16070B end @@ -394,7 +394,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar 0x8008, 42 givedecoration 42 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 237 msgbox BattleTower_Lobby_Text_19ABAA, 4 @@ -403,12 +403,12 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 BattleTower_Lobby_EventScript_160773:: @ 8160773 specialvar RESULT, sub_810F404 - compare_var_to_imm RESULT, 100 + compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar 0x8008, 43 givedecoration 43 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 238 msgbox BattleTower_Lobby_Text_19ABAA, 4 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 2f88db2db..f577f39fa 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -13,7 +13,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 faceplayer msgbox BattleTower_Outside_Text_199D06, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D waittext @@ -36,7 +36,7 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 BattleTower_Outside_EventScript_1601D0:: @ 81601D0 msgbox BattleTower_Outside_Text_199DF2, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 @@ -47,7 +47,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 BattleTower_Outside_EventScript_1601FB:: @ 81601FB msgbox BattleTower_Outside_Text_199E0E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 4d27844a7..dcd97f069 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -66,7 +66,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 waitstate clearflag 2145 specialvar RESULT, sub_810E300 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag 816 setflag 855 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index f8265d1cf..09835c0b9 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -43,7 +43,7 @@ DewfordTown_EventScript_14E06B:: @ 814E06B DewfordTown_EventScript_14E076:: @ 814E076 msgbox DewfordTown_Text_16B3BC, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release @@ -77,9 +77,9 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 checkflag 257 goto_if_eq DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E0F0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E111 end @@ -100,9 +100,9 @@ DewfordTown_EventScript_14E11B:: @ 814E11B message DewfordTown_Text_16B84E waittext multichoice 20, 8, 50, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E13D - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E147 end @@ -599,9 +599,9 @@ DewfordTown_EventScript_14E413:: @ 814E413 faceplayer call DewfordTown_EventScript_1A0102 msgbox DewfordTown_Text_16B9CE, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E439 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E443 end @@ -616,15 +616,15 @@ DewfordTown_EventScript_14E443:: @ 814E443 call DewfordTown_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E46E - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E485 end DewfordTown_EventScript_14E46E:: @ 814E46E inccounter GAME_STAT_STARTED_TRENDS - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 8f57e549a..034bca1bc 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -11,11 +11,11 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar 0x8001, 0x8000 - compare_var_to_imm 0x8000, 0 + compare 0x8000, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare_var_to_imm 0x8000, 1 + compare 0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare_var_to_imm 0x8000, 2 + compare 0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -42,14 +42,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - compare_var_to_var 0x8000, 0x8001 + compare 0x8000, 0x8001 goto_if_eq DewfordTown_Gym_EventScript_1530F5 copyvar 0x8001, 0x8000 - compare_var_to_imm 0x8000, 1 + compare 0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare_var_to_imm 0x8000, 2 + compare 0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare_var_to_imm 0x8000, 3 + compare 0x8000, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -115,7 +115,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag 1204 setflag 2056 addvar 0x4085, 1 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 @@ -124,7 +124,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 giveitem ITEM_TM08 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 setflag 166 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 0b19ef92d..78b5f5044 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -6,7 +6,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 faceplayer call DewfordTown_Hall_EventScript_1A0102 special sub_80FA5E4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 release @@ -31,9 +31,9 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD call DewfordTown_Hall_EventScript_1A0102 special sub_80EB83C msgbox DewfordTown_Hall_Text_1755F9, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532F6 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_153300 end @@ -191,14 +191,14 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD applymovement 8, DewfordTown_Hall_Movement_153599 waitmovement 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end DewfordTown_Hall_EventScript_15351E:: @ 815351E - compare_var_to_imm FACING, 4 + compare FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1534FC applymovement 255, DewfordTown_Hall_Movement_1A0843 waitmovement 0 @@ -210,16 +210,16 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 applymovement 7, DewfordTown_Hall_Movement_15359B waitmovement 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end DewfordTown_Hall_EventScript_153556:: @ 8153556 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, DewfordTown_Hall_EventScript_15356D - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, DewfordTown_Hall_EventScript_153578 return @@ -234,7 +234,7 @@ DewfordTown_Hall_EventScript_153578:: @ 8153578 return DewfordTown_Hall_EventScript_153583:: @ 8153583 - compare_var_to_imm FACING, 3 + compare FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1534FC applymovement 255, DewfordTown_Hall_Movement_1A083F waitmovement 0 @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem ITEM_TM36 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag 230 release diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index b3b3eef34..befe47404 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -8,7 +8,7 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem ITEM_SILK_SCARF - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B setflag 289 release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 45df01e78..669da34f9 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -53,16 +53,16 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 closebutton playse 8 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 reappear 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB end @@ -128,9 +128,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closebutton applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index a283c4c2a..ee171824f 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 checkflag 1248 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 - compare_var_to_imm 0x409c, 4 + compare 0x409c, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E end diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index f00f82f2e..8ebf7939f 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 checkflag 1247 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE - compare_var_to_imm 0x409c, 3 + compare 0x409c, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 0bb327fd4..d0fb7922f 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -44,9 +44,9 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 setvar 0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D end diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 2b5266ade..b8fe90a01 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F checkflag 1246 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 - compare_var_to_imm 0x409c, 2 + compare 0x409c, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 93f9c5fcb..f15f05904 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -50,9 +50,9 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 checkflag 263 goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4000, 11 + compare 0x4000, 11 call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 - compare_var_to_imm 0x4000, 8 + compare 0x4000, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waittext diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 564b2b806..3f472ca3f 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F checkflag 1245 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 - compare_var_to_imm 0x409c, 1 + compare 0x409c, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 1971593cb..0228fe25d 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -11,7 +11,7 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 checkflag 229 goto_if_eq FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_House1_EventScript_153BDA msgbox FallarborTown_House1_Text_177755, 4 release @@ -22,11 +22,11 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA call_if 0, FallarborTown_House1_EventScript_153C2D checkflag 2 call_if 1, FallarborTown_House1_EventScript_153C3E - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem ITEM_TM27 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 call FallarborTown_House1_EventScript_1A067F diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index f25f02da5..3b215a697 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -14,7 +14,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_House2_EventScript_153D60 msgbox FallarborTown_House2_Text_177BDB, 5 switch RESULT @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special sub_80F9A4C waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special sub_8132670 waitstate - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 removeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index c63273d5b..e0bac8007 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -57,7 +57,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9CF msgbox FortreeCity_Text_167868, 4 release @@ -65,7 +65,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 FortreeCity_EventScript_14C9CF:: @ 814C9CF msgbox FortreeCity_Text_16788B, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9E4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index d601aabab..8744141cb 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -37,7 +37,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E giveitem ITEM_TM40 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 setflag 170 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index d21b82e51..3809e1f01 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -11,17 +11,17 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox FortreeCity_House1_Text_18568C, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar 0x8005, 0x800a specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT - compare_var_to_var RESULT, 0x8009 + compare RESULT, 0x8009 goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index ce1dd2344..f210dd3ac 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -22,7 +22,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 giveitem ITEM_TM10 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag 264 msgbox FortreeCity_House2_Text_18652F, 4 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index f13b29249..f7f8391d4 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -35,7 +35,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 giveitem ITEM_MENTAL_HERB - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B setflag 223 releaseall diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index ed6a1a784..06f234f28 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -10,17 +10,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA setflag 189 msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem ITEM_TM47 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, GraniteCave_StevensRoom_EventScript_15CC78 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D playse 9 disappear 1 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index e5782b63e..7a13cbe78 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -17,9 +17,9 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall setflag 0x4000 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq InsideOfTruck_EventScript_15FC68 end diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 98b367006..6f910d0ad 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -8,7 +8,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 end JaggedPass_MapScript1_15D274:: @ 815D274 - compare_var_to_imm 0x40bd, 1 + compare 0x40bd, 1 call_if 1, JaggedPass_EventScript_15D280 end @@ -25,7 +25,7 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 end @@ -38,7 +38,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index d35fcaae5..d24280efa 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -9,7 +9,7 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 - compare_var_to_imm 0x4053, 2 + compare 0x4053, 2 call_if 1, LavaridgeTown_EventScript_14E4D0 end @@ -44,16 +44,16 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED applymovement 8, LavaridgeTown_Movement_1A0835 waitmovement 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E68F checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -70,14 +70,14 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 faceplayer setvar 0x8008, 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -99,22 +99,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closebutton - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E64E disappear 8 reappear 7 delay 30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 disappear 7 setvar 0x4053, 2 savebgm 0 fadedefaultbgm - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end @@ -128,13 +128,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 return LavaridgeTown_EventScript_14E64E:: @ 814E64E - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LavaridgeTown_EventScript_14E67B - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, LavaridgeTown_EventScript_14E680 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LavaridgeTown_EventScript_14E685 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LavaridgeTown_EventScript_14E68A return @@ -165,13 +165,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A return LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LavaridgeTown_EventScript_14E6D2 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, LavaridgeTown_EventScript_14E6D2 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LavaridgeTown_EventScript_14E6DD - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LavaridgeTown_EventScript_14E6D2 return @@ -237,7 +237,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E LavaridgeTown_EventScript_14E710:: @ 814E710 specialvar RESULT, player_get_direction_lower_nybble - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E721 end @@ -275,10 +275,10 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A checkflag 266 goto_if_eq LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E7B2 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag 266 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 68f93443a..e22d4471f 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -84,7 +84,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag 1213 setflag 2058 addvar 0x4085, 1 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 @@ -95,7 +95,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 giveitem ITEM_TM50 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 setflag 168 diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index bf148186a..c924684bc 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem ITEM_CHARCOAL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag 254 release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b8410429b..7031eb530 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -70,7 +70,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 random 10 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B setflag 2255 msgbox LilycoveCity_Text_1C5B1D, 4 @@ -248,9 +248,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 lock faceplayer checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_EventScript_14CDD3 end @@ -260,7 +260,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 call_if 1, LilycoveCity_EventScript_14CDB0 checkflag 286 call_if 0, LilycoveCity_EventScript_14CDB9 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch 0x4023 @@ -291,7 +291,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 call_if 1, LilycoveCity_EventScript_14CE23 checkflag 286 call_if 0, LilycoveCity_EventScript_14CE2C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch 0x4023 @@ -351,9 +351,9 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 setvar RESULT, 0 checkflag 2060 call_if 1, LilycoveCity_EventScript_14CEDE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 clearflag 722 clearflag 849 @@ -388,9 +388,9 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 setvar RESULT, 0 checkflag 2060 call_if 1, LilycoveCity_EventScript_14CEDE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CF50 clearflag 760 goto LilycoveCity_EventScript_14CF6B diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index d775fd440..1020e9d2b 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -31,9 +31,9 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 showcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -44,7 +44,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE special sub_80C4CEC setvar 0x4099, 0 specialvar RESULT, GiveMonArtistRibbon - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 @@ -56,7 +56,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton @@ -205,9 +205,9 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A fadescreen 1 showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end @@ -217,7 +217,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE special sub_80C4CEC setvar 0x4099, 0 specialvar RESULT, GiveMonArtistRibbon - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 @@ -229,7 +229,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton @@ -305,7 +305,7 @@ LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall checkitem ITEM_CONTEST_PASS, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA checkflag 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE @@ -328,11 +328,11 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog hidebox 0, 0, 15, 9 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 setflag 3 return @@ -361,18 +361,18 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestpkmn - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4 - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2 end @@ -420,11 +420,11 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 copyvar 0x8004, RESULT special sub_808363C waitstate - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90 - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 message2 LilycoveCity_ContestLobby_Text_18872A waittext @@ -569,7 +569,7 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 98aec1d7a..0a51aff26 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -9,7 +9,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 checkflag 2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialvar RESULT, sub_8090FC0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index fdf1c76e3..43f110577 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 setdynamicwarp LilycoveCity_DepartmentStore_1F, 255, 2, 1 - compare_var_to_imm 0x4043, 0 + compare 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 0 @@ -31,7 +31,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 setdynamicwarp LilycoveCity_DepartmentStore_2F, 255, 2, 1 - compare_var_to_imm 0x4043, 1 + compare 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 1 @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 setdynamicwarp LilycoveCity_DepartmentStore_3F, 255, 2, 1 - compare_var_to_imm 0x4043, 2 + compare 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 2 @@ -49,7 +49,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B setdynamicwarp LilycoveCity_DepartmentStore_4F, 255, 2, 1 - compare_var_to_imm 0x4043, 3 + compare 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 3 @@ -58,7 +58,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E setdynamicwarp LilycoveCity_DepartmentStore_5F, 255, 2, 1 - compare_var_to_imm 0x4043, 4 + compare 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 3295bf6ee..b01d74129 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -4,9 +4,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 event_96 3 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end @@ -52,7 +52,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 lock faceplayer event_96 3 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release @@ -127,22 +127,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace 0x4000, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 nop @@ -154,10 +154,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 @@ -166,10 +166,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 4ee36a21d..311dac1ab 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -9,12 +9,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer dodailyevents - compare_var_to_imm 0x4045, 0 + compare 0x4045, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag 2250 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag 2250 message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 @@ -33,24 +33,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 inccounter GAME_STAT_WON_POKEMON_LOTTERY - compare_var_to_imm 0x8006, 0 + compare 0x8006, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 bufferitem 0, 0x8005 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 giveitem 0x8005 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end @@ -112,7 +112,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 giveitem 0x4045 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 release diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 8998d6268..94b2d53a9 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -10,7 +10,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 lock faceplayer checkitem ITEM_EON_TICKET, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_Harbor_EventScript_1599EE goto LilycoveCity_Harbor_EventScript_1598BA end @@ -25,7 +25,7 @@ LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD msgbox LilycoveCity_Harbor_Text_18B36F, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 waittext @@ -48,7 +48,7 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A @@ -59,7 +59,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 LilycoveCity_Harbor_EventScript_15995B:: @ 815995B msgbox LilycoveCity_Harbor_Text_18B499, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp BattleTower_Outside, 255, 19, 23 @@ -80,9 +80,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 13, 10 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 spriteinvisible 255, 0, 0 @@ -129,9 +129,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE waitmovement 0 delay 30 disappear 4 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 spriteinvisible 255, 0, 0 diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index cbf015eb3..d3399f5ac 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem ITEM_TM44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag 234 msgbox LilycoveCity_House2_Text_18B883, 4 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 452c0567f..fa5a30862 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -11,7 +11,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 lock faceplayer msgbox LilycoveCity_House3_Text_18B8CC, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closebutton diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 7611b0ef5..db55695e6 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 waittext multichoice 20, 8, 16, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F end @@ -23,9 +23,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 6fb0f07b1..f63068d74 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -125,7 +125,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 givedecoration 44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag 236 closebutton diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 978eb6569..02558e9d3 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,19 +16,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special sub_80F9A0C waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 special sub_80F9EEC fadescreen 0 - compare_var_to_imm 0x8005, 4 + compare 0x8005, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index eb1882043..4d6401502 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -61,9 +61,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 - compare_var_to_imm 0x4095, 1 + compare 0x4095, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 - compare_var_to_imm 0x4095, 2 + compare 0x4095, 2 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 end @@ -71,35 +71,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 setvar 0x8004, 8 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar 0x8004, 9 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar 0x8004, 10 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar 0x8004, 11 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar 0x8004, 12 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar 0x8004, 13 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar 0x8004, 14 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar 0x8004, 15 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -148,13 +148,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F faceplayer setvar 0x8004, 13 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 release @@ -162,7 +162,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 release @@ -188,13 +188,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 faceplayer setvar 0x8004, 8 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 release @@ -202,7 +202,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 release @@ -228,13 +228,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D faceplayer setvar 0x8004, 9 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 release @@ -242,7 +242,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 release @@ -268,13 +268,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 faceplayer setvar 0x8004, 10 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 release @@ -282,7 +282,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 release @@ -309,10 +309,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B setvar 0x8004, 11 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 release @@ -320,7 +320,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 release @@ -342,10 +342,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D setvar 0x8004, 12 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 release @@ -353,7 +353,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 release @@ -375,10 +375,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF setvar 0x8004, 14 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 release @@ -386,7 +386,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 release @@ -408,10 +408,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 setvar 0x8004, 15 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 release @@ -419,7 +419,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index e3f9b1dc7..0f1dc96d9 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -5,19 +5,19 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag 2063 - compare_var_to_imm 0x4092, 2 + compare 0x4092, 2 call_if 1, LittlerootTown_EventScript_14D57B checkflag 82 call_if 0, LittlerootTown_EventScript_14D583 - compare_var_to_imm 0x4050, 3 + compare 0x4050, 3 call_if 1, LittlerootTown_EventScript_14D5A6 - compare_var_to_imm 0x4082, 4 + compare 0x4082, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare_var_to_imm 0x408c, 4 + compare 0x408c, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare_var_to_imm 0x40c7, 1 + compare 0x40c7, 1 call_if 1, LittlerootTown_EventScript_14D567 - compare_var_to_imm 0x408d, 3 + compare 0x408d, 3 call_if 1, LittlerootTown_EventScript_14D563 end @@ -40,7 +40,7 @@ LittlerootTown_EventScript_14D57B:: @ 814D57B return LittlerootTown_EventScript_14D583:: @ 814D583 - compare_var_to_imm 0x4050, 0 + compare 0x4050, 0 goto_if_eq LittlerootTown_EventScript_14D59A movespriteperm 1, 10, 1 spritebehave 1, 7 @@ -55,9 +55,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 clearflag 752 spritebehave 4, 8 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D5C5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D5CD return @@ -191,7 +191,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF goto_if_eq LittlerootTown_EventScript_14D72F checkflag 82 goto_if_eq LittlerootTown_EventScript_14D722 - compare_var_to_imm 0x4050, 0 + compare 0x4050, 0 goto_if 5, LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release @@ -334,9 +334,9 @@ LittlerootTown_EventScript_14D7FF:: @ 814D7FF LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D822 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D82B releaseall end @@ -352,9 +352,9 @@ LittlerootTown_EventScript_14D82B:: @ 814D82B LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D84E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D857 releaseall end @@ -407,27 +407,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D93C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D947 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closebutton checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D952 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14DAAA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DC50 return @@ -842,9 +842,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock faceplayer checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 7f3f3f5cf..e878d7e2e 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 checkflag 274 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 @@ -18,7 +18,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 return @@ -27,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A - compare_var_to_imm 0x4092, 3 + compare 0x4092, 3 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 - compare_var_to_imm 0x4092, 5 + compare 0x4092, 5 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 61b981995..3b39fe2ed 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -6,7 +6,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF checkflag 130 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE - compare_var_to_imm 0x4092, 4 + compare 0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 @@ -23,16 +23,16 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 end @ 81527F1 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152814 end @@ -51,9 +51,9 @@ gUnknown_0815281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15285D end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 022e98b2a..9b5a372fa 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E checkflag 274 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 @@ -18,7 +18,7 @@ LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 checkgender - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE return @@ -27,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 - compare_var_to_imm 0x4092, 3 + compare 0x4092, 3 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 - compare_var_to_imm 0x4092, 5 + compare 0x4092, 5 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 end @@ -117,9 +117,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 @ 81529C7 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -139,7 +139,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag 301 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 - compare_var_to_imm 0x408d, 3 + compare 0x408d, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index cf2033919..712bebf03 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -6,7 +6,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B checkflag 130 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A - compare_var_to_imm 0x4092, 4 + compare 0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 @@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 checkgender - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 end @@ -33,9 +33,9 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D checkflag 292 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse 9 disappear LAST_TALKED @@ -57,11 +57,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closebutton - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F return @@ -91,11 +91,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closebutton - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA return @@ -113,9 +113,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag 293 releaseall @@ -194,9 +194,9 @@ gUnknown_08152C39:: @ 8152C39 LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index d6576be92..834ae8521 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -30,9 +30,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE playfanfare 370 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end @@ -44,9 +44,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -59,9 +59,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -85,7 +85,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer - compare_var_to_imm 0x4084, 3 + compare 0x4084, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 checkflag 88 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 @@ -109,7 +109,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A faceplayer checkflag 896 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F - compare_var_to_imm 0x4084, 5 + compare 0x4084, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 release @@ -124,9 +124,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 waitmovement 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 setflag 116 @@ -139,7 +139,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem ITEM_POKE_BALL, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 setvar RESULT, 0 @@ -148,7 +148,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem ITEM_POKE_BALL, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 setvar RESULT, 1 @@ -188,9 +188,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 lock faceplayer checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 6ebd36749..5dd9983f4 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -105,9 +105,9 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 end MauvilleCity_EventScript_14C154:: @ 814C154 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MauvilleCity_EventScript_14C23C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_14C285 closebutton switch FACING @@ -286,7 +286,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 faceplayer checkflag 209 goto_if_eq MauvilleCity_EventScript_14C368 - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 goto_if_eq MauvilleCity_EventScript_14C33C checkflag 208 goto_if_eq MauvilleCity_EventScript_14C332 @@ -305,7 +305,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 giveitem ITEM_TM24 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag 209 msgbox MauvilleCity_Text_166488, 4 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index b418e8a79..0b577885e 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -10,17 +10,17 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end @@ -64,19 +64,19 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E msgbox MauvilleCity_BikeShop_Text_1813A0, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_15688D - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D msgbox MauvilleCity_BikeShop_Text_1813D4, 4 checkitem ITEM_ACRO_BIKE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9 checkitem ITEM_MACH_BIKE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA msgbox MauvilleCity_BikeShop_Text_181498, 4 release diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index bc49cd481..6e9b11947 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -6,7 +6,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 faceplayer msgbox MauvilleCity_GameCorner_Text_181C35, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 waittext @@ -33,10 +33,10 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins 16385 - compare_var_to_imm 0x4001, 9950 + compare 0x4001, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 50 paymoney 0x3e8, 0 @@ -52,10 +52,10 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins 16385 - compare_var_to_imm 0x4001, 9500 + compare 0x4001, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 500 paymoney 0x2710, 0 @@ -100,7 +100,7 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156B88 release end @@ -144,7 +144,7 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156C46 @@ -154,11 +154,11 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 - compare_var_to_imm 0x4002, 1000 + compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 88 checkdecor 88 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 88 @@ -170,11 +170,11 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 - compare_var_to_imm 0x4002, 1000 + compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 89 checkdecor 89 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 89 @@ -186,11 +186,11 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 - compare_var_to_imm 0x4002, 1000 + compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 90 checkdecor 90 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 90 @@ -221,7 +221,7 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156D36 release end @@ -277,7 +277,7 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156E3C @@ -289,10 +289,10 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins 16386 - compare_var_to_imm 0x4002, 1500 + compare 0x4002, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 1500 additem ITEM_TM32, 1 @@ -304,10 +304,10 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins 16386 - compare_var_to_imm 0x4002, 3500 + compare 0x4002, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 3500 additem ITEM_TM29, 1 @@ -319,10 +319,10 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins 16386 - compare_var_to_imm 0x4002, 4000 + compare 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM35, 1 @@ -334,10 +334,10 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins 16386 - compare_var_to_imm 0x4002, 4000 + compare 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM24, 1 @@ -349,10 +349,10 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins 16386 - compare_var_to_imm 0x4002, 4000 + compare 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM13, 1 @@ -392,7 +392,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 checkflag 226 goto_if_eq MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch 0x4023 case 0, MauvilleCity_GameCorner_EventScript_156FDB @@ -403,7 +403,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB bufferdecor 1, 88 checkdecor 88 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 88 @@ -414,7 +414,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 bufferdecor 1, 89 checkdecor 89 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 89 @@ -425,7 +425,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F bufferdecor 1, 90 checkdecor 90 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 90 @@ -453,7 +453,7 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C lock faceplayer checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_15709C msgbox MauvilleCity_GameCorner_Text_18201E, 4 goto MauvilleCity_GameCorner_EventScript_157108 @@ -463,7 +463,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag 225 goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA checkcoins 16385 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag 225 givecoins 20 @@ -522,7 +522,7 @@ MauvilleCity_GameCorner_EventScript_157125:: @ 8157125 MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialvar RESULT, sub_810F424 @@ -533,7 +533,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialvar RESULT, sub_810F424 @@ -544,7 +544,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialvar RESULT, sub_810F424 @@ -555,7 +555,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialvar RESULT, sub_810F424 @@ -566,7 +566,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialvar RESULT, sub_810F424 @@ -577,7 +577,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialvar RESULT, sub_810F424 @@ -588,7 +588,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialvar RESULT, sub_810F424 @@ -599,7 +599,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialvar RESULT, sub_810F424 @@ -610,7 +610,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialvar RESULT, sub_810F424 @@ -621,7 +621,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialvar RESULT, sub_810F424 @@ -632,7 +632,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialvar RESULT, sub_810F424 @@ -643,7 +643,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialvar RESULT, sub_810F424 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 1030d8f68..e5791d521 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -71,7 +71,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag 167 goto_if 0, MauvilleCity_Gym_EventScript_15661D - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 release @@ -85,7 +85,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag 1208 setflag 2057 addvar 0x4085, 1 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB setvar 0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 @@ -97,7 +97,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB MauvilleCity_Gym_EventScript_15661D:: @ 815661D giveitem ITEM_TM34 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 setflag 167 @@ -113,7 +113,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare_var_to_imm 0x4093, 1 + compare 0x4093, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 1 setvar 0x8004, 0 @@ -124,7 +124,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare_var_to_imm 0x4093, 2 + compare 0x4093, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 2 setvar 0x8004, 1 @@ -135,7 +135,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare_var_to_imm 0x4093, 3 + compare 0x4093, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 3 setvar 0x8004, 2 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 3f9ba59f3..a500a246e 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -8,7 +8,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 goto_if_eq MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_1572E5 release end @@ -20,9 +20,9 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 waitmovement 0 msgbox MauvilleCity_House2_Text_1824D8, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_15731B - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_House2_EventScript_157347 end diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index a5c89055b..b3a0c51fe 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -4,7 +4,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 end @@ -17,7 +17,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 end @@ -30,7 +30,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index cd5d9840f..44deb9d63 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -71,11 +71,11 @@ MossdeepCity_EventScript_14D027:: @ 814D027 checkflag 276 goto_if_eq MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem ITEM_KINGS_ROCK - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B setflag 276 release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 8d889a7d6..7861d0c4d 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special sub_813601C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 end @@ -17,9 +17,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special sub_813601C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E - compare_var_to_imm 0x40c0, 0 + compare 0x40c0, 0 call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF end @@ -49,11 +49,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 moveoffscreen 1 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 - compare_var_to_imm 0x40c0, 1 + compare 0x40c0, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 - compare_var_to_imm 0x40c0, 2 + compare 0x40c0, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B - compare_var_to_imm 0x40c0, 3 + compare 0x40c0, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty setvar 0x40c0, 0 @@ -84,7 +84,7 @@ MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release @@ -94,28 +94,28 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty special sub_810F414 msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MossdeepCity_GameCorner_B1F, 255, 3, 1 waitstate diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 29400a80b..46b9dcfea 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -22,11 +22,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E setvar 0x8005, 0 special sub_813556C waitstate - compare_var_to_imm RESULT, 3 + compare RESULT, 3 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton special ScrSpecial_HealPlayerParty diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 838b7fd14..4365ba74a 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -73,7 +73,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 giveitem ITEM_TM04 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 setflag 171 diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index b6fe4fd6e..6098cc617 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -7,7 +7,7 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F bufferfirstpoke 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialvar RESULT, GetPokeblockNameByMonNature - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 release diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 660bc2c06..b8388376a 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B closebutton setflag 224 clearflag 933 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, MossdeepCity_House2_EventScript_15A8AE - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, MossdeepCity_House2_EventScript_15A8B9 disappear 3 release diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index b94e0ec19..8f9bf4dc5 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -7,7 +7,7 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 checkflag 152 goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem ITEM_SUPER_ROD diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 9b1b17c69..205f10313 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -19,7 +19,7 @@ MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 lock faceplayer special sub_80BB63C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_House4_EventScript_15AB6D special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_18E17E, 4 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index b328a6784..a407bd5b9 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -7,9 +7,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B dodailyevents specialvar RESULT, GetWeekCount buffernum 0, RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closebutton applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D @@ -36,7 +36,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem ITEM_SUN_STONE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag 192 msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 31a9efcea..aebb51c9c 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -14,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 - compare_var_to_imm 0x40c6, 1 + compare 0x40c6, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 end @@ -72,10 +72,10 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT disappear 2 @@ -86,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C givepokemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferpoke 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag 968 setflag 298 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 578743995..d206f927e 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -18,17 +18,17 @@ MtChimney_EventScript_15CF95:: @ 815CF95 showmoney 0, 0 nop msgbox MtChimney_Text_195760, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D018 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MtChimney_EventScript_15D000 giveitem ITEM_LAVA_COOKIE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoney 0, 0 release @@ -411,7 +411,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D checkflag 115 goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem ITEM_METEORITE @@ -441,7 +441,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 43dee22b4..8a66f75ee 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA .byte 0 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 - compare_var_to_imm 0x40a3, 1 + compare 0x40a3, 1 call_if 1, MtChimney_CableCarStation_EventScript_15C111 end @@ -32,9 +32,9 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B lock faceplayer msgbox MtChimney_CableCarStation_Text_19256A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtChimney_CableCarStation_EventScript_15C16C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 3f012780d..026d54bfe 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem ITEM_CLEANSE_TAG - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B setflag 282 release diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 5d650a8a6..433b533b3 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -4,7 +4,7 @@ MtPyre_6F_MapScripts:: @ 815D447 MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 end diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 787315320..550f74d9a 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -8,7 +8,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C MtPyre_Exterior_EventScript_15D492:: @ 815D492 getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4001, 12 + compare 0x4001, 12 goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 44d0760df..e60c40cae 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -143,9 +143,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF .else msgbox MtPyre_Summit_Text_1B64B3, 5 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MtPyre_Summit_EventScript_15D611 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MtPyre_Summit_EventScript_15D61A release end @@ -189,9 +189,9 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A .else msgbox MtPyre_Summit_Text_1B6283, 5 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtPyre_Summit_EventScript_15D669 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -220,9 +220,9 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B .else msgbox MtPyre_Summit_Text_1B62E7, 5 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtPyre_Summit_EventScript_15D669 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -268,11 +268,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,11 +280,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D795 disappear 2 setvar 0x40b9, 3 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 7eb3769cc..6429ff2f9 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A .byte 0 NewMauville_Entrance_MapScript1_15E495:: @ 815E495 - compare_var_to_imm 0x40ba, 0 + compare 0x40ba, 0 call_if 1, NewMauville_Entrance_EventScript_15E4A1 end @@ -27,10 +27,10 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC waitmovement 0 msgbox NewMauville_Entrance_Text_1982C0, 4 checkitem ITEM_BASEMENT_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982D4, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmaptile 3, 0, 707, 0 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 4fdf02d15..ef016f261 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 815E55F .byte 0 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, NewMauville_Inside_EventScript_15E5DA - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 checkflag 2145 call_if 1, NewMauville_Inside_EventScript_15E58F @@ -23,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 call_if 1, NewMauville_Inside_EventScript_15E88B end @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 lockall - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 goto_if_eq NewMauville_Inside_EventScript_15E8F6 msgbox NewMauville_Inside_Text_198315, 4 releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 0afc63220..0ece240c6 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -76,7 +76,7 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 giveitem ITEM_POTION - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 setflag 132 @@ -257,9 +257,9 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 OldaleTown_EventScript_14DF92:: @ 814DF92 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DFAA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_EventScript_14DFB8 end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index e604a4f33..cef40ecd3 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -14,10 +14,10 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 call_if 0, PacifidlogTown_House2_EventScript_1541D7 setflag 300 specialvar RESULT, GetLeadMonFriendshipScore - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_1541EC specialvar RESULT, GetLeadMonFriendshipScore - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end @@ -26,7 +26,7 @@ PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag 299 goto_if 0, PacifidlogTown_House2_EventScript_1A14DC specialvar RESULT, sub_810F908 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -46,7 +46,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 giveitem ITEM_TM27 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 @@ -62,7 +62,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 giveitem ITEM_TM21 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index e39db3921..1edd445fc 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -11,17 +11,17 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar 0x8005, 0x800a specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT - compare_var_to_var RESULT, 0x8009 + compare RESULT, 0x8009 goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index bba0ede14..b7a6c9f86 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -13,9 +13,9 @@ PacifidlogTown_House4_EventScript_15435E:: @ 815435E lock faceplayer msgbox PacifidlogTown_House4_Text_17963D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PacifidlogTown_House4_EventScript_15437F - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House4_EventScript_154389 end diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index abbf81dd8..46b1990df 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5_EventScript_154394:: @ 8154394 lock faceplayer specialvar RESULT, IsMirageIslandPresent - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PacifidlogTown_House5_EventScript_1543B0 msgbox PacifidlogTown_House5_Text_179718, 4 release diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 4dca1fdb8..8b7d4f313 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -5,9 +5,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag 2070 - compare_var_to_imm 0x4057, 0 + compare 0x4057, 0 call_if 1, PetalburgCity_EventScript_14B731 - compare_var_to_imm 0x4057, 2 + compare 0x4057, 2 call_if 1, PetalburgCity_EventScript_14B739 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index f4598403f..1eff4d6c4 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 .byte 0 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 - compare_var_to_imm 0x4085, 7 + compare 0x4085, 7 call_if 4, PetalburgCity_Gym_EventScript_1544ED end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED return PetalburgCity_Gym_MapScript1_15451B:: @ 815451B - compare_var_to_imm 0x4085, 1 + compare 0x4085, 1 call_if 1, PetalburgCity_Gym_EventScript_15453B - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 checkflag 2052 call_if 1, PetalburgCity_Gym_EventScript_15454B @@ -144,65 +144,65 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E PetalburgCity_Gym_EventScript_154669:: @ 8154669 reappear 10 playse 8 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closebutton setflag 0x4001 playbgm 420, 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 disappear 10 setflag 728 @@ -352,7 +352,7 @@ PetalburgCity_Gym_EventScript_15493C:: @ 815493C PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag 169 goto_if 0, PetalburgCity_Gym_EventScript_154A2C @@ -364,15 +364,15 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D PetalburgCity_Gym_EventScript_154969:: @ 8154969 specialvar RESULT, IsEnigmaBerryValid - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkpcitem ITEM_ENIGMA_BERRY, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 - compare_var_to_imm 0x402d, 0 + compare 0x402d, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 setvar RESULT, 1 @@ -384,7 +384,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem ITEM_ENIGMA_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 release @@ -413,28 +413,28 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag 169 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154ABC - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, PetalburgCity_Gym_EventScript_154AC7 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, PetalburgCity_Gym_EventScript_154AD2 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154ADD delay 70 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154AE8 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, PetalburgCity_Gym_EventScript_154AF3 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, PetalburgCity_Gym_EventScript_154AFE - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release @@ -592,14 +592,14 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -622,14 +622,14 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -640,9 +640,9 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 setvar 0x8008, 7 setvar 0x8009, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -653,9 +653,9 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B setvar 0x8008, 1 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -666,9 +666,9 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E setvar 0x8008, 7 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -679,9 +679,9 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 setvar 0x8008, 1 setvar 0x8009, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -692,9 +692,9 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 setvar 0x8008, 1 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -705,9 +705,9 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 setvar 0x8008, 7 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -718,9 +718,9 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A setvar 0x8008, 1 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -731,9 +731,9 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D setvar 0x8008, 7 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -744,9 +744,9 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 setvar 0x8008, 1 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -757,9 +757,9 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 setvar 0x8008, 7 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -891,72 +891,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A setvar 0x8004, 1 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB setvar 0x8004, 2 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC setvar 0x8004, 3 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD setvar 0x8004, 4 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E setvar 0x8004, 5 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F setvar 0x8004, 6 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 setvar 0x8004, 7 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 setvar 0x8004, 8 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 25783cf33..a70035fef 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -28,17 +28,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 specialvar RESULT, IsStarterInParty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F release end PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F - compare_var_to_imm 0x4023, 0 + compare 0x4023, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 - compare_var_to_imm 0x4023, 1 + compare 0x4023, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B - compare_var_to_imm 0x4023, 2 + compare 0x4023, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 8f34eecc6..48eb53a50 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -91,7 +91,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 giveitem ITEM_GREAT_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D end @@ -245,7 +245,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem ITEM_MIRACLE_SEED - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B setflag 297 release @@ -272,7 +272,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 end diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 70b750aef..95a0a4a1f 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -20,7 +20,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 end diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 102d2aa0c..b46545050 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -10,9 +10,9 @@ Route103_MapScript1_14EB87:: @ 814EB87 Route103_EventScript_14EB92:: @ 814EB92 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route103_EventScript_14EBAB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EC04 end @@ -174,7 +174,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 end @@ -187,7 +187,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 end @@ -205,7 +205,7 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index d9f65a382..c954ac972 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -35,7 +35,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 246 msgbox Route104_Text_1C5665, 4 @@ -54,7 +54,7 @@ Route104_EventScript_14EF09:: @ 814EF09 goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 279 release @@ -108,7 +108,7 @@ Route104_EventScript_14EF93:: @ 814EF93 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 262 release @@ -410,7 +410,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -423,7 +423,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -436,7 +436,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 6428e018b..cc3dad35a 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag 2109 - compare_var_to_imm 0x4090, 1 + compare 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag 188 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 @@ -37,7 +37,7 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E setflag 147 msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -54,14 +54,14 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 msgbox Route104_MrBrineysHouse_Text_191CC3, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E msgbox Route104_MrBrineysHouse_Text_191DA6, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 44fb9a082..876af8650 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -25,18 +25,18 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag 127 msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -96,7 +96,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA random 8 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag 2256 msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 6a0eea00f..2ec903363 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -18,7 +18,7 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 end diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index 907ac93a2..b6973407b 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -9,7 +9,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index bd5116a43..45ff1d3ed 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -279,7 +279,7 @@ Route109_EventScript_14F680:: @ 814F680 Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 msgbox Route109_Text_16E0F9, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end @@ -332,7 +332,7 @@ Route109_EventScript_14F725:: @ 814F725 goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem ITEM_SOFT_SAND - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_EventScript_1A029B closebutton applymovement LAST_TALKED, Route109_Movement_1A083D @@ -397,7 +397,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 end @@ -410,7 +410,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 2a69242c2..789ee3e56 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -28,7 +28,7 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 giveitem ITEM_SODA_POP, 6 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag 140 release @@ -43,7 +43,7 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoney 0, 0 nop msgbox Route109_SeashoreHouse_Text_19B702, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoney 0, 0 @@ -52,10 +52,10 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A checkmoney 0x12c, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E9E checkitemspace ITEM_SODA_POP, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 paymoney 0x12c, 0 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index e4582e08e..56d4ff196 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -12,7 +12,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A0196 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 - compare_var_to_imm 0x40a9, 1 + compare 0x40a9, 1 call_if 1, Route110_EventScript_14F92F end @@ -132,7 +132,7 @@ Route110_EventScript_14FA25:: @ 814FA25 Route110_EventScript_14FA2E:: @ 814FA2E lockall specialvar RESULT, GetRecordedCyclingRoadResults - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 releaseall @@ -147,9 +147,9 @@ Route110_EventScript_14FA53:: @ 814FA53 lock faceplayer specialvar RESULT, GetPlayerAvatarBike - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FA84 - compare_var_to_imm 0x40a9, 0 + compare 0x40a9, 0 goto_if_eq Route110_EventScript_14FA7A msgbox Route110_Text_16F26A, 4 release @@ -178,7 +178,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 end @@ -206,7 +206,7 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 end @@ -224,7 +224,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 end @@ -237,7 +237,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 end @@ -326,9 +326,9 @@ Route110_EventScript_14FD29:: @ 814FD29 Route110_EventScript_14FD34:: @ 814FD34 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_EventScript_14FDA7 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route110_EventScript_14FDAC applymovement 28, Route110_Movement_1A0845 waitmovement 0 @@ -337,16 +337,16 @@ Route110_EventScript_14FD34:: @ 814FD34 applymovement 28, Route110_Movement_1A0835 waitmovement 0 delay 30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route110_EventScript_14FF14 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route110_EventScript_14FF1F - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, Route110_EventScript_14FF2A checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FE2B releaseall end @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closebutton - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route110_EventScript_14FF56 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route110_EventScript_14FF5E - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, Route110_EventScript_14FF66 spritebehave 28, 10 spritebehave 29, 10 disappear 28 reappear 29 delay 45 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route110_EventScript_14FF35 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route110_EventScript_14FF40 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, Route110_EventScript_14FF4B disappear 29 setvar 0x4069, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index c2900de22..a7db7e0ee 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -3,9 +3,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 .byte 0 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE - compare_var_to_imm 0x40a9, 3 + compare 0x40a9, 3 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 - compare_var_to_imm 0x40a9, 2 + compare 0x40a9, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end @@ -24,9 +24,9 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 @ Coord event directly in front of the gatesman heading left to right lockall specialvar RESULT, GetPlayerAvatarBike @ player state? - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag 2091 setvar 0x4001, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index c385a7bc9..1cb046a99 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -11,7 +11,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B lockall specialvar RESULT, GetPlayerAvatarBike - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag 2091 setvar 0x4001, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 61c0e65a6..f99869648 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 .byte 0 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161994 end @@ -61,7 +61,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_RARE_CANDY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -74,7 +74,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_TIMER_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -87,7 +87,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_HARD_STONE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -100,7 +100,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_SMOKE_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -113,7 +113,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_TM12 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -126,7 +126,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_MAGNET - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -139,7 +139,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_PP_MAX - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closebutton - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161C74 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route110_TrickHouseEnd_EventScript_161C7F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route110_TrickHouseEnd_EventScript_161C8A - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_161C95 delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 @@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF .else givedecoration 31 .endc - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 4e60c9fc1..129cc7d6a 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -6,17 +6,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B setflag 2114 - compare_var_to_imm 0x40b5, 1 + compare 0x40b5, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE - compare_var_to_imm 0x40c1, 1 + compare 0x40c1, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 - compare_var_to_imm 0x40a6, 1 + compare 0x40a6, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E - compare_var_to_imm 0x40a7, 5 + compare 0x40a7, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare_var_to_imm 0x40a7, 3 + compare 0x40a7, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare_var_to_imm 0x40a7, 0 + compare 0x40a7, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE switch 0x40a7 case 0, Route110_TrickHouseEntrance_EventScript_16109A @@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 setvar 0x40a5, 1 - compare_var_to_imm 0x4044, 8 + compare 0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 setvar 0x40a7, 2 end @@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE setvar 0x40a7, 0 - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_16103C - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_161046 - compare_var_to_imm 0x4044, 3 + compare 0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_161050 - compare_var_to_imm 0x4044, 4 + compare 0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_16105A - compare_var_to_imm 0x4044, 5 + compare 0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_161064 - compare_var_to_imm 0x4044, 6 + compare 0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_16106E - compare_var_to_imm 0x4044, 7 + compare 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_161078 - compare_var_to_imm 0x4044, 8 + compare 0x4044, 8 call_if 1, Route110_TrickHouseEntrance_EventScript_161082 return @@ -213,7 +213,7 @@ Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall delay 20 - compare_var_to_imm 0x4044, 0 + compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton @@ -248,21 +248,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4044, 0 + compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF - compare_var_to_imm 0x4044, 3 + compare 0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 - compare_var_to_imm 0x4044, 4 + compare 0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 - compare_var_to_imm 0x4044, 5 + compare 0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA - compare_var_to_imm 0x4044, 6 + compare 0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_161303 - compare_var_to_imm 0x4044, 7 + compare 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closebutton setvar 0x40a6, 1 @@ -351,27 +351,27 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA - compare_var_to_imm 0x4044, 3 + compare 0x4044, 3 goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 - compare_var_to_imm 0x4044, 4 + compare 0x4044, 4 goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 - compare_var_to_imm 0x4044, 5 + compare 0x4044, 5 goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E - compare_var_to_imm 0x4044, 6 + compare 0x4044, 6 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA - compare_var_to_imm 0x4044, 7 + compare 0x4044, 7 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE giveitem ITEM_RARE_CANDY - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -379,9 +379,9 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA giveitem ITEM_TIMER_BALL - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -389,9 +389,9 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 giveitem ITEM_HARD_STONE - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -399,9 +399,9 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 giveitem ITEM_SMOKE_BALL - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -409,9 +409,9 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E giveitem ITEM_TM12 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -419,9 +419,9 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA giveitem ITEM_MAGNET - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -429,9 +429,9 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 giveitem ITEM_PP_MAX - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -454,9 +454,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 .else givedecoration 31 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall @@ -495,7 +495,7 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 closebutton - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end @@ -577,7 +577,7 @@ Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 end Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 - compare_var_to_imm 0x4044, 8 + compare 0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 releaseall @@ -602,7 +602,7 @@ gUnknown_081616E1:: @ 81616E1 end Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 - compare_var_to_imm 0x40AB, 0 + compare 0x40AB, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 playse SE_PIN @@ -613,7 +613,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 end Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 - compare_var_to_imm 0x40AC, 0 + compare 0x40AC, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 playse SE_PIN @@ -624,7 +624,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 end Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 - compare_var_to_imm 0x40AD, 0 + compare 0x40AD, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 playse SE_PIN @@ -635,7 +635,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 end Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB - compare_var_to_imm 0x40AE, 0 + compare 0x40AE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 playse SE_PIN @@ -646,7 +646,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB end Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 - compare_var_to_imm 0x40AF, 0 + compare 0x40AF, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 playse SE_PIN @@ -657,7 +657,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 end Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D - compare_var_to_imm 0x40B0, 0 + compare 0x40B0, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 playse SE_PIN @@ -668,7 +668,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D end Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 - compare_var_to_imm 0x40B1, 0 + compare 0x40B1, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 playse SE_PIN @@ -679,7 +679,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 end Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F - compare_var_to_imm 0x40B2, 0 + compare 0x40B2, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 playse SE_PIN @@ -726,11 +726,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 lockall msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall - compare_var_to_imm 0x4044, 0 + compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_16190B setvar 0x40a5, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index d9536edde..3a89c2db1 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 .byte 0 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE - compare_var_to_imm 0x40ab, 2 + compare 0x40ab, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A end @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall - compare_var_to_imm 0x40ab, 0 + compare 0x40ab, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 goto Route110_TrickHousePuzzle1_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 6252a96d6..f71a9611a 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,13 +4,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 .byte 0 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F - compare_var_to_imm 0x4003, 1 + compare 0x4003, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 - compare_var_to_imm 0x4004, 1 + compare 0x4004, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end @@ -23,7 +23,7 @@ Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall - compare_var_to_imm 0x40ac, 0 + compare 0x40ac, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 goto Route110_TrickHousePuzzle2_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 705f52455..a50ecd3ce 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 - compare_var_to_imm 0x4009, 0 + compare 0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end @@ -31,19 +31,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmaptile 13, 7, 600, 0 setmaptile 1, 3, 600, 0 setmaptile 10, 2, 600, 0 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 - compare_var_to_imm 0x4008, 6 + compare 0x4008, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 - compare_var_to_imm 0x4008, 7 + compare 0x4008, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return @@ -302,19 +302,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar 0x4005, 0 setvar 0x4006, 0 setvar 0x4007, 0 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B - compare_var_to_imm 0x4008, 6 + compare 0x4008, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 - compare_var_to_imm 0x4008, 7 + compare 0x4008, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return @@ -347,14 +347,14 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 return Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare_var_to_imm 0x4009, 0 + compare 0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD - compare_var_to_imm 0x4009, 0 + compare 0x4009, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end @@ -370,7 +370,7 @@ Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall - compare_var_to_imm 0x40ad, 0 + compare 0x40ad, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD goto Route110_TrickHousePuzzle3_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 0bff3f526..0c9fc426f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall - compare_var_to_imm 0x40ae, 0 + compare 0x40ae, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 goto Route110_TrickHousePuzzle4_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index c99158dbd..dc3f9f725 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall - compare_var_to_imm 0x40af, 0 + compare 0x40af, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 goto Route110_TrickHousePuzzle5_EventScript_161892 end @@ -27,7 +27,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F @@ -37,7 +37,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 @@ -47,7 +47,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4003, 1 + compare 0x4003, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 @@ -57,7 +57,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4004, 1 + compare 0x4004, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B @@ -67,7 +67,7 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4005, 1 + compare 0x4005, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F @@ -165,11 +165,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 @@ -187,11 +187,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 @@ -209,11 +209,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 @@ -231,11 +231,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 @@ -253,11 +253,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 @@ -418,80 +418,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 end Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 - compare_var_to_imm 0x4009, 4 + compare 0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 - compare_var_to_imm 0x4009, 5 + compare 0x4009, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index e4ce617c9..ddf845142 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -17,7 +17,7 @@ Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall - compare_var_to_imm 0x40b0, 0 + compare 0x40b0, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC goto Route110_TrickHousePuzzle6_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index ae55a4316..3361e3e9d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -73,7 +73,7 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 - compare_var_to_imm 0x40b6, 1 + compare 0x40b6, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E clearflag 194 clearflag 195 @@ -86,7 +86,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E end Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F - compare_var_to_imm 0x40b6, 1 + compare 0x40b6, 1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 end @@ -100,7 +100,7 @@ Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall - compare_var_to_imm 0x40b1, 0 + compare 0x40b1, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D goto Route110_TrickHousePuzzle7_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index 1c6a9847f..5f0b00684 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall - compare_var_to_imm 0x40b2, 0 + compare 0x40b2, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E goto Route110_TrickHousePuzzle8_EventScript_161892 end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 35c60cf8f..617509938 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -22,15 +22,15 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4001, 34 + compare 0x4001, 34 goto_if 0, Route111_EventScript_15000C - compare_var_to_imm 0x4001, 107 + compare 0x4001, 107 goto_if 2, Route111_EventScript_15000C - compare_var_to_imm 0x4001, 72 + compare 0x4001, 72 goto_if 2, Route111_EventScript_150009 - compare_var_to_imm 0x4000, 2000 + compare 0x4000, 2000 goto_if 2, Route111_EventScript_15000C - compare_var_to_imm 0x4000, 8 + compare 0x4000, 8 goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 @@ -52,7 +52,7 @@ Route111_EventScript_15000D:: @ 815000D Route111_EventScript_150023:: @ 8150023 lockall msgbox Route111_Text_16FA54, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL closebutton @@ -74,7 +74,7 @@ Route111_EventScript_15005F:: @ 815005F Route111_EventScript_150069:: @ 8150069 lockall msgbox Route111_Text_16FAED, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL closebutton @@ -125,7 +125,7 @@ Route111_EventScript_1500C5:: @ 81500C5 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem ITEM_RAZZ_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1A029B setflag 2252 special GetPlayerBigGuyGirlString @@ -164,7 +164,7 @@ Route111_EventScript_150122:: @ 8150122 Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_150151 setvar 0x4003, 1 releaseall @@ -173,13 +173,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closebutton - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 call_if 1, Route111_EventScript_150188 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, Route111_EventScript_150193 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, Route111_EventScript_15019E - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, Route111_EventScript_1501A9 releaseall end @@ -238,7 +238,7 @@ Route111_EventScript_1501D1:: @ 81501D1 faceplayer setflag 2115 msgbox Route111_Text_16F705, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release @@ -393,7 +393,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 end @@ -421,7 +421,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 end @@ -434,7 +434,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 end diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index fdd0078ed..a33b436dc 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -10,9 +10,9 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB lock faceplayer msgbox Route111_OldLadysRestStop_Text_1923AF, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end @@ -21,9 +21,9 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC closebutton call Route111_OldLadysRestStop_EventScript_1A02CA msgbox Route111_OldLadysRestStop_Text_19244D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 7742d3507..ea70af41f 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem ITEM_MACHO_BRACE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag 277 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 70a6a2869..d0d464207 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -39,7 +39,7 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index dfa1fecd6..5254b7beb 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E warp6 Route112, 255, 28, 28 - compare_var_to_imm 0x40a3, 2 + compare 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end @@ -33,9 +33,9 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C lock faceplayer msgbox Route112_CableCarStation_Text_1924F5, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route112_CableCarStation_EventScript_15C0AD - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route112_CableCarStation_EventScript_15C0DC end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 06519867e..2eb34cdf3 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -14,9 +14,9 @@ Route113_MapScript1_1505DA:: @ 81505DA Route113_EventScript_1505E5:: @ 81505E5 getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4000, 19 + compare 0x4000, 19 goto_if 0, Route113_EventScript_150604 - compare_var_to_imm 0x4000, 84 + compare 0x4000, 84 goto_if 2, Route113_EventScript_150604 setweather 7 return @@ -61,7 +61,7 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 end @@ -74,7 +74,7 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 9774a3a5f..48c2965fd 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -4,7 +4,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag 2116 - compare_var_to_imm 0x40be, 1 + compare 0x40be, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end @@ -15,11 +15,11 @@ Route113_GlassWorkshop_EventScript_16355F:: @ 816355F Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer - compare_var_to_imm 0x40be, 10 + compare 0x40be, 10 goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 - compare_var_to_imm 0x40be, 2 + compare 0x40be, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 - compare_var_to_imm 0x40be, 1 + compare 0x40be, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 giveitem ITEM_SOOT_SACK @@ -35,10 +35,10 @@ Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 checkitem ITEM_SOOT_SACK, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 - compare_var_to_imm 0x4048, 250 + compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waittext @@ -70,10 +70,10 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 bufferitem 0, 0x8008 setvar 0x800a, 250 - compare_var_to_imm 0x4048, 250 + compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 10 subvar 0x4048, 250 @@ -84,10 +84,10 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 bufferitem 0, 0x8008 setvar 0x800a, 500 - compare_var_to_imm 0x4048, 500 + compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 11 subvar 0x4048, 500 @@ -98,10 +98,10 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 bufferitem 0, 0x8008 setvar 0x800a, 500 - compare_var_to_imm 0x4048, 500 + compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 12 subvar 0x4048, 500 @@ -112,10 +112,10 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 bufferitem 0, 0x8008 setvar 0x800a, 1000 - compare_var_to_imm 0x4048, 1000 + compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 13 subvar 0x4048, 1000 @@ -126,10 +126,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 bufferitem 0, 0x8008 setvar 0x800a, 1000 - compare_var_to_imm 0x4048, 1000 + compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 14 subvar 0x4048, 1000 @@ -141,10 +141,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8008, 13 bufferdecor 0, 0x8008 setvar 0x800a, 6000 - compare_var_to_imm 0x4048, 6000 + compare 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 15 subvar 0x4048, 6000 @@ -156,10 +156,10 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8008, 6 bufferdecor 0, 0x8008 setvar 0x800a, 8000 - compare_var_to_imm 0x4048, 8000 + compare 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 16 subvar 0x4048, 8000 @@ -201,9 +201,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare_var_to_imm 0x8009, 0 + compare 0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare_var_to_imm 0x8009, 1 + compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release @@ -211,13 +211,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 Route113_GlassWorkshop_EventScript_163889:: @ 8163889 giveitem 0x8008 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 givedecoration 0x8008 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -295,9 +295,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare_var_to_imm 0x8009, 0 + compare 0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare_var_to_imm 0x8009, 1 + compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 799a115b7..95d321e0b 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -12,7 +12,7 @@ Route114_EventScript_150733:: @ 8150733 addvar RESULT, 15 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 2251 msgbox Route114_Text_1C5861, 4 @@ -31,7 +31,7 @@ Route114_EventScript_150782:: @ 8150782 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 231 msgbox Route114_Text_1701C5, 4 @@ -88,7 +88,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -101,7 +101,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 3406a78f6..b217f24c4 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem ITEM_TM28 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag 261 release diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 71c627728..13843f758 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -7,10 +7,10 @@ Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F checkflag 267 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 msgbox Route114_FossilManiacsTunnel_Text_192795, 4 release diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index fbc4976ab..e4334647c 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -18,7 +18,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 .else givedecoration 100 .endif - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE setflag 131 release @@ -32,7 +32,7 @@ Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall msgbox Route114_LanettesHouse_Text_192B4A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall @@ -40,7 +40,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 64b0a7497..8e0eb7855 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -16,7 +16,7 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 end @@ -34,7 +34,7 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 end @@ -47,7 +47,7 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 61ccb6632..5a328f198 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -44,17 +44,17 @@ Route116_EventScript_150A7B:: @ 8150A7B Route116_EventScript_150A94:: @ 8150A94 setflag 287 giveitem ITEM_REPEAT_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route116_EventScript_150AEE - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route116_EventScript_150AEE - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route116_EventScript_150AEE - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route116_EventScript_150AF9 disappear LAST_TALKED clearflag 949 @@ -148,10 +148,10 @@ Route116_EventScript_150B8F:: @ 8150B8F lock faceplayer checkitem ITEM_BLACK_GLASSES, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150BCA specialvar RESULT, sub_810F828 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 release @@ -167,7 +167,7 @@ Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_1708EE, 4 msgbox Route116_Text_170921, 4 specialvar RESULT, sub_810F828 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 release @@ -181,13 +181,13 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 delay 20 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route116_EventScript_150C37 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route116_EventScript_150C37 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route116_EventScript_150C37 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route116_EventScript_150C42 disappear LAST_TALKED release @@ -241,7 +241,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 end @@ -264,7 +264,7 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 6d538a872..6ba9519eb 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -41,7 +41,7 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 end @@ -54,7 +54,7 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 end @@ -67,7 +67,7 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 end @@ -80,7 +80,7 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 end @@ -98,7 +98,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 end @@ -111,7 +111,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 8c91e7da4..86e5f9045 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -12,9 +12,9 @@ Route118_EventScript_150F34:: @ 8150F34 checkflag 227 goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route118_EventScript_150F5E - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route118_EventScript_150F7F end @@ -83,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 delay 30 msgbox Route118_Text_170D66, 4 closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, Route118_EventScript_151048 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route118_EventScript_151053 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 disappear 19 @@ -162,7 +162,7 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 end @@ -185,7 +185,7 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 5b0f61387..fff294ca9 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare_var_to_imm 0x8004, 6 + compare 0x8004, 6 call_if 1, Route119_EventScript_151193 - compare_var_to_imm 0x8004, 7 + compare 0x8004, 7 call_if 1, Route119_EventScript_151197 return @@ -27,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A014E call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 - compare_var_to_imm 0x40b3, 1 + compare 0x40b3, 1 call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -52,29 +52,29 @@ Route119_EventScript_1511DB:: @ 81511DB lockall reappear 25 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route119_EventScript_151254 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route119_EventScript_151259 delay 65 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513A6 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513B1 applymovement 255, Route119_Movement_1A0845 waitmovement 0 delay 30 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513D2 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 25 reappear 16 delay 30 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route119_EventScript_15125E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1512D8 releaseall end @@ -154,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closebutton - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513D2 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 16 reappear 25 delay 30 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513BC - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513C7 disappear 25 setvar 0x4072, 1 @@ -297,7 +297,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 end @@ -310,7 +310,7 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 end diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index aa918bc34..762a6c299 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -4,7 +4,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 - compare_var_to_imm 0x40b3, 0 + compare 0x40b3, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 end @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D lock faceplayer special GetPlayerBigGuyGirlString - compare_var_to_imm 0x40b3, 0 + compare 0x40b3, 0 goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index b903d7063..5f9cf9888 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -4,9 +4,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 - compare_var_to_imm 0x40b3, 0 + compare 0x40b3, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 - compare_var_to_imm 0x40b3, 1 + compare 0x40b3, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 end @@ -56,7 +56,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 7c1968aa5..cb8ebb2cc 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 call_if 1, Route120_EventScript_15166B - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, Route120_EventScript_151672 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, Route120_EventScript_151676 - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, Route120_EventScript_15167A - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 call_if 1, Route120_EventScript_15167E - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 call_if 1, Route120_EventScript_151682 return @@ -81,11 +81,11 @@ Route120_MapScript1_1516DF:: @ 81516DF Route120_EventScript_1516EA:: @ 81516EA getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4001, 14 + compare 0x4001, 14 goto_if 3, Route120_EventScript_151715 - compare_var_to_imm 0x4001, 60 + compare 0x4001, 60 goto_if 3, Route120_EventScript_151719 - compare_var_to_imm 0x4001, 61 + compare 0x4001, 61 goto_if 4, Route120_EventScript_151711 return @@ -98,9 +98,9 @@ Route120_EventScript_151715:: @ 8151715 return Route120_EventScript_151719:: @ 8151719 - compare_var_to_imm 0x4000, 7 + compare 0x4000, 7 goto_if 3, Route120_EventScript_151735 - compare_var_to_imm 0x4000, 19 + compare 0x4000, 19 goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -116,9 +116,9 @@ Route120_EventScript_151739:: @ 8151739 checkflag 2254 goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route120_EventScript_151841 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route120_EventScript_15184A specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT @@ -161,7 +161,7 @@ Route120_EventScript_151808:: @ 8151808 Route120_EventScript_151813:: @ 8151813 giveitem 0x8004 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag 2254 msgbox Route120_Text_1C5A0B, 4 @@ -187,7 +187,7 @@ Route120_EventScript_151853:: @ 8151853 checkflag 290 goto_if_eq Route120_EventScript_151884 msgbox Route120_Text_171827, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -200,7 +200,7 @@ Route120_EventScript_151877:: @ 8151877 Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -208,9 +208,9 @@ Route120_EventScript_151884:: @ 8151884 Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route120_EventScript_15197F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route120_EventScript_15198A applymovement 31, Route120_Movement_1A083F waitmovement 0 @@ -293,7 +293,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 end @@ -316,7 +316,7 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 end diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 562f122e3..efaf251b1 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -74,7 +74,7 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 end @@ -102,7 +102,7 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 52f0e5c44..5fdb749f3 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -34,7 +34,7 @@ Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A lock faceplayer msgbox Route121_SafariZoneEntrance_Text_1C3704, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release @@ -52,7 +52,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 showmoney 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C @@ -60,11 +60,11 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450 call Route121_SafariZoneEntrance_EventScript_15C425 checkmoney 0x1f4, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 paymoney 0x1f4, 0 @@ -88,10 +88,10 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialvar RESULT, CheckFreePokemonStorageSpace - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 6e6cbd506..14c5a2dba 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -13,11 +13,11 @@ Route123_EventScript_151C5D:: @ 8151C5D goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 giveitem ITEM_TM19 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag 232 msgbox Route123_Text_171E34, 4 @@ -63,7 +63,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 end @@ -76,7 +76,7 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index ee7bc80cf..64888759d 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 2253 msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 release @@ -47,9 +47,9 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AAD - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163A9B end @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end @@ -79,7 +79,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 random 10 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D release @@ -90,7 +90,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_SPELON_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 248 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -101,7 +101,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_PAMTRE_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 249 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -112,7 +112,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_WATMEL_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 250 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -123,7 +123,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_DURIN_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 251 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -134,7 +134,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_BELUE_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 252 goto Route123_BerryMastersHouse_EventScript_163C1D diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 7d7d38ceb..ffe4cef97 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -24,7 +24,7 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 end @@ -47,7 +47,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 end @@ -60,7 +60,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 1deeb9e34..b3e91e43c 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,7 +23,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end @@ -31,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar 0x4001, 0 checkitem ITEM_RED_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C return @@ -247,13 +247,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitem 0, 0x8008 bufferitem 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F checkitemspace 0x8009, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 checkitem 0x8008, 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end @@ -263,10 +263,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 giveitem 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index c62d49117..489a7314b 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -30,7 +30,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 0ce76670f..158313a1b 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -183,7 +183,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 end @@ -196,7 +196,7 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 3e234667a..7c3c575dc 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81523C2 Route130_MapScript1_1523C8:: @ 81523C8 specialvar RESULT, IsMirageIslandPresent - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route130_EventScript_15240C setflag 17 setflag 18 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index ddd58be1a..dcbb75886 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -363,13 +363,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 end RustboroCity_EventScript_14C650:: @ 814C650 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, RustboroCity_EventScript_14C691 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 @@ -457,19 +457,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 end RustboroCity_EventScript_14C77D:: @ 814C77D - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RustboroCity_EventScript_14C82A - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RustboroCity_EventScript_14C856 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C882 - compare_var_to_imm 0x4001, 4 + compare 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem ITEM_GREAT_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closebutton @@ -552,9 +552,9 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA checkflag 288 goto_if_eq RustboroCity_EventScript_14C917 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_14C90A end @@ -572,9 +572,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_14C939 end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index d5b3b03c7..e7c966c08 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA .byte 0 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC end @@ -14,7 +14,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 287 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 188 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release @@ -64,16 +64,16 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 lock faceplayer - compare_var_to_imm 0x40c4, 2 + compare 0x40c4, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE release end @@ -86,7 +86,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -104,7 +104,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -125,9 +125,9 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 end RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A - compare_var_to_imm 0x40c5, 1 + compare 0x40c5, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 - compare_var_to_imm 0x40c5, 2 + compare 0x40c5, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 end @@ -135,7 +135,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 bufferpoke 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 @@ -146,7 +146,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 waittext givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -155,7 +155,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 bufferpoke 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 @@ -166,7 +166,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 waittext givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 12cf2f6c8..88f1c377a 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 - compare_var_to_imm 0x408f, 0 + compare 0x408f, 0 call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D end @@ -160,7 +160,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 giveitem ITEM_EXP_SHARE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index fefc67d0f..0dfec5cfa 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem ITEM_PREMIER_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag 213 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 353ac8fe3..6bb33b4dc 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -20,14 +20,14 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE addvar 0x4085, 1 setvar 0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag 165 msgbox RustboroCity_Gym_Text_184170, 4 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 080fc7e18..a344738a8 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -11,17 +11,17 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar 0x8005, 0x800a specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT - compare_var_to_var RESULT, 0x8009 + compare RESULT, 0x8009 goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index cd71e8bba..156b437a0 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -79,13 +79,13 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE faceplayer checkflag 275 goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem ITEM_QUICK_CLAW - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closebutton applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 922ad27e1..81bfcd27d 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -10,7 +10,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 - compare_var_to_imm 0x409a, 2 + compare 0x409a, 2 call_if 1, RusturfTunnel_EventScript_15C773 end @@ -52,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8CA - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C8DF - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C8EB - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem ITEM_HM04 setflag 106 msgbox RusturfTunnel_Text_194693, 4 closebutton - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C880 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C892 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closebutton - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C909 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 9f86473be..3edfdd7bb 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -41,9 +41,9 @@ SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 return gUnknown_0815FD0D:: @ 815FD0D - compare_var_to_imm 0x40B4, 2 + compare 0x40B4, 2 goto_if_eq SSTidalCorridor_EventScript_15FD24 - compare_var_to_imm 0x40B4, 7 + compare 0x40B4, 7 goto_if_eq SSTidalCorridor_EventScript_15FD3A end @@ -113,9 +113,9 @@ SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 lock faceplayer - compare_var_to_imm 0x40b4, 4 + compare 0x40b4, 4 goto_if_eq SSTidalCorridor_EventScript_15FDF8 - compare_var_to_imm 0x40b4, 8 + compare 0x40b4, 8 goto_if_eq SSTidalCorridor_EventScript_15FE17 msgbox SSTidalCorridor_Text_19913B, 4 release @@ -147,9 +147,9 @@ SSTidalCorridor_EventScript_15FE36:: @ 815FE36 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A lockall - compare_var_to_imm 0x40b4, 2 + compare 0x40b4, 2 goto_if_eq SSTidalCorridor_EventScript_15FE5B - compare_var_to_imm 0x40b4, 7 + compare 0x40b4, 7 goto_if_eq SSTidalCorridor_EventScript_15FE5B msgbox SSTidalCorridor_Text_199268, 4 releaseall diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index f9e815d1f..aa84b6b48 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem ITEM_TM49 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag 260 msgbox SSTidalRooms_Text_199C1A, 4 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index b735a87b2..0632a2dda 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -20,7 +20,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B end SafariZone_Southeast_MapScript1_160073:: @ 8160073 - compare_var_to_imm 0x40a4, 2 + compare 0x40a4, 2 call_if 1, SafariZone_Southeast_EventScript_16007F end @@ -52,10 +52,10 @@ SafariZone_Southeast_EventScript_16009E:: @ 816009E SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 929b4d0ca..70821d183 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -9,7 +9,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 checkflag 228 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeoutbgm 0 playse 49 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index e51817e27..983ab69d9 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -23,24 +23,24 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 checkflag 2143 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 checkitem ITEM_SHOAL_SHELL, 4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 removeitem ITEM_SHOAL_SALT, 4 removeitem ITEM_SHOAL_SHELL, 4 giveitem ITEM_SHELL_BELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 setflag 2 @@ -49,13 +49,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 ShoalCave_LowTideEntranceRoom_EventScript_15E106:: @ 815E106 checkitem ITEM_SHOAL_SALT, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E117 return ShoalCave_LowTideEntranceRoom_EventScript_15E117:: @ 815E117 checkitem ITEM_SHOAL_SHELL, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E128 return @@ -70,10 +70,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138 checkitem ITEM_SHOAL_SALT, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 checkitem ITEM_SHOAL_SHELL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4 release diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 8dec3b212..05fc6a315 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -73,7 +73,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 checkflag 956 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 20, 859, 0 special DrawWholeMapView @@ -91,7 +91,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 checkflag 957 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 10, 859, 0 special DrawWholeMapView @@ -104,7 +104,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 checkflag 958 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 6, 9, 859, 0 special DrawWholeMapView @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 checkflag 959 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 16, 13, 859, 0 special DrawWholeMapView @@ -130,7 +130,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 checkflag 952 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 31, 8, 858, 0 special DrawWholeMapView @@ -148,7 +148,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 checkflag 953 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 14, 26, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index 01719a9cf..db5779efe 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 checkflag 955 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmaptile 18, 2, 858, 0 special DrawWholeMapView @@ -40,7 +40,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem ITEM_FOCUS_BAND - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag 283 release diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index 1c5cde842..bffb7bd49 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 checkflag 954 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmaptile 11, 11, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 02ab6c28c..aba9ee235 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -12,7 +12,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C .endif setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BA68 end @@ -67,10 +67,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 bufferfirstpoke 0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_EventScript_14BB35 specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 playfanfare 370 @@ -95,7 +95,7 @@ SlateportCity_EventScript_14BB35:: @ 814BB35 SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release @@ -109,7 +109,7 @@ SlateportCity_EventScript_14BB56:: @ 814BB56 SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release @@ -123,7 +123,7 @@ SlateportCity_EventScript_14BB77:: @ 814BB77 SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBA1 checkflag 96 goto_if_eq SlateportCity_EventScript_14BBAB @@ -144,7 +144,7 @@ SlateportCity_EventScript_14BBAB:: @ 814BBAB SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release @@ -156,7 +156,7 @@ SlateportCity_EventScript_14BBCC:: @ 814BBCC end SlateportCity_EventScript_14BBD6:: @ 814BBD6 - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 goto_if_eq SlateportCity_EventScript_14BBEA msgbox SlateportCity_Text_164AA9, 2 end @@ -168,7 +168,7 @@ SlateportCity_EventScript_14BBEA:: @ 814BBEA SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release @@ -253,7 +253,7 @@ SlateportCity_EventScript_14BCAF:: @ 814BCAF SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release @@ -288,9 +288,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 lock faceplayer msgbox SlateportCity_Text_1650F1, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_EventScript_14BD28 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SlateportCity_EventScript_14BD31 release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 74eaf27fe..f8070f1a1 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -16,7 +16,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem ITEM_TM41 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag 265 msgbox SlateportCity_ContestHall_Text_17CE28, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 0e0b5da1f..184586d94 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 warp6 SlateportCity, 255, 28, 13 setvar 0x4001, 0 - compare_var_to_imm 0x40a0, 1 + compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag 2052 call_if 1, SlateportCity_Harbor_EventScript_155F85 @@ -63,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 disappear 7 disappear 8 setvar 0x40a0, 2 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closebutton @@ -168,7 +168,7 @@ SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 msgbox SlateportCity_Harbor_Text_17FA73, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A waittext @@ -191,7 +191,7 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 @@ -202,7 +202,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F SlateportCity_Harbor_EventScript_156167:: @ 8156167 msgbox SlateportCity_Harbor_Text_17FB9C, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp BattleTower_Outside, 255, 19, 23 @@ -223,9 +223,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 9, 8 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 spriteinvisible 255, 0, 0 @@ -274,7 +274,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag 112 goto_if_eq SlateportCity_Harbor_EventScript_156258 - compare_var_to_imm 0x40a0, 2 + compare 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closebutton @@ -300,10 +300,10 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 end SlateportCity_Harbor_EventScript_15626F:: @ 815626F - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 checkflag 2052 goto_if_eq SlateportCity_Harbor_EventScript_15629D @@ -333,10 +333,10 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_TOOTH - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 @@ -346,10 +346,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_SCALE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index e932a58ab..c72aa229a 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -5,9 +5,9 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B lock faceplayer msgbox SlateportCity_House1_Text_17D46A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15569C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special sub_80F9A0C waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -28,20 +28,20 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialvar RESULT, ScriptGetPartyMonSpecies - compare_var_to_imm RESULT, SPECIES_EGG + compare RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C special sub_80BFAE0 special sub_80BFB10 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 specialvar RESULT, sub_810F96C special sub_80BFAE0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155730 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -60,7 +60,7 @@ SlateportCity_House1_EventScript_155730:: @ 8155730 call SlateportCity_House1_EventScript_1A0678 specialvar RESULT, sub_80BF9B4 special sub_80BFAE0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 release diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/scripts/maps/SlateportCity_House2.inc index 6f267d31f..934fae153 100644 --- a/data/scripts/maps/SlateportCity_House2.inc +++ b/data/scripts/maps/SlateportCity_House2.inc @@ -9,7 +9,7 @@ SlateportCity_House2_EventScript_156399:: @ 8156399 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House2_EventScript_1563B5 msgbox SlateportCity_House2_Text_180567, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 575538286..7fe5865a4 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -34,7 +34,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoney 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closebutton hidemoney 0, 0 @@ -45,7 +45,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D checkmoney 0x32, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A paymoney 0x32, 0 updatemoney 0, 0 @@ -165,14 +165,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 giveitem ITEM_TM46 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag 269 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 - compare_var_to_imm FACING, 2 + compare FACING, 2 goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 1f6aa3c2d..c1398e579 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -21,21 +21,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmovement 0 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closebutton applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmovement 0 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 882e865ee..cd71d8d51 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -33,9 +33,9 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 200 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - compare_var_to_imm 0x4002, 5 + compare 0x4002, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D - compare_var_to_imm 0x40b7, 2 + compare 0x40b7, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 @@ -85,7 +85,7 @@ SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 checkitemspace ITEM_RED_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 200 @@ -96,7 +96,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 checkitemspace ITEM_BLUE_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 201 @@ -107,7 +107,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 checkitemspace ITEM_PINK_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 202 @@ -118,7 +118,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 checkitemspace ITEM_GREEN_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 203 @@ -129,7 +129,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 checkitemspace ITEM_YELLOW_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 204 @@ -145,7 +145,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 specialvar RESULT, CheckLeadMonCool - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 return @@ -155,7 +155,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 specialvar RESULT, CheckLeadMonBeauty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA return @@ -165,7 +165,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 specialvar RESULT, CheckLeadMonCute - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 return @@ -175,7 +175,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 specialvar RESULT, CheckLeadMonSmart - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 return @@ -185,7 +185,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE specialvar RESULT, CheckLeadMonTough - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F return @@ -200,7 +200,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialvar RESULT, GetLeadMonFriendshipScore - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A release end @@ -213,7 +213,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 giveitem ITEM_SOOTHE_BELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag 278 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 6006ac2ef..936b859e5 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -45,7 +45,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 call SootopolisCity_EventScript_1A02C1 movespriteperm 1, 29, 19 movespriteperm 2, 33, 19 - compare_var_to_imm 0x405e, 1 + compare 0x405e, 1 call_if 1, SootopolisCity_EventScript_14D142 return @@ -99,20 +99,20 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B setflag 2258 msgbox SootopolisCity_Text_1C64D0, 4 random 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_14D1FF - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D220 end SootopolisCity_EventScript_14D1FF:: @ 814D1FF giveitem ITEM_FIGY_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -120,7 +120,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF SootopolisCity_EventScript_14D220:: @ 814D220 giveitem ITEM_IAPAPA_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -128,7 +128,7 @@ SootopolisCity_EventScript_14D220:: @ 814D220 SootopolisCity_EventScript_14D241:: @ 814D241 msgbox SootopolisCity_Text_1C6540, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index d6c7958b6..bd0af12be 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -19,11 +19,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E - compare_var_to_imm 0x4022, 8 + compare 0x4022, 8 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 - compare_var_to_imm 0x4022, 28 + compare 0x4022, 28 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 - compare_var_to_imm 0x4022, 69 + compare 0x4022, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 setmaptile 8, 4, 519, 0 setmaptile 8, 5, 519, 0 @@ -109,7 +109,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 giveitem ITEM_TM03 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 setflag 172 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 6315cee85..011806291 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -5,9 +5,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 lock faceplayer msgbox SootopolisCity_House2_Text_18FA66, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SootopolisCity_House2_EventScript_15B307 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index 156ee232d..f1bf0bf19 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -5,7 +5,7 @@ SootopolisCity_House3_EventScript_15B31A:: @ 815B31A lock faceplayer msgbox SootopolisCity_House3_Text_18FB36, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 2d6add92d..1e1b53956 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -7,11 +7,11 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 checkflag 245 goto_if_eq SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration 117 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag 245 release diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index e7ddaa39d..662117741 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -9,14 +9,14 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 special sub_80F9A0C waitstate copyvar RESULT, 0x8004 - compare_var_to_imm RESULT, 255 + compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B452 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B45C - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B466 release end @@ -39,7 +39,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 giveitem ITEM_ELIXIR - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closebutton release @@ -58,14 +58,14 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 special sub_80F9A0C waitstate copyvar RESULT, 0x8004 - compare_var_to_imm RESULT, 255 + compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B4E3 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B4ED - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B4F7 release end @@ -88,7 +88,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 giveitem ITEM_ELIXIR - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closebutton release diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index a45b0b556..358e2277c 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -10,7 +10,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 lock faceplayer msgbox SouthernIsland_Exterior_Text_1C5215, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closebutton diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index d30f8cee4..37af5e140 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -23,9 +23,9 @@ SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SouthernIsland_Interior_EventScript_160B8F - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SouthernIsland_Interior_EventScript_160B95 end diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 6d263690d..5bbe8e3b6 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -4,9 +4,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 getplayerxy 0x8004, 0x8005 - compare_var_to_imm 0x8004, 12 + compare 0x8004, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare_var_to_imm 0x8005, 44 + compare 0x8005, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 0bf09e41e..994f37b63 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -13,15 +13,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LinkContestRoom1_EventScript_15F5E0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LinkContestRoom1_EventScript_15F5E4 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, LinkContestRoom1_EventScript_15F5E8 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 call_if 1, LinkContestRoom1_EventScript_15F5EC - compare_var_to_imm RESULT, 4 + compare RESULT, 4 call_if 1, LinkContestRoom1_EventScript_15F5F0 return @@ -46,7 +46,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, LinkContestRoom1_EventScript_15F600 end @@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_15F625:: @ 815F625 LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 - compare_var_to_imm 0x4000, 8 + compare 0x4000, 8 goto_if 0, LinkContestRoom1_EventScript_15F630 return @@ -414,9 +414,9 @@ LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9 return diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 52de0db78..5d7c6de18 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -105,7 +105,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem ITEM_TM45 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag 235 release diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 7bbcf6a41..a0173e720 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -94,7 +94,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 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 1881bc242..215fb3948 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -26,9 +26,9 @@ SpeakToBard: lock faceplayer msgbox gTextBard_HiImTheBard, MSGBOX_YESNO - compare_var_to_imm RESULT, YES + compare RESULT, YES goto_if_eq yes_hear_song - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_hear_song end @@ -38,7 +38,7 @@ yes_hear_song: special ScrSpecial_PlayBardSong delay 60 special ScrSpecial_HasBardSongBeenChanged - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE @ Prompt new lyrics only if song hasn't been changed goto_if_eq prompt_write_lyrics msgbox gTextBard_OhWhatAMovingSong, 4 @@ -52,9 +52,9 @@ dont_hear_song: prompt_write_lyrics: msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO - compare_var_to_imm RESULT, YES + compare RESULT, YES goto_if_eq write_lyrics - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_write_lyrics end @@ -63,7 +63,7 @@ write_lyrics: call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 setvar 0x8004, 1 @@ -71,7 +71,7 @@ write_lyrics: special ScrSpecial_PlayBardSong delay 60 msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq write_lyrics @ Keep looping until player responds YES special ScrSpecial_SaveBardSongLyrics msgbox gTextBard_OkayThatsIt, 4 @@ -94,7 +94,7 @@ SpeakToHipster: setflag 2054 msgbox gTextHipster_TheyCallMeTheHipster, 4 special ScrSpecial_GetHipsterSpokenFlag - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE goto_if_eq hipster_first_time msgbox gTextHipster_TaughtYouAlready, 4 release @@ -102,7 +102,7 @@ SpeakToHipster: hipster_first_time: special ScrSpecial_HipsterTeachWord - compare_var_to_imm RESULT, TRUE @ TRUE if player learned a new word + compare RESULT, TRUE @ TRUE if player learned a new word goto_if_eq teach_new_word msgbox gTextHipster_YouAlreadyKnowALot, 4 release @@ -125,10 +125,10 @@ SpeakToTrader: lock faceplayer msgbox gTextTrader_Introduction, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_want_to_trade special ScrSpecial_GetTraderTradedFlag - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq already_traded message gTextTrader_MenuPrompt waittext @@ -146,15 +146,15 @@ already_traded: do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq cancelled_get_menu - compare_var_to_imm 0x8004, 65535 + compare 0x8004, 65535 goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_want_item special ScrSpecial_DoesPlayerHaveNoDecorations - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq player_has_no_decorations goto do_trader_menu_give end @@ -183,15 +183,15 @@ do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration waitstate - compare_var_to_imm 0x8006, 0 + compare 0x8006, 0 goto_if_eq cancelled_give_menu - compare_var_to_imm 0x8006, 65535 + compare 0x8006, 65535 goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq decorations_full msgbox gTextTrader_SoWellTrade, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq do_trader_menu_give special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 @@ -225,51 +225,51 @@ SpeakToStoryteller: lock faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_hear_story specialvar RESULT, ScrSpecial_StorytellerGetFreeStorySlot - compare_var_to_imm RESULT, 0 @ If slot is 0, then the list is empty + compare RESULT, 0 @ If slot is 0, then the list is empty goto_if_eq no_stories_recorded choose_story: message gTextStoryteller_WhichTale waittext special ScrSpecial_StorytellerStoryListMenu waitstate - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE goto_if_eq cancel_story_menu setvar 0x8008, 1 special ScrSpecial_StorytellerDisplayStory waittext waitbutton specialvar RESULT, ScrSpecial_StorytellerUpdateStat - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE goto_if_eq no_stat_update goto stat_update cancel_story_menu: - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq dont_hear_story goto yes_hear_story no_stat_update: msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO - compare_var_to_imm RESULT, YES + compare RESULT, YES goto_if_eq choose_story yes_hear_story: specialvar RESULT, ScrSpecial_HasStorytellerAlreadyRecorded - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq cant_record_story @ already recorded story specialvar RESULT, ScrSpecial_StorytellerGetFreeStorySlot - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq cant_record_story @ story list is full goto prompt_record_story no_stories_recorded: msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 prompt_record_story: msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_hear_story specialvar RESULT, ScrSpecial_StorytellerInitializeRandomStat - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq stat_update msgbox gTextStoryteller_ImNotSatisfied, 4 closebutton @@ -305,25 +305,25 @@ SpeakToGiddy: lock faceplayer msgbox gTextGiddy_Introduction, MSGBOX_YESNO - compare_var_to_imm RESULT, YES + compare RESULT, YES goto_if_eq yes_hear_giddy - compare_var_to_imm RESULT, NO + compare RESULT, NO goto_if_eq dont_hear_giddy end yes_hear_giddy: special ScrSpecial_GiddyShouldTellAnotherTale - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq tell_giddy_tale - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE goto_if_eq bye_bye end tell_another_giddy_tale: special ScrSpecial_GiddyShouldTellAnotherTale - compare_var_to_imm RESULT, TRUE + compare RESULT, TRUE goto_if_eq also_i_was_thinking - compare_var_to_imm RESULT, FALSE + compare RESULT, FALSE goto_if_eq bye_bye end @@ -337,9 +337,9 @@ tell_giddy_tale: special ShowFieldMessageStringVar4 waittext yesnobox 20, 8 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq tell_another_giddy_tale - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq tell_another_giddy_tale end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index ed21a1869..7f29be0d8 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -29,11 +29,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB end @@ -83,11 +83,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index bb890ebcb..432ba8f65 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -8,9 +8,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closebutton @@ -69,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB setflag 754 setflag 755 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse 9 disappear 0x8008 @@ -252,17 +252,17 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 lock faceplayer - compare_var_to_imm 0x4082, 4 + compare 0x4082, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - compare_var_to_imm 0x408c, 4 + compare 0x408c, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 checkflag 2059 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D checkflag 82 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 - compare_var_to_imm 0x4092, 7 + compare 0x4092, 7 goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 release @@ -278,7 +278,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 giveitem ITEM_AMULET_COIN - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 setflag 133 @@ -362,13 +362,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 @@ -378,23 +378,23 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 delay 20 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 giveitem ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse 8 disappear 0x8009 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 5f185c8ff..dde0d0400 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -39,24 +39,24 @@ SlateportCity_ContestLobby_EventScript_1B7681:: @ 81B7681 VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall msgbox FallarborTown_ContestLobby_Text_1B6E63, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780 specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialvar RESULT, sub_810CA00 - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -67,9 +67,9 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end @@ -149,9 +149,9 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, 4 specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77E6 end @@ -209,23 +209,23 @@ SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialvar RESULT, sub_810CA00 - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 msgbox FallarborTown_ContestLobby_Text_1B727C, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end @@ -236,21 +236,21 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 waittext special sub_8083614 waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7980 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq FallarborTown_ContestLobby_EventScript_1B794C - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7959 - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7966 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7973 end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 01fdf3c03..b7c4d1a43 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -14,7 +14,7 @@ EventScript_1C341B: @ 81C341B gUnknown_081C342D:: @ 81C342D lockall msgbox UnknownString_81C34B2, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1C3443 releaseall end @@ -43,10 +43,10 @@ gUnknown_081C3459:: @ 81C3459 gUnknown_081C346A:: @ 81C346A lockall special SafariZoneGetPokeblockNameInFeeder - compare_var_to_imm RESULT, -1 + compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A9 msgbox UnknownString_81C354E, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1C348E releaseall end @@ -55,7 +55,7 @@ EventScript_1C348E: fadescreen 1 special sub_810BAF4 waitstate - compare_var_to_imm RESULT, -1 + compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A0 end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index ac033506b..2c1524e5b 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -2,7 +2,7 @@ Route111_EventScript_1A3858:: @ 81A3858 lock faceplayer msgbox Route111_Text_1A3520, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1A3877 msgbox Route111_Text_1A37B5, 4 release @@ -10,17 +10,17 @@ Route111_EventScript_1A3858:: @ 81A3858 Route111_EventScript_1A3877:: @ 81A3877 giveitem ITEM_TM43 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 closebutton setflag 96 clearflag 948 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route111_EventScript_1A38C3 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route111_EventScript_1A38C3 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route111_EventScript_1A38CE disappear LAST_TALKED release diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index a2348315f..41e55929d 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -3,30 +3,30 @@ Event_TV:: @ 81A6E72 inccounter GAME_STAT_WATCHED_TV special sub_80C2014 specialvar RESULT, CheckForBigMovieOrEmergencyNewsOnTV - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq EventScript_1A6F01 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A6F0B checkflag 2098 goto_if 0, EventScript_1A6EF1 checkflag 2097 goto_if_eq EventScript_1A6EF1 specialvar RESULT, IsTVShowInSearchOfTrainersAiring - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F50 end EventScript_1A6EBB: specialvar 0x8004, special_0x44 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq EventScript_1A6F3F specialvar RESULT, special_0x4a - compare_var_to_imm RESULT, 255 + compare RESULT, 255 goto_if_eq EventScript_1A6F3F copyvar 0x8004, RESULT specialvar RESULT, sub_80BDA0C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, EventScript_1A6F21 end @@ -59,7 +59,7 @@ EventScript_1A6F21: special DoTVShow waittext waitbutton - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if 5, EventScript_1A6F21 goto EventScript_1A6F37 end @@ -78,7 +78,7 @@ EventScript_1A6F3F: EventScript_1A6F50: special sub_80BECE8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A6EBB waittext waitbutton @@ -89,7 +89,7 @@ EventScript_1A6F66: special DoTVShowInSearchOfTrainers waittext waitbutton - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F37 end -- cgit v1.2.3 From b4ba35a54c0f6204e34d2814351162c79ea4c0ba Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 26 Sep 2017 14:33:52 -0500 Subject: more command renaming --- data/event_scripts.s | 12 +++--- data/field_move_scripts.inc | 4 +- data/scripts/cable_club.inc | 8 ++-- data/scripts/contest_hall.inc | 4 +- data/scripts/magma_chimney.inc | 10 ++--- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/AquaHideout_B1F.inc | 2 +- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 +- data/scripts/maps/BattleTower_Elevator.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 2 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/DewfordTown.inc | 22 +++++------ data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 6 +-- data/scripts/maps/EverGrandeCity_Corridor1.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor2.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor3.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor4.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor5.inc | 2 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 2 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/FortreeCity.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 8 ++-- data/scripts/maps/LilycoveCity.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 12 +++--- data/scripts/maps/LilycoveCity_Harbor.inc | 12 +++--- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 28 ++++++------- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 2 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MagmaHideout_B1F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 4 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 16 ++++---- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 10 ++--- data/scripts/maps/NewMauville_Inside.inc | 2 +- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 8 ++-- data/scripts/maps/PetalburgWoods.inc | 4 +- data/scripts/maps/Route101.inc | 8 ++-- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/Route104.inc | 12 +++--- data/scripts/maps/Route109.inc | 12 +++--- data/scripts/maps/Route110.inc | 6 +-- data/scripts/maps/Route110_TrickHouseEnd.inc | 12 +++--- data/scripts/maps/Route110_TrickHouseEntrance.inc | 46 +++++++++++----------- data/scripts/maps/Route111.inc | 22 +++++------ data/scripts/maps/Route116.inc | 4 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 16 ++++---- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 6 +-- data/scripts/maps/Route120.inc | 16 ++++---- data/scripts/maps/Route121.inc | 6 +-- data/scripts/maps/Route128.inc | 8 ++-- data/scripts/maps/RustboroCity.inc | 8 ++-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 8 ++-- data/scripts/maps/SeafloorCavern_Room9.inc | 14 +++---- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SlateportCity.inc | 6 +-- data/scripts/maps/SlateportCity_Harbor.inc | 10 ++--- .../maps/SlateportCity_OceanicMuseum_1F.inc | 4 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 14 +++---- data/scripts/maps/SootopolisCity.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 6 +-- data/scripts/players_house.inc | 8 ++-- data/scripts/pokeblocks.inc | 8 ++-- data/scripts/secret_power_tm.inc | 2 +- 81 files changed, 258 insertions(+), 258 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 0db608cd5..32cb8d233 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1607,7 +1607,7 @@ Std_FindItem: @ 819FF21 return Std_FindItem_Success: @ 819FF52 - disappear LAST_TALKED + removeobject LAST_TALKED message Message_FoundOneItem waitfanfare waittext @@ -2254,8 +2254,8 @@ PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 return RusturfTunnel_EventScript_1A0442:: @ 81A0442 - disappear 1 - disappear 10 + removeobject 1 + removeobject 10 clearflag 808 clearflag 984 setvar 0x409a, 6 @@ -2266,7 +2266,7 @@ EventScript_1A0457: @ unreferenced? delay 30 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 waitmovement 0 - spritevisible 255, 0, 0 + showobject 255, 0, 0 delay 30 applymovement 255, Movement_1A047A waitmovement 0 @@ -2284,7 +2284,7 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 call BattleTower_Outside_EventScript_1A040E return @@ -3877,7 +3877,7 @@ EventScript_1A2F95: addvar 0x8004, 1 compare 0x8005, 0 goto_if_eq EventScript_1A2F95 - disappear 0x8006 + removeobject 0x8006 setflag 0x8005 goto EventScript_1A2F95 end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 7df5ac90f..592dd7003 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -28,7 +28,7 @@ S_UseCut:: @ 81B0E16 DoTreeCutMovement: @ 81B0E21 applymovement LAST_TALKED, TreeCutMovement @ tree cut animation waitmovement 0 - disappear LAST_TALKED @ tree disappears + removeobject LAST_TALKED @ tree disappears releaseall end @@ -86,7 +86,7 @@ S_UseRockSmash:: @ 81B0F01 DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 - disappear LAST_TALKED + removeobject LAST_TALKED specialvar RESULT, sub_810F5BC compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b25bc12bd..078d6444f 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -21,7 +21,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_1A3D2D:: @ 81A3D2D - spriteface 0x8007, 4 + turnobject 0x8007, 4 end DewfordTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 @@ -233,7 +233,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E doorchange applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setdoorclosed 5, 1 doorchange release @@ -398,7 +398,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 doorchange applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setdoorclosed 8, 1 doorchange release @@ -496,7 +496,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 doorchange applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setdoorclosed 11, 1 doorchange release diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index acf5597ea..10314c462 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -344,7 +344,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall - reappear 13 + addobject 13 playse 10 lockall applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C @@ -724,7 +724,7 @@ LinkContestRoom1_EventScript_1A587F:: @ 81A587F LinkContestRoom1_EventScript_1A5880:: @ 81A5880 closebutton release - disappear 13 + removeobject 13 special sub_80C5164 switch 0x8006 case 0, LinkContestRoom1_EventScript_1A58BA diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 01bdb7c31..998da7380 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -60,13 +60,13 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB closebutton delay 30 fadescreen 1 - disappear 2 - disappear 3 - disappear 22 + removeobject 2 + removeobject 3 + removeobject 22 setflag 926 fadescreen 0 movespriteperm 1, 10, 12 - reappear 1 + addobject 1 compare FACING, 4 call_if 1, MtChimney_EventScript_1B2D7D compare FACING, 2 @@ -83,7 +83,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB call_if 1, MtChimney_EventScript_1B2D93 compare FACING, 2 call_if 1, MtChimney_EventScript_1B2D9E - disappear 1 + removeobject 1 setflag 927 setflag 139 clearflag 928 diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index a0f00e877..5a0b4014a 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -10,7 +10,7 @@ AncientTomb_MapScript1_15EFCE:: @ 815EFCE end AncientTomb_EventScript_15EFD8:: @ 815EFD8 - disappear LAST_TALKED + removeobject LAST_TALKED return AncientTomb_MapScript1_15EFDC:: @ 815EFDC diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index cad8e7481..0001d7574 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -9,7 +9,7 @@ AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C end AquaHideout_B1F_EventScript_15D846:: @ 815D846 - disappear LAST_TALKED + removeobject LAST_TALKED return AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index b08a68d1b..9fd81f121 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -59,7 +59,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD applymovement 0x8009, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - disappear 0x8009 + removeobject 0x8009 delay 20 applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index bbc3360a8..3223deba4 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -13,7 +13,7 @@ BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special sub_81347F8 - reappear 1 + addobject 1 applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 special sub_8135474 @@ -45,7 +45,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 case 8, BattleTower_BattleRoom_EventScript_160A56 applymovement 1, BattleTower_BattleRoom_Movement_160AC6 waitmovement 0 - disappear 1 + removeobject 1 applymovement 2, BattleTower_BattleRoom_Movement_160ACB waitmovement 0 applymovement 255, BattleTower_BattleRoom_Movement_160ABC diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index fe55b50db..a147a3b5a 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -29,7 +29,7 @@ BattleTower_Elevator_MapScript2_160821:: @ 8160821 BattleTower_Elevator_EventScript_16082B:: @ 816082B setvar 0x4001, 1 - spriteface 255, 2 + turnobject 255, 2 end BattleTower_Elevator_Movement_160835:: @ 8160835 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 61b2da5e7..61ac04810 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -46,7 +46,7 @@ BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE BattleTower_Lobby_EventScript_1602F8:: @ 81602F8 setvar 0x4001, 1 - spriteface 255, 2 + turnobject 255, 2 end BattleTower_Lobby_MapScript2_160302:: @ 8160302 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index f577f39fa..53e693f71 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -67,7 +67,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmovement 0 delay 30 - spriteinvisible 5, 26, 4 + hideobject 5, 26, 4 setvar 0x8004, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index dcd97f069..3b2e7802d 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -9,7 +9,7 @@ CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 end CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 - disappear 1 + removeobject 1 return CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index d63398d78..b549cf127 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -10,7 +10,7 @@ DesertRuins_MapScript1_15CB03:: @ 815CB03 end DesertRuins_EventScript_15CB0D:: @ 815CB0D - disappear LAST_TALKED + removeobject LAST_TALKED return DesertRuins_MapScript1_15CB11:: @ 815CB11 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 09835c0b9..c8f20f4ac 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -122,24 +122,24 @@ DewfordTown_EventScript_14E151:: @ 814E151 spritelevelup 255, 0, 11, 0 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 - disappear 2 + removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - spriteinvisible 255, 0, 11 + hideobject 255, 0, 11 call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E293 applymovement 255, DewfordTown_Movement_14E293 waitmovement 0 - spritevisible 255, 0, 19 + showobject 255, 0, 19 call DewfordTown_EventScript_1A02EF applymovement 255, DewfordTown_Movement_14E405 waitmovement 0 - spritevisible 255, 0, 19 + showobject 255, 0, 19 clearflag 739 clearflag 881 clearflag 742 setflag 743 - spriteinvisible 4, 0, 11 + hideobject 4, 0, 11 setvar 0x408e, 2 restorespritelevel 255, 0, 11 warp Route104_MrBrineysHouse, 255, 5, 4 @@ -154,28 +154,28 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 spritelevelup 255, 0, 11, 1 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 - disappear 2 + removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - spriteinvisible 255, 0, 11 + hideobject 255, 0, 11 call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E356 applymovement 255, DewfordTown_Movement_14E356 waitmovement 0 call DewfordTown_EventScript_1A02EF - spritevisible 255, 0, 24 + showobject 255, 0, 24 applymovement 255, DewfordTown_Movement_14E409 waitmovement 0 movespriteperm 2, 21, 26 - reappear 2 + addobject 2 spritelevelup 2, 0, 24, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 clearflag 741 - reappear 1 + addobject 1 clearflag 744 setflag 743 - spriteinvisible 4, 0, 11 + hideobject 4, 0, 11 checkflag 149 call_if 0, DewfordTown_EventScript_14E281 checkflag 149 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 669da34f9..adfbca1bf 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 @@ -57,7 +57,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 - reappear 2 + addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkgender compare RESULT, 0 @@ -102,7 +102,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 closebutton - reappear 3 + addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 waitmovement 0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843 diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.inc b/data/scripts/maps/EverGrandeCity_Corridor1.inc index 499ad673f..104504960 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor1.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor1.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 .2byte 0 EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.inc b/data/scripts/maps/EverGrandeCity_Corridor2.inc index 692de1ed9..c7c049020 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor2.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor2.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 .2byte 0 EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.inc b/data/scripts/maps/EverGrandeCity_Corridor3.inc index f8ed19669..1714db5cc 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor3.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor3.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C .2byte 0 EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.inc b/data/scripts/maps/EverGrandeCity_Corridor4.inc index 616a25ec5..64cc234eb 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor4.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor4.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 .2byte 0 EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.inc b/data/scripts/maps/EverGrandeCity_Corridor5.inc index 783b03aec..73c0b5a84 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor5.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor5.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 .2byte 0 EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index ee171824f..3d3d56ff9 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 8ebf7939f..07f6e8877 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index d0fb7922f..523a337cc 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index b8fe90a01..b7c1618ba 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8 diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 3f472ca3f..daca98176 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -25,7 +25,7 @@ EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index abe0ac7c6..3b33c5a41 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -47,7 +47,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 playse 18 - disappear 4 + removeobject 4 clearflag 870 release end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index e0bac8007..a7c548b1f 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -81,7 +81,7 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 waitpokecry applymovement LAST_TALKED, FortreeCity_Movement_14CA13 waitmovement 0 - disappear LAST_TALKED + removeobject LAST_TALKED setflag 295 release end diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index f7f8391d4..f90c080f8 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -19,7 +19,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 clearflag 934 applymovement 3, FortreeCity_House4_Movement_158218 waitmovement 0 - disappear 3 + removeobject 3 releaseall end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 06f234f28..9afe54091 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -23,7 +23,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA compare FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D playse 9 - disappear 1 + removeobject 1 release end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 06524f95e..b59500625 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -10,7 +10,7 @@ IslandCave_MapScript1_15EEC6:: @ 815EEC6 end IslandCave_EventScript_15EED0:: @ 815EED0 - disappear LAST_TALKED + removeobject LAST_TALKED return IslandCave_MapScript1_15EED4:: @ 815EED4 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index d24280efa..afad309a9 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -31,7 +31,7 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED setvar 0x8008, 1 setdooropened 12, 15 doorchange - reappear 8 + addobject 8 applymovement 8, LavaridgeTown_Movement_14E70E waitmovement 0 setdoorclosed 12, 15 @@ -103,14 +103,14 @@ LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 call_if 1, LavaridgeTown_EventScript_14E646 compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E64E - disappear 8 - reappear 7 + removeobject 8 + addobject 7 delay 30 compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E69A compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 - disappear 7 + removeobject 7 setvar 0x4053, 2 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 7031eb530..af353e824 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -418,7 +418,7 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B setanimation 0, 1 doanimation 30 delay 15 - disappear LAST_TALKED + removeobject LAST_TALKED checkanimation 30 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1020e9d2b..7746eac01 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -20,7 +20,7 @@ LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 lockall - reappear 4 + addobject 4 applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B waitmovement 4 applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C @@ -48,7 +48,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE call_if 1, LilycoveCity_ContestLobby_EventScript_158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 - disappear 4 + removeobject 4 call LilycoveCity_ContestLobby_EventScript_158994 call LilycoveCity_ContestLobby_EventScript_1589EA releaseall @@ -63,7 +63,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 setvar 0x4099, 0 - disappear 4 + removeobject 4 releaseall end @@ -195,7 +195,7 @@ LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A lockall - reappear 11 + addobject 11 applymovement 11, LilycoveCity_ContestLobby_Movement_158B64 waitmovement 11 applymovement 255, LilycoveCity_ContestLobby_Movement_158B76 @@ -221,7 +221,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 - disappear 11 + removeobject 11 call LilycoveCity_ContestLobby_EventScript_158994 call LilycoveCity_ContestLobby_EventScript_1589EA releaseall @@ -236,7 +236,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 setvar 0x4099, 0 - disappear 11 + removeobject 11 releaseall end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 94b2d53a9..cbcac6f6e 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -79,13 +79,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - spriteinvisible LAST_TALKED, 13, 10 + hideobject LAST_TALKED, 13, 10 compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -117,9 +117,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - spriteinvisible LAST_TALKED, 13, 10 + hideobject LAST_TALKED, 13, 10 delay 60 - reappear 4 + addobject 4 delay 30 applymovement 4, LilycoveCity_Harbor_Movement_1A0839 waitmovement 0 @@ -128,13 +128,13 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement 4, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - disappear 4 + removeobject 4 compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index db55695e6..548c80a96 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -38,7 +38,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, 3 applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC waitmovement 0 - disappear 2 + removeobject 2 switch FACING case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 0f1dc96d9..06508fd02 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -104,7 +104,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmovement 0 setdooropened 0x8004, 0x8005 doorchange - reappear 4 + addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 setdoorclosed 0x8004, 0x8005 @@ -124,7 +124,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmovement 0 setflag 752 setvar 0x4092, 3 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setdoorclosed 0x8004, 0x8005 doorchange clearflag 868 @@ -370,14 +370,14 @@ LittlerootTown_EventScript_14D857:: @ 814D857 LittlerootTown_EventScript_14D860:: @ 814D860 lockall setvar 0x8008, 0 - movesprite 4, 10, 9 + setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall setvar 0x8008, 1 - movesprite 4, 11, 9 + setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end @@ -599,7 +599,7 @@ LittlerootTown_EventScript_14DB46:: @ 814DB46 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -611,7 +611,7 @@ LittlerootTown_EventScript_14DB6C:: @ 814DB6C doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -623,7 +623,7 @@ LittlerootTown_EventScript_14DB92:: @ 814DB92 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -635,7 +635,7 @@ LittlerootTown_EventScript_14DBB8:: @ 814DBB8 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -647,7 +647,7 @@ LittlerootTown_EventScript_14DBDE:: @ 814DBDE doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -659,7 +659,7 @@ LittlerootTown_EventScript_14DC04:: @ 814DC04 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -671,7 +671,7 @@ LittlerootTown_EventScript_14DC2A:: @ 814DC2A doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -683,7 +683,7 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -853,14 +853,14 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange goto LittlerootTown_EventScript_14DD2B end LittlerootTown_EventScript_14DD2B:: @ 814DD2B - disappear 4 + removeobject 4 setflag 2144 setvar 0x4050, 4 release diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 712bebf03..84fb4e69b 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -38,7 +38,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse 9 - disappear LAST_TALKED + removeobject LAST_TALKED setvar 0x408d, 3 setvar 0x4050, 1 savebgm 0 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 834ae8521..7e3386d7a 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -14,7 +14,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 - spriteface 255, 2 + turnobject 255, 2 end LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 63364c6e5..780eea4f5 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -8,5 +8,5 @@ MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE end MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 - disappear LAST_TALKED + removeobject LAST_TALKED return diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 5dd9983f4..da406e2f7 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -154,8 +154,8 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 end MauvilleCity_EventScript_14C22B:: @ 814C22B - disappear 6 - disappear 7 + removeobject 6 + removeobject 7 clearflag 806 clearflag 809 setflag 190 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 8d78d1496..c7aa8fb10 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -33,9 +33,9 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_1A083F applymovement 6, MeteorFalls_1F_1R_Movement_1A083F waitmovement 0 - reappear 7 - reappear 8 - reappear 9 + addobject 7 + addobject 8 + addobject 9 applymovement 7, MeteorFalls_1F_1R_Movement_15C608 applymovement 8, MeteorFalls_1F_1R_Movement_15C60F applymovement 9, MeteorFalls_1F_1R_Movement_15C617 @@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1 applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC waitmovement 0 - disappear 5 - disappear 6 + removeobject 5 + removeobject 6 applymovement 7, MeteorFalls_1F_1R_Movement_15C628 waitmovement 0 .ifdef SAPPHIRE @@ -74,9 +74,9 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 8, MeteorFalls_1F_1R_Movement_15C62E applymovement 9, MeteorFalls_1F_1R_Movement_15C63E waitmovement 0 - disappear 7 - disappear 8 - disappear 9 + removeobject 7 + removeobject 8 + removeobject 9 setflag 819 setvar 0x40bf, 1 releaseall diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index b8388376a..c34eb9391 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -23,7 +23,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B call_if 1, MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 call_if 1, MossdeepCity_House2_EventScript_15A8B9 - disappear 3 + removeobject 3 release end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index aebb51c9c..8648487c9 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -78,7 +78,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT - disappear 2 + removeobject 2 playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e60c40cae..8720375ae 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -43,10 +43,10 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 .endif closebutton fadescreen 1 - disappear 2 - disappear 4 - disappear 5 - disappear 6 + removeobject 2 + removeobject 4 + removeobject 5 + removeobject 6 setflag 916 setflag 917 fadescreen 0 @@ -286,7 +286,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 call_if 1, MtPyre_Summit_EventScript_15D78A compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D795 - disappear 2 + removeobject 2 setvar 0x40b9, 3 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index ef016f261..0627fc53b 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -14,7 +14,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F end NewMauville_Inside_EventScript_15E58F:: @ 815E58F - disappear LAST_TALKED + removeobject LAST_TALKED return NewMauville_Inside_MapScript1_15E593:: @ 815E593 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 0ece240c6..412261ce1 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -277,7 +277,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 closebutton applymovement 4, OldaleTown_Movement_14DFE5 waitmovement 0 - disappear 4 + removeobject 4 setvar 0x40c7, 2 setflag 979 releaseall diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 1eff4d6c4..3ac7b85fc 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -69,7 +69,7 @@ PetalburgCity_Gym_MapScript2_154553:: @ 8154553 .2byte 0 PetalburgCity_Gym_EventScript_15455D:: @ 815455D - spriteface 255, 2 + turnobject 255, 2 end PetalburgCity_Gym_MapScript2_154562:: @ 8154562 @@ -85,7 +85,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 playse 9 - disappear 10 + removeobject 10 setflag 726 delay 30 applymovement 255, PetalburgCity_Gym_Movement_1A0841 @@ -142,7 +142,7 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E end PetalburgCity_Gym_EventScript_154669:: @ 8154669 - reappear 10 + addobject 10 playse 8 compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE @@ -204,7 +204,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 call_if 1, PetalburgCity_Gym_EventScript_154860 compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 - disappear 10 + removeobject 10 setflag 728 setvar 0x4085, 1 setvar 0x4057, 2 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 48eb53a50..4dececafa 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -86,7 +86,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA closebutton applymovement 3, PetalburgWoods_Movement_15CEB7 waitmovement 0 - disappear 3 + removeobject 3 applymovement 255, PetalburgWoods_Movement_1A0845 waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 @@ -110,7 +110,7 @@ PetalburgWoods_EventScript_15CE4D:: @ 815CE4D return PetalburgWoods_EventScript_15CE69:: @ 815CE69 - disappear 4 + removeobject 4 setvar 0x4098, 1 releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 35fbaf744..35c2d4117 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -21,8 +21,8 @@ Route101_EventScript_14E948:: @ 814E948 playbgm 410, 1 msgbox Route101_Text_16D10E, 4 closebutton - movesprite 2, 0, 15 - movesprite 4, 0, 16 + setobjectxy 2, 0, 15 + setobjectxy 4, 0, 16 applymovement 255, Route101_Movement_14EA2C applymovement 2, Route101_Movement_14EA50 applymovement 4, Route101_Movement_14EA1F @@ -220,8 +220,8 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag 2048 setflag 82 fadescreen 1 - disappear 4 - movesprite 255, 6, 13 + removeobject 4 + setobjectxy 255, 6, 13 applymovement 255, Route101_Movement_1A083F waitmovement 0 special ScrSpecial_ChooseStarter diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index b46545050..e5cf156a1 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -116,7 +116,7 @@ Route103_EventScript_14ED29:: @ 814ED29 end Route103_EventScript_14ED46:: @ 814ED46 - disappear 2 + removeobject 2 setvar 0x4062, 1 setvar 0x4084, 4 clearflag 889 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index c954ac972..8abb7354a 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -128,10 +128,10 @@ Route104_EventScript_14EFD5:: @ 814EFD5 spritelevelup 255, 0, 19, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 - disappear 8 + removeobject 8 applymovement 255, Route104_Movement_14F162 waitmovement 0 - spriteinvisible 255, 0, 19 + hideobject 255, 0, 19 call Route104_EventScript_1A02E7 applymovement 7, Route104_Movement_14F09F applymovement 255, Route104_Movement_14F09F @@ -139,20 +139,20 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement 255, Route104_Movement_14F166 waitmovement 0 call Route104_EventScript_1A02EF - spritevisible 255, 0, 11 + showobject 255, 0, 11 applymovement 255, Route104_Movement_14F168 waitmovement 0 movespriteperm 2, 12, 8 - reappear 2 + addobject 2 spritelevelup 2, 0, 11, 0 clearflag 740 applymovement 2, Route104_Movement_14F16F waitmovement 0 - reappear 4 + addobject 4 clearflag 743 call Route104_EventScript_1A02EF setflag 742 - spriteinvisible 7, 0, 19 + hideobject 7, 0, 19 copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 19 restorespritelevel 2, 0, 11 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 45ff1d3ed..7b13fef72 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -7,7 +7,7 @@ Route109_EventScript_14F4D3:: @ 814F4D3 spritelevelup 255, 0, 24, 0 applymovement 2, Route109_Movement_14F67B waitmovement 0 - disappear 2 + removeobject 2 switch FACING case 1, Route109_EventScript_14F518 case 3, Route109_EventScript_14F538 @@ -33,25 +33,25 @@ Route109_EventScript_14F538:: @ 814F538 end Route109_EventScript_14F548:: @ 814F548 - spriteinvisible 255, 0, 24 + hideobject 255, 0, 24 call Route109_EventScript_1A02E7 applymovement 1, Route109_Movement_14F5BF applymovement 255, Route109_Movement_14F5BF waitmovement 0 call Route109_EventScript_1A02EF - spritevisible 255, 0, 11 + showobject 255, 0, 11 applymovement 255, Route109_Movement_14F670 waitmovement 0 - reappear 4 + addobject 4 clearflag 743 movespriteperm 2, 12, 8 - reappear 2 + addobject 2 spritelevelup 2, 0, 11, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 clearflag 740 setflag 744 - spriteinvisible 1, 0, 24 + hideobject 1, 0, 24 msgbox Route109_Text_16B4B5, 4 closebutton copyvar 0x4096, 0x8008 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 56d4ff196..194816c36 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -433,8 +433,8 @@ Route110_EventScript_14FEB2:: @ 814FEB2 call_if 1, Route110_EventScript_14FF66 spritebehave 28, 10 spritebehave 29, 10 - disappear 28 - reappear 29 + removeobject 28 + addobject 29 delay 45 compare 0x8008, 1 call_if 1, Route110_EventScript_14FF35 @@ -442,7 +442,7 @@ Route110_EventScript_14FEB2:: @ 814FEB2 call_if 1, Route110_EventScript_14FF40 compare 0x8008, 3 call_if 1, Route110_EventScript_14FF4B - disappear 29 + removeobject 29 setvar 0x4069, 1 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index f99869648..0445496d2 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -21,9 +21,9 @@ Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 .2byte 0 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F - reappear 1 - spritevisible 1, 29, 1 - spriteface 1, 4 + addobject 1 + showobject 1, 29, 1 + turnobject 1, 4 end Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C @@ -185,7 +185,7 @@ Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E playse 178 applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 - disappear 1 + removeobject 1 addvar 0x4044, 1 return @@ -223,7 +223,7 @@ Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall - spriteface 1, 3 + turnobject 1, 3 playse 21 applymovement 1, Route110_TrickHouseEnd_Movement_1A0833 waitmovement 0 @@ -238,7 +238,7 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 applymovement 255, Route110_TrickHouseEnd_Movement_161CE8 waitmovement 0 delay 4 - spriteface 1, 4 + turnobject 1, 4 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 129cc7d6a..677ce93fa 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -138,15 +138,15 @@ Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 .2byte 0 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 - reappear 1 - spritevisible 1, 29, 0 - spriteface 1, 4 - spriteface 255, 3 + addobject 1 + showobject 1, 29, 0 + turnobject 1, 4 + turnobject 255, 3 end Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 - reappear 1 - spriteinvisible 1, 29, 0 + addobject 1 + hideobject 1, 29, 0 switch 0x4044 case 0, Route110_TrickHouseEntrance_EventScript_16116B case 1, Route110_TrickHouseEntrance_EventScript_161173 @@ -159,51 +159,51 @@ Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 end Route110_TrickHouseEntrance_EventScript_16116B:: @ 816116B - movesprite 1, 6, 3 + setobjectxy 1, 6, 3 end Route110_TrickHouseEntrance_EventScript_161173:: @ 8161173 - movesprite 1, 11, 5 + setobjectxy 1, 11, 5 end Route110_TrickHouseEntrance_EventScript_16117B:: @ 816117B - movesprite 1, 11, 1 + setobjectxy 1, 11, 1 end Route110_TrickHouseEntrance_EventScript_161183:: @ 8161183 - movesprite 1, 3, 1 + setobjectxy 1, 3, 1 end Route110_TrickHouseEntrance_EventScript_16118B:: @ 816118B - movesprite 1, 0, 5 + setobjectxy 1, 0, 5 end Route110_TrickHouseEntrance_EventScript_161193:: @ 8161193 - movesprite 1, 9, 1 + setobjectxy 1, 9, 1 end Route110_TrickHouseEntrance_EventScript_16119B:: @ 816119B - movesprite 1, 8, 1 + setobjectxy 1, 8, 1 end Route110_TrickHouseEntrance_EventScript_1611A3:: @ 81611A3 - movesprite 1, 4, 4 + setobjectxy 1, 4, 4 end Route110_TrickHouseEntrance_EventScript_1611AB:: @ 81611AB - disappear 1 + removeobject 1 end Route110_TrickHouseEntrance_EventScript_1611AF:: @ 81611AF - reappear 1 - movesprite 1, 5, 2 - spriteface 1, 2 + addobject 1 + setobjectxy 1, 5, 2 + turnobject 1, 2 end Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE - reappear 1 - movesprite 1, 5, 2 - spriteface 1, 1 + addobject 1 + setobjectxy 1, 5, 2 + turnobject 1, 1 end Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD @@ -223,7 +223,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 playse 178 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 - disappear 1 + removeobject 1 setvar 0x40a7, 1 setvar 0x40a6, 0 releaseall @@ -472,7 +472,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 playse 178 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 - disappear 1 + removeobject 1 setvar 0x40c1, 0 setvar 0x40a7, 5 releaseall diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 617509938..879735ece 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -58,11 +58,11 @@ Route111_EventScript_150023:: @ 8150023 closebutton setflag 963 setflag 964 - disappear 34 + removeobject 34 delay 30 applymovement 35, Route111_Movement_1500AF waitmovement 0 - disappear 35 + removeobject 35 releaseall end @@ -80,11 +80,11 @@ Route111_EventScript_150069:: @ 8150069 closebutton setflag 964 setflag 963 - disappear 35 + removeobject 35 delay 30 applymovement 34, Route111_Movement_1500AF waitmovement 0 - disappear 34 + removeobject 34 releaseall end @@ -254,12 +254,12 @@ Route111_EventScript_1501F3:: @ 81501F3 closebutton applymovement 1, Route111_Movement_150356 waitmovement 0 - disappear 1 + removeobject 1 call Route111_EventScript_15034F applymovement 255, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 - reappear 2 + addobject 2 applymovement 2, Route111_Movement_150359 waitmovement 0 call Route111_EventScript_15034F @@ -272,12 +272,12 @@ Route111_EventScript_1501F3:: @ 81501F3 closebutton applymovement 2, Route111_Movement_150356 waitmovement 0 - disappear 2 + removeobject 2 call Route111_EventScript_15034F applymovement 255, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 - reappear 3 + addobject 3 applymovement 3, Route111_Movement_150359 waitmovement 0 call Route111_EventScript_15034F @@ -290,12 +290,12 @@ Route111_EventScript_1501F3:: @ 81501F3 closebutton applymovement 3, Route111_Movement_150356 waitmovement 0 - disappear 3 + removeobject 3 call Route111_EventScript_15034F applymovement 255, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 - reappear 4 + addobject 4 applymovement 4, Route111_Movement_150359 waitmovement 0 call Route111_EventScript_15034F @@ -308,7 +308,7 @@ Route111_EventScript_1501F3:: @ 81501F3 call Route111_EventScript_150348 applymovement 4, Route111_Movement_150356 waitmovement 0 - disappear 4 + removeobject 4 call Route111_EventScript_15034F release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 5a328f198..ca3895e1a 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -56,7 +56,7 @@ Route116_EventScript_150A94:: @ 8150A94 call_if 1, Route116_EventScript_150AEE compare FACING, 4 call_if 1, Route116_EventScript_150AF9 - disappear LAST_TALKED + removeobject LAST_TALKED clearflag 949 setflag 256 release @@ -189,7 +189,7 @@ Route116_EventScript_150C03:: @ 8150C03 call_if 1, Route116_EventScript_150C37 compare FACING, 4 call_if 1, Route116_EventScript_150C42 - disappear LAST_TALKED + removeobject LAST_TALKED release end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 86e5f9045..8427395a6 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -90,7 +90,7 @@ Route118_EventScript_151004:: @ 8151004 compare 0x8008, 2 call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 - disappear 19 + removeobject 19 releaseall end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index fff294ca9..d825cb96e 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -16,11 +16,11 @@ Route119_EventScript_15117C:: @ 815117C return Route119_EventScript_151193:: @ 8151193 - disappear 35 + removeobject 35 return Route119_EventScript_151197:: @ 8151197 - disappear 36 + removeobject 36 return Route119_MapScript1_15119B:: @ 815119B @@ -50,7 +50,7 @@ Route119_EventScript_1511D0:: @ 81511D0 Route119_EventScript_1511DB:: @ 81511DB lockall - reappear 25 + addobject 25 checkgender compare RESULT, 0 call_if 1, Route119_EventScript_151254 @@ -68,8 +68,8 @@ Route119_EventScript_1511DB:: @ 81511DB call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 - disappear 25 - reappear 16 + removeobject 25 + addobject 16 delay 30 checkgender compare RESULT, 0 @@ -158,14 +158,14 @@ Route119_EventScript_151362:: @ 8151362 call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 - disappear 16 - reappear 25 + removeobject 16 + addobject 25 delay 30 compare 0x4001, 1 call_if 1, Route119_EventScript_1513BC compare 0x4001, 2 call_if 1, Route119_EventScript_1513C7 - disappear 25 + removeobject 25 setvar 0x4072, 1 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 5f9cf9888..37b6d07a9 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -43,9 +43,9 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 fadedefaultbgm fadescreen 1 setflag 890 - disappear 1 - disappear 2 - disappear 3 + removeobject 1 + removeobject 2 + removeobject 3 fadescreen 0 applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8 waitmovement 0 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index cb8ebb2cc..b6bb60ddd 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -25,28 +25,28 @@ Route120_EventScript_151628:: @ 8151628 return Route120_EventScript_15166B:: @ 815166B - disappear 30 - disappear 36 + removeobject 30 + removeobject 36 return Route120_EventScript_151672:: @ 8151672 - disappear 37 + removeobject 37 return Route120_EventScript_151676:: @ 8151676 - disappear 38 + removeobject 38 return Route120_EventScript_15167A:: @ 815167A - disappear 39 + removeobject 39 return Route120_EventScript_15167E:: @ 815167E - disappear 41 + removeobject 41 return Route120_EventScript_151682:: @ 8151682 - disappear 40 + removeobject 40 return Route120_MapScript1_151686:: @ 8151686 @@ -248,7 +248,7 @@ Route120_EventScript_151908:: @ 8151908 setanimation 0, 1 doanimation 30 delay 15 - disappear 31 + removeobject 31 checkanimation 30 setmaptile 13, 15, 663, 0 setmaptile 12, 16, 671, 0 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index efaf251b1..43be91266 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -26,9 +26,9 @@ Route121_EventScript_151B25:: @ 8151B25 applymovement 13, Route121_Movement_151B60 applymovement 14, Route121_Movement_151B69 waitmovement 0 - disappear 12 - disappear 13 - disappear 14 + removeobject 12 + removeobject 13 + removeobject 14 setvar 0x4074, 1 releaseall end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 158313a1b..f19dc6662 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -49,13 +49,13 @@ Route128_EventScript_15213F:: @ 815213F applymovement 5, Route128_Movement_152296 applymovement 4, Route128_Movement_152283 waitmovement 0 - disappear 5 - disappear 4 + removeobject 5 + removeobject 4 delay 100 setanimation 0, 1 doanimation 30 checkanimation 30 - reappear 3 + addobject 3 applymovement 3, Route128_Movement_15226F waitmovement 0 applymovement 255, Route128_Movement_1A0843 @@ -80,7 +80,7 @@ Route128_EventScript_15213F:: @ 815213F setanimation 0, 1 doanimation 30 delay 15 - disappear 3 + removeobject 3 checkanimation 30 setvar 0x407b, 2 releaseall diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index dcbb75886..d2469dca7 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -165,18 +165,18 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD RustboroCity_EventScript_14C4F4:: @ 814C4F4 msgbox RustboroCity_Text_166E65, 4 closebutton - reappear 10 - reappear 9 + addobject 10 + addobject 9 applymovement 10, RustboroCity_Movement_14C5C2 waitmovement 0 - disappear 10 + removeobject 10 applymovement 9, RustboroCity_Movement_14C5D3 waitmovement 0 msgbox RustboroCity_Text_166E7E, 4 closebutton applymovement 9, RustboroCity_Movement_14C5DB waitmovement 0 - disappear 9 + removeobject 9 movespriteperm 9, 30, 10 clearflag 732 setflag 142 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 88f1c377a..6458ec5ca 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 - spriteface 255, 4 + turnobject 255, 4 end RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 81bfcd27d..0cfb66351 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -318,9 +318,9 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA applymovement 255, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 waitmovement 0 - disappear 6 + removeobject 6 delay 50 - reappear 5 + addobject 5 applymovement 5, RusturfTunnel_Movement_15CAAC waitmovement 0 applymovement 255, RusturfTunnel_Movement_15CA9F @@ -339,8 +339,8 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA applymovement 5, RusturfTunnel_Movement_15CAB4 applymovement 7, RusturfTunnel_Movement_15CAC3 waitmovement 0 - disappear 5 - disappear 7 + removeobject 5 + removeobject 7 clearflag 142 setflag 143 setvar 0x405a, 4 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 087c1caf7..e600611be 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -28,7 +28,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif closebutton - reappear 0x8004 + addobject 0x8004 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD36 @@ -96,8 +96,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 delay 150 - disappear 7 - reappear 1 + removeobject 7 + addobject 1 waitstate delay 60 applymovement 1, SeafloorCavern_Room9_Movement_15DD4C @@ -110,7 +110,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA waitstate applymovement 1, SeafloorCavern_Room9_Movement_15DD57 waitmovement 0 - disappear 1 + removeobject 1 delay 4 setvar 0x8004, 2 setvar 0x8005, 2 @@ -153,9 +153,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif closebutton - reappear 0x8005 - reappear 0x8006 - reappear 0x8007 + addobject 0x8005 + addobject 0x8006 + addobject 0x8007 applymovement 0x8007, SeafloorCavern_Room9_Movement_15DD63 applymovement 0x8006, SeafloorCavern_Room9_Movement_15DD63 applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD5A diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 9a8a57e3f..f5ee60d6d 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -8,7 +8,7 @@ SkyPillar_Top_MapScript1_15F308:: @ 815F308 end SkyPillar_Top_EventScript_15F312:: @ 815F312 - disappear LAST_TALKED + removeobject LAST_TALKED return SkyPillar_Top_EventScript_15F316:: @ 815F316 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index aba9ee235..1c9fc342f 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -502,8 +502,8 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 10, SlateportCity_Movement_14BFDD applymovement 9, SlateportCity_Movement_14BFEA waitmovement 0 - disappear 10 - disappear 9 + removeobject 10 + removeobject 9 msgbox SlateportCity_Text_16558D, 4 applymovement 11, SlateportCity_Movement_1A0841 waitmovement 0 @@ -532,7 +532,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_14BFFB applymovement 255, SlateportCity_Movement_14C008 waitmovement 0 - disappear 11 + removeobject 11 clearflag 841 clearflag 848 clearflag 845 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 184586d94..50f4926e4 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -59,9 +59,9 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 applymovement 7, SlateportCity_Harbor_Movement_15609B applymovement 8, SlateportCity_Harbor_Movement_1560A5 waitmovement 0 - disappear 6 - disappear 7 - disappear 8 + removeobject 6 + removeobject 7 + removeobject 8 setvar 0x40a0, 2 compare 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C @@ -222,13 +222,13 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - spriteinvisible LAST_TALKED, 9, 8 + hideobject LAST_TALKED, 9, 8 compare FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setvar 0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E return diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 7fe5865a4..32a5c2013 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -181,7 +181,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 waitmovement 0 setflag 965 playse 9 - disappear 13 + removeobject 13 release end @@ -190,7 +190,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD waitmovement 0 setflag 965 playse 9 - disappear 13 + removeobject 13 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index c1398e579..5f64b3941 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -12,10 +12,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 closebutton playbgm BGM_EVIL_TEAM, 1 - reappear 3 + addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 waitmovement 0 - reappear 4 + addobject 4 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3 waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 @@ -55,7 +55,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4 closebutton delay 35 - reappear 2 + addobject 2 applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE waitmovement 0 @@ -69,9 +69,9 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 .endif closebutton fadescreen 1 - disappear 2 - disappear 3 - disappear 4 + removeobject 2 + removeobject 3 + removeobject 4 fadescreen 0 delay 30 setflag 883 @@ -85,7 +85,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 playse 9 - disappear 1 + removeobject 1 setflag 900 setflag 149 clearflag 947 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 936b859e5..90d2bcc5e 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -464,7 +464,7 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD setanimation 0, 1 doanimation 30 delay 15 - disappear LAST_TALKED + removeobject LAST_TALKED checkanimation 30 release end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 358e2277c..77c163c47 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -17,7 +17,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmovement 0 delay 30 - spriteinvisible 1, 26, 9 + hideobject 1, 26, 9 setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C warp LilycoveCity_Harbor, 255, 8, 11 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 37af5e140..f4ec0ab2f 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -9,7 +9,7 @@ SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E end SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 - disappear 2 + removeobject 2 return SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C @@ -57,7 +57,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 pokecry SPECIES_LATIAS_OR_LATIOS, 0 delay 30 waitpokecry - reappear 2 + addobject 2 delay 30 applymovement 127, SouthernIsland_Interior_Movement_160C16 applymovement 2, SouthernIsland_Interior_Movement_160C22 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 994f37b63..0c621d237 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A end LinkContestRoom1_EventScript_15F625:: @ 815F625 - spriteinvisible 255, 0, 9 + hideobject 255, 0, 9 call LinkContestRoom1_EventScript_15F919 end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index a0173e720..2ed660a5f 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -13,7 +13,7 @@ VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 lockall - reappear 4 + addobject 4 applymovement 4, VictoryRoad_1F_Movement_15DF07 waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 @@ -21,7 +21,7 @@ VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB lockall - reappear 4 + addobject 4 applymovement 4, VictoryRoad_1F_Movement_15DF13 waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 @@ -29,7 +29,7 @@ VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF lockall - reappear 4 + addobject 4 applymovement 4, VictoryRoad_1F_Movement_15DF1E waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 432ba8f65..a821fd62d 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -74,13 +74,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse 9 - disappear 0x8008 + removeobject 0x8008 releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 setvar 0x8008, 14 - reappear 0x8008 + addobject 0x8008 applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 @@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 setvar 0x8008, 14 - reappear 0x8008 + addobject 0x8008 applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F @@ -397,7 +397,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse 8 - disappear 0x8009 + removeobject 0x8009 setflag 291 setvar 0x4082, 4 setvar 0x408c, 4 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index dde0d0400..9f9b21807 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -272,10 +272,10 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D setvar 0x8004, 0 fadescreen 1 - disappear 240 - disappear 239 - disappear 238 - disappear 237 + removeobject 240 + removeobject 239 + removeobject 238 + removeobject 237 special sub_804E538 waitstate releaseall diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 2c1524e5b..d9ebe56a3 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -22,7 +22,7 @@ Route111_EventScript_1A3877:: @ 81A3877 call_if 1, Route111_EventScript_1A38C3 compare FACING, 2 call_if 1, Route111_EventScript_1A38CE - disappear LAST_TALKED + removeobject LAST_TALKED release end -- cgit v1.2.3 From 676ffb73cad2a5ec4173a09d525fda68dd2bd0f7 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 15:38:46 -0500 Subject: stuff... I don't remember --- data/event_scripts.s | 94 +++++++++++++++++++++--------------------- data/scripts/gabby_and_ty.inc | 2 +- data/scripts/maps/Route111.inc | 6 +-- 3 files changed, 51 insertions(+), 51 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 32cb8d233..1359199d3 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -943,7 +943,7 @@ gUnknown_0819F818:: @ 819F818 goto EventScript_19F8F2 EventScript_19F83F: - endtrainerbattle + ontrainerbattleend gUnknown_0819F840:: @ 819F840 lock @@ -967,14 +967,14 @@ EventScript_19F870: end EventScript_19F877: - endtrainerbattle + ontrainerbattleend gUnknown_0819F878:: @ 819F878 applymovement LAST_TALKED, Movement_19F8F0 waitmovement 0 special PlayTrainerEncounterMusic - reptrainerbattle - endtrainerbattle + battlebegin + ontrainerbattleend gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 @@ -992,7 +992,7 @@ gUnknown_0819F887:: @ 819F887 end EventScript_19F8AD: - endtrainerbattle + ontrainerbattleend gUnknown_0819F8AE:: @ 819F8AE specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag @@ -1012,7 +1012,7 @@ gUnknown_0819F8AE:: @ 819F8AE end EventScript_19F8DD: - endtrainerbattle + ontrainerbattleend EventScript_19F8DE: special ScrSpecial_ShowTrainerNonBattlingSpeech @@ -1034,7 +1034,7 @@ EventScript_19F8F2: special ScrSpecial_ShowTrainerIntroSpeech waittext waitbutton - reptrainerbattle + battlebegin specialvar RESULT, ScrSpecial_GetTrainerBattleMode compare RESULT, 0 goto_if_eq EventScript_19F934 @@ -1052,7 +1052,7 @@ EventScript_19F934: end EventScript_19F936: - endtrainerbattle2 + ontrainerbattleendgoto Std_6:: message 0x0 @@ -1939,66 +1939,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 end DewfordTown_Gym_EventScript_1A021E:: @ 81A021E - cleartrainerflag OPPONENT_JOSH - cleartrainerflag OPPONENT_TOMMY + settrainerflag OPPONENT_JOSH + settrainerflag OPPONENT_TOMMY return DewfordTown_Gym_EventScript_1A0225:: @ 81A0225 - cleartrainerflag OPPONENT_HIDEKI - cleartrainerflag OPPONENT_TESSA - cleartrainerflag OPPONENT_LAURA + settrainerflag OPPONENT_HIDEKI + settrainerflag OPPONENT_TESSA + settrainerflag OPPONENT_LAURA return DewfordTown_Gym_EventScript_1A022F:: @ 81A022F - cleartrainerflag OPPONENT_KIRK - cleartrainerflag OPPONENT_SHAWN - cleartrainerflag OPPONENT_BEN - cleartrainerflag OPPONENT_VIVIAN + settrainerflag OPPONENT_KIRK + settrainerflag OPPONENT_SHAWN + settrainerflag OPPONENT_BEN + settrainerflag OPPONENT_VIVIAN return DewfordTown_Gym_EventScript_1A023C:: @ 81A023C - cleartrainerflag OPPONENT_COLE - cleartrainerflag OPPONENT_AXLE - cleartrainerflag OPPONENT_ANDY - cleartrainerflag OPPONENT_ZANE - cleartrainerflag OPPONENT_SADIE + settrainerflag OPPONENT_COLE + settrainerflag OPPONENT_AXLE + settrainerflag OPPONENT_ANDY + settrainerflag OPPONENT_ZANE + settrainerflag OPPONENT_SADIE return DewfordTown_Gym_EventScript_1A024C:: @ 81A024C - cleartrainerflag OPPONENT_RANDALL - cleartrainerflag OPPONENT_PARKER - cleartrainerflag OPPONENT_GEORGE - cleartrainerflag OPPONENT_BERKE - cleartrainerflag OPPONENT_MARY - cleartrainerflag OPPONENT_LORI - cleartrainerflag OPPONENT_JODY + settrainerflag OPPONENT_RANDALL + settrainerflag OPPONENT_PARKER + settrainerflag OPPONENT_GEORGE + settrainerflag OPPONENT_BERKE + settrainerflag OPPONENT_MARY + settrainerflag OPPONENT_LORI + settrainerflag OPPONENT_JODY return DewfordTown_Gym_EventScript_1A0262:: @ 81A0262 - cleartrainerflag OPPONENT_JARED - cleartrainerflag OPPONENT_TERRELL - cleartrainerflag OPPONENT_KYLEE - cleartrainerflag OPPONENT_WILL + settrainerflag OPPONENT_JARED + settrainerflag OPPONENT_TERRELL + settrainerflag OPPONENT_KYLEE + settrainerflag OPPONENT_WILL return DewfordTown_Gym_EventScript_1A026F:: @ 81A026F - cleartrainerflag OPPONENT_PRESTON - cleartrainerflag OPPONENT_VIRGIL - cleartrainerflag OPPONENT_FRITZ - cleartrainerflag OPPONENT_HANNAH - cleartrainerflag OPPONENT_SAMANTHA - cleartrainerflag OPPONENT_MAURA + settrainerflag OPPONENT_PRESTON + settrainerflag OPPONENT_VIRGIL + settrainerflag OPPONENT_FRITZ + settrainerflag OPPONENT_HANNAH + settrainerflag OPPONENT_SAMANTHA + settrainerflag OPPONENT_MAURA return DewfordTown_Gym_EventScript_1A0282:: @ 81A0282 - cleartrainerflag OPPONENT_ANDREA - cleartrainerflag OPPONENT_CRISSY - cleartrainerflag OPPONENT_BRIANNA_2 - cleartrainerflag OPPONENT_CONNIE - cleartrainerflag OPPONENT_BRIDGET - cleartrainerflag OPPONENT_OLIVIA - cleartrainerflag OPPONENT_TIFFANY - cleartrainerflag OPPONENT_MARISSA + settrainerflag OPPONENT_ANDREA + settrainerflag OPPONENT_CRISSY + settrainerflag OPPONENT_BRIANNA_2 + settrainerflag OPPONENT_CONNIE + settrainerflag OPPONENT_BRIDGET + settrainerflag OPPONENT_OLIVIA + settrainerflag OPPONENT_TIFFANY + settrainerflag OPPONENT_MARISSA return DewfordTown_Gym_EventScript_1A029B:: @ 81A029B diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index cad2c6a48..214c61142 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,7 +1,7 @@ Route111_EventScript_1AE313:: @ 81AE313 Route118_EventScript_1AE313:: @ 81AE313 Route120_EventScript_1AE313:: @ 81AE313 - settrainerflag OPPONENT_GABBY_AND_TY_6 + cleartrainerflag OPPONENT_GABBY_AND_TY_6 specialvar RESULT, GabbyAndTyGetBattleNum switch RESULT case 0, Route111_EventScript_1AE384 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 879735ece..de37c68fc 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -44,9 +44,9 @@ Route111_EventScript_15000D:: @ 815000D setflag 769 setflag 770 setflag 771 - settrainerflag OPPONENT_VICTOR - settrainerflag OPPONENT_VICTORIA - settrainerflag OPPONENT_VIVI + cleartrainerflag OPPONENT_VICTOR + cleartrainerflag OPPONENT_VICTORIA + cleartrainerflag OPPONENT_VIVI end Route111_EventScript_150023:: @ 8150023 -- cgit v1.2.3 From e2f293d771fe6a5ea8ae3e272db880d048a1e99b Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 16:13:50 -0500 Subject: name some ScrCmd_ functions --- data/script_cmd_table.inc | 398 +++++++++++++++++++++++----------------------- 1 file changed, 199 insertions(+), 199 deletions(-) (limited to 'data') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index a68f2ca8d..1ee61e2e7 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -1,203 +1,203 @@ .align 2 gScriptCmdTable:: @ 814AE30 - .4byte ScrCmd_snop - .4byte ScrCmd_snop1 - .4byte ScrCmd_end - .4byte ScrCmd_return - .4byte ScrCmd_call - .4byte ScrCmd_jump - .4byte ScrCmd_jumpif - .4byte ScrCmd_callif - .4byte ScrCmd_jumpstd - .4byte ScrCmd_callstd - .4byte ScrCmd_jumpstdif - .4byte ScrCmd_callstdif - .4byte ScrCmd_jumpram - .4byte ScrCmd_die - .4byte ScrCmd_setbyte - .4byte ScrCmd_loadptr - .4byte ScrCmd_setbufferbyte - .4byte ScrCmd_writebytetooffset - .4byte ScrCmd_loadbytefrompointer - .4byte ScrCmd_setptrbyte - .4byte ScrCmd_copybuffers - .4byte ScrCmd_copybyte - .4byte ScrCmd_setvar - .4byte ScrCmd_addvar - .4byte ScrCmd_subvar - .4byte ScrCmd_copyvar - .4byte ScrCmd_setorcopyvar - .4byte ScrCmd_comparebuffers - .4byte ScrCmd_comparebuffertobyte - .4byte ScrCmd_comparebuffertoptrbyte - .4byte ScrCmd_compareptrbytetobuffer - .4byte ScrCmd_compareptrbytetobyte - .4byte ScrCmd_compareptrbytes - .4byte ScrCmd_compare - .4byte ScrCmd_comparevars - .4byte ScrCmd_callasm - .4byte ScrCmd_jumpasm - .4byte ScrCmd_special - .4byte ScrCmd_specialval - .4byte ScrCmd_waitstate - .4byte ScrCmd_pause - .4byte ScrCmd_setflag - .4byte ScrCmd_clearflag - .4byte ScrCmd_checkflag - .4byte ScrCmd_compareflags - .4byte ScrCmd_checkdailyflags - .4byte ScrCmd_resetvars - .4byte ScrCmd_playsfx - .4byte ScrCmd_checksound - .4byte ScrCmd_fanfare - .4byte ScrCmd_waitfanfare - .4byte ScrCmd_playmusic - .4byte ScrCmd_playmusicbattle - .4byte ScrCmd_fadedefault - .4byte ScrCmd_fademusic - .4byte ScrCmd_fadeout - .4byte ScrCmd_fadein - .4byte ScrCmd_warp - .4byte ScrCmd_warpmuted - .4byte ScrCmd_warpwalk - .4byte ScrCmd_warphole - .4byte ScrCmd_warpteleport - .4byte ScrCmd_warp3 - .4byte ScrCmd_warpplace - .4byte ScrCmd_warp4 - .4byte ScrCmd_warp5 - .4byte ScrCmd_getplayerxy - .4byte ScrCmd_countpokemon - .4byte ScrCmd_additem - .4byte ScrCmd_removeitem - .4byte ScrCmd_checkitemspace - .4byte ScrCmd_checkitem - .4byte ScrCmd_checkitemtype - .4byte ScrCmd_addpcitem - .4byte ScrCmd_checkpcitem - .4byte ScrCmd_adddecor - .4byte ScrCmd_removedecor - .4byte ScrCmd_testdecor - .4byte ScrCmd_checkdecor - .4byte ScrCmd_move - .4byte ScrCmd_movecoords - .4byte ScrCmd_waitmove - .4byte ScrCmd_waitmovexy - .4byte ScrCmd_disappear - .4byte ScrCmd_disappearxy - .4byte ScrCmd_reappear - .4byte ScrCmd_reappearxy - .4byte ScrCmd_movesprite - .4byte ScrCmd_spritevisible - .4byte ScrCmd_spriteinvisible - .4byte ScrCmd_faceplayer - .4byte ScrCmd_spriteface - .4byte ScrCmd_trainerbattle - .4byte ScrCmd_reptrainerbattle - .4byte ScrCmd_endtrainerbattle - .4byte ScrCmd_endtrainerbattle2 - .4byte ScrCmd_checktrainerflag - .4byte ScrCmd_cleartrainerflag - .4byte ScrCmd_settrainerflag - .4byte ScrCmd_movespriteperm - .4byte ScrCmd_moveoffscreen - .4byte ScrCmd_spritebehave - .4byte ScrCmd_waittext - .4byte ScrCmd_message - .4byte ScrCmd_closebutton - .4byte ScrCmd_lockall - .4byte ScrCmd_lock - .4byte ScrCmd_releaseall - .4byte ScrCmd_release - .4byte ScrCmd_waitbutton - .4byte ScrCmd_yesnobox - .4byte ScrCmd_multichoice - .4byte ScrCmd_multichoicedef - .4byte ScrCmd_multichoicerow - .4byte ScrCmd_showbox - .4byte ScrCmd_hidebox - .4byte ScrCmd_clearbox - .4byte ScrCmd_showpokepic - .4byte ScrCmd_hidepokepic - .4byte ScrCmd_showcontestwinner - .4byte ScrCmd_braillemsg - .4byte ScrCmd_givepokemon - .4byte ScrCmd_giveegg - .4byte ScrCmd_setpokemove - .4byte ScrCmd_checkattack - .4byte ScrCmd_bufferpoke - .4byte ScrCmd_bufferfirstpoke - .4byte ScrCmd_bufferpartypoke - .4byte ScrCmd_bufferitem - .4byte ScrCmd_bufferdecor - .4byte ScrCmd_bufferattack - .4byte ScrCmd_buffernum - .4byte ScrCmd_bufferstd - .4byte ScrCmd_buffertext - .4byte ScrCmd_pokemart - .4byte ScrCmd_pokemartdecor - .4byte ScrCmd_pokemartbp - .4byte ScrCmd_pokecasino - .4byte ScrCmd_event_8a - .4byte ScrCmd_choosecontestpkmn - .4byte ScrCmd_startcontest - .4byte ScrCmd_showcontestresults - .4byte ScrCmd_contestlinktransfer - .4byte ScrCmd_random - .4byte ScrCmd_givemoney - .4byte ScrCmd_paymoney - .4byte ScrCmd_checkmoney - .4byte ScrCmd_showmoney - .4byte ScrCmd_hidemoney - .4byte ScrCmd_updatemoney - .4byte ScrCmd_event_96 - .4byte ScrCmd_fadescreen - .4byte ScrCmd_fadescreendelay - .4byte ScrCmd_darken - .4byte ScrCmd_lighten - .4byte ScrCmd_message2 - .4byte ScrCmd_doanimation - .4byte ScrCmd_setanimation - .4byte ScrCmd_checkanimation - .4byte ScrCmd_sethealplace - .4byte ScrCmd_checkgender - .4byte ScrCmd_pokecry - .4byte ScrCmd_setmaptile - .4byte ScrCmd_resetweather - .4byte ScrCmd_setweather - .4byte ScrCmd_doweather - .4byte ScrCmd_tileeffect - .4byte ScrCmd_setmapfooter - .4byte ScrCmd_spritelevelup - .4byte ScrCmd_restorespritelevel - .4byte ScrCmd_createvsprite - .4byte ScrCmd_vspriteface - .4byte ScrCmd_setdooropened - .4byte ScrCmd_setdoorclosed - .4byte ScrCmd_doorchange - .4byte ScrCmd_setdooropened2 - .4byte ScrCmd_setdoorclosed2 - .4byte ScrCmd_event_b1 - .4byte ScrCmd_event_b2 - .4byte ScrCmd_checkcoins - .4byte ScrCmd_givecoins - .4byte ScrCmd_removecoins - .4byte ScrCmd_setwildbattle - .4byte ScrCmd_dowildbattle - .4byte ScrCmd_setvaddress - .4byte ScrCmd_vjump - .4byte ScrCmd_vcall - .4byte ScrCmd_if5 - .4byte ScrCmd_if6 - .4byte ScrCmd_vtext - .4byte ScrCmd_vloadptr - .4byte ScrCmd_vbuffer - .4byte ScrCmd_showcoins - .4byte ScrCmd_hidecoins - .4byte ScrCmd_updatecoins - .4byte ScrCmd_inccounter - .4byte ScrCmd_warp6 - .4byte ScrCmd_waitpokecry + .4byte ScrCmd_nop @ 0x00 + .4byte ScrCmd_nop1 @ 0x01 + .4byte ScrCmd_end @ 0x02 + .4byte ScrCmd_return @ 0x03 + .4byte ScrCmd_call @ 0x04 + .4byte ScrCmd_goto @ 0x05 + .4byte ScrCmd_goto_if @ 0x06 + .4byte ScrCmd_call_if @ 0x07 + .4byte ScrCmd_gotostd @ 0x08 + .4byte ScrCmd_callstd @ 0x09 + .4byte ScrCmd_jumpstdif @ 0x0A + .4byte ScrCmd_callstdif @ 0x0B + .4byte ScrCmd_jumpram @ 0x0C + .4byte ScrCmd_die @ 0x0D + .4byte ScrCmd_setbyte @ 0x0E + .4byte ScrCmd_loadptr @ 0x0F + .4byte ScrCmd_setbufferbyte @ 0x10 + .4byte ScrCmd_writebytetooffset @ 0x11 + .4byte ScrCmd_loadbytefrompointer @ 0x12 + .4byte ScrCmd_setptrbyte @ 0x13 + .4byte ScrCmd_copybuffers @ 0x14 + .4byte ScrCmd_copybyte @ 0x15 + .4byte ScrCmd_setvar @ 0x16 + .4byte ScrCmd_addvar @ 0x17 + .4byte ScrCmd_subvar @ 0x18 + .4byte ScrCmd_copyvar @ 0x19 + .4byte ScrCmd_setorcopyvar @ 0x1A + .4byte ScrCmd_comparebuffers @ 0x1B + .4byte ScrCmd_comparebuffertobyte @ 0x1C + .4byte ScrCmd_comparebuffertoptrbyte @ 0x1D + .4byte ScrCmd_compareptrbytetobuffer @ 0x1E + .4byte ScrCmd_compareptrbytetobyte @ 0x1F + .4byte ScrCmd_compareptrbytes @ 0x20 + .4byte ScrCmd_compare @ 0x21 + .4byte ScrCmd_comparevars @ 0x22 + .4byte ScrCmd_callasm @ 0x23 + .4byte ScrCmd_jumpasm @ 0x24 + .4byte ScrCmd_special @ 0x25 + .4byte ScrCmd_specialval @ 0x26 + .4byte ScrCmd_waitstate @ 0x27 + .4byte ScrCmd_pause @ 0x28 + .4byte ScrCmd_setflag @ 0x29 + .4byte ScrCmd_clearflag @ 0x2A + .4byte ScrCmd_checkflag @ 0x2B + .4byte ScrCmd_compareflags @ 0x2C + .4byte ScrCmd_checkdailyflags @ 0x2D + .4byte ScrCmd_resetvars @ 0x2E + .4byte ScrCmd_playsfx @ 0x2F + .4byte ScrCmd_checksound @ 0x30 + .4byte ScrCmd_fanfare @ 0x31 + .4byte ScrCmd_waitfanfare @ 0x32 + .4byte ScrCmd_playmusic @ 0x33 + .4byte ScrCmd_playmusicbattle @ 0x34 + .4byte ScrCmd_fadedefault @ 0x35 + .4byte ScrCmd_fademusic @ 0x36 + .4byte ScrCmd_fadeout @ 0x37 + .4byte ScrCmd_fadein @ 0x38 + .4byte ScrCmd_warp @ 0x39 + .4byte ScrCmd_warpmuted @ 0x3A + .4byte ScrCmd_warpwalk @ 0x3B + .4byte ScrCmd_warphole @ 0x3C + .4byte ScrCmd_warpteleport @ 0x3D + .4byte ScrCmd_warp3 @ 0x3E + .4byte ScrCmd_warpplace @ 0x3F + .4byte ScrCmd_warp4 @ 0x40 + .4byte ScrCmd_warp5 @ 0x41 + .4byte ScrCmd_getplayerxy @ 0x42 + .4byte ScrCmd_countpokemon @ 0x43 + .4byte ScrCmd_additem @ 0x44 + .4byte ScrCmd_removeitem @ 0x45 + .4byte ScrCmd_checkitemspace @ 0x46 + .4byte ScrCmd_checkitem @ 0x47 + .4byte ScrCmd_checkitemtype @ 0x48 + .4byte ScrCmd_addpcitem @ 0x49 + .4byte ScrCmd_checkpcitem @ 0x4A + .4byte ScrCmd_adddecor @ 0x4B + .4byte ScrCmd_removedecor @ 0x4C + .4byte ScrCmd_testdecor @ 0x4D + .4byte ScrCmd_checkdecor @ 0x4E + .4byte ScrCmd_move @ 0x4F + .4byte ScrCmd_movecoords @ 0x50 + .4byte ScrCmd_waitmove @ 0x51 + .4byte ScrCmd_waitmovexy @ 0x52 + .4byte ScrCmd_disappear @ 0x53 + .4byte ScrCmd_disappearxy @ 0x54 + .4byte ScrCmd_reappear @ 0x55 + .4byte ScrCmd_reappearxy @ 0x56 + .4byte ScrCmd_movesprite @ 0x57 + .4byte ScrCmd_spritevisible @ 0x58 + .4byte ScrCmd_spriteinvisible @ 0x59 + .4byte ScrCmd_faceplayer @ 0x5A + .4byte ScrCmd_spriteface @ 0x5B + .4byte ScrCmd_trainerbattle @ 0x5C + .4byte ScrCmd_reptrainerbattle @ 0x5D + .4byte ScrCmd_endtrainerbattle @ 0x5E + .4byte ScrCmd_endtrainerbattle2 @ 0x5F + .4byte ScrCmd_checktrainerflag @ 0x60 + .4byte ScrCmd_cleartrainerflag @ 0x61 + .4byte ScrCmd_settrainerflag @ 0x62 + .4byte ScrCmd_movespriteperm @ 0x63 + .4byte ScrCmd_moveoffscreen @ 0x64 + .4byte ScrCmd_spritebehave @ 0x65 + .4byte ScrCmd_waittext @ 0x66 + .4byte ScrCmd_message @ 0x67 + .4byte ScrCmd_closebutton @ 0x68 + .4byte ScrCmd_lockall @ 0x69 + .4byte ScrCmd_lock @ 0x6A + .4byte ScrCmd_releaseall @ 0x6B + .4byte ScrCmd_release @ 0x6C + .4byte ScrCmd_waitbutton @ 0x6D + .4byte ScrCmd_yesnobox @ 0x6E + .4byte ScrCmd_multichoice @ 0x6F + .4byte ScrCmd_multichoicedef @ 0x70 + .4byte ScrCmd_multichoicerow @ 0x71 + .4byte ScrCmd_showbox @ 0x72 + .4byte ScrCmd_hidebox @ 0x73 + .4byte ScrCmd_clearbox @ 0x74 + .4byte ScrCmd_showpokepic @ 0x75 + .4byte ScrCmd_hidepokepic @ 0x76 + .4byte ScrCmd_showcontestwinner @ 0x77 + .4byte ScrCmd_braillemsg @ 0x78 + .4byte ScrCmd_givepokemon @ 0x79 + .4byte ScrCmd_giveegg @ 0x7A + .4byte ScrCmd_setpokemove @ 0x7B + .4byte ScrCmd_checkattack @ 0x7C + .4byte ScrCmd_bufferpoke @ 0x7D + .4byte ScrCmd_bufferfirstpoke @ 0x7E + .4byte ScrCmd_bufferpartypoke @ 0x7F + .4byte ScrCmd_bufferitem @ 0x80 + .4byte ScrCmd_bufferdecor @ 0x81 + .4byte ScrCmd_bufferattack @ 0x82 + .4byte ScrCmd_buffernum @ 0x83 + .4byte ScrCmd_bufferstd @ 0x84 + .4byte ScrCmd_buffertext @ 0x85 + .4byte ScrCmd_pokemart @ 0x86 + .4byte ScrCmd_pokemartdecor @ 0x87 + .4byte ScrCmd_pokemartbp @ 0x88 + .4byte ScrCmd_pokecasino @ 0x89 + .4byte ScrCmd_event_8a @ 0x8A + .4byte ScrCmd_choosecontestpkmn @ 0x8B + .4byte ScrCmd_startcontest @ 0x8C + .4byte ScrCmd_showcontestresults @ 0x8D + .4byte ScrCmd_contestlinktransfer @ 0x8E + .4byte ScrCmd_random @ 0x8F + .4byte ScrCmd_givemoney @ 0x90 + .4byte ScrCmd_paymoney @ 0x91 + .4byte ScrCmd_checkmoney @ 0x92 + .4byte ScrCmd_showmoney @ 0x93 + .4byte ScrCmd_hidemoney @ 0x94 + .4byte ScrCmd_updatemoney @ 0x95 + .4byte ScrCmd_event_96 @ 0x96 + .4byte ScrCmd_fadescreen @ 0x97 + .4byte ScrCmd_fadescreendelay @ 0x98 + .4byte ScrCmd_darken @ 0x99 + .4byte ScrCmd_lighten @ 0x9A + .4byte ScrCmd_message2 @ 0x9B + .4byte ScrCmd_doanimation @ 0x9C + .4byte ScrCmd_setanimation @ 0x9D + .4byte ScrCmd_checkanimation @ 0x9E + .4byte ScrCmd_sethealplace @ 0x9F + .4byte ScrCmd_checkgender @ 0xA0 + .4byte ScrCmd_pokecry @ 0xA1 + .4byte ScrCmd_setmaptile @ 0xA2 + .4byte ScrCmd_resetweather @ 0xA3 + .4byte ScrCmd_setweather @ 0xA4 + .4byte ScrCmd_doweather @ 0xA5 + .4byte ScrCmd_tileeffect @ 0xA6 + .4byte ScrCmd_setmapfooter @ 0xA7 + .4byte ScrCmd_spritelevelup @ 0xA8 + .4byte ScrCmd_restorespritelevel @ 0xA9 + .4byte ScrCmd_createvsprite @ 0xAA + .4byte ScrCmd_vspriteface @ 0xAB + .4byte ScrCmd_setdooropened @ 0xAC + .4byte ScrCmd_setdoorclosed @ 0xAD + .4byte ScrCmd_doorchange @ 0xAE + .4byte ScrCmd_setdooropened2 @ 0xAF + .4byte ScrCmd_setdoorclosed2 @ 0xB0 + .4byte ScrCmd_event_b1 @ 0xB1 + .4byte ScrCmd_event_b2 @ 0xB2 + .4byte ScrCmd_checkcoins @ 0xB3 + .4byte ScrCmd_givecoins @ 0xB4 + .4byte ScrCmd_removecoins @ 0xB5 + .4byte ScrCmd_setwildbattle @ 0xB6 + .4byte ScrCmd_dowildbattle @ 0xB7 + .4byte ScrCmd_setvaddress @ 0xB8 + .4byte ScrCmd_vjump @ 0xB9 + .4byte ScrCmd_vcall @ 0xBA + .4byte ScrCmd_if5 @ 0xBB + .4byte ScrCmd_if6 @ 0xBC + .4byte ScrCmd_vtext @ 0xBD + .4byte ScrCmd_vloadptr @ 0xBE + .4byte ScrCmd_vbuffer @ 0xBF + .4byte ScrCmd_showcoins @ 0xC0 + .4byte ScrCmd_hidecoins @ 0xC1 + .4byte ScrCmd_updatecoins @ 0xC2 + .4byte ScrCmd_inccounter @ 0xC3 + .4byte ScrCmd_warp6 @ 0xC4 + .4byte ScrCmd_waitpokecry @ 0xC5 gScriptCmdTableEnd:: - .4byte ScrCmd_snop + .4byte ScrCmd_nop -- cgit v1.2.3 From c0c4ab681c4413cf534c7e7e6eb8c56edaf4e7ec Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 16:25:36 -0500 Subject: update --- data/script_cmd_table.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 1ee61e2e7..a3d96c0a1 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -10,17 +10,17 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_call_if @ 0x07 .4byte ScrCmd_gotostd @ 0x08 .4byte ScrCmd_callstd @ 0x09 - .4byte ScrCmd_jumpstdif @ 0x0A - .4byte ScrCmd_callstdif @ 0x0B - .4byte ScrCmd_jumpram @ 0x0C - .4byte ScrCmd_die @ 0x0D - .4byte ScrCmd_setbyte @ 0x0E - .4byte ScrCmd_loadptr @ 0x0F - .4byte ScrCmd_setbufferbyte @ 0x10 - .4byte ScrCmd_writebytetooffset @ 0x11 - .4byte ScrCmd_loadbytefrompointer @ 0x12 + .4byte ScrCmd_gotostd_if @ 0x0A + .4byte ScrCmd_callstd_if @ 0x0B + .4byte ScrCmd_gotoram @ 0x0C + .4byte ScrCmd_killscript @ 0x0D + .4byte ScrCmd_setmestatus @ 0x0E + .4byte ScrCmd_loadword @ 0x0F + .4byte ScrCmd_loadbyte @ 0x10 + .4byte ScrCmd_writebytetoaddr @ 0x11 + .4byte ScrCmd_loadbytefromaddr @ 0x12 .4byte ScrCmd_setptrbyte @ 0x13 - .4byte ScrCmd_copybuffers @ 0x14 + .4byte ScrCmd_copylocal @ 0x14 .4byte ScrCmd_copybyte @ 0x15 .4byte ScrCmd_setvar @ 0x16 .4byte ScrCmd_addvar @ 0x17 -- cgit v1.2.3 From 0f0f7856f135317f98de81675c98aa46564b59ee Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 16:41:50 -0500 Subject: update --- data/script_cmd_table.inc | 96 +++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'data') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index a3d96c0a1..4295c0b63 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -27,45 +27,45 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_subvar @ 0x18 .4byte ScrCmd_copyvar @ 0x19 .4byte ScrCmd_setorcopyvar @ 0x1A - .4byte ScrCmd_comparebuffers @ 0x1B - .4byte ScrCmd_comparebuffertobyte @ 0x1C - .4byte ScrCmd_comparebuffertoptrbyte @ 0x1D - .4byte ScrCmd_compareptrbytetobuffer @ 0x1E - .4byte ScrCmd_compareptrbytetobyte @ 0x1F - .4byte ScrCmd_compareptrbytes @ 0x20 - .4byte ScrCmd_compare @ 0x21 - .4byte ScrCmd_comparevars @ 0x22 - .4byte ScrCmd_callasm @ 0x23 - .4byte ScrCmd_jumpasm @ 0x24 + .4byte ScrCmd_compare_local_to_local @ 0x1B + .4byte ScrCmd_compare_local_to_imm @ 0x1C + .4byte ScrCmd_compare_local_to_addr @ 0x1D + .4byte ScrCmd_compare_addr_to_local @ 0x1E + .4byte ScrCmd_compare_addr_to_imm @ 0x1F + .4byte ScrCmd_compare_addr_to_addr @ 0x20 + .4byte ScrCmd_compare_var_to_imm @ 0x21 + .4byte ScrCmd_compare_var_to_var @ 0x22 + .4byte ScrCmd_callnative @ 0x23 + .4byte ScrCmd_gotonative @ 0x24 .4byte ScrCmd_special @ 0x25 - .4byte ScrCmd_specialval @ 0x26 + .4byte ScrCmd_specialvar @ 0x26 .4byte ScrCmd_waitstate @ 0x27 - .4byte ScrCmd_pause @ 0x28 + .4byte ScrCmd_delay @ 0x28 .4byte ScrCmd_setflag @ 0x29 .4byte ScrCmd_clearflag @ 0x2A .4byte ScrCmd_checkflag @ 0x2B - .4byte ScrCmd_compareflags @ 0x2C - .4byte ScrCmd_checkdailyflags @ 0x2D - .4byte ScrCmd_resetvars @ 0x2E - .4byte ScrCmd_playsfx @ 0x2F - .4byte ScrCmd_checksound @ 0x30 - .4byte ScrCmd_fanfare @ 0x31 + .4byte ScrCmd_initclock @ 0x2C + .4byte ScrCmd_dodailyevents @ 0x2D + .4byte ScrCmd_gettime @ 0x2E + .4byte ScrCmd_playse @ 0x2F + .4byte ScrCmd_waitse @ 0x30 + .4byte ScrCmd_playfanfare @ 0x31 .4byte ScrCmd_waitfanfare @ 0x32 - .4byte ScrCmd_playmusic @ 0x33 - .4byte ScrCmd_playmusicbattle @ 0x34 - .4byte ScrCmd_fadedefault @ 0x35 - .4byte ScrCmd_fademusic @ 0x36 - .4byte ScrCmd_fadeout @ 0x37 - .4byte ScrCmd_fadein @ 0x38 + .4byte ScrCmd_playbgm @ 0x33 + .4byte ScrCmd_savebgm @ 0x34 + .4byte ScrCmd_fadedefaultbgm @ 0x35 + .4byte ScrCmd_fadenewbgm @ 0x36 + .4byte ScrCmd_fadeoutbgm @ 0x37 + .4byte ScrCmd_fadeinbgm @ 0x38 .4byte ScrCmd_warp @ 0x39 - .4byte ScrCmd_warpmuted @ 0x3A - .4byte ScrCmd_warpwalk @ 0x3B + .4byte ScrCmd_warpsilent @ 0x3A + .4byte ScrCmd_warpdoor @ 0x3B .4byte ScrCmd_warphole @ 0x3C .4byte ScrCmd_warpteleport @ 0x3D - .4byte ScrCmd_warp3 @ 0x3E - .4byte ScrCmd_warpplace @ 0x3F - .4byte ScrCmd_warp4 @ 0x40 - .4byte ScrCmd_warp5 @ 0x41 + .4byte ScrCmd_setwarp @ 0x3E + .4byte ScrCmd_setdynamicwarp @ 0x3F + .4byte ScrCmd_setdivewarp @ 0x40 + .4byte ScrCmd_setholewarp @ 0x41 .4byte ScrCmd_getplayerxy @ 0x42 .4byte ScrCmd_countpokemon @ 0x43 .4byte ScrCmd_additem @ 0x44 @@ -77,28 +77,28 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_checkpcitem @ 0x4A .4byte ScrCmd_adddecor @ 0x4B .4byte ScrCmd_removedecor @ 0x4C - .4byte ScrCmd_testdecor @ 0x4D + .4byte ScrCmd_hasdecor @ 0x4D .4byte ScrCmd_checkdecor @ 0x4E - .4byte ScrCmd_move @ 0x4F - .4byte ScrCmd_movecoords @ 0x50 - .4byte ScrCmd_waitmove @ 0x51 - .4byte ScrCmd_waitmovexy @ 0x52 - .4byte ScrCmd_disappear @ 0x53 - .4byte ScrCmd_disappearxy @ 0x54 - .4byte ScrCmd_reappear @ 0x55 - .4byte ScrCmd_reappearxy @ 0x56 - .4byte ScrCmd_movesprite @ 0x57 - .4byte ScrCmd_spritevisible @ 0x58 - .4byte ScrCmd_spriteinvisible @ 0x59 + .4byte ScrCmd_applymovement @ 0x4F + .4byte ScrCmd_applymovement_at @ 0x50 + .4byte ScrCmd_waitmovement @ 0x51 + .4byte ScrCmd_waitmovement_at @ 0x52 + .4byte ScrCmd_removeobject @ 0x53 + .4byte ScrCmd_removeobject_at @ 0x54 + .4byte ScrCmd_addobject @ 0x55 + .4byte ScrCmd_addobject_at @ 0x56 + .4byte ScrCmd_setobjectxy @ 0x57 + .4byte ScrCmd_showobject @ 0x58 + .4byte ScrCmd_hideobject @ 0x59 .4byte ScrCmd_faceplayer @ 0x5A - .4byte ScrCmd_spriteface @ 0x5B + .4byte ScrCmd_turnobject @ 0x5B .4byte ScrCmd_trainerbattle @ 0x5C - .4byte ScrCmd_reptrainerbattle @ 0x5D - .4byte ScrCmd_endtrainerbattle @ 0x5E - .4byte ScrCmd_endtrainerbattle2 @ 0x5F + .4byte ScrCmd_battlebegin @ 0x5D + .4byte ScrCmd_ontrainerbattleend @ 0x5E + .4byte ScrCmd_ontrainerbattleendgoto @ 0x5F .4byte ScrCmd_checktrainerflag @ 0x60 - .4byte ScrCmd_cleartrainerflag @ 0x61 - .4byte ScrCmd_settrainerflag @ 0x62 + .4byte ScrCmd_settrainerflag @ 0x61 + .4byte ScrCmd_cleartrainerflag @ 0x62 .4byte ScrCmd_movespriteperm @ 0x63 .4byte ScrCmd_moveoffscreen @ 0x64 .4byte ScrCmd_spritebehave @ 0x65 -- cgit v1.2.3 From e926119b726839bc687c503db3680899906aad0d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 17:04:25 -0500 Subject: update --- data/event_scripts.s | 136 ++++++++++----------- data/field_move_scripts.inc | 24 ++-- data/script_cmd_table.inc | 30 ++--- data/scripts/berry_tree.inc | 28 ++--- data/scripts/cable_club.inc | 92 +++++++------- data/scripts/contest_hall.inc | 40 +++--- data/scripts/day_care.inc | 4 +- data/scripts/magma_chimney.inc | 8 +- data/scripts/maps/AncientTomb.inc | 4 +- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 8 +- data/scripts/maps/BattleTower_Lobby.inc | 42 +++---- data/scripts/maps/BattleTower_Outside.inc | 8 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 +- data/scripts/maps/DesertRuins.inc | 4 +- data/scripts/maps/DewfordTown.inc | 20 +-- data/scripts/maps/DewfordTown_Gym.inc | 2 +- data/scripts/maps/DewfordTown_Hall.inc | 4 +- data/scripts/maps/DewfordTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 4 +- .../maps/EverGrandeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 22 ++-- data/scripts/maps/FallarborTown_ContestLobby.inc | 6 +- data/scripts/maps/FallarborTown_Mart.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/FortreeCity.inc | 2 +- data/scripts/maps/FortreeCity_DecorationShop.inc | 4 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/FortreeCity_Mart.inc | 2 +- data/scripts/maps/FortreeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 18 +-- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 12 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 2 +- data/scripts/maps/LavaridgeTown_Mart.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 56 ++++----- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 8 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 6 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 6 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- .../maps/LilycoveCity_DepartmentStore_2F.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_3F.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_4F.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_5F.inc | 8 +- data/scripts/maps/LilycoveCity_Harbor.inc | 12 +- data/scripts/maps/LilycoveCity_House3.inc | 6 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 14 +-- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 16 +-- data/scripts/maps/LittlerootTown.inc | 32 ++--- .../maps/LittlerootTown_BrendansHouse_1F.inc | 14 +-- .../maps/LittlerootTown_BrendansHouse_2F.inc | 4 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 14 +-- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 8 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/scripts/maps/MauvilleCity.inc | 10 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 18 +-- data/scripts/maps/MauvilleCity_GameCorner.inc | 16 +-- data/scripts/maps/MauvilleCity_Gym.inc | 2 +- data/scripts/maps/MauvilleCity_Mart.inc | 2 +- .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 12 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 14 +-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 8 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MossdeepCity_Mart.inc | 2 +- .../scripts/maps/MossdeepCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 10 +- data/scripts/maps/MtChimney_CableCarStation.inc | 10 +- data/scripts/maps/MtPyre_Summit.inc | 6 +- data/scripts/maps/OldaleTown.inc | 16 +-- data/scripts/maps/OldaleTown_Mart.inc | 2 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- .../maps/PacifidlogTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 10 +- data/scripts/maps/PetalburgCity_Gym.inc | 18 +-- data/scripts/maps/PetalburgCity_Mart.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 18 +-- data/scripts/maps/Route101.inc | 10 +- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/Route104.inc | 4 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 12 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 4 +- data/scripts/maps/Route104_Prototype.inc | 2 +- data/scripts/maps/Route109.inc | 16 +-- data/scripts/maps/Route110.inc | 12 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 2 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 20 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 16 +-- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 4 +- data/scripts/maps/Route111.inc | 14 +-- data/scripts/maps/Route111_OldLadysRestStop.inc | 2 +- .../maps/Route111_WinstrateFamilysHouse.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 10 +- data/scripts/maps/Route113_GlassWorkshop.inc | 8 +- data/scripts/maps/Route116.inc | 8 +- data/scripts/maps/Route117.inc | 2 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 14 +-- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 6 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 16 +-- data/scripts/maps/Route120.inc | 8 +- data/scripts/maps/Route121.inc | 2 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 6 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 2 +- data/scripts/maps/Route128.inc | 12 +- data/scripts/maps/RustboroCity.inc | 30 ++--- data/scripts/maps/RustboroCity_DevonCorp_1F.inc | 4 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 12 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 18 +-- data/scripts/maps/RustboroCity_Gym.inc | 2 +- data/scripts/maps/RustboroCity_Mart.inc | 2 +- .../scripts/maps/RustboroCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 8 +- data/scripts/maps/RusturfTunnel.inc | 28 ++--- data/scripts/maps/SSTidalRooms.inc | 2 +- data/scripts/maps/SafariZone_Southeast.inc | 6 +- data/scripts/maps/SeafloorCavern_Room9.inc | 10 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 16 +-- data/scripts/maps/SealedChamber_OuterRoom.inc | 24 ++-- data/scripts/maps/SlateportCity.inc | 60 ++++----- data/scripts/maps/SlateportCity_ContestLobby.inc | 6 +- data/scripts/maps/SlateportCity_Harbor.inc | 26 ++-- data/scripts/maps/SlateportCity_Mart.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 6 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 14 +-- .../maps/SlateportCity_PokemonCenter_1F.inc | 2 +- .../maps/SlateportCity_SternsShipyard_1F.inc | 4 +- data/scripts/maps/SootopolisCity.inc | 34 +++--- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SootopolisCity_House8.inc | 4 +- data/scripts/maps/SootopolisCity_Mart.inc | 2 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 2 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 6 +- data/scripts/maps/VerdanturfTown_Mart.inc | 2 +- .../maps/VerdanturfTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- data/scripts/mauville_man.inc | 20 +-- data/scripts/mystery_event_club.inc | 6 +- data/scripts/players_house.inc | 24 ++-- data/scripts/pokeblocks.inc | 2 +- data/scripts/safari_zone.inc | 8 +- data/scripts/secret_power_tm.inc | 2 +- data/scripts/tv.inc | 6 +- 157 files changed, 810 insertions(+), 810 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 1359199d3..01120b194 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -390,7 +390,7 @@ gUnknown_0815F36C:: @ 815F36C message UnknownString_81A3A72 doanimation 61 waitstate - waittext + waitmessage waitbutton playse 5 goto EventScript_15F384 @@ -398,7 +398,7 @@ gUnknown_0815F36C:: @ 815F36C EventScript_15F384: message UnknownString_81A3A87 - waittext + waitmessage checkflag 268 goto_if_eq EventScript_15F3A0 goto EventScript_15F3E2 @@ -432,7 +432,7 @@ EventScript_15F419: msgbox UnknownString_81A38FB, 5 compare RESULT, 0 goto_if_eq EventScript_15F384 - closebutton + closemessage special SecretBasePC_PackUp releaseall end @@ -451,7 +451,7 @@ gUnknown_0815F43A:: @ 815F43A playse 2 doanimation 61 waitstate - waittext + waitmessage waitbutton playse 5 goto EventScript_15F452 @@ -459,7 +459,7 @@ gUnknown_0815F43A:: @ 815F43A EventScript_15F452: message UnknownString_81A3A87 - waittext + waitmessage multichoice 0, 0, 7, 0 switch RESULT case 0, EventScript_15F4A1 @@ -503,19 +503,19 @@ EventScript_15F4E0: EventScript_15F503: msgbox UnknownString_81A39C0, 3 special sub_80C683C - closebutton + closemessage releaseall end EventScript_15F511: message UnknownString_81A3AA2 - waittext + waitmessage goto EventScript_15F452 end EventScript_15F51D: special sub_80C683C - closebutton + closemessage releaseall end @@ -890,7 +890,7 @@ Std_2: lock faceplayer message 0x0 - waittext + waitmessage waitbutton release return @@ -898,20 +898,20 @@ Std_2: Std_3: lockall message 0x0 - waittext + waitmessage waitbutton releaseall return Std_4: message 0x0 - waittext + waitmessage waitbutton return Std_5: message 0x0 - waittext + waitmessage yesnobox 20, 8 return @@ -961,7 +961,7 @@ gUnknown_0819F840:: @ 819F840 EventScript_19F870: special ScrSpecial_ShowTrainerNonBattlingSpeech - waittext + waitmessage waitbutton release end @@ -984,7 +984,7 @@ gUnknown_0819F887:: @ 819F887 special PlayTrainerEncounterMusic special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech - waittext + waitmessage waitbutton special ScrSpecial_StartTrainerEyeRematch waitstate @@ -1004,7 +1004,7 @@ gUnknown_0819F8AE:: @ 819F8AE special PlayTrainerEncounterMusic special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech - waittext + waitmessage waitbutton special ScrSpecial_StartTrainerEyeRematch waitstate @@ -1016,7 +1016,7 @@ EventScript_19F8DD: EventScript_19F8DE: special ScrSpecial_ShowTrainerNonBattlingSpeech - waittext + waitmessage waitbutton release end @@ -1032,7 +1032,7 @@ Movement_19F8F0:: EventScript_19F8F2: special ScrSpecial_ShowTrainerIntroSpeech - waittext + waitmessage waitbutton battlebegin specialvar RESULT, ScrSpecial_GetTrainerBattleMode @@ -1056,7 +1056,7 @@ EventScript_19F936: Std_6:: message 0x0 - waittext + waitmessage waitbutton release return @@ -1442,7 +1442,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B do_heal_party:: @ 819FD7C inccounter GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon - waittext + waitmessage applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F waitmovement 0 doanimation 25 @@ -1457,16 +1457,16 @@ do_heal_party:: @ 819FD7C OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 message gText_NurseJoy_ThankYouForWaiting - waittext + waitmessage applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4 waitmovement 0 message gText_NurseJoy_WeHopeToSeeYouAgain - waittext + waitmessage return dont_heal_party:: @ 819FDC7 message gText_NurseJoy_WeHopeToSeeYouAgain - waittext + waitmessage return OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE @@ -1479,7 +1479,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA message gText_NurseJoy_Pokerus - waittext + waitmessage setflag 273 return @@ -1546,7 +1546,7 @@ GetItem_HandlePocket_Berries: Std_ObtainItem_Success: @ 819FEB7 message Message_ObtainedItem waitfanfare - waittext + waitmessage msgbox Message_PutAwayItem setvar RESULT, 1 return @@ -1581,7 +1581,7 @@ Std_ObtainDecoration_Success: @ 819FF03 playfanfare 0x172 message Message_ObtainedDecoration waitfanfare - waittext + waitmessage msgbox Message_TransferredToPC setvar RESULT, 1 return @@ -1610,7 +1610,7 @@ Std_FindItem_Success: @ 819FF52 removeobject LAST_TALKED message Message_FoundOneItem waitfanfare - waittext + waitmessage msgbox Message_PutAwayItem return @@ -1637,7 +1637,7 @@ HiddenItemScript:: @ 819FF7B HiddenItemScript_Success: message Message_FoundOneItem waitfanfare - waittext + waitmessage msgbox Message_PutAwayItem special SetFlagInVar releaseall @@ -1666,7 +1666,7 @@ UnusedMixRecordsScript_Yes: @ 819FFFA faceplayer UnusedMixRecordsScript_Done: @ 81A0000 message UnusedMixRecordsSeeYouAgainText - waittext + waitmessage waitbutton release end @@ -1682,7 +1682,7 @@ gUnknown_081A0009:: @ 81A0009 EventScript_1A0023: message gPCText_WhichPCShouldBeAccessed - waittext + waitmessage special ScrSpecial_CreatePCMenu waitstate goto EventScript_1A0033 @@ -1810,7 +1810,7 @@ Route109_EventScript_1A010C:: @ 81A010C return UseSurfScript:: @ 81A0117 - checkattack MOVE_SURF + checkpokemove MOVE_SURF compare RESULT, 6 goto_if_eq UseSurfScript_NoMon bufferpartypoke 0, RESULT @@ -2197,7 +2197,7 @@ Route101_EventScript_1A039B:: @ 81A039B Route101_EventScript_1A03A5:: @ 81A03A5 copyvar 0x8004, 0x8009 special ShowPokedexRatingMessage - waittext + waitmessage waitbutton return @@ -2439,7 +2439,7 @@ Route119_EventScript_1A05AE:: @ 81A05AE Route119_EventScript_1A05C3:: @ 81A05C3 msgbox Route119_Text_171BF6, 4 - closebutton + closemessage applymovement LAST_TALKED, Route119_Movement_1A0839 waitmovement 0 applymovement LAST_TALKED, Route119_Movement_1A0662 @@ -2539,7 +2539,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F bufferitem 0, 0x8004 playfanfare 372 message FallarborTown_House1_Text_1A1498 - waittext + waitmessage waitfanfare removeitem 0x8004, 1 return @@ -3260,7 +3260,7 @@ gUnknown_081A14B8:: @ 81A14B8 EventScript_1A14CA:: message UnknownString_81A1141 - waittext + waitmessage waitbutton special sub_8081924 waitstate @@ -3599,7 +3599,7 @@ gUnknown_081A2C51:: @ 81A2C51 special sub_80BB63C compare RESULT, 1 goto_if_eq EventScript_1A2E45 - checkattack MOVE_SECRET_POWER + checkpokemove MOVE_SECRET_POWER setanimation 0, RESULT bufferattack 1, MOVE_SECRET_POWER compare 0x8007, 1 @@ -3625,7 +3625,7 @@ EventScript_1A2CB0: compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 - closebutton + closemessage doanimation 11 waitstate goto EventScript_1A2CFA @@ -3656,7 +3656,7 @@ EventScript_1A2D08: compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 - closebutton + closemessage doanimation 26 waitstate goto EventScript_1A2D52 @@ -3687,7 +3687,7 @@ EventScript_1A2D60: compare RESULT, 0 goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 - closebutton + closemessage doanimation 27 waitstate goto EventScript_1A2DAA @@ -3710,7 +3710,7 @@ EventScript_1A2DAA: end EventScript_1A2DB8: - closebutton + closemessage playse 9 setvar 0x4097, 0 setflag 173 @@ -3730,13 +3730,13 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE msgbox SecretBase_RedCave1_Text_198F89, 5 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 - closebutton + closemessage playse 9 special sub_80BC440 end SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08 - closebutton + closemessage setflag 96 special sub_80BBC78 waitstate @@ -3768,7 +3768,7 @@ EventScript_1A2E38: end EventScript_1A2E45: - checkattack MOVE_SECRET_POWER + checkpokemove MOVE_SECRET_POWER compare RESULT, 6 goto_if_eq EventScript_1A2EF7 setanimation 0, RESULT @@ -3783,7 +3783,7 @@ EventScript_1A2E45: goto_if_eq EventScript_1A2F3A fadescreen 1 special sub_80BC50C - closebutton + closemessage fadescreen 0 msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 @@ -3791,8 +3791,8 @@ EventScript_1A2E45: bufferpartypoke 0, 0x8004 bufferattack 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 - closebutton - closebutton + closemessage + closemessage compare 0x8007, 1 goto_if_eq gUnknown_081A2CE6 compare 0x8007, 2 @@ -3824,7 +3824,7 @@ EventScript_1A2EF7:: end EventScript_1A2F3A:: - closebutton + closemessage releaseall end @@ -3947,7 +3947,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 call S_DoSaveDialog compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A308F - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1B83, 4 goto SecretBase_RedCave1_EventScript_1A350A end @@ -3959,7 +3959,7 @@ SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086 SecretBase_RedCave1_EventScript_1A308F:: @ 81A308F setvar RESULT, 0 special sub_80BCE4C - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1B97, 2 end @@ -3982,7 +3982,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE call S_DoSaveDialog compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A310B - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1F04, 4 goto SecretBase_RedCave1_EventScript_1A350A end @@ -3994,7 +3994,7 @@ SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102 SecretBase_RedCave1_EventScript_1A310B:: @ 81A310B setvar RESULT, 0 special sub_80BCE4C - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1F2E, 2 end @@ -4017,7 +4017,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A call S_DoSaveDialog compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3187 - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2220, 4 goto SecretBase_RedCave1_EventScript_1A350A end @@ -4029,7 +4029,7 @@ SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E SecretBase_RedCave1_EventScript_1A3187:: @ 81A3187 setvar RESULT, 0 special sub_80BCE4C - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2230, 2 end @@ -4052,7 +4052,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 call S_DoSaveDialog compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3203 - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A256F, 4 goto SecretBase_RedCave1_EventScript_1A350A end @@ -4064,7 +4064,7 @@ SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA SecretBase_RedCave1_EventScript_1A3203:: @ 81A3203 setvar RESULT, 0 special sub_80BCE4C - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A258A, 2 end @@ -4087,7 +4087,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 call S_DoSaveDialog compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A327F - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A28D7, 4 goto SecretBase_RedCave1_EventScript_1A350A end @@ -4099,7 +4099,7 @@ SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276 SecretBase_RedCave1_EventScript_1A327F:: @ 81A327F setvar RESULT, 0 special sub_80BCE4C - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A28F4, 2 end @@ -4122,7 +4122,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E call S_DoSaveDialog compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A32FB - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1D48, 4 goto SecretBase_RedCave1_EventScript_1A350A end @@ -4134,7 +4134,7 @@ SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2 SecretBase_RedCave1_EventScript_1A32FB:: @ 81A32FB setvar RESULT, 0 special sub_80BCE4C - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A1D59, 2 end @@ -4157,7 +4157,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A call S_DoSaveDialog compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3377 - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2095, 4 goto SecretBase_RedCave1_EventScript_1A350A end @@ -4169,7 +4169,7 @@ SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E SecretBase_RedCave1_EventScript_1A3377:: @ 81A3377 setvar RESULT, 0 special sub_80BCE4C - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A20AE, 2 end @@ -4192,7 +4192,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 call S_DoSaveDialog compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2405, 4 goto SecretBase_RedCave1_EventScript_1A350A end @@ -4204,7 +4204,7 @@ SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA SecretBase_RedCave1_EventScript_1A33F3:: @ 81A33F3 setvar RESULT, 0 special sub_80BCE4C - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2420, 2 end @@ -4227,7 +4227,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 call S_DoSaveDialog compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A346F - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2710, 4 goto SecretBase_RedCave1_EventScript_1A350A end @@ -4239,7 +4239,7 @@ SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466 SecretBase_RedCave1_EventScript_1A346F:: @ 81A346F setvar RESULT, 0 special sub_80BCE4C - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2736, 2 end @@ -4262,7 +4262,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E call S_DoSaveDialog compare RESULT, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A34EB - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2AE2, 4 goto SecretBase_RedCave1_EventScript_1A350A end @@ -4274,7 +4274,7 @@ SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2 SecretBase_RedCave1_EventScript_1A34EB:: @ 81A34EB setvar RESULT, 0 special sub_80BCE4C - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 msgbox SecretBase_RedCave1_Text_1A2AFB, 2 end @@ -4671,7 +4671,7 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 message BattleTower_Lobby_Text_1A7823 - waittext + waitmessage multichoice 19, 8, 45, 1 copyvar 0x8008, RESULT compare RESULT, 0 @@ -4919,7 +4919,7 @@ gUnknown_081C6C02:: @ 81C6C02 lockall braillemsg Underwater_SealedChamber_Braille_1C533D waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 592dd7003..94f6b356c 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -2,7 +2,7 @@ S_CuttableTree:: @ 81B0DCC lockall checkflag 2055 goto_if 0, CannotUseCut - checkattack MOVE_CUT + checkpokemove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT @@ -12,7 +12,7 @@ S_CuttableTree:: @ 81B0DCC compare RESULT, 0 goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 - closebutton + closemessage doanimation 2 waitstate goto DoTreeCutMovement @@ -42,7 +42,7 @@ CannotUseCut: @ 81B0E32 end Cut_ChoseNo: @ 81B0E3C - closebutton + closemessage releaseall end @@ -60,7 +60,7 @@ S_BreakableRock:: @ 81B0EB7 lockall checkflag 2057 goto_if 0, CannotUseRockSmash - checkattack MOVE_ROCK_SMASH + checkpokemove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT @@ -70,7 +70,7 @@ S_BreakableRock:: @ 81B0EB7 compare RESULT, 0 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 - closebutton + closemessage doanimation 37 waitstate goto DoRockSmashMovement @@ -111,7 +111,7 @@ CannotUseRockSmash: @ 81B0F3E end RockSmash_ChoseNo: @ 81B0F48 - closebutton + closemessage releaseall end @@ -129,14 +129,14 @@ S_PushableBoulder:: @ 81B0FCB goto_if 0, CannotUseStrength checkflag 2089 goto_if_eq AlreadyUsedStrength - checkattack 70 + checkpokemove 70 compare RESULT, 6 goto_if_eq CannotUseStrength setanimation 0, RESULT msgbox UseStrengthPromptText, 5 compare RESULT, 0 goto_if_eq Strength_ChoseNo - closebutton + closemessage doanimation 40 waitstate goto UsedStrength @@ -166,7 +166,7 @@ AlreadyUsedStrength: @ 81B1030 end Strength_ChoseNo: @ 81B103A - closebutton + closemessage releaseall end @@ -190,7 +190,7 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall - checkattack MOVE_WATERFALL + checkpokemove MOVE_WATERFALL compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows bufferpartypoke 0, RESULT @@ -223,7 +223,7 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall - checkattack MOVE_DIVE + checkpokemove MOVE_DIVE compare RESULT, 6 goto_if_eq CannotUseDive bufferpartypoke 0, RESULT @@ -246,7 +246,7 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall - checkattack MOVE_DIVE + checkpokemove MOVE_DIVE compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive bufferpartypoke 0, RESULT diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 4295c0b63..1262e259a 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -99,12 +99,12 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_checktrainerflag @ 0x60 .4byte ScrCmd_settrainerflag @ 0x61 .4byte ScrCmd_cleartrainerflag @ 0x62 - .4byte ScrCmd_movespriteperm @ 0x63 - .4byte ScrCmd_moveoffscreen @ 0x64 - .4byte ScrCmd_spritebehave @ 0x65 - .4byte ScrCmd_waittext @ 0x66 + .4byte ScrCmd_setobjectxyperm @ 0x63 + .4byte ScrCmd_moveobjectoffscreen @ 0x64 + .4byte ScrCmd_setobjectmovementtype @ 0x65 + .4byte ScrCmd_waitmessage @ 0x66 .4byte ScrCmd_message @ 0x67 - .4byte ScrCmd_closebutton @ 0x68 + .4byte ScrCmd_closemessage @ 0x68 .4byte ScrCmd_lockall @ 0x69 .4byte ScrCmd_lock @ 0x6A .4byte ScrCmd_releaseall @ 0x6B @@ -112,19 +112,19 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_waitbutton @ 0x6D .4byte ScrCmd_yesnobox @ 0x6E .4byte ScrCmd_multichoice @ 0x6F - .4byte ScrCmd_multichoicedef @ 0x70 - .4byte ScrCmd_multichoicerow @ 0x71 - .4byte ScrCmd_showbox @ 0x72 - .4byte ScrCmd_hidebox @ 0x73 - .4byte ScrCmd_clearbox @ 0x74 - .4byte ScrCmd_showpokepic @ 0x75 - .4byte ScrCmd_hidepokepic @ 0x76 - .4byte ScrCmd_showcontestwinner @ 0x77 + .4byte ScrCmd_multichoicedefault @ 0x70 + .4byte ScrCmd_multichoicegrid @ 0x71 + .4byte ScrCmd_drawbox @ 0x72 + .4byte ScrCmd_erasebox @ 0x73 + .4byte ScrCmd_drawboxtext @ 0x74 + .4byte ScrCmd_drawpokepic @ 0x75 + .4byte ScrCmd_erasepokepic @ 0x76 + .4byte ScrCmd_drawcontestwinner @ 0x77 .4byte ScrCmd_braillemsg @ 0x78 - .4byte ScrCmd_givepokemon @ 0x79 + .4byte ScrCmd_givepoke @ 0x79 .4byte ScrCmd_giveegg @ 0x7A .4byte ScrCmd_setpokemove @ 0x7B - .4byte ScrCmd_checkattack @ 0x7C + .4byte ScrCmd_checkpokemove @ 0x7C .4byte ScrCmd_bufferpoke @ 0x7D .4byte ScrCmd_bufferfirstpoke @ 0x7E .4byte ScrCmd_bufferpartypoke @ 0x7F diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 0ed7749bc..79e1de13b 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -13,7 +13,7 @@ S_BerryTree:: @ 81A14DD Route102_EventScript_1A1533:: @ 81A1533 lockall message Route102_Text_1A1946 - waittext + waitmessage waitbutton releaseall end @@ -25,7 +25,7 @@ Route102_EventScript_1A153D:: @ 81A153D compare RESULT, 1 goto_if_eq Route102_EventScript_1A1558 message Route102_Text_1A16B6 - waittext + waitmessage waitbutton release end @@ -40,7 +40,7 @@ Route102_EventScript_1A1558:: @ 81A1558 Route102_EventScript_1A1577:: @ 81A1577 fadescreen 1 - closebutton + closemessage special sub_80B4EE4 waitstate compare ITEM_ID, 0 @@ -55,21 +55,21 @@ Route102_EventScript_1A1593:: @ 81A1593 Route102_EventScript_1A1595:: @ 81A1595 lockall message Route102_Text_1A172C - waittext + waitmessage waitbutton goto Route102_EventScript_1A165F Route102_EventScript_1A15A2:: @ 81A15A2 lockall message Route102_Text_1A174B - waittext + waitmessage waitbutton goto Route102_EventScript_1A165F Route102_EventScript_1A15AF:: @ 81A15AF lockall message Route102_Text_1A175C - waittext + waitmessage waitbutton goto Route102_EventScript_1A165F @@ -77,7 +77,7 @@ Route102_EventScript_1A15BC:: @ 81A15BC call Route102_EventScript_1A15CE lockall message Route102_Text_1A177D - waittext + waitmessage waitbutton goto Route102_EventScript_1A165F @@ -114,25 +114,25 @@ Route102_EventScript_1A161D:: @ 81A161D special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD playfanfare 387 - waittext + waitmessage waitfanfare waitbutton message Route102_Text_1A181A - waittext + waitmessage waitbutton release end Route102_EventScript_1A1642:: @ 81A1642 message Route102_Text_1A1881 - waittext + waitmessage waitbutton release end Route102_EventScript_1A164B:: @ 81A164B message Route102_Text_1A18C5 - waittext + waitmessage waitbutton release end @@ -164,12 +164,12 @@ gUnknown_081A168F:: @ 81A168F Route102_EventScript_1A1693:: @ 81A1693 message Route102_Text_1A1912 - waittext + waitmessage special FieldObjectInteractionWaterBerryTree special DoWateringBerryTreeAnim waitstate message Route102_Text_1A1925 - waittext + waitmessage waitbutton releaseall end @@ -178,6 +178,6 @@ Route102_EventScript_1A16A9:: @ 81A16A9 special FieldObjectInteractionPlantBerryTree inccounter GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB - waittext + waitmessage waitbutton return diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 078d6444f..33df12c8c 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -121,7 +121,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 call OldaleTown_PokemonCenter_2F_EventScript_1A3E30 setmaptile 8, 3, 605, 1 special DrawWholeMapView - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -135,10 +135,10 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 message OldaleTown_PokemonCenter_2F_Text_1A4E50 - waittext + waitmessage playse 21 message OldaleTown_PokemonCenter_2F_Text_1A4E79 - waittext + waitmessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 @@ -156,7 +156,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E8D:: @ 81A3E8D call OldaleTown_PokemonCenter_2F_EventScript_1A3DDA setmaptile 5, 3, 605, 1 special DrawWholeMapView - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -180,7 +180,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 lock faceplayer message OldaleTown_PokemonCenter_2F_Text_1A4510 - waittext + waitmessage OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC multichoice 17, 6, 17, 0 @@ -198,7 +198,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 compare 0x8004, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C - waittext + waitmessage special sub_808347C waitstate compare RESULT, 1 @@ -220,13 +220,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E special LoadPlayerBag copyvar 0x4087, 0x8004 message2 OldaleTown_PokemonCenter_2F_Text_1A4A22 - waittext + waitmessage setmaptile 5, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 - closebutton + closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B waitmovement 0 setdooropened 5, 1 @@ -254,15 +254,15 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD OldaleTown_PokemonCenter_2F_EventScript_1A3FDD:: @ 81A3FDD message OldaleTown_PokemonCenter_2F_Text_1A4696 - waittext + waitmessage waitbutton message OldaleTown_PokemonCenter_2F_Text_1A4826 - waittext + waitmessage goto OldaleTown_PokemonCenter_2F_EventScript_1A3EBC OldaleTown_PokemonCenter_2F_EventScript_1A3FEF:: @ 81A3FEF message OldaleTown_PokemonCenter_2F_Text_1A4840 - waittext + waitmessage multichoice 0, 0, 18, 0 switch RESULT case 0, OldaleTown_PokemonCenter_2F_EventScript_1A4062 @@ -288,7 +288,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 message OldaleTown_PokemonCenter_2F_Text_1A486A - waittext + waitmessage waitbutton goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF @@ -306,28 +306,28 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4068:: @ 81A4068 OldaleTown_PokemonCenter_2F_EventScript_1A4093:: @ 81A4093 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C03 - waittext + waitmessage waitbutton goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40A2:: @ 81A40A2 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4BCC - waittext + waitmessage waitbutton goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40B1:: @ 81A40B1 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B95 - waittext + waitmessage waitbutton goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40C0:: @ 81A40C0 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C38 - waittext + waitmessage waitbutton release end @@ -365,7 +365,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C - waittext + waitmessage special sub_80834E4 waitstate compare RESULT, 1 @@ -385,13 +385,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 setvar 0x8004, 3 copyvar 0x4087, 0x8004 message2 OldaleTown_PokemonCenter_2F_Text_1A4A22 - waittext + waitmessage setmaptile 8, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 - closebutton + closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B waitmovement 0 setdooropened 8, 1 @@ -416,14 +416,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB OldaleTown_PokemonCenter_2F_EventScript_1A41E1:: @ 81A41E1 message OldaleTown_PokemonCenter_2F_Text_1A48A3 - waittext + waitmessage waitbutton setvar RESULT, 0 return OldaleTown_PokemonCenter_2F_EventScript_1A41EE:: @ 81A41EE message OldaleTown_PokemonCenter_2F_Text_1A48DD - waittext + waitmessage waitbutton setvar RESULT, 0 return @@ -459,7 +459,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C - waittext + waitmessage special sub_808350C waitstate special sub_80835D8 @@ -483,13 +483,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 setvar 0x8004, 4 copyvar 0x4087, 0x8004 message2 OldaleTown_PokemonCenter_2F_Text_1A4A22 - waittext + waitmessage setmaptile 11, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 - closebutton + closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B waitmovement 0 setdooropened 11, 1 @@ -505,7 +505,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4AC8 - waittext + waitmessage waitbutton release end @@ -513,7 +513,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9 OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4A85 - waittext + waitmessage waitbutton release end @@ -521,7 +521,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4A30 - waittext + waitmessage waitbutton release end @@ -529,7 +529,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301 OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B1D - waittext + waitmessage waitbutton release end @@ -537,7 +537,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D OldaleTown_PokemonCenter_2F_EventScript_1A4319:: @ 81A4319 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B59 - waittext + waitmessage waitbutton release end @@ -551,7 +551,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4325:: @ 81A4325 OldaleTown_PokemonCenter_2F_EventScript_1A432D:: @ 81A432D special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B6C - waittext + waitmessage waitbutton release end @@ -599,7 +599,7 @@ gUnknown_081A4363:: @ 81A4363 lockall special ShowLinkBattleRecords waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -721,14 +721,14 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 RecordCorner_EventScript_1A446C:: @ 81A446C bufferitem 1, 0x4001 message RecordCorner_Text_1A4E3B - waittext + waitmessage waitbutton releaseall end TradeRoom_ReadTrainerCard1:: @ 81A4479 message CableClub_LookAtTrainerCard1 - waittext + waitmessage waitbutton fadescreen 1 special sub_8083BDC @@ -737,7 +737,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479 TradeRoom_ReadTrainerCard2:: @ 81A4487 message CableClub_LookAtTrainerCard2 - waittext + waitmessage waitbutton fadescreen 1 special sub_8083BDC @@ -746,27 +746,27 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487 TradeRoom_TooBusyToNotice:: @ 81A4495 message CableClub_TooBusyToNotice - waittext + waitmessage waitbutton - closebutton + closemessage end SingleBattleColosseum_EventScript_1A449E:: @ 81A449E special sub_8064EAC message SingleBattleColosseum_Text_1A4D7E - waittext + waitmessage waitbutton special sub_8064ED4 - closebutton + closemessage end TradeCenter_EventScript_1A44AD:: @ 81A44AD special sub_8064EAC message TradeCenter_Text_1A4DAB - waittext + waitmessage waitbutton special sub_8064ED4 - closebutton + closemessage end RecordCorner_EventScript_1A44BC:: @ 81A44BC @@ -774,31 +774,31 @@ RecordCorner_EventScript_1A44BC:: @ 81A44BC goto_if 5, RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 - waittext + waitmessage waitbutton special sub_8064ED4 - closebutton + closemessage end RecordCorner_EventScript_1A44D6:: @ 81A44D6 special sub_8064EAC message RecordCorner_Text_1A4DF7 - waittext + waitmessage waitbutton special sub_8064ED4 - closebutton + closemessage end TradeRoom_PromptToCancelLink:: @ 81A44E5 msgbox TradeRoom_WillLinkBeTerminated, 5 compare RESULT, 1 goto_if_eq TradeRoom_TerminateLink - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 end TradeRoom_TerminateLink:: @ 81A44FE message2 TradeRoom_TerminatingLink - waittext + waitmessage special sub_80839D0 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 10314c462..16e5a6282 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -66,7 +66,7 @@ FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 setvar 0x408a, 0 - closebutton + closemessage release end @@ -76,7 +76,7 @@ FallarborTown_ContestLobby_EventScript_1A4F86:: @ 81A4F86 FallarborTown_ContestLobby_EventScript_1A4F8F:: @ 81A4F8F message FallarborTown_ContestLobby_Text_1A5E46 - waittext + waitmessage multichoice 0, 0, 2, 0 switch RESULT case 0, FallarborTown_ContestLobby_EventScript_1A5097 @@ -87,7 +87,7 @@ FallarborTown_ContestLobby_EventScript_1A4F8F:: @ 81A4F8F FallarborTown_ContestLobby_EventScript_1A4FCC:: @ 81A4FCC message FallarborTown_ContestLobby_Text_1A5E7C - waittext + waitmessage multichoice 0, 0, 3, 0 switch RESULT case 0, FallarborTown_ContestLobby_EventScript_1A5014 @@ -137,7 +137,7 @@ FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 FallarborTown_ContestLobby_EventScript_1A5097:: @ 81A5097 message FallarborTown_ContestLobby_Text_1A6623 - waittext + waitmessage multichoice 0, 0, 4, 0 switch RESULT case 5, FallarborTown_ContestLobby_EventScript_1A503E @@ -180,7 +180,7 @@ FallarborTown_ContestLobby_EventScript_1A512E:: @ 81A512E FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D msgbox FallarborTown_ContestLobby_Text_1A67C1, 4 - closebutton + closemessage releaseall setvar 0x4086, 1 return @@ -277,7 +277,7 @@ LinkContestRoom1_EventScript_1A525F:: @ 81A525F LinkContestRoom1_EventScript_1A5273:: @ 81A5273 message2 LinkContestRoom1_Text_1A6976 - waittext + waitmessage return LinkContestRoom1_EventScript_1A527A:: @ 81A527A @@ -360,19 +360,19 @@ LinkContestRoom1_EventScript_1A535E:: @ 81A535E compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5370 message LinkContestRoom1_Text_1A6A04 - waittext + waitmessage return LinkContestRoom1_EventScript_1A5370:: @ 81A5370 message2 LinkContestRoom1_Text_1A6A04 - waittext + waitmessage return LinkContestRoom1_EventScript_1A5377:: @ 81A5377 call LinkContestRoom1_EventScript_1A53B3 call LinkContestRoom1_EventScript_1A53CE playse 223 - waittext + waitmessage call LinkContestRoom1_EventScript_1A5A90 applymovement 1, LinkContestRoom1_Movement_1A5D9F waitmovement 0 @@ -392,7 +392,7 @@ LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3 LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7 message2 LinkContestRoom1_Text_1A6A1F - waittext + waitmessage return LinkContestRoom1_EventScript_1A53CE:: @ 81A53CE @@ -722,7 +722,7 @@ LinkContestRoom1_EventScript_1A587F:: @ 81A587F return LinkContestRoom1_EventScript_1A5880:: @ 81A5880 - closebutton + closemessage release removeobject 13 special sub_80C5164 @@ -766,7 +766,7 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE applymovement 1, LinkContestRoom1_Movement_1A5DA3 waitmovement 0 call LinkContestRoom1_EventScript_1A5930 - waittext + waitmessage applymovement 1, LinkContestRoom1_Movement_1A5D91 applymovement 2, LinkContestRoom1_Movement_1A5D95 waitmovement 0 @@ -800,7 +800,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A call LinkContestRoom1_EventScript_1A59DE applymovement 1, LinkContestRoom1_Movement_1A5D8F waitmovement 0 - closebutton + closemessage releaseall setvar 0x4009, 1 showcontestresults @@ -816,7 +816,7 @@ LinkContestRoom1_EventScript_1A5984:: @ 81A5984 LinkContestRoom1_EventScript_1A5998:: @ 81A5998 message2 LinkContestRoom1_Text_1A6C06 - waittext + waitmessage delay 30 return @@ -828,7 +828,7 @@ LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 message2 LinkContestRoom1_Text_1A6C21 - waittext + waitmessage delay 30 return @@ -840,7 +840,7 @@ LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 message2 LinkContestRoom1_Text_1A6C9D - waittext + waitmessage delay 30 return @@ -852,7 +852,7 @@ LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 message2 LinkContestRoom1_Text_1A6D16 - waittext + waitmessage delay 30 return @@ -902,7 +902,7 @@ LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 message2 LinkContestRoom1_Text_1A6D3C - waittext + waitmessage return LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 @@ -999,7 +999,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB checkflag 2 goto_if_eq LinkContestRoom1_EventScript_1A5BF6 msgbox LinkContestRoom1_Text_1A6DC5, 3 - waittext + waitmessage call LinkContestRoom1_EventScript_1A5C7F call LinkContestRoom1_EventScript_1A5CE5 playse 223 @@ -1055,7 +1055,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C special sub_80C4CF8 compare 0x8004, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C64 - closebutton + closemessage return LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 62a2d6224..23e61063c 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -38,7 +38,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 message Route117_Text_1B27A2 playfanfare 367 waitfanfare - waittext + waitmessage waitbutton msgbox Route117_Text_1B27CD, 4 special sp0B8_daycare @@ -69,7 +69,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE msgbox Route117_Text_1B2897, 4 special sp0B9_daycare_relationship_comment special ShowFieldMessageStringVar4 - waittext + waitmessage waitbutton setvar 0x8004, 0 call Route117_EventScript_1B22CD diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 998da7380..f13b319f4 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -5,7 +5,7 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 call_if 0, MtChimney_EventScript_1B2CB9 checkflag 219 call_if 1, MtChimney_EventScript_1B2CC2 - closebutton + closemessage applymovement 1, MtChimney_Movement_1A083D waitmovement 0 setflag 219 @@ -57,7 +57,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .else msgbox MtChimney_Text_1B3A90, 4 .endif - closebutton + closemessage delay 30 fadescreen 1 removeobject 2 @@ -65,7 +65,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB removeobject 22 setflag 926 fadescreen 0 - movespriteperm 1, 10, 12 + setobjectxyperm 1, 10, 12 addobject 1 compare FACING, 4 call_if 1, MtChimney_EventScript_1B2D7D @@ -78,7 +78,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .else msgbox MtChimney_Text_1B3FFE, 4 .endif - closebutton + closemessage compare FACING, 4 call_if 1, MtChimney_EventScript_1B2D93 compare FACING, 2 diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 5a0b4014a..0e9a82f4c 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -37,7 +37,7 @@ AncientTomb_EventScript_15F021:: @ 815F021 goto_if_eq AncientTomb_EventScript_15F038 braillemsg AncientTomb_Braille_1C552E waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -50,7 +50,7 @@ AncientTomb_EventScript_15F042:: @ 815F042 lockall braillemsg AncientTomb_Braille_1C552E waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 9fd81f121..230d0e2db 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -47,7 +47,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 - closebutton + closemessage .ifdef SAPPHIRE applymovement 0x8008, Movement_1A083F .else diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 3223deba4..3f1aad4a0 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -18,8 +18,8 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA waitmovement 0 special sub_8135474 msgbox 0x20234cc, 4 - waittext - closebutton + waitmessage + closemessage special ScrSpecial_HealPlayerParty setvar 0x8004, 0 setvar 0x8005, 0 @@ -80,7 +80,7 @@ BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E case 127, BattleTower_BattleRoom_EventScript_1609B2 BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C - closebutton + closemessage applymovement 255, BattleTower_BattleRoom_Movement_160ABE waitmovement 0 applymovement 2, BattleTower_BattleRoom_Movement_160AD0 @@ -109,7 +109,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 special sub_8135BA0 message BattleTower_BattleRoom_Text_1C6CE1 delay 60 - waittext + waitmessage playse 55 waitse msgbox BattleTower_BattleRoom_Text_1C6D05, 4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 61ac04810..555e32d81 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -65,7 +65,7 @@ BattleTower_Lobby_EventScript_160330:: @ 8160330 lock faceplayer msgbox BattleTower_Lobby_Text_19A3FD, 4 - closebutton + closemessage setvar 0x4000, 5 release end @@ -74,7 +74,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 lock faceplayer message BattleTower_Lobby_Text_19A487 - waittext + waitmessage setvar 0x8004, 0 special sub_81358A4 compare RESULT, 6 @@ -83,7 +83,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE - waittext + waitmessage playfanfare 370 waitfanfare msgbox BattleTower_Lobby_Text_19A719, 4 @@ -94,7 +94,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 - waittext + waitmessage setvar 0x8004, 13 special sub_8135668 special sub_8135D84 @@ -108,12 +108,12 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar 0x8005, 3 special sub_8135668 message BattleTower_Lobby_Text_19A4BB - waittext + waitmessage special sub_8135DEC switch RESULT case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 - waittext + waitmessage playfanfare 370 waitfanfare setvar 0x8004, 9 @@ -124,15 +124,15 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 msgbox BattleTower_Lobby_Text_199FA9, 4 - closebutton + closemessage setvar 0x4000, 5 release end BattleTower_Lobby_EventScript_160408:: @ 8160408 msgbox BattleTower_Lobby_Text_19A520, 4 - waittext - closebutton + waitmessage + closemessage setvar 0x4000, 5 release end @@ -141,9 +141,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 lock faceplayer message BattleTower_Lobby_Text_19A571 - waittext + waitmessage message BattleTower_Lobby_Text_19A589 - waittext + waitmessage setvar 0x8004, 13 special sub_8135668 setvar 0x8004, 0 @@ -151,7 +151,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 playse 55 waitse msgbox BattleTower_Lobby_Text_199FA9, 4 - closebutton + closemessage setvar 0x4000, 5 release end @@ -161,9 +161,9 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B faceplayer setvar 0x40bc, 1 message BattleTower_Lobby_Text_19A5B1 - waittext + waitmessage message BattleTower_Lobby_Text_19A5CE - waittext + waitmessage setvar 0x8004, 1 special sub_8135BA0 playse 55 @@ -175,7 +175,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B special SavePlayerParty special sub_8135A14 msgbox BattleTower_Lobby_Text_19A0A8, 4 - closebutton + closemessage call BattleTower_Lobby_EventScript_160664 warp BattleTower_Elevator, 255, 1, 6 setvar 0x4000, 0 @@ -193,7 +193,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E BattleTower_Lobby_EventScript_1604BE:: @ 81604BE message BattleTower_Lobby_Text_199F79 - waittext + waitmessage multichoice 15, 6, 23, 0 switch RESULT case 0, BattleTower_Lobby_EventScript_1604FA @@ -203,7 +203,7 @@ BattleTower_Lobby_EventScript_1604BE:: @ 81604BE BattleTower_Lobby_EventScript_1604FA:: @ 81604FA message BattleTower_Lobby_Text_19A024 - waittext + waitmessage multichoice 18, 6, 24, 0 switch RESULT case 2, BattleTower_Lobby_EventScript_160652 @@ -240,11 +240,11 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar 0x8005, 0 special sub_8135668 special LoadPlayerParty - closebutton + closemessage delay 2 call S_DoSaveDialog setvar 0x4000, 5 - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 inccounter GAME_STAT_ENTERED_BATTLE_TOWER @@ -252,7 +252,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 special sub_8135A14 setvar 0x40bc, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 - closebutton + closemessage call BattleTower_Lobby_EventScript_160664 warp BattleTower_Elevator, 255, 1, 6 setvar 0x4000, 0 @@ -380,7 +380,7 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727 lockall special ShowBattleTowerRecords waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 53e693f71..95c5a9d77 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -16,12 +16,12 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D - waittext + waitmessage goto BattleTower_Outside_EventScript_16018E end BattleTower_Outside_EventScript_16018E:: @ 816018E - multichoicedef 21, 6, 53, 2, 0 + multichoicedefault 21, 6, 53, 2, 0 switch RESULT case 0, BattleTower_Outside_EventScript_1601D0 case 1, BattleTower_Outside_EventScript_1601FB @@ -58,12 +58,12 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB BattleTower_Outside_EventScript_160226:: @ 8160226 message BattleTower_Outside_Text_199E7A - waittext + waitmessage goto BattleTower_Outside_EventScript_16018E end BattleTower_Outside_EventScript_160232:: @ 8160232 - closebutton + closemessage applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmovement 0 delay 30 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 3b2e7802d..503b9f1a8 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -32,7 +32,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 .else msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4 .endif - closebutton + closemessage setweather 0 doweather special WaitWeather @@ -87,7 +87,7 @@ CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73 .else msgbox CaveOfOrigin_B4F_Text_1B5009, 4 .endif - closebutton + closemessage return CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index b549cf127..6b8bb5cdb 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -37,7 +37,7 @@ DesertRuins_EventScript_15CB56:: @ 815CB56 goto_if_eq DesertRuins_EventScript_15CB6D braillemsg DesertRuins_Braille_1C54C8 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -50,7 +50,7 @@ DesertRuins_EventScript_15CB77:: @ 815CB77 lockall braillemsg DesertRuins_Braille_1C54C8 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index c8f20f4ac..480a408e3 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -12,8 +12,8 @@ DewfordTown_EventScript_14E002:: @ 814E002 checkflag 189 goto_if 0, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 - waittext - multichoicedef 21, 6, 0, 2, 0 + waitmessage + multichoicedefault 21, 6, 0, 2, 0 switch RESULT case 0, DewfordTown_EventScript_14E04B case 1, DewfordTown_EventScript_14E05B @@ -23,21 +23,21 @@ DewfordTown_EventScript_14E002:: @ 814E002 DewfordTown_EventScript_14E04B:: @ 814E04B msgbox DewfordTown_Text_16B57D, 4 - closebutton + closemessage goto DewfordTown_EventScript_14E151 release end DewfordTown_EventScript_14E05B:: @ 814E05B msgbox DewfordTown_Text_16B5D2, 4 - closebutton + closemessage goto DewfordTown_EventScript_14E1D8 release end DewfordTown_EventScript_14E06B:: @ 814E06B msgbox DewfordTown_Text_16B627, 4 - closebutton + closemessage release end @@ -51,7 +51,7 @@ DewfordTown_EventScript_14E076:: @ 814E076 DewfordTown_EventScript_14E093:: @ 814E093 msgbox DewfordTown_Text_16B417, 4 - closebutton + closemessage goto DewfordTown_EventScript_14E151 end @@ -98,7 +98,7 @@ DewfordTown_EventScript_14E111:: @ 814E111 DewfordTown_EventScript_14E11B:: @ 814E11B message DewfordTown_Text_16B84E - waittext + waitmessage multichoice 20, 8, 50, 1 compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E13D @@ -166,7 +166,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 showobject 255, 0, 24 applymovement 255, DewfordTown_Movement_14E409 waitmovement 0 - movespriteperm 2, 21, 26 + setobjectxyperm 2, 21, 26 addobject 2 spritelevelup 2, 0, 24, 0 applymovement 2, DewfordTown_Movement_14E410 @@ -180,11 +180,11 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 call_if 0, DewfordTown_EventScript_14E281 checkflag 149 call_if 1, DewfordTown_EventScript_14E28A - closebutton + closemessage copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 11 restorespritelevel 2, 0, 24 - moveoffscreen 2 + moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 034bca1bc..296d2ed2d 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -109,7 +109,7 @@ DewfordTown_Gym_EventScript_153152:: @ 8153152 DewfordTown_Gym_EventScript_153177:: @ 8153177 call DewfordTown_Gym_EventScript_153117 message DewfordTown_Gym_Text_1752BB - waittext + waitmessage call DewfordTown_Gym_EventScript_1A02C5 msgbox DewfordTown_Gym_Text_1752E6, 4 setflag 1204 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 78b5f5044..ea4016147 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -52,7 +52,7 @@ DewfordTown_Hall_EventScript_15330A:: @ 815330A faceplayer call DewfordTown_Hall_EventScript_1A0102 msgbox DewfordTown_Hall_Text_17570D, 4 - closebutton + closemessage applymovement 4, DewfordTown_Hall_Movement_1A0841 waitmovement 0 release @@ -63,7 +63,7 @@ DewfordTown_Hall_EventScript_153326:: @ 8153326 faceplayer call DewfordTown_Hall_EventScript_1A0102 msgbox DewfordTown_Hall_Text_17574C, 4 - closebutton + closemessage applymovement 5, DewfordTown_Hall_Movement_1A0841 waitmovement 0 release diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index 96c198ae5..70e75492e 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 setvar 0x800b, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index adfbca1bf..febd6a521 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -50,7 +50,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 setmaptile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 - closebutton + closemessage playse 8 checkgender compare RESULT, 0 @@ -101,7 +101,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB end EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 - closebutton + closemessage addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 waitmovement 0 @@ -116,7 +116,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4 - closebutton + closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD @@ -132,7 +132,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 - closebutton + closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 waitmovement 0 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 523a337cc..b53319abe 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -24,7 +24,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_191841, 4 - closebutton + closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60 applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60 waitmovement 0 @@ -33,7 +33,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_1918D7, 4 - closebutton + closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0841 applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841 waitmovement 0 diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 7c0b8b0a4..57262b211 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 setvar 0x800b, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index f15f05904..acbdac899 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -10,14 +10,14 @@ EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B end EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B - movespriteperm 3, 9, 2 - movespriteperm 4, 10, 2 + setobjectxyperm 3, 9, 2 + setobjectxyperm 4, 10, 2 return EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A setvar 0x800b, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B - waittext + waitmessage waitbutton release end @@ -26,7 +26,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8 lock faceplayer message EverGrandeCity_PokemonLeague_Text_1A0BE4 - waittext + waitmessage pokemart EverGrandeCity_PokemonLeague_Items msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, 4 release @@ -55,22 +55,22 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 compare 0x4000, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD - waittext + waitmessage delay 75 checkflag 2060 goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A - closebutton + closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmovement 0 delay 10 playfanfare 369 message EverGrandeCity_PokemonLeague_Text_191804 - waittext + waitmessage waitfanfare - closebutton - moveoffscreen 3 - moveoffscreen 4 + closemessage + moveobjectoffscreen 3 + moveobjectoffscreen 4 setflag 263 releaseall end @@ -95,7 +95,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57 applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839 waitmovement 0 msgbox EverGrandeCity_PokemonLeague_Text_191804, 4 - closebutton + closemessage applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D waitmovement 0 releaseall diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index a629acaf9..c4c590b53 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -38,7 +38,7 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 applymovement 255, FallarborTown_ContestLobby_Movement_153A7A waitmovement 0 msgbox FallarborTown_ContestLobby_Text_1A6832, 4 - closebutton + closemessage applymovement 1, FallarborTown_ContestLobby_Movement_153A83 applymovement 255, FallarborTown_ContestLobby_Movement_153A70 waitmovement 0 @@ -108,7 +108,7 @@ FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2 FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB lockall fadescreen 1 - showcontestwinner 2 + drawcontestwinner 2 releaseall end @@ -116,6 +116,6 @@ FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 lockall special ShowBerryBlenderRecordWindow waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc index 05a3704fe..0cf842ddf 100644 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ b/data/scripts/maps/FallarborTown_Mart.inc @@ -5,7 +5,7 @@ FallarborTown_Mart_EventScript_153967:: @ 8153967 lock faceplayer message FallarborTown_Mart_Text_1A0BE4 - waittext + waitmessage pokemart FallarborTown_Mart_Items msgbox FallarborTown_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 3b33c5a41..5b1f1c948 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 setvar 0x800b, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end @@ -27,7 +27,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 lock faceplayer msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, 4 - closebutton + closemessage switch FACING case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49 case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index a7c548b1f..3cddff4f9 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -72,7 +72,7 @@ FortreeCity_EventScript_14C9CF:: @ 814C9CF FortreeCity_EventScript_14C9E4:: @ 814C9E4 msgbox FortreeCity_Text_1678CB, 4 - closebutton + closemessage applymovement LAST_TALKED, FortreeCity_Movement_1A0662 waitmovement 0 waitse diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/scripts/maps/FortreeCity_DecorationShop.inc index c9d9fdd4e..fca20b866 100644 --- a/data/scripts/maps/FortreeCity_DecorationShop.inc +++ b/data/scripts/maps/FortreeCity_DecorationShop.inc @@ -13,7 +13,7 @@ FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A lock faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 - waittext + waitmessage pokemartdecor FortreeCity_DecorationShop_Decorations1 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release @@ -37,7 +37,7 @@ FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 lock faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 - waittext + waitmessage pokemartdecor FortreeCity_DecorationShop_Decorations2 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 8744141cb..7309be0bb 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -25,7 +25,7 @@ FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 FortreeCity_Gym_EventScript_157F15:: @ 8157F15 message FortreeCity_Gym_Text_185E48 - waittext + waitmessage call FortreeCity_Gym_EventScript_1A02C5 msgbox FortreeCity_Gym_Text_185E73, 4 setflag 1225 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index f90c080f8..fdd30022f 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -14,7 +14,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 checkflag 222 goto_if_eq FortreeCity_House4_EventScript_1581C2 msgbox FortreeCity_House4_Text_186835, 4 - closebutton + closemessage setflag 222 clearflag 934 applymovement 3, FortreeCity_House4_Movement_158218 diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/scripts/maps/FortreeCity_Mart.inc index 9e5f34ff9..076f702af 100644 --- a/data/scripts/maps/FortreeCity_Mart.inc +++ b/data/scripts/maps/FortreeCity_Mart.inc @@ -5,7 +5,7 @@ FortreeCity_Mart_EventScript_158067:: @ 8158067 lock faceplayer message FortreeCity_Mart_Text_1A0BE4 - waittext + waitmessage pokemart FortreeCity_Mart_Items msgbox FortreeCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index 148324abf..5268cbeed 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B setvar 0x800b, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 9afe54091..070276e58 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -13,7 +13,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA compare RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 - closebutton + closemessage compare FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 1 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index b59500625..ed230477c 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -70,7 +70,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C IslandCave_EventScript_15EF95:: @ 815EF95 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index afad309a9..e0d54d0e7 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -14,8 +14,8 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE end LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 - movespriteperm 8, 11, 9 - movespriteperm 7, 11, 9 + setobjectxyperm 8, 11, 9 + setobjectxyperm 7, 11, 9 return LavaridgeTown_EventScript_14E4DF:: @ 814E4DF @@ -98,7 +98,7 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 end LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 - closebutton + closemessage compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E646 compare 0x8008, 0 @@ -124,7 +124,7 @@ LavaridgeTown_EventScript_14E644:: @ 814E644 end LavaridgeTown_EventScript_14E646:: @ 814E646 - movespriteperm 7, 6, 16 + setobjectxyperm 7, 6, 16 return LavaridgeTown_EventScript_14E64E:: @ 814E64E @@ -139,19 +139,19 @@ LavaridgeTown_EventScript_14E64E:: @ 814E64E return LavaridgeTown_EventScript_14E67B:: @ 814E67B - spritebehave 7, 8 + setobjectmovementtype 7, 8 return LavaridgeTown_EventScript_14E680:: @ 814E680 - spritebehave 7, 7 + setobjectmovementtype 7, 7 return LavaridgeTown_EventScript_14E685:: @ 814E685 - spritebehave 7, 10 + setobjectmovementtype 7, 10 return LavaridgeTown_EventScript_14E68A:: @ 814E68A - spritebehave 7, 9 + setobjectmovementtype 7, 9 return LavaridgeTown_EventScript_14E68F:: @ 814E68F @@ -285,7 +285,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A playfanfare 370 message LavaridgeTown_Text_16C2EA waitfanfare - waittext + waitmessage giveegg 360 release end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index e22d4471f..2edffe9f0 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -43,27 +43,27 @@ LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF checktrainerflag OPPONENT_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_15370C - spritebehave 2, 63 + setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C checktrainerflag OPPONENT_ZANE goto_if_eq LavaridgeTown_Gym_1F_EventScript_153719 - spritebehave 3, 63 + setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 checktrainerflag OPPONENT_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_153726 - spritebehave 4, 63 + setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 checktrainerflag OPPONENT_SADIE goto_if_eq LavaridgeTown_Gym_1F_EventScript_153733 - spritebehave 5, 63 + setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 checktrainerflag OPPONENT_ANDY goto_if_eq LavaridgeTown_Gym_1F_EventScript_153740 - spritebehave 7, 63 + setobjectmovementtype 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 return @@ -78,7 +78,7 @@ LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 message LavaridgeTown_Gym_1F_Text_176A62 - waittext + waitmessage call LavaridgeTown_Gym_1F_EventScript_1A02C5 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 setflag 1213 diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index c924684bc..5ec6731d4 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -5,7 +5,7 @@ LavaridgeTown_HerbShop_EventScript_153629:: @ 8153629 lock faceplayer message LavaridgeTown_HerbShop_Text_17615C - waittext + waitmessage pokemart LavaridgeTown_HerbShop_Items msgbox LavaridgeTown_HerbShop_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/scripts/maps/LavaridgeTown_Mart.inc index 4f28e16b0..99b567e06 100644 --- a/data/scripts/maps/LavaridgeTown_Mart.inc +++ b/data/scripts/maps/LavaridgeTown_Mart.inc @@ -5,7 +5,7 @@ LavaridgeTown_Mart_EventScript_1538CB:: @ 81538CB lock faceplayer message LavaridgeTown_Mart_Text_1A0BE4 - waittext + waitmessage pokemart LavaridgeTown_Mart_Items msgbox LavaridgeTown_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index c0762bcc3..9d0f31059 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B setvar 0x800b, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index af353e824..76976543c 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -411,7 +411,7 @@ LilycoveCity_EventScript_14CF62:: @ 814CF62 return LilycoveCity_EventScript_14CF6B:: @ 814CF6B - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 waitmovement 0 delay 50 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7746eac01..09f2e88ea 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -28,7 +28,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 msgbox LilycoveCity_ContestLobby_Text_18890F, 4 lockall fadescreen 1 - showcontestwinner 0 + drawcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 compare RESULT, 1 @@ -40,7 +40,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 - closebutton + closemessage special sub_80C4CEC setvar 0x4099, 0 specialvar RESULT, GiveMonArtistRibbon @@ -59,7 +59,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 - closebutton + closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 setvar 0x4099, 0 @@ -83,7 +83,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 msgbox LilycoveCity_ContestLobby_Text_188C32, 4 - closebutton + closemessage return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 @@ -203,7 +203,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A msgbox LilycoveCity_ContestLobby_Text_18890F, 4 lockall fadescreen 1 - showcontestwinner 0 + drawcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE @@ -213,7 +213,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 - closebutton + closemessage special sub_80C4CEC setvar 0x4099, 0 specialvar RESULT, GiveMonArtistRibbon @@ -232,7 +232,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 - closebutton + closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 setvar 0x4099, 0 @@ -256,7 +256,7 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 msgbox LilycoveCity_ContestLobby_Text_188C32, 4 - closebutton + closemessage return LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64 @@ -310,14 +310,14 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 checkflag 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C - waittext + waitmessage setflag 2 goto LilycoveCity_ContestLobby_EventScript_158BF0 end LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE message LilycoveCity_ContestLobby_Text_188584 - waittext + waitmessage goto LilycoveCity_ContestLobby_EventScript_158BF0 end @@ -331,7 +331,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog - hidebox 0, 0, 15, 9 + erasebox 0, 0, 15, 9 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 setflag 3 @@ -394,7 +394,7 @@ LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 copyvar 0x8008, 0x8004 message LilycoveCity_ContestLobby_Text_1A67A3 - waittext + waitmessage yesnobox 20, 8 switch RESULT case 0, LilycoveCity_ContestLobby_EventScript_158C42 @@ -405,7 +405,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA checkflag 3 call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4 message LilycoveCity_ContestLobby_Text_1886DC - waittext + waitmessage multichoice 0, 0, 4, 0 switch RESULT case 5, LilycoveCity_ContestLobby_EventScript_158C35 @@ -416,7 +416,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 message LilycoveCity_ContestLobby_Text_1887C7 - waittext + waitmessage copyvar 0x8004, RESULT special sub_808363C waitstate @@ -427,7 +427,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 compare RESULT, 6 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 message2 LilycoveCity_ContestLobby_Text_18872A - waittext + waitmessage contestlinktransfer switch 0x8004 case 0, LilycoveCity_ContestLobby_EventScript_158DD1 @@ -443,7 +443,7 @@ LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82 LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 special CloseLink msgbox LilycoveCity_ContestLobby_Text_18878D, 4 - closebutton + closemessage releaseall clearflag 3 end @@ -451,7 +451,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 special CloseLink msgbox LilycoveCity_ContestLobby_Text_1887F4, 4 - closebutton + closemessage releaseall clearflag 3 end @@ -459,7 +459,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 special CloseLink msgbox LilycoveCity_ContestLobby_Text_18881F, 4 - closebutton + closemessage releaseall clearflag 3 end @@ -474,7 +474,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 addvar 0x8004, 1 buffernum 1, 32772 message2 LilycoveCity_ContestLobby_Text_188845 - waittext + waitmessage addvar 0x8004, 65535 goto LilycoveCity_ContestLobby_EventScript_158DEE end @@ -491,9 +491,9 @@ LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B lockall message2 LilycoveCity_ContestLobby_Text_1888C6 - waittext + waitmessage delay 20 - closebutton + closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 playse 71 @@ -512,9 +512,9 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B applymovement 255, LilycoveCity_ContestLobby_Movement_158E99 waitmovement 0 message2 LilycoveCity_ContestLobby_Text_1A6832 - waittext + waitmessage delay 20 - closebutton + closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4 applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E waitmovement 0 @@ -651,7 +651,7 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 applymovement 255, LilycoveCity_ContestLobby_Movement_159008 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_1A6832, 4 - closebutton + closemessage applymovement 1, LilycoveCity_ContestLobby_Movement_159013 applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE waitmovement 0 @@ -735,21 +735,21 @@ LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066 lockall fadescreen 1 - showcontestwinner 6 + drawcontestwinner 6 releaseall end LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D lockall fadescreen 1 - showcontestwinner 7 + drawcontestwinner 7 releaseall end LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074 lockall fadescreen 1 - showcontestwinner 8 + drawcontestwinner 8 releaseall end @@ -766,6 +766,6 @@ SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D lockall special ShowBerryBlenderRecordWindow waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index f6fb499a3..7b602b2c7 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -11,7 +11,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, 4 - closebutton + closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D waitmovement 0 releaseall @@ -22,7 +22,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, 4 - closebutton + closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D waitmovement 0 releaseall @@ -33,7 +33,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, 4 - closebutton + closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D waitmovement 0 releaseall @@ -49,7 +49,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845 waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, 4 - closebutton + closemessage applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 0a51aff26..fd9ea8a58 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -27,7 +27,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD message LilycoveCity_CoveLilyMotel_2F_Text_18708F - waittext + waitmessage call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5 special ScrSpecial_ShowDiploma waitstate diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 43f110577..9d04d2e33 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -9,7 +9,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C copyvar 0x8005, 0x4043 special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 - waittext + waitmessage multichoice 0, 0, 57, 0 switch RESULT case 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A402 @@ -66,12 +66,12 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E end LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1 - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 release end LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 waitmovement 0 special sub_810EBEC diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index b01d74129..02f5ca3ca 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 lock faceplayer message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4 - waittext + waitmessage pokemartdecor LilycoveCity_DepartmentStoreRooftop_Decorations msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4 release @@ -70,7 +70,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4:: @ 815A1C4 LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD lockall message LilycoveCity_DepartmentStoreRooftop_Text_18C72B - waittext + waitmessage showmoney 0, 0 nop goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE @@ -182,7 +182,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E:: @ 815A36E message LilycoveCity_DepartmentStoreRooftop_Text_18C72B - waittext + waitmessage goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 311dac1ab..2b39ea557 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -18,7 +18,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag 2250 message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 - waittext + waitmessage special RetrieveLotteryNumber copyvar 0x8008, RESULT special sub_810F9AC diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc index e54883714..25e981628 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc @@ -17,7 +17,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_159F2A:: @ 8159F2A lock faceplayer message LilycoveCity_DepartmentStore_2F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_2F_Items1 msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4 release @@ -44,7 +44,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_159F5E:: @ 8159F5E lock faceplayer message LilycoveCity_DepartmentStore_2F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_2F_Items2 msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc index e669cef7f..1f55f5018 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_159F91:: @ 8159F91 lock faceplayer message LilycoveCity_DepartmentStore_3F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_3F_Items1 msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4 release @@ -27,7 +27,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_159FB8:: @ 8159FB8 lock faceplayer message LilycoveCity_DepartmentStore_3F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_3F_Items2 msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc index 994b3b63f..d922d9181 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc @@ -17,7 +17,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019 lock faceplayer message LilycoveCity_DepartmentStore_4F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_4F_Items1 msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4 release @@ -37,7 +37,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C lock faceplayer message LilycoveCity_DepartmentStore_4F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_4F_Items2 msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc index 0bef8866a..835a0f48d 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061 lock faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 - waittext + waitmessage pokemartbp LilycoveCity_DepartmentStore_5F_Items1 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release @@ -33,7 +33,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094 lock faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 - waittext + waitmessage pokemartbp LilycoveCity_DepartmentStore_5F_Items2 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release @@ -58,7 +58,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2 lock faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 - waittext + waitmessage pokemartbp LilycoveCity_DepartmentStore_5F_Items3 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release @@ -83,7 +83,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2 lock faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 - waittext + waitmessage pokemartbp LilycoveCity_DepartmentStore_5F_Items4 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index cbcac6f6e..1fc172d8c 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -28,12 +28,12 @@ LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 - waittext + waitmessage goto LilycoveCity_Harbor_EventScript_1598F1 end LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1 - multichoicedef 18, 6, 56, 2, 0 + multichoicedefault 18, 6, 56, 2, 0 switch RESULT case 0, LilycoveCity_Harbor_EventScript_159933 case 1, LilycoveCity_Harbor_EventScript_15995B @@ -69,13 +69,13 @@ LilycoveCity_Harbor_EventScript_15995B:: @ 815995B LilycoveCity_Harbor_EventScript_15997E:: @ 815997E message LilycoveCity_Harbor_Text_18B4E2 - waittext + waitmessage goto LilycoveCity_Harbor_EventScript_1598F1 end LilycoveCity_Harbor_EventScript_15998A:: @ 815998A msgbox LilycoveCity_Harbor_Text_18B4B3, 4 - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 @@ -113,7 +113,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE checkflag 2131 goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 @@ -124,7 +124,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement 4, LilycoveCity_Harbor_Movement_1A0839 waitmovement 0 msgbox LilycoveCity_Harbor_Text_1C5120, 4 - closebutton + closemessage applymovement 4, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index fa5a30862..f700eed9d 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -14,7 +14,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 compare RESULT, 0 goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D waitmovement 0 release @@ -22,7 +22,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D msgbox LilycoveCity_House3_Text_18B9DC, 4 - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D waitmovement 0 release @@ -32,7 +32,7 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32 lock faceplayer msgbox LilycoveCity_House3_Text_18BD64, 4 - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 548c80a96..06e82d5f8 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -9,7 +9,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 lockall applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839 message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 - waittext + waitmessage multichoice 20, 8, 16, 1 compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index f63068d74..a4599f14a 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -128,14 +128,14 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag 236 - closebutton + closemessage releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_158783:: @ 8158783 call LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188166, 4 - closebutton + closemessage releaseall end @@ -198,34 +198,34 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158817:: @ 8158817 LilycoveCity_LilycoveMuseum_2F_EventScript_158820:: @ 8158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - showcontestwinner 9 + drawcontestwinner 9 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15882E:: @ 815882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - showcontestwinner 10 + drawcontestwinner 10 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15883C:: @ 815883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - showcontestwinner 11 + drawcontestwinner 11 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15884A:: @ 815884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - showcontestwinner 12 + drawcontestwinner 12 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - showcontestwinner 13 + drawcontestwinner 13 releaseall end diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index b398076fa..20b5c5f13 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 setvar 0x800b, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 4d6401502..13217b340 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -104,35 +104,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 end LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5 - movespriteperm 1, 7, 5 + setobjectxyperm 1, 7, 5 return LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD:: @ 81594DD - movespriteperm 3, 3, 4 + setobjectxyperm 3, 3, 4 return LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5:: @ 81594E5 - movespriteperm 4, 7, 2 + setobjectxyperm 4, 7, 2 return LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED:: @ 81594ED - movespriteperm 5, 5, 5 + setobjectxyperm 5, 5, 5 return LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5:: @ 81594F5 - movespriteperm 6, 5, 2 + setobjectxyperm 6, 5, 2 return LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD:: @ 81594FD - movespriteperm 2, 8, 4 + setobjectxyperm 2, 8, 4 return LilycoveCity_PokemonTrainerFanClub_EventScript_159505:: @ 8159505 - movespriteperm 7, 3, 3 + setobjectxyperm 7, 3, 3 return LilycoveCity_PokemonTrainerFanClub_EventScript_15950D:: @ 815950D - movespriteperm 8, 8, 3 + setobjectxyperm 8, 8, 3 return LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 06508fd02..095862fd6 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -36,24 +36,24 @@ LittlerootTown_EventScript_14D570:: @ 814D570 return LittlerootTown_EventScript_14D57B:: @ 814D57B - movespriteperm 4, 14, 8 + setobjectxyperm 4, 14, 8 return LittlerootTown_EventScript_14D583:: @ 814D583 compare 0x4050, 0 goto_if_eq LittlerootTown_EventScript_14D59A - movespriteperm 1, 10, 1 - spritebehave 1, 7 + setobjectxyperm 1, 10, 1 + setobjectmovementtype 1, 7 return LittlerootTown_EventScript_14D59A:: @ 814D59A - movespriteperm 1, 7, 2 - spritebehave 1, 8 + setobjectxyperm 1, 7, 2 + setobjectmovementtype 1, 8 return LittlerootTown_EventScript_14D5A6:: @ 814D5A6 clearflag 752 - spritebehave 4, 8 + setobjectmovementtype 4, 8 checkgender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D5C5 @@ -62,11 +62,11 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 return LittlerootTown_EventScript_14D5C5:: @ 814D5C5 - movespriteperm 4, 5, 9 + setobjectxyperm 4, 5, 9 return LittlerootTown_EventScript_14D5CD:: @ 814D5CD - movespriteperm 4, 14, 9 + setobjectxyperm 4, 14, 9 return LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 @@ -113,7 +113,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6AE waitmovement 0 msgbox LittlerootTown_Text_16A7C9, 4 - closebutton + closemessage applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 @@ -199,7 +199,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF LittlerootTown_EventScript_14D708:: @ 814D708 msgbox LittlerootTown_Text_16AD82, 4 - closebutton + closemessage applymovement 1, LittlerootTown_Movement_1A083D waitmovement 0 setvar 0x4050, 2 @@ -229,12 +229,12 @@ LittlerootTown_EventScript_14D739:: @ 814D739 LittlerootTown_EventScript_14D755:: @ 814D755 msgbox LittlerootTown_Text_16ACEB, 4 - closebutton + closemessage applymovement 1, LittlerootTown_Movement_14D787 applymovement 255, LittlerootTown_Movement_14D793 waitmovement 0 msgbox LittlerootTown_Text_16AD3C, 4 - closebutton + closemessage return LittlerootTown_Movement_14D779:: @ 814D779 @@ -316,7 +316,7 @@ LittlerootTown_EventScript_14D7C7:: @ 814D7C7 applymovement 255, LittlerootTown_Movement_1A083F waitmovement 0 msgbox LittlerootTown_Text_16AD82, 4 - closebutton + closemessage applymovement 1, LittlerootTown_Movement_1A083D waitmovement 0 setvar 0x4050, 2 @@ -417,7 +417,7 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6 compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 - closebutton + closemessage checkgender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D952 @@ -871,10 +871,10 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38 playfanfare 370 message LittlerootTown_Text_16AA32 waitfanfare - waittext + waitmessage setflag 274 msgbox LittlerootTown_Text_16AA5C, 4 msgbox LittlerootTown_Text_16AB10, 4 - closebutton + closemessage delay 30 return diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index e878d7e2e..30b2d6eef 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -36,18 +36,18 @@ LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A end LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC - movespriteperm 1, 8, 4 - spritebehave 1, 7 + setobjectxyperm 1, 8, 4 + setobjectmovementtype 1, 7 return LittlerootTown_BrendansHouse_1F_EventScript_1526B8:: @ 81526B8 - movespriteperm 1, 4, 5 - spritebehave 1, 7 + setobjectxyperm 1, 4, 5 + setobjectmovementtype 1, 7 return LittlerootTown_BrendansHouse_1F_EventScript_1526C4:: @ 81526C4 - movespriteperm 1, 9, 8 - spritebehave 1, 7 + setobjectxyperm 1, 9, 8 + setobjectmovementtype 1, 7 return LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0 @@ -61,7 +61,7 @@ LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0 LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA lockall msgbox LittlerootTown_BrendansHouse_1F_Text_172574, 4 - closebutton + closemessage applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 waitmovement 0 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 3b39fe2ed..1f4b301c0 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -13,8 +13,8 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF end LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE - movespriteperm 1, 1, 2 - spritebehave 1, 7 + setobjectxyperm 1, 1, 2 + setobjectmovementtype 1, 7 return LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 9b5a372fa..45eb481e4 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -36,18 +36,18 @@ LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 end LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA - movespriteperm 1, 2, 4 - spritebehave 1, 7 + setobjectxyperm 1, 2, 4 + setobjectmovementtype 1, 7 return LittlerootTown_MaysHouse_1F_EventScript_1528F6:: @ 81528F6 - movespriteperm 1, 6, 5 - spritebehave 1, 7 + setobjectxyperm 1, 6, 5 + setobjectmovementtype 1, 7 return LittlerootTown_MaysHouse_1F_EventScript_152902:: @ 8152902 - movespriteperm 1, 1, 8 - spritebehave 1, 7 + setobjectxyperm 1, 1, 8 + setobjectmovementtype 1, 7 return LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E @@ -61,7 +61,7 @@ LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 lockall msgbox LittlerootTown_MaysHouse_1F_Text_172574, 4 - closebutton + closemessage applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E waitmovement 0 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 84fb4e69b..b35ee81a9 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -13,8 +13,8 @@ LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B end LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A - movespriteperm 1, 7, 2 - spritebehave 1, 7 + setobjectxyperm 1, 7, 2 + setobjectmovementtype 1, 7 return LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 @@ -56,7 +56,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 - closebutton + closemessage compare FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 compare FACING, 2 @@ -90,7 +90,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 - closebutton + closemessage compare FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 2 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 7e3386d7a..7c6886209 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -26,7 +26,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE lockall bufferfirstpoke 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 - waittext + waitmessage playfanfare 370 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 @@ -158,7 +158,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D playfanfare 370 message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare - waittext + waitmessage setflag 2049 return diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index da406e2f7..5c93aa252 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -70,7 +70,7 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4 checkflag 284 goto_if_eq MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 - closebutton + closemessage applymovement 7, MauvilleCity_Movement_1A083D waitmovement 0 release @@ -78,7 +78,7 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4 MauvilleCity_EventScript_14C0E4:: @ 814C0E4 msgbox MauvilleCity_Text_165E45, 4 - closebutton + closemessage applymovement 7, MauvilleCity_Movement_1A083D waitmovement 0 release @@ -109,7 +109,7 @@ MauvilleCity_EventScript_14C154:: @ 814C154 call_if 1, MauvilleCity_EventScript_14C23C compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_14C285 - closebutton + closemessage switch FACING case 2, MauvilleCity_EventScript_14C187 case 4, MauvilleCity_EventScript_14C1D9 @@ -127,7 +127,7 @@ MauvilleCity_EventScript_14C187:: @ 814C187 applymovement 255, MauvilleCity_Movement_1A0845 waitmovement 0 msgbox MauvilleCity_Text_1660FA, 4 - closebutton + closemessage applymovement 6, MauvilleCity_Movement_14C2B6 applymovement 7, MauvilleCity_Movement_14C2DF waitmovement 0 @@ -146,7 +146,7 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 applymovement 255, MauvilleCity_Movement_1A0845 waitmovement 0 msgbox MauvilleCity_Text_1660FA, 4 - closebutton + closemessage applymovement 6, MauvilleCity_Movement_14C2C1 applymovement 7, MauvilleCity_Movement_14C2E8 waitmovement 0 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 0b577885e..8c0ce9590 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -26,7 +26,7 @@ MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0 message MauvilleCity_BikeShop_Text_1810B1 - waittext + waitmessage multichoice 21, 8, 12, 1 switch RESULT case 0, MauvilleCity_BikeShop_EventScript_15682D @@ -109,7 +109,7 @@ MauvilleCity_BikeShop_EventScript_15690B:: @ 815690B MauvilleCity_BikeShop_EventScript_156914:: @ 8156914 message MauvilleCity_BikeShop_Text_1815EA - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156920 end @@ -125,19 +125,19 @@ MauvilleCity_BikeShop_EventScript_156920:: @ 8156920 MauvilleCity_BikeShop_EventScript_156962:: @ 8156962 message MauvilleCity_BikeShop_Text_18162C - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_15696E:: @ 815696E message MauvilleCity_BikeShop_Text_1816F5 - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_15697A:: @ 815697A message MauvilleCity_BikeShop_Text_1817BF - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156920 end @@ -147,7 +147,7 @@ MauvilleCity_BikeShop_EventScript_156986:: @ 8156986 MauvilleCity_BikeShop_EventScript_156988:: @ 8156988 message MauvilleCity_BikeShop_Text_181892 - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156994 end @@ -163,19 +163,19 @@ MauvilleCity_BikeShop_EventScript_156994:: @ 8156994 MauvilleCity_BikeShop_EventScript_1569D6:: @ 81569D6 message MauvilleCity_BikeShop_Text_1818D4 - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_1569E2:: @ 81569E2 message MauvilleCity_BikeShop_Text_18199A - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_1569EE:: @ 81569EE message MauvilleCity_BikeShop_Text_181A3D - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156994 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 6e9b11947..6952ca4e1 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -9,14 +9,14 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 - waittext + waitmessage showmoney 0, 0 nop showcoins 0, 5 goto MauvilleCity_GameCorner_EventScript_156A60 MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 - multichoicedef 15, 0, 49, 0, 0 + multichoicedefault 15, 0, 49, 0, 0 switch RESULT case 0, MauvilleCity_GameCorner_EventScript_156AAE case 1, MauvilleCity_GameCorner_EventScript_156AF0 @@ -24,7 +24,7 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 end @ 8156A87 - multichoicedef 15, 0, 49, 1, 0 + multichoicedefault 15, 0, 49, 1, 0 switch RESULT case 0, MauvilleCity_GameCorner_EventScript_156AAE case 1, MauvilleCity_GameCorner_EventScript_156AF0 @@ -107,14 +107,14 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 message MauvilleCity_GameCorner_Text_181E17 - waittext + waitmessage showcoins 0, 0 setvar 0x4001, 0 goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B message MauvilleCity_GameCorner_Text_181E17 - waittext + waitmessage goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 @@ -228,14 +228,14 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 message MauvilleCity_GameCorner_Text_181E17 - waittext + waitmessage showcoins 0, 0 setvar 0x4001, 0 goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 message MauvilleCity_GameCorner_Text_181E17 - waittext + waitmessage goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 @@ -499,7 +499,7 @@ MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8 end MauvilleCity_GameCorner_EventScript_157108:: @ 8157108 - closebutton + closemessage applymovement LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index e5791d521..5221add7a 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -79,7 +79,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB message MauvilleCity_Gym_Text_180DAF - waittext + waitmessage call MauvilleCity_Gym_EventScript_1A02C5 msgbox MauvilleCity_Gym_Text_180DDA, 4 setflag 1208 diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/scripts/maps/MauvilleCity_Mart.inc index fac5906ad..0dd66eddf 100644 --- a/data/scripts/maps/MauvilleCity_Mart.inc +++ b/data/scripts/maps/MauvilleCity_Mart.inc @@ -5,7 +5,7 @@ MauvilleCity_Mart_EventScript_1573BE:: @ 81573BE lock faceplayer message MauvilleCity_Mart_Text_1A0BE4 - waittext + waitmessage pokemart MauvilleCity_Mart_Items msgbox MauvilleCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index 0e9ba15ef..7122b8c3c 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -15,7 +15,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 setvar 0x800b, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index c7aa8fb10..06abbc8f6 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -14,7 +14,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_1A0845 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193237, 4 - closebutton + closemessage applymovement 5, MeteorFalls_1F_1R_Movement_1A0841 applymovement 6, MeteorFalls_1F_1R_Movement_1A0841 waitmovement 0 @@ -24,11 +24,11 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_1A0835 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193268, 4 - closebutton + closemessage applymovement 5, MeteorFalls_1F_1R_Movement_15C5EE waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1932C5, 4 - closebutton + closemessage applymovement 255, MeteorFalls_1F_1R_Movement_1A083F applymovement 5, MeteorFalls_1F_1R_Movement_1A083F applymovement 6, MeteorFalls_1F_1R_Movement_1A083F @@ -44,7 +44,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 6, MeteorFalls_1F_1R_Movement_1A083F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193320, 4 - closebutton + closemessage applymovement 255, MeteorFalls_1F_1R_Movement_15C64F applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1 applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC @@ -58,7 +58,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C .else msgbox MeteorFalls_1F_1R_Text_193584, 4 .endif - closebutton + closemessage applymovement 8, MeteorFalls_1F_1R_Movement_15C639 applymovement 9, MeteorFalls_1F_1R_Movement_15C64A waitmovement 0 @@ -69,7 +69,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 7, MeteorFalls_1F_1R_Movement_1A083F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1937AA, 4 - closebutton + closemessage applymovement 7, MeteorFalls_1F_1R_Movement_15C61F applymovement 8, MeteorFalls_1F_1R_Movement_15C62E applymovement 9, MeteorFalls_1F_1R_Movement_15C63E diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 7861d0c4d..66ad747f9 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -25,13 +25,13 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E setvar 0x4001, 1 - movespriteperm 1, 3, 2 - spritebehave 1, 8 + setobjectxyperm 1, 3, 2 + setobjectmovementtype 1, 8 return MossdeepCity_GameCorner_1F_EventScript_15ACAF:: @ 815ACAF - movespriteperm 1, 2, 2 - spritebehave 1, 10 + setobjectxyperm 1, 2, 2 + setobjectmovementtype 1, 10 return MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB @@ -46,7 +46,7 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 waitmovement 0 applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F waitmovement 0 - moveoffscreen 1 + moveobjectoffscreen 1 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 compare 0x40c0, 1 @@ -106,11 +106,11 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 call S_DoSaveDialog compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 - closebutton + closemessage compare FACING, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 compare FACING, 4 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 46b9dcfea..886c64d29 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -17,7 +17,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E waitmovement 0 special sub_81360C0 msgbox 0x20234cc, 4 - closebutton + closemessage setvar 0x8004, 2 setvar 0x8005, 0 special sub_813556C @@ -28,7 +28,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 compare RESULT, 2 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE - closebutton + closemessage special ScrSpecial_HealPlayerParty applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmovement 0 @@ -47,14 +47,14 @@ MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5 MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 setvar 0x40c0, 1 special ShowFieldMessageStringVar4 - waittext + waitmessage waitbutton return MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE setvar 0x40c0, 2 special ShowFieldMessageStringVar4 - waittext + waitmessage waitbutton return diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 4365ba74a..944860f2d 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -58,7 +58,7 @@ MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B MossdeepCity_Gym_EventScript_15A594:: @ 815A594 message MossdeepCity_Gym_Text_18D0F9 - waittext + waitmessage call MossdeepCity_Gym_EventScript_1A02C5 msgbox MossdeepCity_Gym_Text_18D128, 4 setflag 1229 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index c34eb9391..b1954a6cf 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -16,7 +16,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B pokecry SPECIES_WINGULL, 0 msgbox MossdeepCity_House2_Text_18D61E, 4 waitpokecry - closebutton + closemessage setflag 224 clearflag 933 compare FACING, 2 diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/scripts/maps/MossdeepCity_Mart.inc index d1e861b99..ce5845c81 100644 --- a/data/scripts/maps/MossdeepCity_Mart.inc +++ b/data/scripts/maps/MossdeepCity_Mart.inc @@ -5,7 +5,7 @@ MossdeepCity_Mart_EventScript_15A926:: @ 815A926 lock faceplayer message MossdeepCity_Mart_Text_1A0BE4 - waittext + waitmessage pokemart MossdeepCity_Mart_Items msgbox MossdeepCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index 988608ffd..4ed3ea57e 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA setvar 0x800b, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index a407bd5b9..acd499966 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -11,7 +11,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 - closebutton + closemessage applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmovement 0 release @@ -56,7 +56,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F lock faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, 4 - closebutton + closemessage applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 8648487c9..6905b31b3 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -19,8 +19,8 @@ MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 end MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 - movespriteperm 1, 6, 5 - spritebehave 1, 7 + setobjectxyperm 1, 6, 5 + setobjectmovementtype 1, 7 return MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01 @@ -43,7 +43,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B setflag 123 setflag 302 msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 - closebutton + closemessage delay 20 applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76 waitmovement 0 @@ -82,8 +82,8 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare - waittext - givepokemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 + waitmessage + givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferpoke 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 8a66f75ee..2b4de8344 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -9,8 +9,8 @@ MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 end MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 - movespriteperm 1, 5, 4 - spritebehave 1, 10 + setobjectxyperm 1, 5, 4 + setobjectmovementtype 1, 10 return MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D @@ -23,8 +23,8 @@ MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 applymovement 1, MtChimney_CableCarStation_Movement_15C1AA waitmovement 0 setvar 0x40a3, 0 - movespriteperm 1, 6, 7 - spritebehave 1, 8 + setobjectxyperm 1, 6, 7 + setobjectmovementtype 1, 8 releaseall end @@ -40,7 +40,7 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C msgbox MtChimney_CableCarStation_Text_1925A9, 4 - closebutton + closemessage applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 8720375ae..533fb6e90 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -41,7 +41,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 .else msgbox MtPyre_Summit_Text_1B5EEC, 4 .endif - closebutton + closemessage fadescreen 1 removeobject 2 removeobject 4 @@ -198,7 +198,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A MtPyre_Summit_EventScript_15D669:: @ 815D669 setvar 0x8004, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F - closebutton + closemessage applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 waitmovement 0 delay 40 @@ -279,7 +279,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 .else msgbox MtPyre_Summit_Text_1B6848, 4 .endif - closebutton + closemessage compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D77F compare 0x8008, 1 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 412261ce1..2d84a6f92 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -18,13 +18,13 @@ OldaleTown_EventScript_14DD8C:: @ 814DD8C return OldaleTown_EventScript_14DD92:: @ 814DD92 - movespriteperm 3, 1, 11 - spritebehave 3, 9 + setobjectxyperm 3, 1, 11 + setobjectmovementtype 3, 9 return OldaleTown_EventScript_14DD9E:: @ 814DD9E - movespriteperm 2, 13, 14 - spritebehave 2, 8 + setobjectxyperm 2, 13, 14 + setobjectmovementtype 2, 8 return OldaleTown_EventScript_14DDAA:: @ 814DDAA @@ -45,7 +45,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC setflag 1 playbgm 420, 0 msgbox OldaleTown_Text_16AEF2, 4 - closebutton + closemessage switch FACING case 1, OldaleTown_EventScript_14DE07 case 2, OldaleTown_EventScript_14DE1E @@ -198,7 +198,7 @@ OldaleTown_EventScript_14DEDF:: @ 814DEDF checkflag 116 goto_if_eq OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 - closebutton + closemessage applymovement 3, OldaleTown_Movement_1A083D waitmovement 0 release @@ -210,7 +210,7 @@ OldaleTown_EventScript_14DEFF:: @ 814DEFF applymovement 3, OldaleTown_Movement_14DFEF waitmovement 0 msgbox OldaleTown_Text_16B045, 4 - closebutton + closemessage applymovement 3, OldaleTown_Movement_14DFF5 waitmovement 0 releaseall @@ -274,7 +274,7 @@ OldaleTown_EventScript_14DFB8:: @ 814DFB8 end OldaleTown_EventScript_14DFC6:: @ 814DFC6 - closebutton + closemessage applymovement 4, OldaleTown_Movement_14DFE5 waitmovement 0 removeobject 4 diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index 77d7eee4d..b9698b58f 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -5,7 +5,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 lock faceplayer message OldaleTown_Mart_Text_1A0BE4 - waittext + waitmessage checkflag 116 goto_if_eq OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index 6d2fe54f0..494f109fe 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 setvar 0x800b, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index 973f80a55..64dd5008c 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 @ 8154109 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 8b7d4f313..1c2711b83 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -12,7 +12,7 @@ PetalburgCity_MapScript1_14B717:: @ 814B717 end PetalburgCity_EventScript_14B731:: @ 814B731 - movespriteperm 9, 5, 11 + setobjectxyperm 9, 5, 11 return PetalburgCity_EventScript_14B739:: @ 814B739 @@ -38,7 +38,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 applymovement 2, PetalburgCity_Movement_1A083F, 0, 0 waitmovement 0, 0, 2 msgbox PetalburgCity_Text_16D408, 4 - closebutton + closemessage clearflag 0x4000 setvar 0x4057, 3 fadedefaultbgm @@ -54,7 +54,7 @@ PetalburgCity_EventScript_14B7AC:: @ 814B7AC lock faceplayer msgbox PetalburgCity_Text_164490, 4 - closebutton + closemessage applymovement 3, PetalburgCity_Movement_1A083D waitmovement 0 release @@ -196,7 +196,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866 compare 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 - closebutton + closemessage compare 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B965 compare 0x8008, 1 @@ -210,7 +210,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 255, PetalburgCity_Movement_1A0843 waitmovement 0 msgbox PetalburgCity_Text_164449, 4 - closebutton + closemessage applymovement 9, PetalburgCity_Movement_14B9F4 waitmovement 0 fadedefaultbgm diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 3ac7b85fc..b2d104894 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -53,15 +53,15 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B end PetalburgCity_Gym_EventScript_15453B:: @ 815453B - movespriteperm 10, 5, 108 + setobjectxyperm 10, 5, 108 return PetalburgCity_Gym_EventScript_154543:: @ 8154543 - movespriteperm 1, 4, 107 + setobjectxyperm 1, 4, 107 return PetalburgCity_Gym_EventScript_15454B:: @ 815454B - movespriteperm 1, 4, 107 + setobjectxyperm 1, 4, 107 return PetalburgCity_Gym_MapScript2_154553:: @ 8154553 @@ -80,7 +80,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C lockall msgbox PetalburgCity_Gym_Text_17A196, 4 msgbox PetalburgCity_Gym_Text_17A1B0, 4 - closebutton + closemessage applymovement 255, PetalburgCity_Gym_Movement_1A0845 applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 @@ -113,7 +113,7 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 case 6, PetalburgCity_Gym_EventScript_1549D6 case 7, PetalburgCity_Gym_EventScript_15493D msgbox PetalburgCity_Gym_Text_179DF6, 4 - closebutton + closemessage switch FACING case 1, PetalburgCity_Gym_EventScript_15463D case 2, PetalburgCity_Gym_EventScript_154648 @@ -193,7 +193,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 - closebutton + closemessage setflag 0x4001 playbgm 420, 0 compare 0x8008, 0 @@ -394,7 +394,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A653, 4 trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A message PetalburgCity_Gym_Text_17A7DD - waittext + waitmessage call PetalburgCity_Gym_EventScript_1A02C5 msgbox PetalburgCity_Gym_Text_17A805, 4 setflag 1217 @@ -418,7 +418,7 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C setflag 169 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 - closebutton + closemessage compare FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154ABC compare FACING, 1 @@ -604,7 +604,7 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 end PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 - closebutton + closemessage delay 30 warpdoor PetalburgCity_Gym, 255, 32776, 32777 waitstate diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc index ab7bb822a..e4186eaae 100644 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ b/data/scripts/maps/PetalburgCity_Mart.inc @@ -5,7 +5,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 lock faceplayer message PetalburgCity_Mart_Text_1A0BE4 - waittext + waitmessage checkflag 296 goto_if_eq PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index a70035fef..e2013a1d6 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 setvar 0x800b, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 4dececafa..0b0c72f70 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -12,18 +12,18 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 applymovement 4, PetalburgWoods_Movement_15CE89 waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 - closebutton + closemessage playbgm BGM_EVIL_TEAM, 0 applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 - closebutton + closemessage applymovement 3, PetalburgWoods_Movement_15CEB0 waitmovement 0 applymovement 4, PetalburgWoods_Movement_1A0841 waitmovement 0 msgbox PetalburgWoods_Text_194E6B, 4 - closebutton + closemessage applymovement 4, PetalburgWoods_Movement_15CE9E waitmovement 0 msgbox PetalburgWoods_Text_194E9A, 4 @@ -47,18 +47,18 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 applymovement 255, PetalburgWoods_Movement_1A083F waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 - closebutton + closemessage playbgm BGM_EVIL_TEAM, 0 applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 - closebutton + closemessage applymovement 3, PetalburgWoods_Movement_15CEBF waitmovement 0 applymovement 4, PetalburgWoods_Movement_1A0841 waitmovement 0 msgbox PetalburgWoods_Text_194E6B, 4 - closebutton + closemessage applymovement 4, PetalburgWoods_Movement_15CEA4 waitmovement 0 msgbox PetalburgWoods_Text_194E9A, 4 @@ -78,12 +78,12 @@ PetalburgWoods_EventScript_15CDE6:: @ 815CDE6 applymovement 4, PetalburgWoods_Movement_15CE73 waitmovement 0 msgbox PetalburgWoods_Text_194D71, 4 - closebutton + closemessage return PetalburgWoods_EventScript_15CDFA:: @ 815CDFA msgbox PetalburgWoods_Text_194FA4, 4 - closebutton + closemessage applymovement 3, PetalburgWoods_Movement_15CEB7 waitmovement 0 removeobject 3 @@ -106,7 +106,7 @@ PetalburgWoods_EventScript_15CE4D:: @ 815CE4D applymovement 4, PetalburgWoods_Movement_15CEA8 waitmovement 0 msgbox PetalburgWoods_Text_195153, 4 - closebutton + closemessage return PetalburgWoods_EventScript_15CE69:: @ 815CE69 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 35c2d4117..2fe80e098 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -20,7 +20,7 @@ Route101_EventScript_14E948:: @ 814E948 lockall playbgm 410, 1 msgbox Route101_Text_16D10E, 4 - closebutton + closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 applymovement 255, Route101_Movement_14EA2C @@ -36,7 +36,7 @@ Route101_EventScript_14E948:: @ 814E948 applymovement 2, Route101_Movement_14EA58 waitmovement 0 msgbox Route101_Text_16D119, 4 - closebutton + closemessage setvar 0x4060, 2 releaseall end @@ -44,7 +44,7 @@ Route101_EventScript_14E948:: @ 814E948 Route101_EventScript_14E9B8:: @ 814E9B8 lockall msgbox Route101_Text_16D15E, 4 - closebutton + closemessage applymovement 255, Route101_Movement_14E9FA waitmovement 0 releaseall @@ -53,7 +53,7 @@ Route101_EventScript_14E9B8:: @ 814E9B8 Route101_EventScript_14E9CE:: @ 814E9CE lockall msgbox Route101_Text_16D15E, 4 - closebutton + closemessage applymovement 255, Route101_Movement_14E9FC waitmovement 0 releaseall @@ -62,7 +62,7 @@ Route101_EventScript_14E9CE:: @ 814E9CE Route101_EventScript_14E9E4:: @ 814E9E4 lockall msgbox Route101_Text_16D15E, 4 - closebutton + closemessage applymovement 255, Route101_Movement_14E9FE waitmovement 0 releaseall diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index e5cf156a1..c9ebf9511 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -89,7 +89,7 @@ Route103_EventScript_14ECCB:: @ 814ECCB end Route103_EventScript_14ECD9:: @ 814ECD9 - closebutton + closemessage switch FACING case 1, Route103_EventScript_14ED29 case 2, Route103_EventScript_14ED0C diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 8abb7354a..b1e3d94ac 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -142,7 +142,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 showobject 255, 0, 11 applymovement 255, Route104_Movement_14F168 waitmovement 0 - movespriteperm 2, 12, 8 + setobjectxyperm 2, 12, 8 addobject 2 spritelevelup 2, 0, 11, 0 clearflag 740 @@ -156,7 +156,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 19 restorespritelevel 2, 0, 11 - moveoffscreen 2 + moveobjectoffscreen 2 setvar 0x408e, 0 checkflag 189 goto_if 0, Route104_EventScript_14F08B diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index cc3dad35a..d388d1c7a 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -15,10 +15,10 @@ Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 return Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 - movespriteperm 1, 9, 3 - spritebehave 1, 50 - movespriteperm 2, 9, 6 - spritebehave 2, 51 + setobjectxyperm 1, 9, 3 + setobjectmovementtype 1, 50 + setobjectxyperm 2, 9, 6 + setobjectmovementtype 2, 51 return Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB @@ -44,8 +44,8 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 message Route104_MrBrineysHouse_Text_191E80 - waittext - multichoicedef 21, 8, 14, 1, 0 + waitmessage + multichoicedefault 21, 8, 14, 1, 0 switch RESULT case 0, Route104_MrBrineysHouse_EventScript_15BDAB case 1, Route104_MrBrineysHouse_EventScript_15BDA1 diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 876af8650..4c5becf88 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -12,7 +12,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA end Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 - movespriteperm 1, 4, 6 + setobjectxyperm 1, 4, 6 end Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B @@ -51,7 +51,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73 Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C message Route104_PrettyPetalFlowerShop_Text_1A0C42 - waittext + waitmessage pokemartbp Route104_PrettyPetalFlowerShop_Items msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4 release diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index 6103d19ac..3c218747a 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -56,7 +56,7 @@ Route104_Prototype_EventScript_160CF1:: @ 8160CF1 end Route104_Prototype_EventScript_160CFB:: @ 8160CFB - closebutton + closemessage delay 60 fadescreen 1 delay 60 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 7b13fef72..be296d403 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -44,7 +44,7 @@ Route109_EventScript_14F548:: @ 814F548 waitmovement 0 addobject 4 clearflag 743 - movespriteperm 2, 12, 8 + setobjectxyperm 2, 12, 8 addobject 2 spritelevelup 2, 0, 11, 0 applymovement 2, Route109_Movement_14F67D @@ -53,11 +53,11 @@ Route109_EventScript_14F548:: @ 814F548 setflag 744 hideobject 1, 0, 24 msgbox Route109_Text_16B4B5, 4 - closebutton + closemessage copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 24 restorespritelevel 2, 0, 11 - moveoffscreen 2 + moveobjectoffscreen 2 release end @@ -286,8 +286,8 @@ Route109_EventScript_14F691:: @ 814F691 Route109_EventScript_14F6AF:: @ 814F6AF message Route109_Text_16E26A - waittext - multichoicedef 21, 8, 14, 1, 0 + waitmessage + multichoicedefault 21, 8, 14, 1, 0 switch RESULT case 0, Route109_EventScript_14F6E2 case 1, Route109_EventScript_14F6FB @@ -296,7 +296,7 @@ Route109_EventScript_14F6AF:: @ 814F6AF Route109_EventScript_14F6E2:: @ 814F6E2 msgbox Route109_Text_16E159, 4 - closebutton + closemessage goto Route109_EventScript_14F4D3 end @@ -318,7 +318,7 @@ Route109_EventScript_14F70E:: @ 814F70E lock faceplayer msgbox Route109_Text_16E405, 4 - closebutton + closemessage applymovement LAST_TALKED, Route109_Movement_1A083D waitmovement 0 release @@ -334,7 +334,7 @@ Route109_EventScript_14F725:: @ 814F725 giveitem ITEM_SOFT_SAND compare RESULT, 0 goto_if_eq Route109_EventScript_1A029B - closebutton + closemessage applymovement LAST_TALKED, Route109_Movement_1A083D waitmovement 0 setflag 280 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 194816c36..afbfebcc2 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -424,15 +424,15 @@ Route110_EventScript_14FEA5:: @ 814FEA5 return Route110_EventScript_14FEB2:: @ 814FEB2 - closebutton + closemessage compare 0x8008, 1 call_if 1, Route110_EventScript_14FF56 compare 0x8008, 2 call_if 1, Route110_EventScript_14FF5E compare 0x8008, 3 call_if 1, Route110_EventScript_14FF66 - spritebehave 28, 10 - spritebehave 29, 10 + setobjectmovementtype 28, 10 + setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 @@ -480,15 +480,15 @@ Route110_EventScript_14FF4B:: @ 814FF4B return Route110_EventScript_14FF56:: @ 814FF56 - movespriteperm 29, 33, 55 + setobjectxyperm 29, 33, 55 return Route110_EventScript_14FF5E:: @ 814FF5E - movespriteperm 29, 34, 55 + setobjectxyperm 29, 34, 55 return Route110_EventScript_14FF66:: @ 814FF66 - movespriteperm 29, 35, 55 + setobjectxyperm 29, 35, 55 return Route110_Movement_14FF6E:: @ 814FF6E diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index a7db7e0ee..c60bc366e 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -41,7 +41,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 @ You don't have a bike! msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4 - closebutton + closemessage applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538 waitmovement 0 releaseall diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 1cb046a99..cf18a8e36 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -20,7 +20,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6 msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, 4 - closebutton + closemessage applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB waitmovement 0 releaseall diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 0445496d2..12309207c 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -64,7 +64,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -77,7 +77,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -90,7 +90,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -103,7 +103,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -116,7 +116,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -129,7 +129,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -142,14 +142,14 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 - closebutton + closemessage compare FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161C74 compare FACING, 2 @@ -160,7 +160,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF call_if 1, Route110_TrickHouseEnd_EventScript_161C95 delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 - closebutton + closemessage applymovement 1, Route110_TrickHouseEnd_Movement_1A0839 waitmovement 0 delay 30 @@ -234,7 +234,7 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 applymovement 255, Route110_TrickHouseEnd_Movement_1A0845 waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, 4 - closebutton + closemessage applymovement 255, Route110_TrickHouseEnd_Movement_161CE8 waitmovement 0 delay 4 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 677ce93fa..cf192345c 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -106,8 +106,8 @@ Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088 return Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E - movespriteperm 1, 5, 2 - spritebehave 1, 4 + setobjectxyperm 1, 5, 2 + setobjectmovementtype 1, 4 end Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A @@ -216,7 +216,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 - closebutton + closemessage delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 @@ -264,7 +264,7 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D call_if 1, Route110_TrickHouseEntrance_EventScript_161303 compare 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_16130C - closebutton + closemessage setvar 0x40a6, 1 warp Route110_TrickHouseEntrance, 255, 6, 2 waitstate @@ -333,7 +333,7 @@ Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327 Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 msgbox Route110_TrickHouseEntrance_Text_19BF19, 4 - closebutton + closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 playse 21 @@ -464,7 +464,7 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 msgbox Route110_TrickHouseEntrance_Text_19C17E, 4 - closebutton + closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_16309F waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 @@ -494,7 +494,7 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 - closebutton + closemessage compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall @@ -717,7 +717,7 @@ Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C playfanfare 370 message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare - waittext + waitmessage msgbox Route110_TrickHousePuzzle1_Text_19C1CB, 4 releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index dc3f9f725..222a71138 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -398,9 +398,9 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 applymovement 5, Route110_TrickHousePuzzle5_Movement_16309F msgbox Route110_TrickHousePuzzle5_Text_19D5ED, 4 waitmovement 0 - closebutton + closemessage msgbox Route110_TrickHousePuzzle5_Text_19D615, 4 - closebutton + closemessage warp Route110_TrickHousePuzzle5, 255, 0, 21 waitstate releaseall diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index de37c68fc..ec13ca3a3 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -55,7 +55,7 @@ Route111_EventScript_150023:: @ 8150023 compare RESULT, 0 goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL - closebutton + closemessage setflag 963 setflag 964 removeobject 34 @@ -77,7 +77,7 @@ Route111_EventScript_150069:: @ 8150069 compare RESULT, 0 goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL - closebutton + closemessage setflag 964 setflag 963 removeobject 35 @@ -172,7 +172,7 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 - closebutton + closemessage compare 0x8004, 0 call_if 1, Route111_EventScript_150188 compare 0x8004, 1 @@ -251,7 +251,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F7FF, 4 - closebutton + closemessage applymovement 1, Route111_Movement_150356 waitmovement 0 removeobject 1 @@ -269,7 +269,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F8D5, 4 - closebutton + closemessage applymovement 2, Route111_Movement_150356 waitmovement 0 removeobject 2 @@ -287,7 +287,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F96C, 4 - closebutton + closemessage applymovement 3, Route111_Movement_150356 waitmovement 0 removeobject 3 @@ -302,7 +302,7 @@ Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F991, 4 trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC msgbox Route111_Text_16FA22, 4 - closebutton + closemessage applymovement 4, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index a33b436dc..5576a44ff 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -18,7 +18,7 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC msgbox Route111_OldLadysRestStop_Text_192423, 4 - closebutton + closemessage call Route111_OldLadysRestStop_EventScript_1A02CA msgbox Route111_OldLadysRestStop_Text_19244D, 5 compare RESULT, 1 diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index ea70af41f..d9a94ce75 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -53,7 +53,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 end Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 - closebutton + closemessage applymovement 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 5254b7beb..f8e91eb09 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -10,8 +10,8 @@ Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E end Route112_CableCarStation_EventScript_15C052:: @ 815C052 - movespriteperm 1, 7, 4 - spritebehave 1, 9 + setobjectxyperm 1, 7, 4 + setobjectmovementtype 1, 9 return Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E @@ -24,8 +24,8 @@ Route112_CableCarStation_EventScript_15C068:: @ 815C068 applymovement 1, Route112_CableCarStation_Movement_15C0EB waitmovement 0 setvar 0x40a3, 0 - movespriteperm 1, 6, 7 - spritebehave 1, 8 + setobjectxyperm 1, 6, 7 + setobjectmovementtype 1, 8 releaseall end @@ -41,7 +41,7 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD msgbox Route112_CableCarStation_Text_1925A9, 4 - closebutton + closemessage applymovement 1, Route112_CableCarStation_Movement_15C0E6 applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 48c2965fd..39b484c8a 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -41,7 +41,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 - waittext + waitmessage goto Route113_GlassWorkshop_EventScript_1635EE end @@ -183,19 +183,19 @@ Route113_GlassWorkshop_EventScript_163830:: @ 8163830 subvar 0x800a, 16456 buffernum 1, 32778 message Route113_GlassWorkshop_Text_19E890 - waittext + waitmessage goto Route113_GlassWorkshop_EventScript_1635EE end Route113_GlassWorkshop_EventScript_163845:: @ 8163845 message Route113_GlassWorkshop_Text_19E802 - waittext + waitmessage goto Route113_GlassWorkshop_EventScript_1635EE end Route113_GlassWorkshop_EventScript_163851:: @ 8163851 msgbox Route113_GlassWorkshop_Text_19E827, 4 - closebutton + closemessage fadescreen 1 playse 5 delay 30 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index ca3895e1a..beb01e083 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -8,7 +8,7 @@ Route116_MapScript1_150A37:: @ 8150A37 end Route116_EventScript_150A41:: @ 8150A41 - movespriteperm 21, 41, 10 + setobjectxyperm 21, 41, 10 return Route116_EventScript_150A49:: @ 8150A49 @@ -47,7 +47,7 @@ Route116_EventScript_150A94:: @ 8150A94 compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 - closebutton + closemessage compare FACING, 2 call_if 1, Route116_EventScript_150AEE compare FACING, 1 @@ -159,7 +159,7 @@ Route116_EventScript_150B8F:: @ 8150B8F Route116_EventScript_150BBB:: @ 8150BBB msgbox Route116_Text_1709B7, 4 - closebutton + closemessage goto Route116_EventScript_150C03 end @@ -175,7 +175,7 @@ Route116_EventScript_150BCA:: @ 8150BCA Route116_EventScript_150BF4:: @ 8150BF4 msgbox Route116_Text_17094D, 4 - closebutton + closemessage goto Route116_EventScript_150C03 end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 6ba9519eb..40affd3fd 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -9,7 +9,7 @@ Route117_MapScript1_150D40:: @ 8150D40 Route117_EventScript_150D46:: @ 8150D46 checkflag 134 goto_if 0, Route117_EventScript_150D56 - movespriteperm 3, 47, 6 + setobjectxyperm 3, 47, 6 Route117_EventScript_150D56:: @ 8150D56 return diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 8427395a6..b96346f15 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -82,7 +82,7 @@ Route118_EventScript_151004:: @ 8151004 waitmovement 0 delay 30 msgbox Route118_Text_170D66, 4 - closebutton + closemessage compare 0x8008, 0 call_if 1, Route118_EventScript_151048 compare 0x8008, 1 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index d825cb96e..7d5acea77 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -153,7 +153,7 @@ Route119_EventScript_151352:: @ 8151352 return Route119_EventScript_151362:: @ 8151362 - closebutton + closemessage compare 0x4001, 1 call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 @@ -193,13 +193,13 @@ Route119_EventScript_1513C7:: @ 81513C7 return Route119_EventScript_1513D2:: @ 81513D2 - movespriteperm 16, 25, 32 - movespriteperm 25, 25, 32 + setobjectxyperm 16, 25, 32 + setobjectxyperm 25, 25, 32 return Route119_EventScript_1513E1:: @ 81513E1 - movespriteperm 16, 26, 32 - movespriteperm 25, 26, 32 + setobjectxyperm 16, 26, 32 + setobjectxyperm 25, 26, 32 return Route119_Movement_1513F0:: @ 81513F0 @@ -354,7 +354,7 @@ Route119_EventScript_1515C5:: @ 81515C5 lock faceplayer msgbox Route119_Text_171520, 4 - closebutton + closemessage applymovement LAST_TALKED, Route119_Movement_1A083D waitmovement 0 release @@ -364,7 +364,7 @@ Route119_EventScript_1515DC:: @ 81515DC lock faceplayer msgbox Route119_Text_17157C, 4 - closebutton + closemessage applymovement LAST_TALKED, Route119_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 762a6c299..3dc9672e3 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -9,8 +9,8 @@ Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 end Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41 - movespriteperm 5, 0, 5 - spritebehave 5, 10 + setobjectxyperm 5, 0, 5 + setobjectmovementtype 5, 10 return Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D @@ -39,7 +39,7 @@ Route119_WeatherInstitute_1F_EventScript_163C7A:: @ 8163C7A Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83 lockall msgbox Route119_WeatherInstitute_1F_Text_19EE8B, 4 - closebutton + closemessage call Route119_WeatherInstitute_1F_EventScript_1A02CA releaseall end diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 37b6d07a9..ac64904a2 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -11,13 +11,13 @@ Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 end Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4 - movespriteperm 5, 1, 6 - spritebehave 5, 10 + setobjectxyperm 5, 1, 6 + setobjectmovementtype 5, 10 return Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0 - movespriteperm 5, 4, 6 - spritebehave 5, 10 + setobjectxyperm 5, 4, 6 + setobjectmovementtype 5, 10 return Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC @@ -37,7 +37,7 @@ Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 - closebutton + closemessage setvar 0x40b3, 1 clearflag 893 fadedefaultbgm @@ -49,7 +49,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 fadescreen 0 applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8 waitmovement 0 - moveoffscreen 5 + moveobjectoffscreen 5 goto Route119_WeatherInstitute_2F_EventScript_163D7A end @@ -61,8 +61,8 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare - waittext - givepokemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 + waitmessage + givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 setflag 151 msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 release diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index b6bb60ddd..d5807ae94 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -71,7 +71,7 @@ Route120_EventScript_1516B5:: @ 81516B5 return Route120_EventScript_1516DA:: @ 81516DA - spritebehave 36, 10 + setobjectmovementtype 36, 10 return Route120_MapScript1_1516DF:: @ 81516DF @@ -207,7 +207,7 @@ Route120_EventScript_151884:: @ 8151884 Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 - closebutton + closemessage compare FACING, 2 call_if 1, Route120_EventScript_15197F compare FACING, 3 @@ -216,7 +216,7 @@ Route120_EventScript_15189D:: @ 815189D waitmovement 0 delay 20 msgbox Route120_Text_1719D4, 4 - closebutton + closemessage applymovement 30, Route120_Movement_1A0843 waitmovement 0 applymovement 30, Route120_Movement_1A0662 @@ -241,7 +241,7 @@ Route120_EventScript_151908:: @ 8151908 giveitem ITEM_DEVON_SCOPE setflag 285 msgbox Route120_Text_171B0E, 4 - closebutton + closemessage applymovement 31, Route120_Movement_1A0845 waitmovement 0 delay 50 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 43be91266..39443d2f9 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -21,7 +21,7 @@ Route121_EventScript_151B1C:: @ 8151B1C Route121_EventScript_151B25:: @ 8151B25 lockall msgbox Route121_Text_171C8F, 4 - closebutton + closemessage applymovement 12, Route121_Movement_151B57 applymovement 13, Route121_Movement_151B60 applymovement 14, Route121_Movement_151B69 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 5fdb749f3..c9439ee5f 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -74,9 +74,9 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 playfanfare 370 message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare - waittext + waitmessage msgbox Route121_SafariZoneEntrance_Text_1C392D, 4 - closebutton + closemessage hidemoney 0, 0 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E waitmovement 0 @@ -111,7 +111,7 @@ Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E end Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C - closebutton + closemessage hidemoney 0, 0 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C waitmovement 0 diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index b3e91e43c..543736e80 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -67,7 +67,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0 message Route124_DivingTreasureHuntersHouse_Text_19F5C5 - waittext + waitmessage switch 0x4001 case 1, Route124_DivingTreasureHuntersHouse_EventScript_163F61 case 2, Route124_DivingTreasureHuntersHouse_EventScript_163F87 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index f19dc6662..3b2c99591 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -26,25 +26,25 @@ Route128_EventScript_15213F:: @ 815213F applymovement 4, Route128_Movement_152279 waitmovement 0 msgbox Route128_Text_171F35, 4 - closebutton + closemessage applymovement 5, Route128_Movement_152293 waitmovement 0 applymovement 4, Route128_Movement_1A0841 waitmovement 0 msgbox Route128_Text_171F4B, 4 - closebutton + closemessage applymovement 5, Route128_Movement_1522A1 waitmovement 0 applymovement 255, Route128_Movement_1A0841 waitmovement 0 msgbox Route128_Text_172008, 4 - closebutton + closemessage applymovement 4, Route128_Movement_15227E applymovement 255, Route128_Movement_1A083F applymovement 5, Route128_Movement_152290 waitmovement 0 msgbox Route128_Text_17210B, 4 - closebutton + closemessage delay 40 applymovement 5, Route128_Movement_152296 applymovement 4, Route128_Movement_152283 @@ -61,7 +61,7 @@ Route128_EventScript_15213F:: @ 815213F applymovement 255, Route128_Movement_1A0843 waitmovement 0 msgbox Route128_Text_172181, 4 - closebutton + closemessage applymovement 3, Route128_Movement_15226D applymovement 255, Route128_Movement_1A0841 waitmovement 0 @@ -73,7 +73,7 @@ Route128_EventScript_15213F:: @ 815213F applymovement 3, Route128_Movement_1A0845 waitmovement 0 msgbox Route128_Text_1723BE, 4 - closebutton + closemessage applymovement 3, Route128_Movement_1A0845 waitmovement 0 delay 50 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index d2469dca7..955726d89 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -124,47 +124,47 @@ RustboroCity_EventScript_14C475:: @ 814C475 RustboroCity_EventScript_14C481:: @ 814C481 lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 0 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C498:: @ 814C498 lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 1 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 2 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 3 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 4 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4F4:: @ 814C4F4 msgbox RustboroCity_Text_166E65, 4 - closebutton + closemessage addobject 10 addobject 9 applymovement 10, RustboroCity_Movement_14C5C2 @@ -173,11 +173,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 applymovement 9, RustboroCity_Movement_14C5D3 waitmovement 0 msgbox RustboroCity_Text_166E7E, 4 - closebutton + closemessage applymovement 9, RustboroCity_Movement_14C5DB waitmovement 0 removeobject 9 - movespriteperm 9, 30, 10 + setobjectxyperm 9, 30, 10 clearflag 732 setflag 142 setvar 0x405a, 2 @@ -373,7 +373,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 - moveoffscreen 9 + moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 releaseall end @@ -472,7 +472,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 - closebutton + closemessage setflag 144 setflag 732 setvar 0x405a, 5 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index f5fb02c93..48d8aaf9f 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -8,8 +8,8 @@ RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C end RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 - movespriteperm 2, 14, 2 - spritebehave 2, 8 + setobjectxyperm 2, 14, 2 + setobjectmovementtype 2, 8 return RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index e7c966c08..784ef8087 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -79,7 +79,7 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 end RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 - closebutton + closemessage playse 21 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmovement 0 @@ -97,7 +97,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 end RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE - closebutton + closemessage playse 21 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmovement 0 @@ -143,8 +143,8 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare - waittext - givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 + waitmessage + givepoke SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 @@ -163,8 +163,8 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare - waittext - givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 + waitmessage + givepoke SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 6458ec5ca..6f0152e60 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -10,8 +10,8 @@ RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 end RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D - movespriteperm 2, 3, 2 - spritebehave 2, 9 + setobjectxyperm 2, 3, 2 + setobjectmovementtype 2, 9 return RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 @@ -29,20 +29,20 @@ RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 lockall msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4 - closebutton + closemessage applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815 waitmovement 0 delay 80 applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 - closebutton + closemessage playbgm 420, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4 - closebutton + closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 @@ -53,7 +53,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 playfanfare 370 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare - waittext + waitmessage setflag 2050 setflag 188 msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 @@ -151,7 +151,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B checkflag 189 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 - closebutton + closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D waitmovement 0 release @@ -164,7 +164,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 - closebutton + closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D waitmovement 0 release @@ -172,7 +172,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4 - closebutton + closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 6bb33b4dc..b1bbfb8d8 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -11,7 +11,7 @@ RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 RustboroCity_Gym_EventScript_1578FE:: @ 81578FE message RustboroCity_Gym_Text_1840AB - waittext + waitmessage call RustboroCity_Gym_EventScript_1A02C5 msgbox RustboroCity_Gym_Text_1840D5, 4 setflag 1201 diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc index 7ee528ade..cb722a6af 100644 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ b/data/scripts/maps/RustboroCity_Mart.inc @@ -5,7 +5,7 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 lock faceplayer message RustboroCity_Mart_Text_1A0BE4 - waittext + waitmessage checkflag 287 goto_if 0, RustboroCity_Mart_EventScript_157BEF checkflag 287 diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index 896e8e220..53b481832 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 setvar 0x800b, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 156b437a0..73b364f5e 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -9,8 +9,8 @@ RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2 RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 message RustboroCity_PokemonSchool_Text_184368 - waittext - multichoicerow 8, 1, 13, 3, 0 + waitmessage + multichoicegrid 8, 1, 13, 3, 0 switch RESULT case 0, RustboroCity_PokemonSchool_EventScript_157A50 case 1, RustboroCity_PokemonSchool_EventScript_157A5E @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE giveitem ITEM_QUICK_CLAW compare RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B - closebutton + closemessage applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmovement 0 setflag 275 @@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29 RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 msgbox RustboroCity_PokemonSchool_Text_184737, 4 - closebutton + closemessage applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmovement 0 release diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 0cfb66351..b11304607 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -15,15 +15,15 @@ RusturfTunnel_MapScript1_15C762:: @ 815C762 end RusturfTunnel_EventScript_15C773:: @ 815C773 - movespriteperm 7, 13, 4 - movespriteperm 6, 13, 5 + setobjectxyperm 7, 13, 4 + setobjectxyperm 6, 13, 5 return RusturfTunnel_EventScript_15C782:: @ 815C782 lock faceplayer msgbox RusturfTunnel_Text_194766, 4 - closebutton + closemessage applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D waitmovement 0 release @@ -36,7 +36,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 goto_if_eq RusturfTunnel_EventScript_15C7BC setflag 1 msgbox RusturfTunnel_Text_1944C5, 4 - closebutton + closemessage applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D waitmovement 0 release @@ -44,7 +44,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 RusturfTunnel_EventScript_15C7BC:: @ 815C7BC msgbox RusturfTunnel_Text_1945B2, 4 - closebutton + closemessage applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D waitmovement 0 release @@ -67,7 +67,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 giveitem ITEM_HM04 setflag 106 msgbox RusturfTunnel_Text_194693, 4 - closebutton + closemessage compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C880 compare 0x4001, 2 @@ -75,7 +75,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 - closebutton + closemessage compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 compare 0x4001, 2 @@ -124,7 +124,7 @@ RusturfTunnel_EventScript_15C8EA:: @ 815C8EA return RusturfTunnel_EventScript_15C8EB:: @ 815C8EB - closebutton + closemessage applymovement 1, RusturfTunnel_Movement_15C98D waitmovement 0 return @@ -280,12 +280,12 @@ RusturfTunnel_EventScript_15C9A5:: @ 815C9A5 RusturfTunnel_EventScript_15C9AB:: @ 815C9AB lockall msgbox RusturfTunnel_Text_194159, 4 - closebutton + closemessage applymovement 6, RusturfTunnel_Movement_15C9D3 applymovement 7, RusturfTunnel_Movement_15C9D3 waitmovement 0 - moveoffscreen 6 - moveoffscreen 7 + moveobjectoffscreen 6 + moveobjectoffscreen 7 setvar 0x409a, 3 releaseall end @@ -314,7 +314,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 giveitem ITEM_DEVON_GOODS - closebutton + closemessage applymovement 255, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 waitmovement 0 @@ -330,12 +330,12 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA applymovement 5, RusturfTunnel_Movement_1A0839 waitmovement 0 message RusturfTunnel_Text_19434F - waittext + waitmessage waitse pokecry SPECIES_WINGULL, 0 waitbutton waitpokecry - closebutton + closemessage applymovement 5, RusturfTunnel_Movement_15CAB4 applymovement 7, RusturfTunnel_Movement_15CAC3 waitmovement 0 diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index aa84b6b48..c7cd4447d 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -23,7 +23,7 @@ SSTidalRooms_EventScript_15FF3D:: @ 815FF3D SSTidalRooms_EventScript_15FF47:: @ 815FF47 lockall msgbox SSTidalRooms_Text_19956B, 4 - closebutton + closemessage call SSTidalRooms_EventScript_1A02CA call SSTidalRooms_EventScript_15FD64 releaseall diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 0632a2dda..06a400810 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -14,7 +14,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B waitmovement 0 applymovement 1, SafariZone_Southeast_Movement_160089 waitmovement 0 - movespriteperm 1, 32, 34 + setobjectxyperm 1, 32, 34 setvar 0x40a4, 0 releaseall end @@ -25,7 +25,7 @@ SafariZone_Southeast_MapScript1_160073:: @ 8160073 end SafariZone_Southeast_EventScript_16007F:: @ 816007F - movespriteperm 1, 31, 34 + setobjectxyperm 1, 31, 34 return SafariZone_Southeast_Movement_160087:: @ 8160087 @@ -69,7 +69,7 @@ SafariZone_Southeast_EventScript_1600D1:: @ 81600D1 SafariZone_Southeast_EventScript_1600E0:: @ 81600E0 msgbox SafariZone_Southeast_Text_1C3ACA, 4 - closebutton + closemessage switch FACING case 2, SafariZone_Southeast_EventScript_160105 case 4, SafariZone_Southeast_EventScript_16011F diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index e600611be..ee404404e 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -27,7 +27,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif - closebutton + closemessage addobject 0x8004 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 @@ -134,7 +134,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 .endif - closebutton + closemessage applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD41 waitmovement 0 .ifdef SAPPHIRE @@ -142,7 +142,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4B11, 4 .endif - closebutton + closemessage playse 3 delay 20 applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0845 @@ -152,7 +152,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif - closebutton + closemessage addobject 0x8005 addobject 0x8006 addobject 0x8007 @@ -182,7 +182,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif - closebutton + closemessage applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD60 applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD46 waitmovement 0 diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 70821d183..027c1c363 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -5,7 +5,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 lockall braillemsg SealedChamber_InnerRoom_Braille_1C53C1 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 checkflag 228 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord @@ -29,7 +29,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 playse 8 delay 40 msgbox SealedChamber_InnerRoom_Text_1A138B, 4 - closebutton + closemessage fadeinbgm 0 setflag 228 releaseall @@ -43,7 +43,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 lockall braillemsg SealedChamber_InnerRoom_Braille_1C53F2 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -51,7 +51,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 lockall braillemsg SealedChamber_InnerRoom_Braille_1C5414 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -59,7 +59,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 lockall braillemsg SealedChamber_InnerRoom_Braille_1C5435 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -67,7 +67,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 lockall braillemsg SealedChamber_InnerRoom_Braille_1C545C waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -75,7 +75,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 lockall braillemsg SealedChamber_InnerRoom_Braille_1C5470 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -83,6 +83,6 @@ SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F lockall braillemsg SealedChamber_InnerRoom_Braille_1C549B waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 091c0e8a4..638fc2a85 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -31,7 +31,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C lockall braillemsg SealedChamber_OuterRoom_Braille_1C534F waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -39,7 +39,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A lockall braillemsg SealedChamber_OuterRoom_Braille_1C5359 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -47,7 +47,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 lockall braillemsg SealedChamber_OuterRoom_Braille_1C5363 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -55,7 +55,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 lockall braillemsg SealedChamber_OuterRoom_Braille_1C536D waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -63,7 +63,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 lockall braillemsg SealedChamber_OuterRoom_Braille_1C5377 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -71,7 +71,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 lockall braillemsg SealedChamber_OuterRoom_Braille_1C5381 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -79,7 +79,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 lockall braillemsg SealedChamber_OuterRoom_Braille_1C538B waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -87,7 +87,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E lockall braillemsg SealedChamber_OuterRoom_Braille_1C5396 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -95,7 +95,7 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C lockall braillemsg SealedChamber_OuterRoom_Braille_1C539E waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -103,7 +103,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA lockall braillemsg SealedChamber_OuterRoom_Braille_1C53A9 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -113,7 +113,7 @@ SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemsg SealedChamber_OuterRoom_Braille_1C53B1 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -126,6 +126,6 @@ SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 lockall braillemsg SealedChamber_OuterRoom_Braille_1C53B1 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 1c9fc342f..dcd550549 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -23,27 +23,27 @@ SlateportCity_EventScript_14BA5C:: @ 814BA5C return SlateportCity_EventScript_14BA68:: @ 814BA68 - movespriteperm 11, 28, 13 - movespriteperm 7, 25, 13 - movespriteperm 3, 25, 14 - movespriteperm 6, 27, 16 - movespriteperm 8, 28, 16 - movespriteperm 1, 29, 16 - movespriteperm 2, 31, 14 - spritebehave 11, 8 - spritebehave 7, 18 - spritebehave 3, 16 - spritebehave 6, 7 - spritebehave 8, 7 - spritebehave 1, 7 - spritebehave 2, 9 + setobjectxyperm 11, 28, 13 + setobjectxyperm 7, 25, 13 + setobjectxyperm 3, 25, 14 + setobjectxyperm 6, 27, 16 + setobjectxyperm 8, 28, 16 + setobjectxyperm 1, 29, 16 + setobjectxyperm 2, 31, 14 + setobjectmovementtype 11, 8 + setobjectmovementtype 7, 18 + setobjectmovementtype 3, 16 + setobjectmovementtype 6, 7 + setobjectmovementtype 8, 7 + setobjectmovementtype 1, 7 + setobjectmovementtype 2, 9 return SlateportCity_EventScript_14BAB6:: @ 814BAB6 lock faceplayer message SlateportCity_Text_164642 - waittext + waitmessage pokemart SlateportCity_Items1 msgbox SlateportCity_Text_1A0C02, 4 release @@ -76,7 +76,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 playfanfare 370 message SlateportCity_Text_1646DD waitfanfare - waittext + waitmessage msgbox SlateportCity_Text_1646FC, 4 special GivLeadMonEffortRibbon release @@ -307,7 +307,7 @@ SlateportCity_EventScript_14BD3A:: @ 814BD3A lock faceplayer msgbox SlateportCity_Text_164C64, 4 - closebutton + closemessage applymovement 5, SlateportCity_Movement_1A083D waitmovement 0 release @@ -317,7 +317,7 @@ SlateportCity_EventScript_14BD51:: @ 814BD51 lock faceplayer msgbox SlateportCity_Text_164C9F, 4 - closebutton + closemessage applymovement 19, SlateportCity_Movement_1A083D waitmovement 0 release @@ -327,7 +327,7 @@ SlateportCity_EventScript_14BD68:: @ 814BD68 lock faceplayer msgbox SlateportCity_Text_164CE8, 4 - closebutton + closemessage applymovement 20, SlateportCity_Movement_1A083D waitmovement 0 release @@ -337,7 +337,7 @@ SlateportCity_EventScript_14BD7F:: @ 814BD7F lock faceplayer msgbox SlateportCity_Text_164D2B, 4 - closebutton + closemessage applymovement 27, SlateportCity_Movement_1A083D waitmovement 0 release @@ -347,7 +347,7 @@ SlateportCity_EventScript_14BD96:: @ 814BD96 lock faceplayer msgbox SlateportCity_Text_164D92, 4 - closebutton + closemessage applymovement 28, SlateportCity_Movement_1A083D waitmovement 0 release @@ -357,7 +357,7 @@ SlateportCity_EventScript_14BDAD:: @ 814BDAD lock faceplayer msgbox SlateportCity_Text_164DD5, 4 - closebutton + closemessage applymovement 29, SlateportCity_Movement_1A083D waitmovement 0 release @@ -367,7 +367,7 @@ SlateportCity_EventScript_14BDC4:: @ 814BDC4 lock faceplayer msgbox SlateportCity_Text_164DF4, 4 - closebutton + closemessage applymovement 30, SlateportCity_Movement_1A083D waitmovement 0 release @@ -377,7 +377,7 @@ SlateportCity_EventScript_14BDDB:: @ 814BDDB lock faceplayer msgbox SlateportCity_Text_164E46, 4 - closebutton + closemessage applymovement 31, SlateportCity_Movement_1A083D waitmovement 0 release @@ -387,7 +387,7 @@ SlateportCity_EventScript_14BDF2:: @ 814BDF2 lock faceplayer message SlateportCity_Text_1A0BE4 - waittext + waitmessage pokemartdecor SlateportCity_Decorations1 msgbox SlateportCity_Text_1A0C02, 4 release @@ -413,7 +413,7 @@ SlateportCity_EventScript_14BE20:: @ 814BE20 checkflag 96 goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 - waittext + waitmessage pokemartdecor SlateportCity_Decorations2 msgbox SlateportCity_Text_1A0C02, 4 release @@ -445,7 +445,7 @@ SlateportCity_Decorations2:: @ 814BE40 checkflag 96 goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 - waittext + waitmessage pokemartdecor SlateportCity_Decorations3 msgbox SlateportCity_Text_1A0C02, 4 release @@ -472,7 +472,7 @@ SlateportCity_EventScript_14BE9A:: @ 814BE9A lock faceplayer message SlateportCity_Text_1A0BE4 - waittext + waitmessage pokemart SlateportCity_Items2 msgbox SlateportCity_Text_1A0C02, 4 release @@ -490,7 +490,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC lockall msgbox SlateportCity_Text_165498, 4 msgbox SlateportCity_Text_1654E0, 4 - closebutton + closemessage applymovement 10, SlateportCity_Movement_1A0843 waitmovement 0 delay 10 @@ -528,7 +528,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_1A0839 waitmovement 0 msgbox SlateportCity_Text_16583A, 4 - closebutton + closemessage applymovement 11, SlateportCity_Movement_14BFFB applymovement 255, SlateportCity_Movement_14C008 waitmovement 0 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index c43b64288..cb4632d77 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -38,7 +38,7 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 applymovement 255, SlateportCity_ContestLobby_Movement_1554CA waitmovement 0 msgbox SlateportCity_ContestLobby_Text_1A6832, 4 - closebutton + closemessage applymovement 1, SlateportCity_ContestLobby_Movement_1554D3 applymovement 255, SlateportCity_ContestLobby_Movement_1554C0 waitmovement 0 @@ -118,7 +118,7 @@ SlateportCity_ContestLobby_EventScript_155526:: @ 8155526 SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F lockall fadescreen 1 - showcontestwinner 3 + drawcontestwinner 3 releaseall end @@ -130,6 +130,6 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536 lockall special ShowBerryBlenderRecordWindow waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 50f4926e4..6d2471d99 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -17,8 +17,8 @@ SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 savebgm BGM_EVIL_TEAM - movespriteperm 4, 12, 13 - spritebehave 4, 9 + setobjectxyperm 4, 12, 13 + setobjectmovementtype 4, 9 setflag 905 return @@ -54,7 +54,7 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 applymovement 255, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 msgbox SlateportCity_Harbor_Text_17FD7D, 4 - closebutton + closemessage applymovement 6, SlateportCity_Harbor_Movement_15609B applymovement 7, SlateportCity_Harbor_Movement_15609B applymovement 8, SlateportCity_Harbor_Movement_1560A5 @@ -72,11 +72,11 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 compare 0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 - closebutton + closemessage setflag 821 setflag 822 - moveoffscreen 4 - spritebehave 4, 10 + moveobjectoffscreen 4 + setobjectmovementtype 4, 10 releaseall end @@ -171,12 +171,12 @@ SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A - waittext + waitmessage goto SlateportCity_Harbor_EventScript_1560FD end SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD - multichoicedef 18, 6, 52, 2, 0 + multichoicedefault 18, 6, 52, 2, 0 switch RESULT case 0, SlateportCity_Harbor_EventScript_15613F case 1, SlateportCity_Harbor_EventScript_156167 @@ -212,13 +212,13 @@ SlateportCity_Harbor_EventScript_156167:: @ 8156167 SlateportCity_Harbor_EventScript_15618A:: @ 815618A message SlateportCity_Harbor_Text_17FBE5 - waittext + waitmessage goto SlateportCity_Harbor_EventScript_1560FD end SlateportCity_Harbor_EventScript_156196:: @ 8156196 msgbox SlateportCity_Harbor_Text_17FBB6, 4 - closebutton + closemessage applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 @@ -277,7 +277,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 compare 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 - closebutton + closemessage applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D waitmovement 0 release @@ -318,7 +318,7 @@ SlateportCity_Harbor_EventScript_15629D:: @ 815629D SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7 message SlateportCity_Harbor_Text_18028B - waittext + waitmessage goto SlateportCity_Harbor_EventScript_1562B3 end @@ -364,7 +364,7 @@ SlateportCity_Harbor_EventScript_15636A:: @ 815636A SlateportCity_Harbor_EventScript_156374:: @ 8156374 message SlateportCity_Harbor_Text_180447 - waittext + waitmessage goto SlateportCity_Harbor_EventScript_1562B3 end diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/scripts/maps/SlateportCity_Mart.inc index 730afe6d4..39a1d5ba2 100644 --- a/data/scripts/maps/SlateportCity_Mart.inc +++ b/data/scripts/maps/SlateportCity_Mart.inc @@ -5,7 +5,7 @@ SlateportCity_Mart_EventScript_156411:: @ 8156411 lock faceplayer message SlateportCity_Mart_Text_1A0BE4 - waittext + waitmessage pokemart SlateportCity_Mart_Items msgbox SlateportCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 32a5c2013..f1da0c5a3 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -36,7 +36,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D - closebutton + closemessage hidemoney 0, 0 applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D waitmovement 0 @@ -60,7 +60,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A checkflag 149 goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 - closebutton + closemessage hidemoney 0, 0 applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D waitmovement 0 @@ -169,7 +169,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag 269 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 - closebutton + closemessage compare FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 compare FACING, 2 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 5f64b3941..e379c633d 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -10,7 +10,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 lock faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 - closebutton + closemessage playbgm BGM_EVIL_TEAM, 1 addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 @@ -30,7 +30,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 - closebutton + closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmovement 0 compare FACING, 1 @@ -39,7 +39,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 - closebutton + closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2 @@ -53,7 +53,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4 - closebutton + closemessage delay 35 addobject 2 applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 @@ -67,7 +67,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 .else msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, 4 .endif - closebutton + closemessage fadescreen 1 removeobject 2 removeobject 3 @@ -81,7 +81,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 setvar 0x8004, 269 call SlateportCity_OceanicMuseum_2F_EventScript_1A067F msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 - closebutton + closemessage applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 playse 9 @@ -265,7 +265,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46 lock faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4 - closebutton + closemessage applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index c550a6850..9aa326f70 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE setvar 0x800b, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 3c988d084..9fe7f1f1a 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -15,7 +15,7 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C1EC, 4 - closebutton + closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 setflag 148 @@ -41,7 +41,7 @@ SlateportCity_SternsShipyard_1F_EventScript_1553B0:: @ 81553B0 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C2F2, 4 - closebutton + closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 releaseall diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 90d2bcc5e..a1ecffbd2 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -12,7 +12,7 @@ SootopolisCity_MapScript1_14D08D:: @ 814D08D end SootopolisCity_EventScript_14D0A0:: @ 814D0A0 - movespriteperm 3, 31, 18 + setobjectxyperm 3, 31, 18 setmaptile 31, 32, 592, 1 return @@ -43,22 +43,22 @@ SootopolisCity_MapScript1_14D10D:: @ 814D10D SootopolisCity_EventScript_14D123:: @ 814D123 call SootopolisCity_EventScript_1A02C1 - movespriteperm 1, 29, 19 - movespriteperm 2, 33, 19 + setobjectxyperm 1, 29, 19 + setobjectxyperm 2, 33, 19 compare 0x405e, 1 call_if 1, SootopolisCity_EventScript_14D142 return SootopolisCity_EventScript_14D142:: @ 814D142 - movespriteperm 10, 29, 6 - spritebehave 10, 10 - movespriteperm 5, 30, 6 - spritebehave 5, 9 + setobjectxyperm 10, 29, 6 + setobjectmovementtype 10, 10 + setobjectxyperm 5, 30, 6 + setobjectmovementtype 5, 9 return SootopolisCity_EventScript_14D159:: @ 814D159 - movespriteperm 10, 31, 33 - spritebehave 10, 8 + setobjectxyperm 10, 31, 33 + setobjectmovementtype 10, 8 return SootopolisCity_MapScript1_14D165:: @ 814D165 @@ -228,7 +228,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169E0F, 4 .endif - closebutton + closemessage applymovement 10, SootopolisCity_Movement_14D417 applymovement 255, SootopolisCity_Movement_14D440 waitmovement 10 @@ -247,7 +247,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169F3C, 4 .endif - closebutton + closemessage delay 30 applymovement 5, SootopolisCity_Movement_14D46A applymovement 10, SootopolisCity_Movement_14D41D @@ -264,7 +264,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169F6B, 4 .endif - closebutton + closemessage delay 30 applymovement 5, SootopolisCity_Movement_14D47C applymovement 255, SootopolisCity_Movement_14D457 @@ -284,10 +284,10 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_16A13E, 4 .endif - moveoffscreen 5 - spritebehave 5, 9 - moveoffscreen 10 - spritebehave 10, 10 + moveobjectoffscreen 5 + setobjectmovementtype 5, 9 + moveobjectoffscreen 10 + setobjectmovementtype 10, 10 setvar 0x405e, 2 releaseall end @@ -457,7 +457,7 @@ SootopolisCity_EventScript_14D498:: @ 814D498 SootopolisCity_EventScript_14D4AD:: @ 814D4AD msgbox SootopolisCity_Text_16A33E, 4 - closebutton + closemessage applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 waitmovement 0 delay 50 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index bd0af12be..51b67ee4b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -97,7 +97,7 @@ SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D message SootopolisCity_Gym_1F_Text_18F342 - waittext + waitmessage call SootopolisCity_Gym_1F_EventScript_1A02C5 msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag 1236 diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index 662117741..df536004e 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -41,7 +41,7 @@ SootopolisCity_House8_EventScript_15B466:: @ 815B466 giveitem ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 - closebutton + closemessage release end @@ -90,7 +90,7 @@ SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 giveitem ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 - closebutton + closemessage release end diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index 6cfb2ff79..b88347002 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -5,7 +5,7 @@ SootopolisCity_Mart_EventScript_15B21B:: @ 815B21B lock faceplayer message SootopolisCity_Mart_Text_1A0BE4 - waittext + waitmessage pokemart SootopolisCity_Mart_Items msgbox SootopolisCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 00c9d3310..cb09d8856 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 @ 815B19A setvar 0x800B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 77c163c47..3c6426024 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -13,7 +13,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 compare RESULT, 0 goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 - closebutton + closemessage applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmovement 0 delay 30 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 5bbe8e3b6..edc8229a7 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -22,6 +22,6 @@ Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 lockall braillemsg Underwater_SealedChamber_Braille_1C533D waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 5d7c6de18..8462892e6 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -38,7 +38,7 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 applymovement 255, VerdanturfTown_ContestLobby_Movement_153E23 waitmovement 0 msgbox VerdanturfTown_ContestLobby_Text_1A6832, 4 - closebutton + closemessage applymovement 1, VerdanturfTown_ContestLobby_Movement_153E2C applymovement 255, VerdanturfTown_ContestLobby_Movement_153E19 waitmovement 0 @@ -90,7 +90,7 @@ VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35 VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37 lockall fadescreen 1 - showcontestwinner 1 + drawcontestwinner 1 releaseall end @@ -124,6 +124,6 @@ VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89 lockall special ShowBerryBlenderRecordWindow waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/scripts/maps/VerdanturfTown_Mart.inc index 4227dc8b1..db72de227 100644 --- a/data/scripts/maps/VerdanturfTown_Mart.inc +++ b/data/scripts/maps/VerdanturfTown_Mart.inc @@ -5,7 +5,7 @@ VerdanturfTown_Mart_EventScript_153EBC:: @ 8153EBC lock faceplayer message VerdanturfTown_Mart_Text_1A0BE4 - waittext + waitmessage pokemart VerdanturfTown_Mart_Items msgbox VerdanturfTown_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index e0fee3fb8..a0b1f87de 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -11,7 +11,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 2ed660a5f..fe775d793 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -42,7 +42,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 clearflag 858 - moveoffscreen 4 + moveobjectoffscreen 4 setflag 126 setvar 0x40c3, 1 releaseall diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 215fb3948..402afae23 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -131,7 +131,7 @@ SpeakToTrader: compare RESULT, TRUE goto_if_eq already_traded message gTextTrader_MenuPrompt - waittext + waitmessage goto do_trader_menu_get end @@ -165,13 +165,13 @@ cancelled_get_menu: rare_item_cant_trade_away: message gTextTrader_ICantTradeThatOneAway - waittext + waitmessage goto do_trader_menu_get end dont_want_item: message gTextTrader_MenuPrompt - waittext + waitmessage goto do_trader_menu_get end @@ -232,14 +232,14 @@ SpeakToStoryteller: goto_if_eq no_stories_recorded choose_story: message gTextStoryteller_WhichTale - waittext + waitmessage special ScrSpecial_StorytellerStoryListMenu waitstate compare RESULT, FALSE goto_if_eq cancel_story_menu setvar 0x8008, 1 special ScrSpecial_StorytellerDisplayStory - waittext + waitmessage waitbutton specialvar RESULT, ScrSpecial_StorytellerUpdateStat compare RESULT, FALSE @@ -272,25 +272,25 @@ prompt_record_story: compare RESULT, TRUE goto_if_eq stat_update msgbox gTextStoryteller_ImNotSatisfied, 4 - closebutton + closemessage release end stat_update: msgbox gTextStoryteller_BirthOfANewLegend, 4 - closebutton + closemessage release end dont_hear_story: msgbox gTextStoryteller_OhIFeelStifled, 4 - closebutton + closemessage release end cant_record_story: msgbox gTextStoryteller_WishMorePeopleWould, 4 - closebutton + closemessage release end @@ -335,7 +335,7 @@ also_i_was_thinking: tell_giddy_tale: special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 - waittext + waitmessage yesnobox 20, 8 compare RESULT, 1 goto_if_eq tell_another_giddy_tale diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 7f29be0d8..df097fc19 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -24,7 +24,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B6C:: @ 81B1B6C PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, 4 - closebutton + closemessage setvar 0x8004, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock @@ -45,7 +45,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1 PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB setvar 0x8004, 0 special sub_80EB7C4 - waittext + waitmessage delay 80 msgbox PetalburgCity_PokemonCenter_1F_Text_1B2137, 4 release @@ -78,7 +78,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C28:: @ 81B1C28 PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, 4 - closebutton + closemessage setvar 0x8004, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index a821fd62d..01fc63f20 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -13,7 +13,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 compare 0x8005, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 - closebutton + closemessage setvar 0x4092, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 @@ -38,7 +38,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5 LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 msgbox LittlerootTown_BrendansHouse_1F_Text_172531, 4 - closebutton + closemessage applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC waitmovement 0 @@ -86,7 +86,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 - closebutton + closemessage applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 waitmovement 0 return @@ -99,7 +99,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 - closebutton + closemessage applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 waitmovement 0 return @@ -162,7 +162,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF waitmovement 0 playbgm 453, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4 - closebutton + closemessage applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 @@ -172,7 +172,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, 4 msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4 - closebutton + closemessage setvar 0x4001, 1 applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 waitmovement 0 @@ -187,7 +187,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E waitmovement 0 playbgm 453, 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4 - closebutton + closemessage applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA @@ -197,7 +197,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E waitmovement 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, 4 msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4 - closebutton + closemessage setvar 0x4001, 1 applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 waitmovement 0 @@ -212,7 +212,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, 4 - closebutton + closemessage return LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE @@ -296,7 +296,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C80:: @ 81B6C80 end LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A:: @ 81B6C8A - closebutton + closemessage call LittlerootTown_BrendansHouse_1F_EventScript_1A02CA inccounter GAME_STAT_RESTED_AT_HOME msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, 4 @@ -385,13 +385,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 giveitem ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 - closebutton + closemessage compare 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 - closebutton + closemessage compare 0x8008, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 compare 0x8008, 1 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 9f9b21807..6fe754097 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -239,7 +239,7 @@ FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 - waittext + waitmessage special sub_8083614 waitstate compare RESULT, 1 diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index b7c4d1a43..d0283f072 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -26,7 +26,7 @@ gUnknown_081C3448:: @ 81C3448 lockall playse 73 message UnknownString_81C34E4 - waittext + waitmessage waitbutton releaseall goto EventScript_1C341B @@ -35,7 +35,7 @@ gUnknown_081C3459:: @ 81C3459 lockall playse 73 message UnknownString_81C3514 - waittext + waitmessage waitbutton releaseall goto EventScript_1C341B @@ -61,14 +61,14 @@ EventScript_1C348E: EventScript_1C34A0: message UnknownString_81C35A9 - waittext + waitmessage waitbutton releaseall end EventScript_1C34A9: message UnknownString_81C3583 - waittext + waitmessage waitbutton releaseall end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index d9ebe56a3..f3c03a853 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -13,7 +13,7 @@ Route111_EventScript_1A3877:: @ 81A3877 compare RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 - closebutton + closemessage setflag 96 clearflag 948 compare FACING, 3 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 41e55929d..621d5d4f0 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -57,7 +57,7 @@ EventScript_1A6F0B: EventScript_1A6F21: special DoTVShow - waittext + waitmessage waitbutton compare RESULT, 1 goto_if 5, EventScript_1A6F21 @@ -80,14 +80,14 @@ EventScript_1A6F50: special sub_80BECE8 compare RESULT, 0 goto_if_eq EventScript_1A6EBB - waittext + waitmessage waitbutton goto EventScript_1A6F37 end EventScript_1A6F66: special DoTVShowInSearchOfTrainers - waittext + waitmessage waitbutton compare RESULT, 0 goto_if_eq EventScript_1A6F66 -- cgit v1.2.3 From 6ca1e8747d0278eb5a8e5d7f5ec74801a3e1aded Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 11:51:50 -0500 Subject: fix more command names --- data/event_scripts.s | 204 ++++++++++----------- data/field_move_scripts.inc | 14 +- data/script_cmd_table.inc | 24 +-- data/scripts/berry_tree.inc | 8 +- data/scripts/cable_club.inc | 2 +- data/scripts/contest_hall.inc | 10 +- data/scripts/maps/AncientTomb.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 2 +- data/scripts/maps/DesertRuins.inc | 4 +- data/scripts/maps/FortreeCity_House1.inc | 4 +- data/scripts/maps/IslandCave.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 14 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 52 +++--- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/PacifidlogTown_House2.inc | 2 +- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- data/scripts/maps/Route113_GlassWorkshop.inc | 32 ++-- .../maps/Route124_DivingTreasureHuntersHouse.inc | 4 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 8 +- data/scripts/maps/RustboroCity_House1.inc | 2 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 14 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 24 +-- data/scripts/maps/SlateportCity.inc | 2 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 2 +- data/scripts/maps/SootopolisCity_House6.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 2 +- 31 files changed, 228 insertions(+), 228 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 01120b194..fddae04a9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1062,86 +1062,86 @@ Std_6:: return Event_ResetBerryTrees: @ 19F940 - event_8a 2, 7, 5 - event_8a 1, 3, 5 - event_8a 11, 7, 5 - event_8a 13, 3, 5 - event_8a 4, 7, 5 - event_8a 76, 1, 5 - event_8a 8, 1, 5 - event_8a 10, 6, 5 - event_8a 25, 20, 5 - event_8a 26, 2, 5 - event_8a 66, 2, 5 - event_8a 67, 20, 5 - event_8a 69, 22, 5 - event_8a 70, 22, 5 - event_8a 71, 22, 5 - event_8a 55, 17, 5 - event_8a 56, 17, 5 - event_8a 5, 1, 5 - event_8a 6, 6, 5 - event_8a 7, 1, 5 - event_8a 16, 18, 5 - event_8a 17, 18, 5 - event_8a 18, 18, 5 - event_8a 29, 19, 5 - event_8a 28, 19, 5 - event_8a 27, 19, 5 - event_8a 24, 4, 5 - event_8a 23, 3, 5 - event_8a 22, 3, 5 - event_8a 21, 4, 5 - event_8a 19, 16, 5 - event_8a 20, 16, 5 - event_8a 80, 7, 5 - event_8a 81, 7, 5 - event_8a 77, 8, 5 - event_8a 78, 8, 5 - event_8a 68, 8, 5 - event_8a 31, 10, 5 - event_8a 33, 10, 5 - event_8a 34, 21, 5 - event_8a 35, 21, 5 - event_8a 36, 21, 5 - event_8a 83, 24, 5 - event_8a 84, 24, 5 - event_8a 85, 10, 5 - event_8a 86, 6, 5 - event_8a 37, 5, 5 - event_8a 38, 5, 5 - event_8a 39, 5, 5 - event_8a 40, 3, 5 - event_8a 41, 3, 5 - event_8a 42, 3, 5 - event_8a 46, 19, 5 - event_8a 45, 20, 5 - event_8a 44, 18, 5 - event_8a 43, 16, 5 - event_8a 47, 8, 5 - event_8a 48, 5, 5 - event_8a 49, 4, 5 - event_8a 50, 2, 5 - event_8a 52, 18, 5 - event_8a 53, 18, 5 - event_8a 62, 6, 5 - event_8a 64, 6, 5 - event_8a 58, 21, 5 - event_8a 59, 21, 5 - event_8a 60, 25, 5 - event_8a 61, 25, 5 - event_8a 79, 23, 5 - event_8a 14, 23, 5 - event_8a 15, 21, 5 - event_8a 30, 21, 5 - event_8a 65, 25, 5 - event_8a 72, 25, 5 - event_8a 73, 23, 5 - event_8a 74, 23, 5 - event_8a 87, 3, 5 - event_8a 88, 10, 5 - event_8a 89, 4, 5 - event_8a 82, 36, 5 + plantberrytree 2, 7, 5 + plantberrytree 1, 3, 5 + plantberrytree 11, 7, 5 + plantberrytree 13, 3, 5 + plantberrytree 4, 7, 5 + plantberrytree 76, 1, 5 + plantberrytree 8, 1, 5 + plantberrytree 10, 6, 5 + plantberrytree 25, 20, 5 + plantberrytree 26, 2, 5 + plantberrytree 66, 2, 5 + plantberrytree 67, 20, 5 + plantberrytree 69, 22, 5 + plantberrytree 70, 22, 5 + plantberrytree 71, 22, 5 + plantberrytree 55, 17, 5 + plantberrytree 56, 17, 5 + plantberrytree 5, 1, 5 + plantberrytree 6, 6, 5 + plantberrytree 7, 1, 5 + plantberrytree 16, 18, 5 + plantberrytree 17, 18, 5 + plantberrytree 18, 18, 5 + plantberrytree 29, 19, 5 + plantberrytree 28, 19, 5 + plantberrytree 27, 19, 5 + plantberrytree 24, 4, 5 + plantberrytree 23, 3, 5 + plantberrytree 22, 3, 5 + plantberrytree 21, 4, 5 + plantberrytree 19, 16, 5 + plantberrytree 20, 16, 5 + plantberrytree 80, 7, 5 + plantberrytree 81, 7, 5 + plantberrytree 77, 8, 5 + plantberrytree 78, 8, 5 + plantberrytree 68, 8, 5 + plantberrytree 31, 10, 5 + plantberrytree 33, 10, 5 + plantberrytree 34, 21, 5 + plantberrytree 35, 21, 5 + plantberrytree 36, 21, 5 + plantberrytree 83, 24, 5 + plantberrytree 84, 24, 5 + plantberrytree 85, 10, 5 + plantberrytree 86, 6, 5 + plantberrytree 37, 5, 5 + plantberrytree 38, 5, 5 + plantberrytree 39, 5, 5 + plantberrytree 40, 3, 5 + plantberrytree 41, 3, 5 + plantberrytree 42, 3, 5 + plantberrytree 46, 19, 5 + plantberrytree 45, 20, 5 + plantberrytree 44, 18, 5 + plantberrytree 43, 16, 5 + plantberrytree 47, 8, 5 + plantberrytree 48, 5, 5 + plantberrytree 49, 4, 5 + plantberrytree 50, 2, 5 + plantberrytree 52, 18, 5 + plantberrytree 53, 18, 5 + plantberrytree 62, 6, 5 + plantberrytree 64, 6, 5 + plantberrytree 58, 21, 5 + plantberrytree 59, 21, 5 + plantberrytree 60, 25, 5 + plantberrytree 61, 25, 5 + plantberrytree 79, 23, 5 + plantberrytree 14, 23, 5 + plantberrytree 15, 21, 5 + plantberrytree 30, 21, 5 + plantberrytree 65, 25, 5 + plantberrytree 72, 25, 5 + plantberrytree 73, 23, 5 + plantberrytree 74, 23, 5 + plantberrytree 87, 3, 5 + plantberrytree 88, 10, 5 + plantberrytree 89, 4, 5 + plantberrytree 82, 36, 5 return gUnknown_0819FA81:: @ 819FA81 @@ -1495,7 +1495,7 @@ Std_ObtainItem: @ 819FDF7 return Std_ObtainItem_: @ 819FE07 - bufferitem 1, 0x8000 + getitemname 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 0x1 @@ -1514,31 +1514,31 @@ GetItem_HandlePocket: end GetItem_HandlePocket_Items: - bufferstd 2, 0xE + getstdstring 2, 0xE compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: - bufferstd 2, 0xF + getstdstring 2, 0xF compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: - bufferstd 2, 0x10 + getstdstring 2, 0x10 compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: - bufferstd 2, 0x11 + getstdstring 2, 0x11 compare 0x8007, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: - bufferstd 2, 0x12 + getstdstring 2, 0x12 compare 0x8007, 1 call_if 1, PlayGetItemFanfare return @@ -1570,7 +1570,7 @@ Std_ObtainDecoration: @ 819FEDA return Std_ObtainDecoration_: @ 819FEE8 - bufferdecor 1, 0x8000 + getdecorname 1, 0x8000 compare 0x8007, 1 call_if 1, Std_ObtainDecoration_Success compare 0x8007, 0 @@ -1596,7 +1596,7 @@ Std_FindItem: @ 819FF21 waitse additem 0x8000, 0x8001 copyvar 0x8007, RESULT - bufferitem 1, 0x8000 + getitemname 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 1 @@ -1625,7 +1625,7 @@ HiddenItemScript:: @ 819FF7B waitse additem 0x8005, 1 copyvar 0x8007, RESULT - bufferitem 0x1, 0x8005 + getitemname 0x1, 0x8005 checkitemtype 0x8005 call GetItem_HandlePocket compare 0x8007, 1 @@ -1813,7 +1813,7 @@ UseSurfScript:: @ 81A0117 checkpokemove MOVE_SURF compare RESULT, 6 goto_if_eq UseSurfScript_NoMon - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT lockall msgbox UseSurfPromptText, 5 @@ -2208,8 +2208,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0 copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 copyvar 0x800a, RESULT - buffernum 0, 0x8008 - buffernum 1, 0x8009 + getnumberstring 0, 0x8008 + getnumberstring 1, 0x8009 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 compare 0x800a, 0 @@ -2218,8 +2218,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0 specialvar RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 - buffernum 0, 0x8008 - buffernum 1, 0x8009 + getnumberstring 0, 0x8008 + getnumberstring 1, 0x8009 msgbox Route101_Text_1C4B05, 4 return @@ -2536,7 +2536,7 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F - bufferitem 0, 0x8004 + getitemname 0, 0x8004 playfanfare 372 message FallarborTown_House1_Text_1A1498 waitmessage @@ -3601,7 +3601,7 @@ gUnknown_081A2C51:: @ 81A2C51 goto_if_eq EventScript_1A2E45 checkpokemove MOVE_SECRET_POWER setanimation 0, RESULT - bufferattack 1, MOVE_SECRET_POWER + getmovename 1, MOVE_SECRET_POWER compare 0x8007, 1 goto_if_eq EventScript_1A2CB0 compare 0x8007, 2 @@ -3620,7 +3620,7 @@ EventScript_1A2CB0: lockall compare RESULT, 6 goto_if_eq EventScript_1A2CF1 - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT msgbox UnknownString_8198F34, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3651,7 +3651,7 @@ EventScript_1A2D08: lockall compare RESULT, 6 goto_if_eq EventScript_1A2D49 - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT msgbox UnknownString_81A197B, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3682,7 +3682,7 @@ EventScript_1A2D60: lockall compare RESULT, 6 goto_if_eq EventScript_1A2DA1 - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT msgbox UnknownString_81A1A4B, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3788,8 +3788,8 @@ EventScript_1A2E45: msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A - bufferpartypoke 0, 0x8004 - bufferattack 1, MOVE_SECRET_POWER + getpartypokename 0, 0x8004 + getmovename 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closemessage closemessage @@ -4917,7 +4917,7 @@ gUnknown_081C6C02:: @ 81C6C02 @ 81C6C1D lockall - braillemsg Underwater_SealedChamber_Braille_1C533D + braillemessage Underwater_SealedChamber_Braille_1C533D waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 94f6b356c..a3fbce103 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -6,8 +6,8 @@ S_CuttableTree:: @ 81B0DCC compare RESULT, 6 goto_if_eq CannotUseCut setanimation 0, RESULT - bufferpartypoke 0, RESULT - bufferattack 1, MOVE_CUT + getpartypokename 0, RESULT + getmovename 1, MOVE_CUT msgbox UseCutPromptText, 5 compare RESULT, 0 goto_if_eq Cut_ChoseNo @@ -64,8 +64,8 @@ S_BreakableRock:: @ 81B0EB7 compare RESULT, 6 goto_if_eq CannotUseRockSmash setanimation 0, RESULT - bufferpartypoke 0, RESULT - bufferattack 1, MOVE_ROCK_SMASH + getpartypokename 0, RESULT + getmovename 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 compare RESULT, 0 goto_if_eq RockSmash_ChoseNo @@ -193,7 +193,7 @@ S_UseWaterfall:: @ 81B115A checkpokemove MOVE_WATERFALL compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 @@ -226,7 +226,7 @@ UseDiveScript:: @ 81B1220 checkpokemove MOVE_DIVE compare RESULT, 6 goto_if_eq CannotUseDive - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UseDivePromptText, 5 @@ -249,7 +249,7 @@ S_UseDiveUnderwater:: @ 81B1269 checkpokemove MOVE_DIVE compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive - bufferpartypoke 0, RESULT + getpartypokename 0, RESULT setanimation 0, RESULT setanimation 1, 1 msgbox UnderwaterUseDivePromptText, 5 diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 1262e259a..38a4a8f3f 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -120,25 +120,25 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_drawpokepic @ 0x75 .4byte ScrCmd_erasepokepic @ 0x76 .4byte ScrCmd_drawcontestwinner @ 0x77 - .4byte ScrCmd_braillemsg @ 0x78 + .4byte ScrCmd_braillemessage @ 0x78 .4byte ScrCmd_givepoke @ 0x79 .4byte ScrCmd_giveegg @ 0x7A .4byte ScrCmd_setpokemove @ 0x7B .4byte ScrCmd_checkpokemove @ 0x7C - .4byte ScrCmd_bufferpoke @ 0x7D - .4byte ScrCmd_bufferfirstpoke @ 0x7E - .4byte ScrCmd_bufferpartypoke @ 0x7F - .4byte ScrCmd_bufferitem @ 0x80 - .4byte ScrCmd_bufferdecor @ 0x81 - .4byte ScrCmd_bufferattack @ 0x82 - .4byte ScrCmd_buffernum @ 0x83 - .4byte ScrCmd_bufferstd @ 0x84 - .4byte ScrCmd_buffertext @ 0x85 + .4byte ScrCmd_getspeciesname @ 0x7D + .4byte ScrCmd_getfirstpartypokename @ 0x7E + .4byte ScrCmd_getpartypokename @ 0x7F + .4byte ScrCmd_getitemname @ 0x80 + .4byte ScrCmd_getdecorname @ 0x81 + .4byte ScrCmd_getmovename @ 0x82 + .4byte ScrCmd_getnumberstring @ 0x83 + .4byte ScrCmd_getstdstring @ 0x84 + .4byte ScrCmd_getstring @ 0x85 .4byte ScrCmd_pokemart @ 0x86 .4byte ScrCmd_pokemartdecor @ 0x87 .4byte ScrCmd_pokemartbp @ 0x88 - .4byte ScrCmd_pokecasino @ 0x89 - .4byte ScrCmd_event_8a @ 0x8A + .4byte ScrCmd_playslotmachine @ 0x89 + .4byte ScrCmd_plantberrytree @ 0x8A .4byte ScrCmd_choosecontestpkmn @ 0x8B .4byte ScrCmd_startcontest @ 0x8C .4byte ScrCmd_showcontestresults @ 0x8D diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 79e1de13b..344c2c18a 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -86,19 +86,19 @@ Route102_EventScript_1A15CE:: @ 81A15CE goto_if_eq Route102_EventScript_1A15F2 compare 0x8005, 4 goto_if_eq Route102_EventScript_1A15EB - buffertext 1, Route102_Text_1A17B7 + getstring 1, Route102_Text_1A17B7 return Route102_EventScript_1A15EB:: @ 81A15EB - buffertext 1, Route102_Text_1A179F + getstring 1, Route102_Text_1A179F return Route102_EventScript_1A15F2:: @ 81A15F2 - buffertext 1, Route102_Text_1A17B0 + getstring 1, Route102_Text_1A17B0 return Route102_EventScript_1A15F9:: @ 81A15F9 - buffernum 1, 0x8006 + getnumberstring 1, 0x8006 lock faceplayer msgbox Route102_Text_1A17C0, 5 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 33df12c8c..63209e77b 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -719,7 +719,7 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 end RecordCorner_EventScript_1A446C:: @ 81A446C - bufferitem 1, 0x4001 + getitemname 1, 0x4001 message RecordCorner_Text_1A4E3B waitmessage waitbutton diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 16e5a6282..56499fced 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F - bufferstd 0, 0x800b + getstdstring 0, 0x800b msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 @@ -260,8 +260,8 @@ LinkContestRoom1_EventScript_1A523F:: @ 81A523F return LinkContestRoom1_EventScript_1A5245:: @ 81A5245 - bufferstd 1, 0x8008 - bufferstd 2, 0x8009 + getstdstring 1, 0x8008 + getstdstring 2, 0x8009 call LinkContestRoom1_EventScript_1A525F lockall applymovement 1, LinkContestRoom1_Movement_1A5D87 @@ -339,7 +339,7 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 LinkContestRoom1_EventScript_1A5323:: @ 81A5323 special sub_80C4C64 addvar 0x8006, 1 - buffernum 1, 0x8006 + getnumberstring 1, 0x8006 lockall applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C waitmovement 0 @@ -885,7 +885,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 special sub_80C47F0 special sub_80C4858 addvar 0x8005, 1 - buffernum 1, 0x8005 + getnumberstring 1, 0x8005 addvar 0x8005, -1 call LinkContestRoom1_EventScript_1A5A75 applymovement 0x4003, LinkContestRoom1_Movement_1A5D99 diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 0e9a82f4c..6f6499b26 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -35,7 +35,7 @@ AncientTomb_EventScript_15F021:: @ 815F021 lockall checkflag 2130 goto_if_eq AncientTomb_EventScript_15F038 - braillemsg AncientTomb_Braille_1C552E + braillemessage AncientTomb_Braille_1C552E waitbutton erasebox 0, 0, 29, 19 releaseall @@ -48,7 +48,7 @@ AncientTomb_EventScript_15F038:: @ 815F038 AncientTomb_EventScript_15F042:: @ 815F042 lockall - braillemsg AncientTomb_Braille_1C552E + braillemessage AncientTomb_Braille_1C552E waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 555e32d81..5bb74d35b 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - bufferdecor 1, 0x8008 + getdecorname 1, 0x8008 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 6b8bb5cdb..93cbb8fe8 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -35,7 +35,7 @@ DesertRuins_EventScript_15CB56:: @ 815CB56 lockall checkflag 2128 goto_if_eq DesertRuins_EventScript_15CB6D - braillemsg DesertRuins_Braille_1C54C8 + braillemessage DesertRuins_Braille_1C54C8 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -48,7 +48,7 @@ DesertRuins_EventScript_15CB6D:: @ 815CB6D DesertRuins_EventScript_15CB77:: @ 815CB77 lockall - braillemsg DesertRuins_Braille_1C54C8 + braillemessage DesertRuins_Braille_1C54C8 waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 3809e1f01..3fb0f7745 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -28,7 +28,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 special sub_804DB68 special sub_804E174 waitstate - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 setflag 155 release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_185737, 4 release end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index ed230477c..55bd4103c 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -47,7 +47,7 @@ IslandCave_EventScript_15EF59:: @ 815EF59 lockall checkflag 2129 goto_if_eq IslandCave_EventScript_15EF72 - braillemsg IslandCave_Braille_1C54FC + braillemessage IslandCave_Braille_1C54FC special DoBrailleWait waitstate goto IslandCave_EventScript_15EF95 @@ -60,7 +60,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall - braillemsg IslandCave_Braille_1C54FC + braillemessage IslandCave_Braille_1C54FC checkflag 2129 goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 09f2e88ea..2bd95eace 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -472,7 +472,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C addvar 0x8004, 1 - buffernum 1, 32772 + getnumberstring 1, 32772 message2 LilycoveCity_ContestLobby_Text_188845 waitmessage addvar 0x8004, 65535 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 02f5ca3ca..03d64bbd1 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -146,12 +146,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 nop - bufferitem 0, 0x4000 + getitemname 0, 0x4000 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 additem 0x4000, 1 - bufferitem 1, 0x4000 - bufferstd 2, 14 + getitemname 1, 0x4000 + getstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -162,8 +162,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 - bufferitem 1, 0x4000 - bufferstd 2, 14 + getitemname 1, 0x4000 + getstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -174,8 +174,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 - bufferitem 1, 0x4000 - bufferstd 2, 14 + getitemname 1, 0x4000 + getstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 2b39ea557..80fda6d59 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitem 0, 0x8005 + getitemname 0, 0x8005 compare 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare 0x8004, 2 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 7c6886209..d7aab95a6 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -24,7 +24,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE lockall - bufferfirstpoke 0 + getfirstpartypokename 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage playfanfare 370 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 6952ca4e1..0a853b2fc 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -129,17 +129,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 setvar 0x4001, 1 - bufferdecor 0, 88 + getdecorname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 setvar 0x4001, 2 - bufferdecor 0, 89 + getdecorname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE setvar 0x4001, 3 - bufferdecor 0, 90 + getdecorname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C @@ -156,7 +156,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecor 1, 88 + getdecorname 1, 88 checkdecor 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 @@ -172,7 +172,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecor 1, 89 + getdecorname 1, 89 checkdecor 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 @@ -188,7 +188,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecor 1, 90 + getdecorname 1, 90 checkdecor 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 @@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar 0x4001, 1 - bufferitem 0, ITEM_TM32 + getitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar 0x4001, 2 - bufferitem 0, ITEM_TM29 + getitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar 0x4001, 3 - bufferitem 0, ITEM_TM35 + getitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar 0x4001, 4 - bufferitem 0, ITEM_TM24 + getitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar 0x4001, 5 - bufferitem 0, ITEM_TM13 + getitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC @@ -401,7 +401,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 end MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB - bufferdecor 1, 88 + getdecorname 1, 88 checkdecor 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 @@ -412,7 +412,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 - bufferdecor 1, 89 + getdecorname 1, 89 checkdecor 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 @@ -423,7 +423,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F - bufferdecor 1, 90 + getdecorname 1, 90 checkdecor 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 @@ -526,7 +526,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -537,7 +537,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -548,7 +548,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -559,7 +559,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -570,7 +570,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -581,7 +581,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -592,7 +592,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -603,7 +603,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -614,7 +614,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -625,7 +625,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -636,7 +636,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -647,7 +647,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 6098cc617..62edffc8b 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -4,7 +4,7 @@ MossdeepCity_House1_MapScripts:: @ 815A82E MossdeepCity_House1_EventScript_15A82F:: @ 815A82F lock faceplayer - bufferfirstpoke 0 + getfirstpartypokename 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialvar RESULT, GetPokeblockNameByMonNature compare RESULT, 0 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index acd499966..260cb4b6e 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B faceplayer dodailyevents specialvar RESULT, GetWeekCount - buffernum 0, RESULT + getnumberstring 0, RESULT compare RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 6905b31b3..8bf899780 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -84,7 +84,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C waitfanfare waitmessage givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 - bufferpoke 1, SPECIES_BELDUM + getspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index cef40ecd3..f3a198a08 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -72,7 +72,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 PacifidlogTown_House2_EventScript_154254:: @ 8154254 specialvar RESULT, sub_810F908 - buffernum 0, RESULT + getnumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 1edd445fc..28b9dbd80 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -28,7 +28,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E special sub_804DB68 special sub_804E174 waitstate - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag 154 release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 39b484c8a..d0b608339 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -68,7 +68,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 250 compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -82,7 +82,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -96,7 +96,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -110,7 +110,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -124,7 +124,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -139,7 +139,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8009, 1 setvar 0x8008, 13 - bufferdecor 0, 0x8008 + getdecorname 0, 0x8008 setvar 0x800a, 6000 compare 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -154,7 +154,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8009, 1 setvar 0x8008, 6 - bufferdecor 0, 0x8008 + getdecorname 0, 0x8008 setvar 0x800a, 8000 compare 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -174,14 +174,14 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E Route113_GlassWorkshop_EventScript_163818:: @ 8163818 setvar 0x800a, 250 subvar 0x800a, 16456 - buffernum 0, 32778 + getnumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 subvar 0x800a, 16456 - buffernum 1, 32778 + getnumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage goto Route113_GlassWorkshop_EventScript_1635EE @@ -247,49 +247,49 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar 0x8009, 0 setvar 0x8008, 39 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar 0x8009, 0 setvar 0x8008, 40 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar 0x8009, 0 setvar 0x8008, 41 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar 0x8009, 0 setvar 0x8008, 43 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar 0x8009, 0 setvar 0x8008, 42 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar 0x8009, 1 setvar 0x8008, 13 - bufferdecor 0, 13 + getdecorname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar 0x8009, 1 setvar 0x8008, 6 - bufferdecor 0, 6 + getdecorname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 543736e80..7421e94e0 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -244,8 +244,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitem 0, 0x8008 - bufferitem 1, 0x8009 + getitemname 0, 0x8008 + getitemname 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 784ef8087..f40c1b87b 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -88,7 +88,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - bufferitem 0, ITEM_ROOT_FOSSIL + getitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 removeitem ITEM_ROOT_FOSSIL, 1 setvar 0x40c4, 1 @@ -106,7 +106,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - bufferitem 0, ITEM_CLAW_FOSSIL + getitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 removeitem ITEM_CLAW_FOSSIL, 1 setvar 0x40c4, 1 @@ -132,7 +132,7 @@ RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A end RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 - bufferpoke 1, SPECIES_LILEEP + getspeciesname 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon compare RESULT, 6 @@ -152,7 +152,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 end RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 - bufferpoke 1, SPECIES_ANORITH + getspeciesname 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon compare RESULT, 6 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index a344738a8..b983617e0 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 027c1c363..526ada367 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -3,7 +3,7 @@ SealedChamber_InnerRoom_MapScripts:: @ 815F1E7 SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C53C1 + braillemessage SealedChamber_InnerRoom_Braille_1C53C1 waitbutton erasebox 0, 0, 29, 19 checkflag 228 @@ -41,7 +41,7 @@ SealedChamber_InnerRoom_EventScript_15F247:: @ 815F247 SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C53F2 + braillemessage SealedChamber_InnerRoom_Braille_1C53F2 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -49,7 +49,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C5414 + braillemessage SealedChamber_InnerRoom_Braille_1C5414 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -57,7 +57,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C5435 + braillemessage SealedChamber_InnerRoom_Braille_1C5435 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -65,7 +65,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C545C + braillemessage SealedChamber_InnerRoom_Braille_1C545C waitbutton erasebox 0, 0, 29, 19 releaseall @@ -73,7 +73,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C5470 + braillemessage SealedChamber_InnerRoom_Braille_1C5470 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -81,7 +81,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F lockall - braillemsg SealedChamber_InnerRoom_Braille_1C549B + braillemessage SealedChamber_InnerRoom_Braille_1C549B waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 638fc2a85..39542559b 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -29,7 +29,7 @@ SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C lockall - braillemsg SealedChamber_OuterRoom_Braille_1C534F + braillemessage SealedChamber_OuterRoom_Braille_1C534F waitbutton erasebox 0, 0, 29, 19 releaseall @@ -37,7 +37,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5359 + braillemessage SealedChamber_OuterRoom_Braille_1C5359 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -45,7 +45,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5363 + braillemessage SealedChamber_OuterRoom_Braille_1C5363 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -53,7 +53,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C536D + braillemessage SealedChamber_OuterRoom_Braille_1C536D waitbutton erasebox 0, 0, 29, 19 releaseall @@ -61,7 +61,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5377 + braillemessage SealedChamber_OuterRoom_Braille_1C5377 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -69,7 +69,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5381 + braillemessage SealedChamber_OuterRoom_Braille_1C5381 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -77,7 +77,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C538B + braillemessage SealedChamber_OuterRoom_Braille_1C538B waitbutton erasebox 0, 0, 29, 19 releaseall @@ -85,7 +85,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5396 + braillemessage SealedChamber_OuterRoom_Braille_1C5396 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -93,7 +93,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C lockall - braillemsg SealedChamber_OuterRoom_Braille_1C539E + braillemessage SealedChamber_OuterRoom_Braille_1C539E waitbutton erasebox 0, 0, 29, 19 releaseall @@ -101,7 +101,7 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA lockall - braillemsg SealedChamber_OuterRoom_Braille_1C53A9 + braillemessage SealedChamber_OuterRoom_Braille_1C53A9 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -111,7 +111,7 @@ SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall checkflag 2127 goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF - braillemsg SealedChamber_OuterRoom_Braille_1C53B1 + braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -124,7 +124,7 @@ SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C53B1 + braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index dcd550549..bea1455a7 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -64,7 +64,7 @@ SlateportCity_Items1:: @ 814BAD0 SlateportCity_EventScript_14BAE0:: @ 814BAE0 lock faceplayer - bufferfirstpoke 0 + getfirstpartypokename 0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon compare RESULT, 1 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index cd71d8d51..fa66113b1 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 checkflag 200 call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 - bufferfirstpoke 0 + getfirstpartypokename 0 switch 0x4001 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 1e1b53956..a0fdc5ca4 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD end SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 - bufferdecor 1, 117 + getdecorname 1, 117 msgbox SootopolisCity_House6_Text_1A0CEF, 4 msgbox SootopolisCity_House6_Text_18FF28, 4 release diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index edc8229a7..836ad86e2 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -20,7 +20,7 @@ Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 lockall - braillemsg Underwater_SealedChamber_Braille_1C533D + braillemessage Underwater_SealedChamber_Braille_1C533D waitbutton erasebox 0, 0, 29, 19 releaseall -- cgit v1.2.3 From 639493e0ee82d173e58d9a791b37ab08106e16fa Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:07:22 -0500 Subject: fix more command names --- data/event_scripts.s | 6 +++--- data/script_cmd_table.inc | 12 ++++++------ data/scripts/maps/DewfordTown_Gym.inc | 10 +++++----- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 16 ++++++++-------- data/scripts/maps/MauvilleCity_GameCorner.inc | 20 ++++++++++---------- data/scripts/maps/MtChimney.inc | 14 +++++++------- data/scripts/maps/Route109_SeashoreHouse.inc | 14 +++++++------- data/scripts/maps/Route121_SafariZoneEntrance.inc | 10 +++++----- data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc | 14 +++++++------- 9 files changed, 58 insertions(+), 58 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index fddae04a9..1ceb9a7c0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4764,7 +4764,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F gUnknown_081B694A:: @ 81B694A lighten 1 - darken 1 + setdarklevel 1 end .include "data/scripts/players_house.inc" @@ -4793,7 +4793,7 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 - event_96 2 + getpricereduction 2 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 @@ -4805,7 +4805,7 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 - event_96 2 + getpricereduction 2 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA addvar 0x8004, 128 diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 38a4a8f3f..414c2df52 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -145,15 +145,15 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_contestlinktransfer @ 0x8E .4byte ScrCmd_random @ 0x8F .4byte ScrCmd_givemoney @ 0x90 - .4byte ScrCmd_paymoney @ 0x91 + .4byte ScrCmd_takemoney @ 0x91 .4byte ScrCmd_checkmoney @ 0x92 - .4byte ScrCmd_showmoney @ 0x93 - .4byte ScrCmd_hidemoney @ 0x94 - .4byte ScrCmd_updatemoney @ 0x95 - .4byte ScrCmd_event_96 @ 0x96 + .4byte ScrCmd_showmoneybox @ 0x93 + .4byte ScrCmd_hidemoneybox @ 0x94 + .4byte ScrCmd_updatemoneybox @ 0x95 + .4byte ScrCmd_getpricereduction @ 0x96 .4byte ScrCmd_fadescreen @ 0x97 .4byte ScrCmd_fadescreendelay @ 0x98 - .4byte ScrCmd_darken @ 0x99 + .4byte ScrCmd_setdarklevel @ 0x99 .4byte ScrCmd_lighten @ 0x9A .4byte ScrCmd_message2 @ 0x9B .4byte ScrCmd_doanimation @ 0x9C diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 296d2ed2d..65556c739 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -20,23 +20,23 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto DewfordTown_Gym_EventScript_1530AE DewfordTown_Gym_EventScript_1530AA:: @ 81530AA - darken 0 + setdarklevel 0 return DewfordTown_Gym_EventScript_1530AE:: @ 81530AE - darken 1 + setdarklevel 1 return DewfordTown_Gym_EventScript_1530B2:: @ 81530B2 - darken 2 + setdarklevel 2 return DewfordTown_Gym_EventScript_1530B6:: @ 81530B6 - darken 3 + setdarklevel 3 return DewfordTown_Gym_EventScript_1530BA:: @ 81530BA - darken 4 + setdarklevel 4 return DewfordTown_Gym_EventScript_1530BE:: @ 81530BE diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 03d64bbd1..29914a9b5 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F .byte 0 LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 - event_96 3 + getpricereduction 3 compare RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F compare RESULT, 0 @@ -51,7 +51,7 @@ LilycoveCity_DepartmentStoreRooftop_Decorations:: @ 815A180 LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 lock faceplayer - event_96 3 + getpricereduction 3 compare RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 @@ -71,7 +71,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD lockall message LilycoveCity_DepartmentStoreRooftop_Text_18C72B waitmessage - showmoney 0, 0 + showmoneybox 0, 0 nop goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE end @@ -115,15 +115,15 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B:: @ 815A24B return LilycoveCity_DepartmentStoreRooftop_EventScript_15A252:: @ 815A252 - paymoney 0xc8, 0 + takemoney 0xc8, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A259:: @ 815A259 - paymoney 0x12c, 0 + takemoney 0x12c, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 - paymoney 0x15e, 0 + takemoney 0x15e, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 @@ -144,7 +144,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 compare 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 - updatemoney 0, 0 + updatemoneybox 0, 0 nop getitemname 0, 0x4000 playse 106 @@ -197,6 +197,6 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A388:: @ 815A388 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A396:: @ 815A396 - hidemoney 0, 0 + hidemoneybox 0, 0 releaseall end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 0a853b2fc..8d98f03a8 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -10,7 +10,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 waitmessage - showmoney 0, 0 + showmoneybox 0, 0 nop showcoins 0, 5 goto MauvilleCity_GameCorner_EventScript_156A60 @@ -39,13 +39,13 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 50 - paymoney 0x3e8, 0 - updatemoney 0, 0 + takemoney 0x3e8, 0 + updatemoneybox 0, 0 nop updatecoins 0, 5 playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 hidecoins 0, 5 release end @@ -58,13 +58,13 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 500 - paymoney 0x2710, 0 - updatemoney 0, 0 + takemoney 0x2710, 0 + updatemoneybox 0, 0 nop updatecoins 0, 5 playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 hidecoins 0, 5 release end @@ -76,21 +76,21 @@ MauvilleCity_GameCorner_EventScript_156B32:: @ 8156B32 MauvilleCity_GameCorner_EventScript_156B3C:: @ 8156B3C msgbox MauvilleCity_GameCorner_Text_181D28, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 hidecoins 0, 5 release end MauvilleCity_GameCorner_EventScript_156B4C:: @ 8156B4C msgbox MauvilleCity_GameCorner_Text_181D73, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 hidecoins 0, 5 release end MauvilleCity_GameCorner_EventScript_156B5C:: @ 8156B5C msgbox MauvilleCity_GameCorner_Text_181D57, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 hidecoins 0, 5 release end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d206f927e..a8eec9a32 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -15,7 +15,7 @@ MtChimney_MapScript1_15CF92:: @ 815CF92 MtChimney_EventScript_15CF95:: @ 815CF95 lock faceplayer - showmoney 0, 0 + showmoneybox 0, 0 nop msgbox MtChimney_Text_195760, 5 compare RESULT, 0 @@ -30,31 +30,31 @@ MtChimney_EventScript_15CF95:: @ 815CF95 giveitem ITEM_LAVA_COOKIE compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 - hidemoney 0, 0 + hidemoneybox 0, 0 release end MtChimney_EventScript_15CFF3:: @ 815CFF3 msgbox MtChimney_Text_1A0CC2, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end MtChimney_EventScript_15D000:: @ 815D000 - paymoney 0xc8, 0 - updatemoney 0, 0 + takemoney 0xc8, 0 + updatemoneybox 0, 0 nop return MtChimney_EventScript_15D00B:: @ 815D00B msgbox MtChimney_Text_1957F7, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end MtChimney_EventScript_15D018:: @ 815D018 msgbox MtChimney_Text_1957BA, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 789ee3e56..4d8d363aa 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -40,13 +40,13 @@ Route109_SeashoreHouse_EventScript_160E2C:: @ 8160E2C end Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 - showmoney 0, 0 + showmoneybox 0, 0 nop msgbox Route109_SeashoreHouse_Text_19B702, 5 compare RESULT, 1 goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end @@ -58,23 +58,23 @@ Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 - paymoney 0x12c, 0 - updatemoney 0, 0 + takemoney 0x12c, 0 + updatemoneybox 0, 0 nop giveitem ITEM_SODA_POP - hidemoney 0, 0 + hidemoneybox 0, 0 release end Route109_SeashoreHouse_EventScript_160E9E:: @ 8160E9E msgbox Route109_SeashoreHouse_Text_19B759, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB msgbox Route109_SeashoreHouse_Text_1A0CC2, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index c9439ee5f..9649271f4 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -49,7 +49,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 lockall applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841 waitmovement 0 - showmoney 0, 0 + showmoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 compare RESULT, 1 @@ -67,8 +67,8 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 compare RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 - paymoney 0x1f4, 0 - updatemoney 0, 0 + takemoney 0x1f4, 0 + updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 playfanfare 370 @@ -77,7 +77,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 waitmessage msgbox Route121_SafariZoneEntrance_Text_1C392D, 4 closemessage - hidemoney 0, 0 + hidemoneybox 0, 0 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E waitmovement 0 special EnterSafariMode @@ -112,7 +112,7 @@ Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C closemessage - hidemoney 0, 0 + hidemoneybox 0, 0 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C waitmovement 0 releaseall diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index f1da0c5a3..1ee8ff39b 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -31,13 +31,13 @@ SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 end SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 - showmoney 0, 0 + showmoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closemessage - hidemoney 0, 0 + hidemoneybox 0, 0 applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D waitmovement 0 releaseall @@ -47,12 +47,12 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D checkmoney 0x32, 0 compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A - paymoney 0x32, 0 - updatemoney 0, 0 + takemoney 0x32, 0 + updatemoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4 setvar 0x40aa, 1 - hidemoney 0, 0 + hidemoneybox 0, 0 releaseall end @@ -61,7 +61,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closemessage - hidemoney 0, 0 + hidemoneybox 0, 0 applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D waitmovement 0 releaseall @@ -70,7 +70,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, 4 setvar 0x40aa, 1 - hidemoney 0, 0 + hidemoneybox 0, 0 releaseall end -- cgit v1.2.3 From 89092b609a9af15a35b0151442e9881aeab28708 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:21:52 -0500 Subject: fix more command names --- data/event_scripts.s | 44 +++++------ data/field_move_scripts.inc | 34 ++++----- data/script_cmd_table.inc | 14 ++-- data/scripts/cable_club.inc | 8 +- data/scripts/contest_hall.inc | 20 ++--- data/scripts/day_care.inc | 4 +- .../maps/AbandonedShip_HiddenFloorRooms.inc | 88 +++++++++++----------- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 12 +-- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/DewfordTown_Gym.inc | 8 +- data/scripts/maps/DewfordTown_House1.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 6 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_Mart.inc | 2 +- data/scripts/maps/FortreeCity.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/FortreeCity_House5.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 8 +- data/scripts/maps/LavaridgeTown_House.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 8 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 8 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- data/scripts/maps/LilycoveCity_House1.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 16 ++-- .../maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 6 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 4 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 8 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 6 +- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/PacifidlogTown_House2.inc | 4 +- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 2 +- data/scripts/maps/Route109.inc | 2 +- data/scripts/maps/Route110.inc | 4 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 10 +-- data/scripts/maps/Route114.inc | 2 +- data/scripts/maps/Route119.inc | 4 +- data/scripts/maps/Route119_House.inc | 2 +- data/scripts/maps/Route120.inc | 8 +- data/scripts/maps/Route128.inc | 12 +-- data/scripts/maps/RustboroCity.inc | 4 +- data/scripts/maps/RustboroCity_Flat2_1F.inc | 2 +- data/scripts/maps/RustboroCity_House3.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 4 +- data/scripts/maps/SSTidalCorridor.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 10 +-- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 6 +- data/scripts/maps/SootopolisCity.inc | 6 +- data/scripts/maps/SootopolisCity_House1.inc | 2 +- data/scripts/maps/SootopolisCity_House4.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 2 +- .../maps/VerdanturfTown_FriendshipRatersHouse.inc | 2 +- data/scripts/players_house.inc | 8 +- 64 files changed, 229 insertions(+), 229 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 1ceb9a7c0..eb29c159d 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -388,7 +388,7 @@ gUnknown_0815F36C:: @ 815F36C lockall playse 2 message UnknownString_81A3A72 - doanimation 61 + dofieldeffect 61 waitstate waitmessage waitbutton @@ -449,7 +449,7 @@ gUnknown_0815F43A:: @ 815F43A lockall message UnknownString_81A3A72 playse 2 - doanimation 61 + dofieldeffect 61 waitstate waitmessage waitbutton @@ -520,7 +520,7 @@ EventScript_15F51D: end gUnknown_0815F523:: @ 815F523 - doanimation 52 + dofieldeffect 52 waitstate end @@ -1445,8 +1445,8 @@ do_heal_party:: @ 819FD7C waitmessage applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F waitmovement 0 - doanimation 25 - checkanimation 25 + dofieldeffect 25 + waitfieldeffect 25 applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty @@ -1814,13 +1814,13 @@ UseSurfScript:: @ 81A0117 compare RESULT, 6 goto_if_eq UseSurfScript_NoMon getpartypokename 0, RESULT - setanimation 0, RESULT + setfieldeffect 0, RESULT lockall msgbox UseSurfPromptText, 5 compare RESULT, 0 goto_if_eq UseSurfScript_No msgbox UsedSurfText, 4 - doanimation 9 + dofieldeffect 9 UseSurfScript_No: @ 81A014C releaseall UseSurfScript_NoMon: @ 81A014D @@ -1835,7 +1835,7 @@ Route103_EventScript_1A014E:: @ 81A014E Route110_EventScript_1A014E:: @ 81A014E Route119_EventScript_1A014E:: @ 81A014E RustboroCity_EventScript_1A014E:: @ 81A014E - checkgender + checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_1A0166 compare RESULT, 1 @@ -1853,7 +1853,7 @@ RustboroCity_EventScript_1A016C:: @ 81A016C LavaridgeTown_EventScript_1A0172:: @ 81A0172 Route110_EventScript_1A0172:: @ 81A0172 Route119_EventScript_1A0172:: @ 81A0172 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_1A018A compare RESULT, 1 @@ -2291,7 +2291,7 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0 lockall waitse - pokecry SPECIES_GROUDON_OR_KYOGRE, 2 + playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 waitpokecry setvar 0x4005, 1 releaseall @@ -2346,7 +2346,7 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE waitse - pokecry SPECIES_ELECTRODE, 2 + playpokecry SPECIES_ELECTRODE, 2 delay 40 waitpokecry setflag 977 @@ -2362,7 +2362,7 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE waitse - pokecry SPECIES_ELECTRODE, 2 + playpokecry SPECIES_ELECTRODE, 2 delay 40 waitpokecry setflag 978 @@ -2445,7 +2445,7 @@ Route119_EventScript_1A05C3:: @ 81A05C3 applymovement LAST_TALKED, Route119_Movement_1A0662 waitmovement 0 waitse - pokecry SPECIES_KECLEON, 2 + playpokecry SPECIES_KECLEON, 2 delay 40 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE @@ -3600,7 +3600,7 @@ gUnknown_081A2C51:: @ 81A2C51 compare RESULT, 1 goto_if_eq EventScript_1A2E45 checkpokemove MOVE_SECRET_POWER - setanimation 0, RESULT + setfieldeffect 0, RESULT getmovename 1, MOVE_SECRET_POWER compare 0x8007, 1 goto_if_eq EventScript_1A2CB0 @@ -3626,14 +3626,14 @@ EventScript_1A2CB0: goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage - doanimation 11 + dofieldeffect 11 waitstate goto EventScript_1A2CFA end gUnknown_081A2CE6:: @ 81A2CE6 lockall - doanimation 11 + dofieldeffect 11 waitstate goto EventScript_1A2CFA end @@ -3657,14 +3657,14 @@ EventScript_1A2D08: goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage - doanimation 26 + dofieldeffect 26 waitstate goto EventScript_1A2D52 end gUnknown_081A2D3E:: @ 81A2D3E lockall - doanimation 26 + dofieldeffect 26 waitstate goto EventScript_1A2D52 end @@ -3688,14 +3688,14 @@ EventScript_1A2D60: goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage - doanimation 27 + dofieldeffect 27 waitstate goto EventScript_1A2DAA end gUnknown_081A2D96:: @ 81A2D96 lockall - doanimation 27 + dofieldeffect 27 waitstate goto EventScript_1A2DAA end @@ -3771,7 +3771,7 @@ EventScript_1A2E45: checkpokemove MOVE_SECRET_POWER compare RESULT, 6 goto_if_eq EventScript_1A2EF7 - setanimation 0, RESULT + setfieldeffect 0, RESULT setorcopyvar 0x8004, RESULT lockall special GetSecretBaseNearbyMapName @@ -4763,7 +4763,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F .include "data/text/magma_summit.inc" gUnknown_081B694A:: @ 81B694A - lighten 1 + animdarklevel 1 setdarklevel 1 end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index a3fbce103..c36f95460 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -5,7 +5,7 @@ S_CuttableTree:: @ 81B0DCC checkpokemove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut - setanimation 0, RESULT + setfieldeffect 0, RESULT getpartypokename 0, RESULT getmovename 1, MOVE_CUT msgbox UseCutPromptText, 5 @@ -13,14 +13,14 @@ S_CuttableTree:: @ 81B0DCC goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage - doanimation 2 + dofieldeffect 2 waitstate goto DoTreeCutMovement end S_UseCut:: @ 81B0E16 lockall - doanimation 2 + dofieldeffect 2 waitstate goto DoTreeCutMovement end @@ -63,7 +63,7 @@ S_BreakableRock:: @ 81B0EB7 checkpokemove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash - setanimation 0, RESULT + setfieldeffect 0, RESULT getpartypokename 0, RESULT getmovename 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 @@ -71,14 +71,14 @@ S_BreakableRock:: @ 81B0EB7 goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage - doanimation 37 + dofieldeffect 37 waitstate goto DoRockSmashMovement end S_UseRockSmash:: @ 81B0F01 lockall - doanimation 37 + dofieldeffect 37 waitstate goto DoRockSmashMovement end @@ -132,19 +132,19 @@ S_PushableBoulder:: @ 81B0FCB checkpokemove 70 compare RESULT, 6 goto_if_eq CannotUseStrength - setanimation 0, RESULT + setfieldeffect 0, RESULT msgbox UseStrengthPromptText, 5 compare RESULT, 0 goto_if_eq Strength_ChoseNo closemessage - doanimation 40 + dofieldeffect 40 waitstate goto UsedStrength end S_UseStrength:: @ 81B100E lockall - doanimation 40 + dofieldeffect 40 waitstate goto UsedStrength end @@ -194,12 +194,12 @@ S_UseWaterfall:: @ 81B115A compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows getpartypokename 0, RESULT - setanimation 0, RESULT + setfieldeffect 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 - doanimation 43 + dofieldeffect 43 goto Waterfall_Done S_CannotUseWaterfall:: @ 81B1194 @@ -227,13 +227,13 @@ UseDiveScript:: @ 81B1220 compare RESULT, 6 goto_if_eq CannotUseDive getpartypokename 0, RESULT - setanimation 0, RESULT - setanimation 1, 1 + setfieldeffect 0, RESULT + setfieldeffect 1, 1 msgbox UseDivePromptText, 5 compare RESULT, 0 goto_if_eq Dive_Done msgbox UsedDiveText, 4 - doanimation 44 + dofieldeffect 44 goto Dive_Done lockall @@ -250,13 +250,13 @@ S_UseDiveUnderwater:: @ 81B1269 compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive getpartypokename 0, RESULT - setanimation 0, RESULT - setanimation 1, 1 + setfieldeffect 0, RESULT + setfieldeffect 1, 1 msgbox UnderwaterUseDivePromptText, 5 compare RESULT, 0 goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 - doanimation 44 + dofieldeffect 44 goto UnderwaterDive_Done UnderwaterCannotUseDive: @ 81B12A7 diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 414c2df52..a72341143 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -154,14 +154,14 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_fadescreen @ 0x97 .4byte ScrCmd_fadescreendelay @ 0x98 .4byte ScrCmd_setdarklevel @ 0x99 - .4byte ScrCmd_lighten @ 0x9A - .4byte ScrCmd_message2 @ 0x9B - .4byte ScrCmd_doanimation @ 0x9C - .4byte ScrCmd_setanimation @ 0x9D - .4byte ScrCmd_checkanimation @ 0x9E + .4byte ScrCmd_animdarklevel @ 0x9A + .4byte ScrCmd_messageautoscroll @ 0x9B + .4byte ScrCmd_dofieldeffect @ 0x9C + .4byte ScrCmd_setfieldeffect @ 0x9D + .4byte ScrCmd_waitfieldeffect @ 0x9E .4byte ScrCmd_sethealplace @ 0x9F - .4byte ScrCmd_checkgender @ 0xA0 - .4byte ScrCmd_pokecry @ 0xA1 + .4byte ScrCmd_checkplayergender @ 0xA0 + .4byte ScrCmd_playpokecry @ 0xA1 .4byte ScrCmd_setmaptile @ 0xA2 .4byte ScrCmd_resetweather @ 0xA3 .4byte ScrCmd_setweather @ 0xA4 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 63209e77b..009dc8dff 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -219,7 +219,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E special SavePlayerParty special LoadPlayerBag copyvar 0x4087, 0x8004 - message2 OldaleTown_PokemonCenter_2F_Text_1A4A22 + messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmaptile 5, 3, 514, 0 special DrawWholeMapView @@ -384,7 +384,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 setvar 0x8004, 3 copyvar 0x4087, 0x8004 - message2 OldaleTown_PokemonCenter_2F_Text_1A4A22 + messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmaptile 8, 3, 514, 0 special DrawWholeMapView @@ -482,7 +482,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 setvar 0x8004, 4 copyvar 0x4087, 0x8004 - message2 OldaleTown_PokemonCenter_2F_Text_1A4A22 + messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmaptile 11, 3, 514, 0 special DrawWholeMapView @@ -797,7 +797,7 @@ TradeRoom_PromptToCancelLink:: @ 81A44E5 end TradeRoom_TerminateLink:: @ 81A44FE - message2 TradeRoom_TerminatingLink + messageautoscroll TradeRoom_TerminatingLink waitmessage special sub_80839D0 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 56499fced..6209a8e6d 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -276,7 +276,7 @@ LinkContestRoom1_EventScript_1A525F:: @ 81A525F return LinkContestRoom1_EventScript_1A5273:: @ 81A5273 - message2 LinkContestRoom1_Text_1A6976 + messageautoscroll LinkContestRoom1_Text_1A6976 waitmessage return @@ -364,7 +364,7 @@ LinkContestRoom1_EventScript_1A535E:: @ 81A535E return LinkContestRoom1_EventScript_1A5370:: @ 81A5370 - message2 LinkContestRoom1_Text_1A6A04 + messageautoscroll LinkContestRoom1_Text_1A6A04 waitmessage return @@ -391,7 +391,7 @@ LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3 return LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7 - message2 LinkContestRoom1_Text_1A6A1F + messageautoscroll LinkContestRoom1_Text_1A6A1F waitmessage return @@ -402,7 +402,7 @@ LinkContestRoom1_EventScript_1A53CE:: @ 81A53CE return LinkContestRoom1_EventScript_1A53DF:: @ 81A53DF - message2 LinkContestRoom1_Text_1A6AE1 + messageautoscroll LinkContestRoom1_Text_1A6AE1 return LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 @@ -788,7 +788,7 @@ LinkContestRoom1_EventScript_1A5930:: @ 81A5930 return LinkContestRoom1_EventScript_1A5944:: @ 81A5944 - message2 LinkContestRoom1_Text_1A6AF5 + messageautoscroll LinkContestRoom1_Text_1A6AF5 return LinkContestRoom1_EventScript_1A594A:: @ 81A594A @@ -815,7 +815,7 @@ LinkContestRoom1_EventScript_1A5984:: @ 81A5984 return LinkContestRoom1_EventScript_1A5998:: @ 81A5998 - message2 LinkContestRoom1_Text_1A6C06 + messageautoscroll LinkContestRoom1_Text_1A6C06 waitmessage delay 30 return @@ -827,7 +827,7 @@ LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 return LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 - message2 LinkContestRoom1_Text_1A6C21 + messageautoscroll LinkContestRoom1_Text_1A6C21 waitmessage delay 30 return @@ -839,7 +839,7 @@ LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 return LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 - message2 LinkContestRoom1_Text_1A6C9D + messageautoscroll LinkContestRoom1_Text_1A6C9D waitmessage delay 30 return @@ -851,7 +851,7 @@ LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE return LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 - message2 LinkContestRoom1_Text_1A6D16 + messageautoscroll LinkContestRoom1_Text_1A6D16 waitmessage delay 30 return @@ -901,7 +901,7 @@ LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 return LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 - message2 LinkContestRoom1_Text_1A6D3C + messageautoscroll LinkContestRoom1_Text_1A6D3C waitmessage return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 23e61063c..43084cc96 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -110,7 +110,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialvar 0x8005, sub_8042328 waitse - pokecry 0x8005, 0 + playpokecry 0x8005, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 waitpokecry special Daycare_SendPokemon_Special @@ -211,7 +211,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse - pokecry RESULT, 0 + playpokecry RESULT, 0 msgbox Route117_PokemonDayCare_Text_1B2B93, 4 waitpokecry specialvar RESULT, sp0B6_daycare diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index cc9074e35..eb5c1dccd 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -39,14 +39,14 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B delay 20 - setanimation 0, 10 - setanimation 1, 10 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 10 + setfieldeffect 1, 10 + setfieldeffect 2, 0 + dofieldeffect 54 specialvar RESULT, sub_810F4D4 compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B - checkanimation 54 + waitfieldeffect 54 delay 10 end @@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 delay 20 compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B - checkanimation 54 + waitfieldeffect 54 delay 10 end @@ -69,39 +69,39 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB delay 20 - setanimation 0, 8 - setanimation 1, 5 - setanimation 2, 0 - doanimation 54 - setanimation 0, 11 - setanimation 1, 3 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 8 + setfieldeffect 1, 5 + setfieldeffect 2, 0 + dofieldeffect 54 + setfieldeffect 0, 11 + setfieldeffect 1, 3 + setfieldeffect 2, 0 + dofieldeffect 54 specialvar RESULT, sub_810F4FC compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B - checkanimation 54 + waitfieldeffect 54 delay 10 end AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 delay 20 - setanimation 0, 16 - setanimation 1, 3 - setanimation 2, 0 - doanimation 54 - setanimation 0, 25 - setanimation 1, 2 - setanimation 2, 0 - doanimation 54 - setanimation 0, 24 - setanimation 1, 6 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 16 + setfieldeffect 1, 3 + setfieldeffect 2, 0 + dofieldeffect 54 + setfieldeffect 0, 25 + setfieldeffect 1, 2 + setfieldeffect 2, 0 + dofieldeffect 54 + setfieldeffect 0, 24 + setfieldeffect 1, 6 + setfieldeffect 2, 0 + dofieldeffect 54 specialvar RESULT, sub_810F4B0 compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B - checkanimation 54 + waitfieldeffect 54 delay 10 end @@ -109,31 +109,31 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A end AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B - setanimation 0, 42 - setanimation 1, 10 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 42 + setfieldeffect 1, 10 + setfieldeffect 2, 0 + dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B - setanimation 0, 20 - setanimation 1, 5 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 20 + setfieldeffect 1, 5 + setfieldeffect 2, 0 + dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B - setanimation 0, 1 - setanimation 1, 12 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 1 + setfieldeffect 1, 12 + setfieldeffect 2, 0 + dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B - setanimation 0, 1 - setanimation 1, 2 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 1 + setfieldeffect 1, 2 + setfieldeffect 2, 0 + dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 6f6499b26..188691e73 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -58,7 +58,7 @@ AncientTomb_EventScript_15F050:: @ 815F050 lock faceplayer waitse - pokecry SPECIES_REGISTEEL, 2 + playpokecry SPECIES_REGISTEEL, 2 delay 40 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 503b9f1a8..e8270030b 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -38,11 +38,11 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special WaitWeather waitstate playse 209 - setanimation 0, 9 - setanimation 1, 13 - setanimation 2, 0 - doanimation 54 - checkanimation 54 + setfieldeffect 0, 9 + setfieldeffect 1, 13 + setfieldeffect 2, 0 + dofieldeffect 54 + waitfieldeffect 54 .ifdef SAPPHIRE setvar RESULT, 3 .else @@ -58,7 +58,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 delay 60 setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE waitse - pokecry SPECIES_GROUDON_OR_KYOGRE, 2 + playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 waitpokecry setflag 2145 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 93cbb8fe8..9f6f7b388 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -58,7 +58,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 lock faceplayer waitse - pokecry SPECIES_REGIROCK, 2 + playpokecry SPECIES_REGIROCK, 2 delay 40 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 65556c739..92776afb1 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -57,25 +57,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 playse 35 - lighten 3 + animdarklevel 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 playse 35 - lighten 2 + animdarklevel 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C playse 35 - lighten 1 + animdarklevel 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 playse 35 - lighten 0 + animdarklevel 0 call DewfordTown_Gym_EventScript_153071 return diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/scripts/maps/DewfordTown_House1.inc index 321e376bd..e8897b974 100644 --- a/data/scripts/maps/DewfordTown_House1.inc +++ b/data/scripts/maps/DewfordTown_House1.inc @@ -13,7 +13,7 @@ DewfordTown_House1_EventScript_153001:: @ 8153001 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox DewfordTown_House1_Text_174CC8, 4 waitpokecry release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index febd6a521..90df9ab4e 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -52,14 +52,14 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closemessage playse 8 - checkgender + checkplayergender compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD - checkgender + checkplayergender compare RESULT, 0 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 compare RESULT, 1 @@ -127,7 +127,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 - checkgender + checkplayergender compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB compare RESULT, 1 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index b53319abe..d9baaee89 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -38,12 +38,12 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841 waitmovement 0 delay 20 - doanimation 62 - checkanimation 62 + dofieldeffect 62 + waitfieldeffect 62 delay 40 setvar 0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 compare RESULT, 1 diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index d6d4ffd3b..13c8a9f2e 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -35,7 +35,7 @@ FallarborTown_EventScript_14E826:: @ 814E826 lock faceplayer waitse - pokecry SPECIES_AZURILL, 0 + playpokecry SPECIES_AZURILL, 0 msgbox FallarborTown_Text_16C92C, 4 waitpokecry release diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc index 0cf842ddf..e6f715697 100644 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ b/data/scripts/maps/FallarborTown_Mart.inc @@ -41,7 +41,7 @@ FallarborTown_Mart_EventScript_1539AE:: @ 81539AE lock faceplayer waitse - pokecry SPECIES_SKITTY, 0 + playpokecry SPECIES_SKITTY, 0 msgbox FallarborTown_Mart_Text_1770D3, 4 waitpokecry release diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 3cddff4f9..6ea89dcb7 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -76,7 +76,7 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 applymovement LAST_TALKED, FortreeCity_Movement_1A0662 waitmovement 0 waitse - pokecry SPECIES_KECLEON, 2 + playpokecry SPECIES_KECLEON, 2 delay 40 waitpokecry applymovement LAST_TALKED, FortreeCity_Movement_14CA13 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 3fb0f7745..7b7ef0b2e 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -58,7 +58,7 @@ FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House1_Text_185888, 4 waitpokecry release diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index fdd30022f..b261e14fb 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -60,7 +60,7 @@ FortreeCity_House4_EventScript_15821E:: @ 815821E lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox FortreeCity_House4_Text_18695C, 4 waitpokecry release diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/scripts/maps/FortreeCity_House5.inc index 59f80917e..fe10b53b0 100644 --- a/data/scripts/maps/FortreeCity_House5.inc +++ b/data/scripts/maps/FortreeCity_House5.inc @@ -13,7 +13,7 @@ FortreeCity_House5_EventScript_158244:: @ 8158244 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House5_Text_186A4F, 4 waitpokecry release diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 7a13cbe78..fc2930aa5 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -16,7 +16,7 @@ InsideOfTruck_MapScript1_15FC26:: @ 815FC26 InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall setflag 0x4000 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 compare RESULT, 1 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 55bd4103c..75399bde8 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -78,7 +78,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D lock faceplayer waitse - pokecry SPECIES_REGICE, 2 + playpokecry SPECIES_REGICE, 2 delay 40 waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index e0d54d0e7..5a4981f09 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -43,14 +43,14 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED waitmovement 0 applymovement 8, LavaridgeTown_Movement_1A0835 waitmovement 0 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E68F - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB compare RESULT, 1 @@ -69,12 +69,12 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 lock faceplayer setvar 0x8008, 0 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB compare RESULT, 1 diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/scripts/maps/LavaridgeTown_House.inc index dd5a9cc2b..c75cb9e4b 100644 --- a/data/scripts/maps/LavaridgeTown_House.inc +++ b/data/scripts/maps/LavaridgeTown_House.inc @@ -9,7 +9,7 @@ LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox LavaridgeTown_House_Text_176D94, 4 waitpokecry release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 76976543c..cf8e2e07d 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -247,7 +247,7 @@ LilycoveCity_EventScript_14CD3D:: @ 814CD3D LilycoveCity_EventScript_14CD46:: @ 814CD46 lock faceplayer - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CD60 compare RESULT, 1 @@ -415,11 +415,11 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 waitmovement 0 delay 50 - setanimation 0, 1 - doanimation 30 + setfieldeffect 0, 1 + dofieldeffect 30 delay 15 removeobject LAST_TALKED - checkanimation 30 + waitfieldeffect 30 savebgm 0 fadedefaultbgm setflag 292 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 2bd95eace..0b8d520ee 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -426,7 +426,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 compare RESULT, 6 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 - message2 LilycoveCity_ContestLobby_Text_18872A + messageautoscroll LilycoveCity_ContestLobby_Text_18872A waitmessage contestlinktransfer switch 0x8004 @@ -473,7 +473,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C addvar 0x8004, 1 getnumberstring 1, 32772 - message2 LilycoveCity_ContestLobby_Text_188845 + messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage addvar 0x8004, 65535 goto LilycoveCity_ContestLobby_EventScript_158DEE @@ -490,7 +490,7 @@ LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B lockall - message2 LilycoveCity_ContestLobby_Text_1888C6 + messageautoscroll LilycoveCity_ContestLobby_Text_1888C6 waitmessage delay 20 closemessage @@ -511,7 +511,7 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B waitmovement 0 applymovement 255, LilycoveCity_ContestLobby_Movement_158E99 waitmovement 0 - message2 LilycoveCity_ContestLobby_Text_1A6832 + messageautoscroll LilycoveCity_ContestLobby_Text_1A6832 waitmessage delay 20 closemessage diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 80fda6d59..a4e6af419 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -134,7 +134,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 lock faceplayer waitse - pokecry SPECIES_AZUMARILL, 0 + playpokecry SPECIES_AZUMARILL, 0 msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4 waitpokecry release diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/scripts/maps/LilycoveCity_House1.inc index 6440f6d3d..4defe37b8 100644 --- a/data/scripts/maps/LilycoveCity_House1.inc +++ b/data/scripts/maps/LilycoveCity_House1.inc @@ -9,7 +9,7 @@ LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F lock faceplayer waitse - pokecry SPECIES_KECLEON, 0 + playpokecry SPECIES_KECLEON, 0 msgbox LilycoveCity_House1_Text_18B82B, 4 waitpokecry release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 095862fd6..af1d0cc1e 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -54,7 +54,7 @@ LittlerootTown_EventScript_14D59A:: @ 814D59A LittlerootTown_EventScript_14D5A6:: @ 814D5A6 clearflag 752 setobjectmovementtype 4, 8 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D5C5 compare RESULT, 1 @@ -333,7 +333,7 @@ LittlerootTown_EventScript_14D7FF:: @ 814D7FF LittlerootTown_EventScript_14D808:: @ 814D808 lockall - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D822 compare RESULT, 1 @@ -351,7 +351,7 @@ LittlerootTown_EventScript_14D82B:: @ 814D82B LittlerootTown_EventScript_14D834:: @ 814D834 lockall - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D84E compare RESULT, 1 @@ -406,25 +406,25 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA end LittlerootTown_EventScript_14D8B6:: @ 814D8B6 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D93C compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D947 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closemessage - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D952 compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14DAAA compare RESULT, 1 @@ -841,7 +841,7 @@ LittlerootTown_Movement_14DCE0:: @ 814DCE0 LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock faceplayer - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 30b2d6eef..04256cacb 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -17,7 +17,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 return LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 return diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 1f4b301c0..8ff7f8b81 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -22,14 +22,14 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA .2byte 0 LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 end @ 81527F1 lockall - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A compare RESULT, 1 @@ -50,7 +50,7 @@ gUnknown_0815281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E lockall - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 45eb481e4..14c7f5d8a 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -17,7 +17,7 @@ LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E return LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 - checkgender + checkplayergender compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE return @@ -116,7 +116,7 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 @ 81529C7 lockall - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index b35ee81a9..68bdf0fcb 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -22,7 +22,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 .2byte 0 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 - checkgender + checkplayergender compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 end @@ -32,7 +32,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall checkflag 292 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare RESULT, 1 @@ -112,7 +112,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB compare RESULT, 1 @@ -193,7 +193,7 @@ gUnknown_08152C39:: @ 8152C39 LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 lockall - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index d7aab95a6..e7ccd73f6 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -123,7 +123,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA waitmovement 0 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 waitmovement 0 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 compare RESULT, 1 @@ -187,7 +187,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 lock faceplayer - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE compare RESULT, 1 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index b1954a6cf..f7f66b843 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -13,7 +13,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox MossdeepCity_House2_Text_18D61E, 4 waitpokecry closemessage diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 205f10313..fd173899d 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -35,7 +35,7 @@ MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 lock faceplayer waitse - pokecry SPECIES_SKITTY, 0 + playpokecry SPECIES_SKITTY, 0 msgbox MossdeepCity_House4_Text_18E1E1, 4 waitpokecry release diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 0627fc53b..2d2a46ab4 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -166,7 +166,7 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - pokecry SPECIES_VOLTORB, 2 + playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry setflag 974 @@ -181,7 +181,7 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - pokecry SPECIES_VOLTORB, 2 + playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry setflag 975 @@ -196,7 +196,7 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - pokecry SPECIES_VOLTORB, 2 + playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry setflag 976 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 2d84a6f92..e80df2cd2 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -256,7 +256,7 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 end OldaleTown_EventScript_14DF92:: @ 814DF92 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DFAA compare RESULT, 1 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index f3a198a08..e04a8caae 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -81,7 +81,7 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267 lock faceplayer waitse - pokecry SPECIES_AZURILL, 0 + playpokecry SPECIES_AZURILL, 0 msgbox PacifidlogTown_House2_Text_17938B, 4 waitpokecry msgbox PacifidlogTown_House2_Text_17939B, 4 @@ -92,7 +92,7 @@ PacifidlogTown_House2_EventScript_154282:: @ 8154282 lock faceplayer waitse - pokecry SPECIES_AZURILL, 2 + playpokecry SPECIES_AZURILL, 2 msgbox PacifidlogTown_House2_Text_1793CC, 4 waitpokecry msgbox PacifidlogTown_House2_Text_1793DD, 4 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index c9ebf9511..ff0ccce30 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -9,7 +9,7 @@ Route103_MapScript1_14EB87:: @ 814EB87 Route103_EventScript_14EB92:: @ 814EB92 lockall - checkgender + checkplayergender compare RESULT, 0 goto_if_eq Route103_EventScript_14EBAB compare RESULT, 1 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index d388d1c7a..f24e92cd4 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -92,7 +92,7 @@ Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1 lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox Route104_MrBrineysHouse_Text_191FB9, 4 waitpokecry release diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index be296d403..501ca5e0e 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -360,7 +360,7 @@ Route109_EventScript_14F788:: @ 814F788 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox Route109_Text_16E5CA, 4 waitpokecry release diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index afbfebcc2..146be5959 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -325,7 +325,7 @@ Route110_EventScript_14FD29:: @ 814FD29 Route110_EventScript_14FD34:: @ 814FD34 lockall - checkgender + checkplayergender compare RESULT, 0 call_if 1, Route110_EventScript_14FDA7 compare RESULT, 1 @@ -343,7 +343,7 @@ Route110_EventScript_14FD34:: @ 814FD34 call_if 1, Route110_EventScript_14FF1F compare 0x8008, 3 call_if 1, Route110_EventScript_14FF2A - checkgender + checkplayergender compare RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 compare RESULT, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index cf192345c..568ba2af6 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -757,10 +757,10 @@ Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B return Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920 - setanimation 0, 32772 - setanimation 1, 32773 - setanimation 2, 32774 - doanimation 54 - checkanimation 54 + setfieldeffect 0, 32772 + setfieldeffect 1, 32773 + setfieldeffect 2, 32774 + dofieldeffect 54 + waitfieldeffect 54 delay 10 return diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 95d321e0b..0730db23a 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -47,7 +47,7 @@ Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer waitse - pokecry SPECIES_POOCHYENA, 2 + playpokecry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 waitpokecry release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 7d5acea77..2179a7e18 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -51,7 +51,7 @@ Route119_EventScript_1511D0:: @ 81511D0 Route119_EventScript_1511DB:: @ 81511DB lockall addobject 25 - checkgender + checkplayergender compare RESULT, 0 call_if 1, Route119_EventScript_151254 compare RESULT, 1 @@ -71,7 +71,7 @@ Route119_EventScript_1511DB:: @ 81511DB removeobject 25 addobject 16 delay 30 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq Route119_EventScript_15125E compare RESULT, 1 diff --git a/data/scripts/maps/Route119_House.inc b/data/scripts/maps/Route119_House.inc index ea963dee0..42cc89068 100644 --- a/data/scripts/maps/Route119_House.inc +++ b/data/scripts/maps/Route119_House.inc @@ -9,7 +9,7 @@ Route119_House_EventScript_163DE7:: @ 8163DE7 lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox Route119_House_Text_19F406, 4 waitpokecry release diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index d5807ae94..868d00324 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -222,7 +222,7 @@ Route120_EventScript_15189D:: @ 815189D applymovement 30, Route120_Movement_1A0662 waitmovement 0 waitse - pokecry SPECIES_KECLEON, 2 + playpokecry SPECIES_KECLEON, 2 delay 40 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE @@ -245,11 +245,11 @@ Route120_EventScript_151908:: @ 8151908 applymovement 31, Route120_Movement_1A0845 waitmovement 0 delay 50 - setanimation 0, 1 - doanimation 30 + setfieldeffect 0, 1 + dofieldeffect 30 delay 15 removeobject 31 - checkanimation 30 + waitfieldeffect 30 setmaptile 13, 15, 663, 0 setmaptile 12, 16, 671, 0 setmaptile 12, 17, 161, 0 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 3b2c99591..615662fc1 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -52,9 +52,9 @@ Route128_EventScript_15213F:: @ 815213F removeobject 5 removeobject 4 delay 100 - setanimation 0, 1 - doanimation 30 - checkanimation 30 + setfieldeffect 0, 1 + dofieldeffect 30 + waitfieldeffect 30 addobject 3 applymovement 3, Route128_Movement_15226F waitmovement 0 @@ -77,11 +77,11 @@ Route128_EventScript_15213F:: @ 815213F applymovement 3, Route128_Movement_1A0845 waitmovement 0 delay 50 - setanimation 0, 1 - doanimation 30 + setfieldeffect 0, 1 + dofieldeffect 30 delay 15 removeobject 3 - checkanimation 30 + waitfieldeffect 30 setvar 0x407b, 2 releaseall end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 955726d89..916eb8108 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -551,7 +551,7 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA faceplayer checkflag 288 goto_if_eq RustboroCity_EventScript_14C917 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD compare RESULT, 1 @@ -571,7 +571,7 @@ RustboroCity_EventScript_14C90A:: @ 814C90A end RustboroCity_EventScript_14C917:: @ 814C917 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F compare RESULT, 1 diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/scripts/maps/RustboroCity_Flat2_1F.inc index f22f6cc90..b6b8b41b1 100644 --- a/data/scripts/maps/RustboroCity_Flat2_1F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc @@ -9,7 +9,7 @@ RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 lock faceplayer waitse - pokecry SPECIES_SKITTY, 0 + playpokecry SPECIES_SKITTY, 0 msgbox RustboroCity_Flat2_1F_Text_185410, 4 waitpokecry release diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/scripts/maps/RustboroCity_House3.inc index b219563be..a5088175e 100644 --- a/data/scripts/maps/RustboroCity_House3.inc +++ b/data/scripts/maps/RustboroCity_House3.inc @@ -13,7 +13,7 @@ RustboroCity_House3_EventScript_157DFF:: @ 8157DFF lock faceplayer waitse - pokecry SPECIES_PIKACHU, 0 + playpokecry SPECIES_PIKACHU, 0 msgbox RustboroCity_House3_Text_18567D, 4 waitpokecry release diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index b11304607..28f6f0ad4 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -300,7 +300,7 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox RusturfTunnel_Text_194188, 4 waitpokecry release @@ -332,7 +332,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA message RusturfTunnel_Text_19434F waitmessage waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 waitbutton waitpokecry closemessage diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 3edfdd7bb..2c55a9443 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -88,7 +88,7 @@ SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox SSTidalCorridor_Text_199388, 4 waitpokecry release diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index ee404404e..19ac9a036 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -79,11 +79,11 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar RESULT, 0 .endif playse 209 - setanimation 0, 16 - setanimation 1, 42 - setanimation 2, 0 - doanimation 54 - checkanimation 54 + setfieldeffect 0, 16 + setfieldeffect 1, 42 + setfieldeffect 2, 0 + dofieldeffect 54 + waitfieldeffect 54 .ifdef SAPPHIRE setvar RESULT, 0 .else diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index f5ee60d6d..1dee6e9c4 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -16,7 +16,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 faceplayer setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE waitse - pokecry SPECIES_RAYQUAZA, 2 + playpokecry SPECIES_RAYQUAZA, 2 delay 40 waitpokecry setflag 773 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index fa66113b1..4195ad43a 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -236,7 +236,7 @@ SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 lock faceplayer waitse - pokecry SPECIES_SKITTY, 0 + playpokecry SPECIES_SKITTY, 0 msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4 waitpokecry release @@ -246,7 +246,7 @@ SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox SlateportCity_PokemonFanClub_Text_17E164, 4 waitpokecry release @@ -256,7 +256,7 @@ SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 lock faceplayer waitse - pokecry SPECIES_AZUMARILL, 0 + playpokecry SPECIES_AZUMARILL, 0 msgbox SlateportCity_PokemonFanClub_Text_17E178, 4 waitpokecry release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index a1ecffbd2..bddc5965d 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -461,10 +461,10 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 waitmovement 0 delay 50 - setanimation 0, 1 - doanimation 30 + setfieldeffect 0, 1 + dofieldeffect 30 delay 15 removeobject LAST_TALKED - checkanimation 30 + waitfieldeffect 30 release end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index ccfec8036..4877d6d6e 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -22,7 +22,7 @@ SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 lock faceplayer waitse - pokecry SPECIES_KECLEON, 0 + playpokecry SPECIES_KECLEON, 0 msgbox SootopolisCity_House1_Text_18FA50, 4 waitpokecry release diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/scripts/maps/SootopolisCity_House4.inc index ac9a641d6..c192a0340 100644 --- a/data/scripts/maps/SootopolisCity_House4.inc +++ b/data/scripts/maps/SootopolisCity_House4.inc @@ -13,7 +13,7 @@ SootopolisCity_House4_EventScript_15B35F:: @ 815B35F lock faceplayer waitse - pokecry SPECIES_AZUMARILL, 0 + playpokecry SPECIES_AZUMARILL, 0 msgbox SootopolisCity_House4_Text_18FDD8, 4 waitpokecry release diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index f4ec0ab2f..bcb316f96 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -22,7 +22,7 @@ SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C end SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq SouthernIsland_Interior_EventScript_160B8F compare RESULT, 1 @@ -54,7 +54,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 waitmovement 0 delay 50 waitse - pokecry SPECIES_LATIAS_OR_LATIOS, 0 + playpokecry SPECIES_LATIAS_OR_LATIOS, 0 delay 30 waitpokecry addobject 2 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 0c621d237..6b7854dc9 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -413,7 +413,7 @@ FallarborTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB - checkgender + checkplayergender compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 compare RESULT, 1 diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index 0dcad8f62..1cfa785d3 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -56,7 +56,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 lock faceplayer waitse - pokecry SPECIES_PIKACHU, 0 + playpokecry SPECIES_PIKACHU, 0 msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4 waitpokecry release diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 01fc63f20..7e42fffb4 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -68,7 +68,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB setflag 81 setflag 754 setflag 755 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 compare RESULT, 1 @@ -313,7 +313,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CA6:: @ 81B6CA6 lock faceplayer waitse - pokecry SPECIES_MACHOKE, 0 + playpokecry SPECIES_MACHOKE, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, 4 waitpokecry release @@ -324,7 +324,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9 lock faceplayer waitse - pokecry SPECIES_MACHOKE, 0 + playpokecry SPECIES_MACHOKE, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172831, 4 waitpokecry release @@ -361,7 +361,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6CDC:: @ 81B6CDC LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE lockall - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD compare RESULT, 1 -- cgit v1.2.3 From 6c9249af37b380ee5f5b00ed24013bfc46bf1bae Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:32:19 -0500 Subject: fix more command names --- data/script_cmd_table.inc | 20 ++-- data/scripts/cable_club.inc | 24 ++-- data/scripts/contest_hall.inc | 124 ++++++++++----------- data/scripts/maps/BattleTower_Lobby.inc | 8 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 +- data/scripts/maps/DewfordTown.inc | 16 +-- data/scripts/maps/LavaridgeTown.inc | 8 +- data/scripts/maps/LittlerootTown.inc | 88 +++++++-------- data/scripts/maps/Route104.inc | 10 +- data/scripts/maps/Route109.inc | 10 +- data/scripts/maps/Route111.inc | 8 +- data/scripts/maps/Route130.inc | 4 +- data/scripts/maps/Route131.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 4 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 4 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 116 +++++++++---------- 17 files changed, 227 insertions(+), 227 deletions(-) (limited to 'data') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index a72341143..463d91201 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -167,16 +167,16 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_setweather @ 0xA4 .4byte ScrCmd_doweather @ 0xA5 .4byte ScrCmd_tileeffect @ 0xA6 - .4byte ScrCmd_setmapfooter @ 0xA7 - .4byte ScrCmd_spritelevelup @ 0xA8 - .4byte ScrCmd_restorespritelevel @ 0xA9 - .4byte ScrCmd_createvsprite @ 0xAA - .4byte ScrCmd_vspriteface @ 0xAB - .4byte ScrCmd_setdooropened @ 0xAC - .4byte ScrCmd_setdoorclosed @ 0xAD - .4byte ScrCmd_doorchange @ 0xAE - .4byte ScrCmd_setdooropened2 @ 0xAF - .4byte ScrCmd_setdoorclosed2 @ 0xB0 + .4byte ScrCmd_setmaplayoutindex @ 0xA7 + .4byte ScrCmd_setobjectpriority @ 0xA8 + .4byte ScrCmd_resetobjectpriority @ 0xA9 + .4byte ScrCmd_createvobject @ 0xAA + .4byte ScrCmd_turnvobject @ 0xAB + .4byte ScrCmd_opendoor @ 0xAC + .4byte ScrCmd_closedoor @ 0xAD + .4byte ScrCmd_waitdooranim @ 0xAE + .4byte ScrCmd_setdooropen @ 0xAF + .4byte ScrCmd_setdoorclosed @ 0xB0 .4byte ScrCmd_event_b1 @ 0xB1 .4byte ScrCmd_event_b2 @ 0xB2 .4byte ScrCmd_checkcoins @ 0xB3 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 009dc8dff..9f44e131b 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -229,13 +229,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B waitmovement 0 - setdooropened 5, 1 - doorchange + opendoor 5, 1 + waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 hideobject 255, 0, 0 - setdoorclosed 5, 1 - doorchange + closedoor 5, 1 + waitdooranim release compare 0x8004, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD @@ -394,13 +394,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B waitmovement 0 - setdooropened 8, 1 - doorchange + opendoor 8, 1 + waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 hideobject 255, 0, 0 - setdoorclosed 8, 1 - doorchange + closedoor 8, 1 + waitdooranim release goto OldaleTown_PokemonCenter_2F_EventScript_1A4325 @@ -492,13 +492,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 closemessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B waitmovement 0 - setdooropened 11, 1 - doorchange + opendoor 11, 1 + waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 hideobject 255, 0, 0 - setdoorclosed 11, 1 - doorchange + closedoor 11, 1 + waitdooranim release goto OldaleTown_PokemonCenter_2F_EventScript_1A4325 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 6209a8e6d..bad45e486 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -924,71 +924,71 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 return LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 - vspriteface 0, 1 - vspriteface 2, 1 - vspriteface 4, 4 - vspriteface 6, 1 - vspriteface 8, 1 - vspriteface 10, 1 - vspriteface 12, 1 - vspriteface 14, 1 - vspriteface 16, 1 - vspriteface 18, 1 - vspriteface 20, 4 - vspriteface 22, 4 - vspriteface 25, 4 - vspriteface 27, 3 - vspriteface 28, 4 + turnvobject 0, 1 + turnvobject 2, 1 + turnvobject 4, 4 + turnvobject 6, 1 + turnvobject 8, 1 + turnvobject 10, 1 + turnvobject 12, 1 + turnvobject 14, 1 + turnvobject 16, 1 + turnvobject 18, 1 + turnvobject 20, 4 + turnvobject 22, 4 + turnvobject 25, 4 + turnvobject 27, 3 + turnvobject 28, 4 delay 10 - vspriteface 0, 4 - vspriteface 2, 4 - vspriteface 4, 4 - vspriteface 6, 4 - vspriteface 8, 4 - vspriteface 10, 3 - vspriteface 12, 3 - vspriteface 14, 3 - vspriteface 16, 3 - vspriteface 18, 3 - vspriteface 20, 1 - vspriteface 22, 1 - vspriteface 25, 2 - vspriteface 27, 2 - vspriteface 28, 2 + turnvobject 0, 4 + turnvobject 2, 4 + turnvobject 4, 4 + turnvobject 6, 4 + turnvobject 8, 4 + turnvobject 10, 3 + turnvobject 12, 3 + turnvobject 14, 3 + turnvobject 16, 3 + turnvobject 18, 3 + turnvobject 20, 1 + turnvobject 22, 1 + turnvobject 25, 2 + turnvobject 27, 2 + turnvobject 28, 2 delay 10 - vspriteface 1, 2 - vspriteface 3, 2 - vspriteface 5, 2 - vspriteface 7, 2 - vspriteface 9, 4 - vspriteface 11, 2 - vspriteface 15, 2 - vspriteface 13, 2 - vspriteface 17, 2 - vspriteface 19, 2 - vspriteface 21, 3 - vspriteface 23, 3 - vspriteface 24, 3 - vspriteface 26, 4 - vspriteface 29, 3 - vspriteface 30, 3 + turnvobject 1, 2 + turnvobject 3, 2 + turnvobject 5, 2 + turnvobject 7, 2 + turnvobject 9, 4 + turnvobject 11, 2 + turnvobject 15, 2 + turnvobject 13, 2 + turnvobject 17, 2 + turnvobject 19, 2 + turnvobject 21, 3 + turnvobject 23, 3 + turnvobject 24, 3 + turnvobject 26, 4 + turnvobject 29, 3 + turnvobject 30, 3 delay 10 - vspriteface 1, 4 - vspriteface 3, 4 - vspriteface 5, 4 - vspriteface 7, 4 - vspriteface 9, 4 - vspriteface 11, 3 - vspriteface 15, 3 - vspriteface 13, 3 - vspriteface 17, 3 - vspriteface 19, 3 - vspriteface 21, 1 - vspriteface 23, 1 - vspriteface 24, 1 - vspriteface 26, 2 - vspriteface 29, 2 - vspriteface 30, 2 + turnvobject 1, 4 + turnvobject 3, 4 + turnvobject 5, 4 + turnvobject 7, 4 + turnvobject 9, 4 + turnvobject 11, 3 + turnvobject 15, 3 + turnvobject 13, 3 + turnvobject 17, 3 + turnvobject 19, 3 + turnvobject 21, 1 + turnvobject 23, 1 + turnvobject 24, 1 + turnvobject 26, 2 + turnvobject 29, 2 + turnvobject 30, 2 delay 10 return diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 5bb74d35b..b92ec258e 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -296,13 +296,13 @@ BattleTower_Lobby_EventScript_160664:: @ 8160664 applymovement 1, BattleTower_Lobby_Movement_160693 applymovement 255, BattleTower_Lobby_Movement_160693 waitmovement 0 - setdooropened 6, 1 - doorchange + opendoor 6, 1 + waitdooranim applymovement 1, BattleTower_Lobby_Movement_160697 applymovement 255, BattleTower_Lobby_Movement_16069A waitmovement 0 - setdoorclosed 6, 1 - doorchange + closedoor 6, 1 + waitdooranim return BattleTower_Lobby_Movement_160693:: @ 8160693 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index e8270030b..c6c3cd45e 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -14,9 +14,9 @@ CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 .ifdef SAPPHIRE - setmapfooter 163 + setmaplayoutindex 163 .else - setmapfooter 313 + setmaplayoutindex 313 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 checkflag 113 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 480a408e3..bdb7ca51a 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -118,8 +118,8 @@ DewfordTown_EventScript_14E147:: @ 814E147 DewfordTown_EventScript_14E151:: @ 814E151 call DewfordTown_EventScript_1A010C - spritelevelup 2, 0, 11, 0 - spritelevelup 255, 0, 11, 0 + setobjectpriority 2, 0, 11, 0 + setobjectpriority 255, 0, 11, 0 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 @@ -141,7 +141,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 setflag 743 hideobject 4, 0, 11 setvar 0x408e, 2 - restorespritelevel 255, 0, 11 + resetobjectpriority 255, 0, 11 warp Route104_MrBrineysHouse, 255, 5, 4 copyvar 0x4096, 0x8008 waitstate @@ -150,8 +150,8 @@ DewfordTown_EventScript_14E151:: @ 814E151 DewfordTown_EventScript_14E1D8:: @ 814E1D8 call DewfordTown_EventScript_1A010C - spritelevelup 2, 0, 11, 0 - spritelevelup 255, 0, 11, 1 + setobjectpriority 2, 0, 11, 0 + setobjectpriority 255, 0, 11, 1 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 @@ -168,7 +168,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 - spritelevelup 2, 0, 24, 0 + setobjectpriority 2, 0, 24, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 clearflag 741 @@ -182,8 +182,8 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 call_if 1, DewfordTown_EventScript_14E28A closemessage copyvar 0x4096, 0x8008 - restorespritelevel 255, 0, 11 - restorespritelevel 2, 0, 24 + resetobjectpriority 255, 0, 11 + resetobjectpriority 2, 0, 24 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 5a4981f09..85f323063 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -29,13 +29,13 @@ LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED lockall setvar 0x8008, 1 - setdooropened 12, 15 - doorchange + opendoor 12, 15 + waitdooranim addobject 8 applymovement 8, LavaridgeTown_Movement_14E70E waitmovement 0 - setdoorclosed 12, 15 - doorchange + closedoor 12, 15 + waitdooranim applymovement 8, LavaridgeTown_Movement_1A083F waitmovement 0 applymovement 255, LavaridgeTown_Movement_1A0843 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index af1d0cc1e..220aeead7 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -102,13 +102,13 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B playse 10 applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 - setdooropened 0x8004, 0x8005 - doorchange + opendoor 0x8004, 0x8005 + waitdooranim addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 - setdoorclosed 0x8004, 0x8005 - doorchange + closedoor 0x8004, 0x8005 + waitdooranim delay 10 applymovement 4, LittlerootTown_Movement_14D6AE waitmovement 0 @@ -117,16 +117,16 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 - setdooropened 0x8004, 0x8005 - doorchange + opendoor 0x8004, 0x8005 + waitdooranim applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD waitmovement 0 setflag 752 setvar 0x4092, 3 hideobject 255, 0, 0 - setdoorclosed 0x8004, 0x8005 - doorchange + closedoor 0x8004, 0x8005 + waitdooranim clearflag 868 clearflag 0x4000 return @@ -595,97 +595,97 @@ LittlerootTown_EventScript_14DB3B:: @ 814DB3B LittlerootTown_EventScript_14DB46:: @ 814DB46 applymovement 4, LittlerootTown_Movement_14DCB4 waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DB6C:: @ 814DB6C applymovement 4, LittlerootTown_Movement_14DCBA waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DB92:: @ 814DB92 applymovement 4, LittlerootTown_Movement_14DCC1 waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 applymovement 4, LittlerootTown_Movement_14DCC5 waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DBDE:: @ 814DBDE applymovement 4, LittlerootTown_Movement_14DCCA waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DC04:: @ 814DC04 applymovement 4, LittlerootTown_Movement_14DCCF waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DC2A:: @ 814DC2A applymovement 4, LittlerootTown_Movement_14DCD3 waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DC50:: @ 814DC50 applymovement 4, LittlerootTown_Movement_14DCDA waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_Movement_14DC76:: @ 814DC76 @@ -849,13 +849,13 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim goto LittlerootTown_EventScript_14DD2B end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b1e3d94ac..651f2afb4 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -124,8 +124,8 @@ Route104_EventScript_14EFCC:: @ 814EFCC end Route104_EventScript_14EFD5:: @ 814EFD5 - spritelevelup 8, 0, 19, 0 - spritelevelup 255, 0, 19, 0 + setobjectpriority 8, 0, 19, 0 + setobjectpriority 255, 0, 19, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 removeobject 8 @@ -144,7 +144,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - spritelevelup 2, 0, 11, 0 + setobjectpriority 2, 0, 11, 0 clearflag 740 applymovement 2, Route104_Movement_14F16F waitmovement 0 @@ -154,8 +154,8 @@ Route104_EventScript_14EFD5:: @ 814EFD5 setflag 742 hideobject 7, 0, 19 copyvar 0x4096, 0x8008 - restorespritelevel 255, 0, 19 - restorespritelevel 2, 0, 11 + resetobjectpriority 255, 0, 19 + resetobjectpriority 2, 0, 11 moveobjectoffscreen 2 setvar 0x408e, 0 checkflag 189 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 501ca5e0e..9f0ef8c8d 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -3,8 +3,8 @@ Route109_MapScripts:: @ 814F4D2 Route109_EventScript_14F4D3:: @ 814F4D3 call Route109_EventScript_1A010C - spritelevelup 2, 0, 24, 0 - spritelevelup 255, 0, 24, 0 + setobjectpriority 2, 0, 24, 0 + setobjectpriority 255, 0, 24, 0 applymovement 2, Route109_Movement_14F67B waitmovement 0 removeobject 2 @@ -46,7 +46,7 @@ Route109_EventScript_14F548:: @ 814F548 clearflag 743 setobjectxyperm 2, 12, 8 addobject 2 - spritelevelup 2, 0, 11, 0 + setobjectpriority 2, 0, 11, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 clearflag 740 @@ -55,8 +55,8 @@ Route109_EventScript_14F548:: @ 814F548 msgbox Route109_Text_16B4B5, 4 closemessage copyvar 0x4096, 0x8008 - restorespritelevel 255, 0, 24 - restorespritelevel 2, 0, 11 + resetobjectpriority 255, 0, 24 + resetobjectpriority 2, 0, 11 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index ec13ca3a3..545e62921 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -314,13 +314,13 @@ Route111_EventScript_1501F3:: @ 81501F3 end Route111_EventScript_150348:: @ 8150348 - setdooropened 13, 113 - doorchange + opendoor 13, 113 + waitdooranim return Route111_EventScript_15034F:: @ 815034F - setdoorclosed 13, 113 - doorchange + closedoor 13, 113 + waitdooranim return Route111_Movement_150356:: @ 8150356 diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 7c3c575dc..69da29471 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -22,11 +22,11 @@ Route130_MapScript1_1523C8:: @ 81523C8 setflag 30 setflag 31 setflag 32 - setmapfooter 264 + setmaplayoutindex 264 end Route130_EventScript_15240C:: @ 815240C - setmapfooter 46 + setmaplayoutindex 46 end Route130_EventScript_152410:: @ 8152410 diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 124788a17..50ad4222b 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -8,7 +8,7 @@ Route131_MapScript1_152444:: @ 8152444 end Route131_EventScript_15244E:: @ 815244E - setmapfooter 320 + setmaplayoutindex 320 return Route131_EventScript_152452:: @ 8152452 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 19ac9a036..eb3d108a6 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -6,9 +6,9 @@ SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC call SeafloorCavern_Room9_EventScript_1A0196 call SeafloorCavern_Room9_EventScript_1A01B5 .ifdef SAPPHIRE - setmapfooter 157 + setmaplayoutindex 157 .else - setmapfooter 327 + setmaplayoutindex 327 .endif end diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 983ab69d9..52d430db5 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -9,11 +9,11 @@ ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E - setmapfooter 169 + setmaplayoutindex 169 end ShoalCave_LowTideEntranceRoom_EventScript_15E072:: @ 815E072 - setmapfooter 165 + setmaplayoutindex 165 end ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 05fc6a315..ada997023 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -9,11 +9,11 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB - setmapfooter 170 + setmaplayoutindex 170 end ShoalCave_LowTideInnerRoom_EventScript_15E1AF:: @ 815E1AF - setmapfooter 166 + setmaplayoutindex 166 end ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 6b7854dc9..a3a1f711c 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -302,73 +302,73 @@ LinkContestRoom1_EventScript_15F919:: @ 815F919 return LinkContestRoom1_EventScript_15F956:: @ 815F956 - createvsprite 5, 20, 3, 2, 3, 1 - createvsprite 46, 24, 11, 2, 3, 1 + createvobject 5, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 return LinkContestRoom1_EventScript_15F969:: @ 815F969 - createvsprite 45, 0, 2, 3, 3, 4 - createvsprite 66, 1, 2, 4, 3, 4 - createvsprite 55, 2, 2, 7, 3, 4 - createvsprite 46, 3, 2, 8, 3, 4 - createvsprite 5, 10, 12, 3, 3, 3 - createvsprite 20, 11, 12, 4, 3, 3 - createvsprite 24, 12, 12, 7, 3, 3 - createvsprite 12, 13, 12, 8, 3, 3 - createvsprite 47, 20, 3, 2, 3, 1 - createvsprite 46, 24, 11, 2, 3, 1 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 46, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 12, 13, 12, 8, 3, 3 + createvobject 47, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 return LinkContestRoom1_EventScript_15F9C4:: @ 815F9C4 - createvsprite 45, 0, 2, 3, 3, 4 - createvsprite 66, 1, 2, 4, 3, 4 - createvsprite 55, 2, 2, 7, 3, 4 - createvsprite 48, 3, 2, 8, 3, 4 - createvsprite 5, 10, 12, 3, 3, 3 - createvsprite 20, 11, 12, 4, 3, 3 - createvsprite 24, 12, 12, 7, 3, 3 - createvsprite 45, 13, 12, 8, 3, 3 - createvsprite 22, 20, 3, 2, 3, 1 - createvsprite 23, 20, 6, 2, 3, 1 - createvsprite 34, 20, 7, 2, 3, 1 - createvsprite 46, 24, 8, 2, 3, 1 - createvsprite 48, 24, 11, 2, 3, 1 - createvsprite 11, 25, 3, 9, 3, 2 - createvsprite 35, 26, 4, 9, 3, 2 - createvsprite 17, 27, 5, 9, 3, 2 - createvsprite 41, 28, 9, 9, 3, 2 - createvsprite 38, 29, 10, 9, 3, 2 - createvsprite 83, 30, 11, 9, 3, 2 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 48, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 22, 20, 3, 2, 3, 1 + createvobject 23, 20, 6, 2, 3, 1 + createvobject 34, 20, 7, 2, 3, 1 + createvobject 46, 24, 8, 2, 3, 1 + createvobject 48, 24, 11, 2, 3, 1 + createvobject 11, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 17, 27, 5, 9, 3, 2 + createvobject 41, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 return LinkContestRoom1_EventScript_15FA70:: @ 815FA70 - createvsprite 45, 0, 2, 3, 3, 4 - createvsprite 66, 1, 2, 4, 3, 4 - createvsprite 55, 2, 2, 7, 3, 4 - createvsprite 12, 3, 2, 8, 3, 4 - createvsprite 39, 4, 1, 3, 3, 4 - createvsprite 34, 6, 1, 5, 3, 4 - createvsprite 26, 7, 1, 6, 3, 4 - createvsprite 48, 9, 1, 8, 3, 4 - createvsprite 5, 10, 12, 3, 3, 3 - createvsprite 20, 11, 12, 4, 3, 3 - createvsprite 24, 12, 12, 7, 3, 3 - createvsprite 45, 13, 12, 8, 3, 3 - createvsprite 50, 14, 13, 3, 3, 3 - createvsprite 52, 15, 13, 4, 3, 3 - createvsprite 65, 17, 13, 6, 3, 3 - createvsprite 83, 18, 13, 7, 3, 3 - createvsprite 116, 19, 13, 8, 3, 3 - createvsprite 25, 20, 3, 2, 3, 1 - createvsprite 31, 21, 6, 2, 3, 1 - createvsprite 33, 22, 7, 2, 3, 1 - createvsprite 46, 24, 11, 2, 3, 1 - createvsprite 49, 25, 3, 9, 3, 2 - createvsprite 35, 26, 4, 9, 3, 2 - createvsprite 48, 27, 5, 9, 3, 2 - createvsprite 41, 28, 9, 9, 3, 2 - createvsprite 38, 29, 10, 9, 3, 2 - createvsprite 83, 30, 11, 9, 3, 2 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 12, 3, 2, 8, 3, 4 + createvobject 39, 4, 1, 3, 3, 4 + createvobject 34, 6, 1, 5, 3, 4 + createvobject 26, 7, 1, 6, 3, 4 + createvobject 48, 9, 1, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 50, 14, 13, 3, 3, 3 + createvobject 52, 15, 13, 4, 3, 3 + createvobject 65, 17, 13, 6, 3, 3 + createvobject 83, 18, 13, 7, 3, 3 + createvobject 116, 19, 13, 8, 3, 3 + createvobject 25, 20, 3, 2, 3, 1 + createvobject 31, 21, 6, 2, 3, 1 + createvobject 33, 22, 7, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + createvobject 49, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 48, 27, 5, 9, 3, 2 + createvobject 41, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 return LinkContestRoom1_EventScript_15FB64:: @ 815FB64 -- cgit v1.2.3 From 3505da56b15432062be0b49fc9d212b12f0bea15 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:40:07 -0500 Subject: fix more command names --- data/event_scripts.s | 4 +- data/script_cmd_table.inc | 26 +++++----- data/scripts/berry_tree.inc | 2 +- data/scripts/contest_hall.inc | 8 ++-- data/scripts/day_care.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 2 +- data/scripts/maps/DewfordTown.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- data/scripts/maps/LilycoveCity_Harbor.inc | 2 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 4 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 56 +++++++++++----------- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 4 +- data/scripts/maps/SeafloorCavern_Entrance.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 2 +- data/scripts/maps/UnknownMap_25_34.inc | 8 ++-- data/scripts/players_house.inc | 4 +- data/scripts/tv.inc | 2 +- 21 files changed, 71 insertions(+), 71 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index eb29c159d..854b52c9e 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1440,7 +1440,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B end do_heal_party:: @ 819FD7C - inccounter GAME_STAT_USED_POKECENTER + incrementgamestat GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon waitmessage applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F @@ -4374,7 +4374,7 @@ FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46 SlateportCity_OceanicMuseum_1F_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 special sub_80BDE48 - inccounter GAME_STAT_GOT_INTERVIEWED + incrementgamestat GAME_STAT_GOT_INTERVIEWED release end diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 463d91201..dd002fb1a 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -177,26 +177,26 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_waitdooranim @ 0xAE .4byte ScrCmd_setdooropen @ 0xAF .4byte ScrCmd_setdoorclosed @ 0xB0 - .4byte ScrCmd_event_b1 @ 0xB1 - .4byte ScrCmd_event_b2 @ 0xB2 + .4byte ScrCmd_addelevmenuitem @ 0xB1 + .4byte ScrCmd_showelevmenu @ 0xB2 .4byte ScrCmd_checkcoins @ 0xB3 .4byte ScrCmd_givecoins @ 0xB4 - .4byte ScrCmd_removecoins @ 0xB5 + .4byte ScrCmd_takecoins @ 0xB5 .4byte ScrCmd_setwildbattle @ 0xB6 .4byte ScrCmd_dowildbattle @ 0xB7 .4byte ScrCmd_setvaddress @ 0xB8 - .4byte ScrCmd_vjump @ 0xB9 + .4byte ScrCmd_vgoto @ 0xB9 .4byte ScrCmd_vcall @ 0xBA - .4byte ScrCmd_if5 @ 0xBB - .4byte ScrCmd_if6 @ 0xBC - .4byte ScrCmd_vtext @ 0xBD + .4byte ScrCmd_vgoto_if @ 0xBB + .4byte ScrCmd_vcall_if @ 0xBC + .4byte ScrCmd_vmessage @ 0xBD .4byte ScrCmd_vloadptr @ 0xBE - .4byte ScrCmd_vbuffer @ 0xBF - .4byte ScrCmd_showcoins @ 0xC0 - .4byte ScrCmd_hidecoins @ 0xC1 - .4byte ScrCmd_updatecoins @ 0xC2 - .4byte ScrCmd_inccounter @ 0xC3 - .4byte ScrCmd_warp6 @ 0xC4 + .4byte ScrCmd_vgetstring @ 0xBF + .4byte ScrCmd_showcoinsbox @ 0xC0 + .4byte ScrCmd_hidecoinsbox @ 0xC1 + .4byte ScrCmd_updatecoinsbox @ 0xC2 + .4byte ScrCmd_incrementgamestat @ 0xC3 + .4byte ScrCmd_setescapewarp @ 0xC4 .4byte ScrCmd_waitpokecry @ 0xC5 gScriptCmdTableEnd:: diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 344c2c18a..9e219a339 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -176,7 +176,7 @@ Route102_EventScript_1A1693:: @ 81A1693 Route102_EventScript_1A16A9:: @ 81A16A9 special FieldObjectInteractionPlantBerryTree - inccounter GAME_STAT_PLANTED_BERRIES + incrementgamestat GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB waitmessage waitbutton diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index bad45e486..1b5c29fee 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1012,7 +1012,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB return LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 - inccounter GAME_STAT_WON_CONTEST + incrementgamestat GAME_STAT_WON_CONTEST msgbox LinkContestRoom1_Text_1A6DF1, 3 delay 90 special sub_80C4CF8 @@ -1070,7 +1070,7 @@ LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A return LinkContestRoom1_EventScript_1A5C7C:: @ 81A5C7C - inccounter GAME_STAT_WON_LINK_CONTEST + incrementgamestat GAME_STAT_WON_LINK_CONTEST return LinkContestRoom1_EventScript_1A5C7F:: @ 81A5C7F @@ -1119,7 +1119,7 @@ LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC compare 0x4088, 2 call_if 1, LinkContestRoom1_EventScript_1A5C42 - inccounter GAME_STAT_WON_CONTEST + incrementgamestat GAME_STAT_WON_CONTEST specialvar RESULT, sub_80C4440 compare RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D5B @@ -1142,7 +1142,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B special sub_80C44C0 - inccounter GAME_STAT_RECEIVED_RIBBONS + incrementgamestat GAME_STAT_RECEIVED_RIBBONS setflag 2107 lockall msgbox LinkContestRoom1_Text_1A6D6A, 4 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 43084cc96..f8151b86a 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -114,7 +114,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C msgbox Route117_PokemonDayCare_Text_1B296E, 4 waitpokecry special Daycare_SendPokemon_Special - inccounter GAME_STAT_USED_DAYCARE + incrementgamestat GAME_STAT_USED_DAYCARE specialvar RESULT, sp0B6_daycare compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index b92ec258e..3227df991 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -247,7 +247,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 erasebox 0, 0, 15, 10 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 - inccounter GAME_STAT_ENTERED_BATTLE_TOWER + incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty special sub_8135A14 setvar 0x40bc, 1 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index bdb7ca51a..aa3584741 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -623,7 +623,7 @@ DewfordTown_EventScript_14E443:: @ 814E443 end DewfordTown_EventScript_14E46E:: @ 814E46E - inccounter GAME_STAT_STARTED_TRENDS + incrementgamestat GAME_STAT_STARTED_TRENDS compare 0x8004, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 85f323063..5192176a7 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -242,7 +242,7 @@ LavaridgeTown_EventScript_14E710:: @ 814E710 end LavaridgeTown_EventScript_14E721:: @ 814E721 - inccounter GAME_STAT_ENTERED_HOT_SPRINGS + incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS end LavaridgeTown_EventScript_14E724:: @ 814E724 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 0b8d520ee..a8c32a4fe 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -68,7 +68,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 end LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 - inccounter GAME_STAT_RECEIVED_RIBBONS + incrementgamestat GAME_STAT_RECEIVED_RIBBONS special sub_80C4858 applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E waitmovement 0 @@ -241,7 +241,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 end LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 - inccounter GAME_STAT_RECEIVED_RIBBONS + incrementgamestat GAME_STAT_RECEIVED_RIBBONS special sub_80C4858 applymovement 11, LilycoveCity_ContestLobby_Movement_158B78 waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index a4e6af419..7acd29523 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -35,7 +35,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E waitmovement 0 compare 0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 - inccounter GAME_STAT_WON_POKEMON_LOTTERY + incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY compare 0x8006, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 1fc172d8c..7e14db994 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor_MapScripts:: @ 8159893 .byte 0 LilycoveCity_Harbor_MapScript1_159899:: @ 8159899 - warp6 LilycoveCity, 255, 12, 33 + setescapewarp LilycoveCity, 255, 12, 33 end LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 8c0ce9590..a93ff5170 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -88,7 +88,7 @@ MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF end MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 - inccounter GAME_STAT_TRADED_BIKES + incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181439, 4 removeitem ITEM_ACRO_BIKE, 1 giveitem ITEM_MACH_BIKE @@ -96,7 +96,7 @@ MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 end MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA - inccounter GAME_STAT_TRADED_BIKES + incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181408, 4 removeitem ITEM_MACH_BIKE, 1 giveitem ITEM_ACRO_BIKE diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 8d98f03a8..2e0231287 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -12,7 +12,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 waitmessage showmoneybox 0, 0 nop - showcoins 0, 5 + showcoinsbox 0, 5 goto MauvilleCity_GameCorner_EventScript_156A60 MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 @@ -42,11 +42,11 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE takemoney 0x3e8, 0 updatemoneybox 0, 0 nop - updatecoins 0, 5 + updatecoinsbox 0, 5 playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoneybox 0, 0 - hidecoins 0, 5 + hidecoinsbox 0, 5 release end @@ -61,11 +61,11 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 takemoney 0x2710, 0 updatemoneybox 0, 0 nop - updatecoins 0, 5 + updatecoinsbox 0, 5 playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoneybox 0, 0 - hidecoins 0, 5 + hidecoinsbox 0, 5 release end @@ -77,21 +77,21 @@ MauvilleCity_GameCorner_EventScript_156B32:: @ 8156B32 MauvilleCity_GameCorner_EventScript_156B3C:: @ 8156B3C msgbox MauvilleCity_GameCorner_Text_181D28, 4 hidemoneybox 0, 0 - hidecoins 0, 5 + hidecoinsbox 0, 5 release end MauvilleCity_GameCorner_EventScript_156B4C:: @ 8156B4C msgbox MauvilleCity_GameCorner_Text_181D73, 4 hidemoneybox 0, 0 - hidecoins 0, 5 + hidecoinsbox 0, 5 release end MauvilleCity_GameCorner_EventScript_156B5C:: @ 8156B5C msgbox MauvilleCity_GameCorner_Text_181D57, 4 hidemoneybox 0, 0 - hidecoins 0, 5 + hidecoinsbox 0, 5 release end @@ -108,7 +108,7 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 message MauvilleCity_GameCorner_Text_181E17 waitmessage - showcoins 0, 0 + showcoinsbox 0, 0 setvar 0x4001, 0 goto MauvilleCity_GameCorner_EventScript_156BA6 @@ -160,9 +160,9 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkdecor 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 - removecoins 1000 + takecoins 1000 adddecor 88 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B @@ -176,9 +176,9 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkdecor 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 - removecoins 1000 + takecoins 1000 adddecor 89 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B @@ -192,9 +192,9 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkdecor 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 - removecoins 1000 + takecoins 1000 adddecor 90 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B @@ -212,7 +212,7 @@ MauvilleCity_GameCorner_EventScript_156D02:: @ 8156D02 MauvilleCity_GameCorner_EventScript_156D0D:: @ 8156D0D msgbox MauvilleCity_GameCorner_Text_181EC2, 4 - hidecoins 0, 0 + hidecoinsbox 0, 0 release end @@ -229,7 +229,7 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 message MauvilleCity_GameCorner_Text_181E17 waitmessage - showcoins 0, 0 + showcoinsbox 0, 0 setvar 0x4001, 0 goto MauvilleCity_GameCorner_EventScript_156D54 @@ -294,9 +294,9 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkitemspace ITEM_TM32, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - removecoins 1500 + takecoins 1500 additem ITEM_TM32, 1 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 @@ -309,9 +309,9 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkitemspace ITEM_TM29, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - removecoins 3500 + takecoins 3500 additem ITEM_TM29, 1 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 @@ -324,9 +324,9 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkitemspace ITEM_TM35, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - removecoins 4000 + takecoins 4000 additem ITEM_TM35, 1 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 @@ -339,9 +339,9 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkitemspace ITEM_TM24, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - removecoins 4000 + takecoins 4000 additem ITEM_TM24, 1 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 @@ -354,9 +354,9 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkitemspace ITEM_TM13, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - removecoins 4000 + takecoins 4000 additem ITEM_TM13, 1 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 @@ -374,7 +374,7 @@ MauvilleCity_GameCorner_EventScript_156F6C:: @ 8156F6C MauvilleCity_GameCorner_EventScript_156F77:: @ 8156F77 msgbox MauvilleCity_GameCorner_Text_181EC2, 4 - hidecoins 0, 0 + hidecoinsbox 0, 0 release end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 2b4de8344..9d99eb5fb 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -46,7 +46,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C waitmovement 0 setvar 0x8004, 1 setvar 0x40a3, 2 - inccounter GAME_STAT_RODE_CABLE_CAR + incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special sub_8123218 waitstate diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index f8e91eb09..22534aa77 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -4,7 +4,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 .byte 0 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E - warp6 Route112, 255, 28, 28 + setescapewarp Route112, 255, 28, 28 compare 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end @@ -47,7 +47,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD waitmovement 0 setvar 0x8004, 0 setvar 0x40a3, 1 - inccounter GAME_STAT_RODE_CABLE_CAR + incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special sub_8123218 waitstate diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index 787ac6605..7ea46d9b0 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -4,5 +4,5 @@ SeafloorCavern_Entrance_MapScripts:: @ 815DA4A SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 setdivewarp Underwater_SeafloorCavern, 255, 6, 5 - warp6 Underwater_SeafloorCavern, 255, 6, 5 + setescapewarp Underwater_SeafloorCavern, 255, 6, 5 end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 39542559b..f16a88802 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -6,7 +6,7 @@ SealedChamber_OuterRoom_MapScripts:: @ 815F0C6 SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 setdivewarp Underwater_SealedChamber, 255, 12, 44 - warp6 Underwater_SealedChamber, 255, 12, 44 + setescapewarp Underwater_SealedChamber, 255, 12, 44 end SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 6d2471d99..f145c4a3d 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -3,7 +3,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D .byte 0 SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 - warp6 SlateportCity, 255, 28, 13 + setescapewarp SlateportCity, 255, 28, 13 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index a3a1f711c..34d0bb70b 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -381,25 +381,25 @@ LinkContestRoom1_EventScript_15FB64:: @ 815FB64 return LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1 - inccounter GAME_STAT_ENTERED_CONTEST + incrementgamestat GAME_STAT_ENTERED_CONTEST warp VerdanturfTown_ContestLobby, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD - inccounter GAME_STAT_ENTERED_CONTEST + incrementgamestat GAME_STAT_ENTERED_CONTEST warp FallarborTown_ContestLobby, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9 - inccounter GAME_STAT_ENTERED_CONTEST + incrementgamestat GAME_STAT_ENTERED_CONTEST warp SlateportCity_ContestLobby, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5 - inccounter GAME_STAT_ENTERED_CONTEST + incrementgamestat GAME_STAT_ENTERED_CONTEST warp LilycoveCity_ContestLobby, 255, 6, 4 waitstate end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 7e42fffb4..69a4dc3e9 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -105,7 +105,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 return LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91 - inccounter GAME_STAT_CHECKED_CLOCK + incrementgamestat GAME_STAT_CHECKED_CLOCK fadescreen 1 special ScrSpecial_ViewWallClock waitstate @@ -298,7 +298,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C80:: @ 81B6C80 LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A:: @ 81B6C8A closemessage call LittlerootTown_BrendansHouse_1F_EventScript_1A02CA - inccounter GAME_STAT_RESTED_AT_HOME + incrementgamestat GAME_STAT_RESTED_AT_HOME msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, 4 release end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 621d5d4f0..425f42a85 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -1,6 +1,6 @@ Event_TV:: @ 81A6E72 lockall - inccounter GAME_STAT_WATCHED_TV + incrementgamestat GAME_STAT_WATCHED_TV special sub_80C2014 specialvar RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare RESULT, 2 -- cgit v1.2.3 From dc802ea2bee0c4a8d8c99abc6918dae2679a4227 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 13:02:25 -0500 Subject: setmestatus -> setmysteryeventstatus --- data/script_cmd_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index dd002fb1a..3f89949a1 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -14,7 +14,7 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_callstd_if @ 0x0B .4byte ScrCmd_gotoram @ 0x0C .4byte ScrCmd_killscript @ 0x0D - .4byte ScrCmd_setmestatus @ 0x0E + .4byte ScrCmd_setmysteryeventstatus @ 0x0E .4byte ScrCmd_loadword @ 0x0F .4byte ScrCmd_loadbyte @ 0x10 .4byte ScrCmd_writebytetoaddr @ 0x11 -- cgit v1.2.3 From ac8f084ec5b95f067369c5162985a5a7a13b3ba4 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 13:22:34 -0500 Subject: imm -> value --- data/script_cmd_table.inc | 220 +++++++++++++++++++++++----------------------- 1 file changed, 110 insertions(+), 110 deletions(-) (limited to 'data') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 3f89949a1..17b872d7c 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -10,33 +10,33 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_call_if @ 0x07 .4byte ScrCmd_gotostd @ 0x08 .4byte ScrCmd_callstd @ 0x09 - .4byte ScrCmd_gotostd_if @ 0x0A - .4byte ScrCmd_callstd_if @ 0x0B + .4byte ScrCmd_gotostd_if @ 0x0A + .4byte ScrCmd_callstd_if @ 0x0B .4byte ScrCmd_gotoram @ 0x0C - .4byte ScrCmd_killscript @ 0x0D - .4byte ScrCmd_setmysteryeventstatus @ 0x0E - .4byte ScrCmd_loadword @ 0x0F - .4byte ScrCmd_loadbyte @ 0x10 - .4byte ScrCmd_writebytetoaddr @ 0x11 - .4byte ScrCmd_loadbytefromaddr @ 0x12 + .4byte ScrCmd_killscript @ 0x0D + .4byte ScrCmd_setmysteryeventstatus @ 0x0E + .4byte ScrCmd_loadword @ 0x0F + .4byte ScrCmd_loadbyte @ 0x10 + .4byte ScrCmd_writebytetoaddr @ 0x11 + .4byte ScrCmd_loadbytefromaddr @ 0x12 .4byte ScrCmd_setptrbyte @ 0x13 - .4byte ScrCmd_copylocal @ 0x14 + .4byte ScrCmd_copylocal @ 0x14 .4byte ScrCmd_copybyte @ 0x15 .4byte ScrCmd_setvar @ 0x16 .4byte ScrCmd_addvar @ 0x17 .4byte ScrCmd_subvar @ 0x18 .4byte ScrCmd_copyvar @ 0x19 .4byte ScrCmd_setorcopyvar @ 0x1A - .4byte ScrCmd_compare_local_to_local @ 0x1B - .4byte ScrCmd_compare_local_to_imm @ 0x1C - .4byte ScrCmd_compare_local_to_addr @ 0x1D - .4byte ScrCmd_compare_addr_to_local @ 0x1E - .4byte ScrCmd_compare_addr_to_imm @ 0x1F - .4byte ScrCmd_compare_addr_to_addr @ 0x20 - .4byte ScrCmd_compare_var_to_imm @ 0x21 - .4byte ScrCmd_compare_var_to_var @ 0x22 - .4byte ScrCmd_callnative @ 0x23 - .4byte ScrCmd_gotonative @ 0x24 + .4byte ScrCmd_compare_local_to_local @ 0x1B + .4byte ScrCmd_compare_local_to_value @ 0x1C + .4byte ScrCmd_compare_local_to_addr @ 0x1D + .4byte ScrCmd_compare_addr_to_local @ 0x1E + .4byte ScrCmd_compare_addr_to_value @ 0x1F + .4byte ScrCmd_compare_addr_to_addr @ 0x20 + .4byte ScrCmd_compare_var_to_value @ 0x21 + .4byte ScrCmd_compare_var_to_var @ 0x22 + .4byte ScrCmd_callnative @ 0x23 + .4byte ScrCmd_gotonative @ 0x24 .4byte ScrCmd_special @ 0x25 .4byte ScrCmd_specialvar @ 0x26 .4byte ScrCmd_waitstate @ 0x27 @@ -44,28 +44,28 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_setflag @ 0x29 .4byte ScrCmd_clearflag @ 0x2A .4byte ScrCmd_checkflag @ 0x2B - .4byte ScrCmd_initclock @ 0x2C - .4byte ScrCmd_dodailyevents @ 0x2D - .4byte ScrCmd_gettime @ 0x2E - .4byte ScrCmd_playse @ 0x2F - .4byte ScrCmd_waitse @ 0x30 - .4byte ScrCmd_playfanfare @ 0x31 + .4byte ScrCmd_initclock @ 0x2C + .4byte ScrCmd_dodailyevents @ 0x2D + .4byte ScrCmd_gettime @ 0x2E + .4byte ScrCmd_playse @ 0x2F + .4byte ScrCmd_waitse @ 0x30 + .4byte ScrCmd_playfanfare @ 0x31 .4byte ScrCmd_waitfanfare @ 0x32 - .4byte ScrCmd_playbgm @ 0x33 - .4byte ScrCmd_savebgm @ 0x34 - .4byte ScrCmd_fadedefaultbgm @ 0x35 - .4byte ScrCmd_fadenewbgm @ 0x36 - .4byte ScrCmd_fadeoutbgm @ 0x37 - .4byte ScrCmd_fadeinbgm @ 0x38 + .4byte ScrCmd_playbgm @ 0x33 + .4byte ScrCmd_savebgm @ 0x34 + .4byte ScrCmd_fadedefaultbgm @ 0x35 + .4byte ScrCmd_fadenewbgm @ 0x36 + .4byte ScrCmd_fadeoutbgm @ 0x37 + .4byte ScrCmd_fadeinbgm @ 0x38 .4byte ScrCmd_warp @ 0x39 - .4byte ScrCmd_warpsilent @ 0x3A + .4byte ScrCmd_warpsilent @ 0x3A .4byte ScrCmd_warpdoor @ 0x3B .4byte ScrCmd_warphole @ 0x3C .4byte ScrCmd_warpteleport @ 0x3D - .4byte ScrCmd_setwarp @ 0x3E - .4byte ScrCmd_setdynamicwarp @ 0x3F - .4byte ScrCmd_setdivewarp @ 0x40 - .4byte ScrCmd_setholewarp @ 0x41 + .4byte ScrCmd_setwarp @ 0x3E + .4byte ScrCmd_setdynamicwarp @ 0x3F + .4byte ScrCmd_setdivewarp @ 0x40 + .4byte ScrCmd_setholewarp @ 0x41 .4byte ScrCmd_getplayerxy @ 0x42 .4byte ScrCmd_countpokemon @ 0x43 .4byte ScrCmd_additem @ 0x44 @@ -77,34 +77,34 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_checkpcitem @ 0x4A .4byte ScrCmd_adddecor @ 0x4B .4byte ScrCmd_removedecor @ 0x4C - .4byte ScrCmd_hasdecor @ 0x4D + .4byte ScrCmd_hasdecor @ 0x4D .4byte ScrCmd_checkdecor @ 0x4E - .4byte ScrCmd_applymovement @ 0x4F - .4byte ScrCmd_applymovement_at @ 0x50 - .4byte ScrCmd_waitmovement @ 0x51 - .4byte ScrCmd_waitmovement_at @ 0x52 - .4byte ScrCmd_removeobject @ 0x53 - .4byte ScrCmd_removeobject_at @ 0x54 - .4byte ScrCmd_addobject @ 0x55 - .4byte ScrCmd_addobject_at @ 0x56 - .4byte ScrCmd_setobjectxy @ 0x57 - .4byte ScrCmd_showobject @ 0x58 - .4byte ScrCmd_hideobject @ 0x59 + .4byte ScrCmd_applymovement @ 0x4F + .4byte ScrCmd_applymovement_at @ 0x50 + .4byte ScrCmd_waitmovement @ 0x51 + .4byte ScrCmd_waitmovement_at @ 0x52 + .4byte ScrCmd_removeobject @ 0x53 + .4byte ScrCmd_removeobject_at @ 0x54 + .4byte ScrCmd_addobject @ 0x55 + .4byte ScrCmd_addobject_at @ 0x56 + .4byte ScrCmd_setobjectxy @ 0x57 + .4byte ScrCmd_showobject @ 0x58 + .4byte ScrCmd_hideobject @ 0x59 .4byte ScrCmd_faceplayer @ 0x5A .4byte ScrCmd_turnobject @ 0x5B .4byte ScrCmd_trainerbattle @ 0x5C - .4byte ScrCmd_battlebegin @ 0x5D - .4byte ScrCmd_ontrainerbattleend @ 0x5E - .4byte ScrCmd_ontrainerbattleendgoto @ 0x5F + .4byte ScrCmd_battlebegin @ 0x5D + .4byte ScrCmd_ontrainerbattleend @ 0x5E + .4byte ScrCmd_ontrainerbattleendgoto @ 0x5F .4byte ScrCmd_checktrainerflag @ 0x60 - .4byte ScrCmd_settrainerflag @ 0x61 - .4byte ScrCmd_cleartrainerflag @ 0x62 - .4byte ScrCmd_setobjectxyperm @ 0x63 - .4byte ScrCmd_moveobjectoffscreen @ 0x64 - .4byte ScrCmd_setobjectmovementtype @ 0x65 - .4byte ScrCmd_waitmessage @ 0x66 + .4byte ScrCmd_settrainerflag @ 0x61 + .4byte ScrCmd_cleartrainerflag @ 0x62 + .4byte ScrCmd_setobjectxyperm @ 0x63 + .4byte ScrCmd_moveobjectoffscreen @ 0x64 + .4byte ScrCmd_setobjectmovementtype @ 0x65 + .4byte ScrCmd_waitmessage @ 0x66 .4byte ScrCmd_message @ 0x67 - .4byte ScrCmd_closemessage @ 0x68 + .4byte ScrCmd_closemessage @ 0x68 .4byte ScrCmd_lockall @ 0x69 .4byte ScrCmd_lock @ 0x6A .4byte ScrCmd_releaseall @ 0x6B @@ -112,91 +112,91 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_waitbutton @ 0x6D .4byte ScrCmd_yesnobox @ 0x6E .4byte ScrCmd_multichoice @ 0x6F - .4byte ScrCmd_multichoicedefault @ 0x70 - .4byte ScrCmd_multichoicegrid @ 0x71 + .4byte ScrCmd_multichoicedefault @ 0x70 + .4byte ScrCmd_multichoicegrid @ 0x71 .4byte ScrCmd_drawbox @ 0x72 - .4byte ScrCmd_erasebox @ 0x73 - .4byte ScrCmd_drawboxtext @ 0x74 + .4byte ScrCmd_erasebox @ 0x73 + .4byte ScrCmd_drawboxtext @ 0x74 .4byte ScrCmd_drawpokepic @ 0x75 - .4byte ScrCmd_erasepokepic @ 0x76 + .4byte ScrCmd_erasepokepic @ 0x76 .4byte ScrCmd_drawcontestwinner @ 0x77 - .4byte ScrCmd_braillemessage @ 0x78 - .4byte ScrCmd_givepoke @ 0x79 + .4byte ScrCmd_braillemessage @ 0x78 + .4byte ScrCmd_givepoke @ 0x79 .4byte ScrCmd_giveegg @ 0x7A .4byte ScrCmd_setpokemove @ 0x7B - .4byte ScrCmd_checkpokemove @ 0x7C - .4byte ScrCmd_getspeciesname @ 0x7D - .4byte ScrCmd_getfirstpartypokename @ 0x7E - .4byte ScrCmd_getpartypokename @ 0x7F - .4byte ScrCmd_getitemname @ 0x80 - .4byte ScrCmd_getdecorname @ 0x81 - .4byte ScrCmd_getmovename @ 0x82 - .4byte ScrCmd_getnumberstring @ 0x83 - .4byte ScrCmd_getstdstring @ 0x84 - .4byte ScrCmd_getstring @ 0x85 + .4byte ScrCmd_checkpokemove @ 0x7C + .4byte ScrCmd_getspeciesname @ 0x7D + .4byte ScrCmd_getfirstpartypokename @ 0x7E + .4byte ScrCmd_getpartypokename @ 0x7F + .4byte ScrCmd_getitemname @ 0x80 + .4byte ScrCmd_getdecorname @ 0x81 + .4byte ScrCmd_getmovename @ 0x82 + .4byte ScrCmd_getnumberstring @ 0x83 + .4byte ScrCmd_getstdstring @ 0x84 + .4byte ScrCmd_getstring @ 0x85 .4byte ScrCmd_pokemart @ 0x86 .4byte ScrCmd_pokemartdecor @ 0x87 .4byte ScrCmd_pokemartbp @ 0x88 - .4byte ScrCmd_playslotmachine @ 0x89 - .4byte ScrCmd_plantberrytree @ 0x8A + .4byte ScrCmd_playslotmachine @ 0x89 + .4byte ScrCmd_plantberrytree @ 0x8A .4byte ScrCmd_choosecontestpkmn @ 0x8B .4byte ScrCmd_startcontest @ 0x8C .4byte ScrCmd_showcontestresults @ 0x8D .4byte ScrCmd_contestlinktransfer @ 0x8E .4byte ScrCmd_random @ 0x8F .4byte ScrCmd_givemoney @ 0x90 - .4byte ScrCmd_takemoney @ 0x91 + .4byte ScrCmd_takemoney @ 0x91 .4byte ScrCmd_checkmoney @ 0x92 - .4byte ScrCmd_showmoneybox @ 0x93 - .4byte ScrCmd_hidemoneybox @ 0x94 - .4byte ScrCmd_updatemoneybox @ 0x95 - .4byte ScrCmd_getpricereduction @ 0x96 + .4byte ScrCmd_showmoneybox @ 0x93 + .4byte ScrCmd_hidemoneybox @ 0x94 + .4byte ScrCmd_updatemoneybox @ 0x95 + .4byte ScrCmd_getpricereduction @ 0x96 .4byte ScrCmd_fadescreen @ 0x97 .4byte ScrCmd_fadescreendelay @ 0x98 - .4byte ScrCmd_setdarklevel @ 0x99 - .4byte ScrCmd_animdarklevel @ 0x9A - .4byte ScrCmd_messageautoscroll @ 0x9B - .4byte ScrCmd_dofieldeffect @ 0x9C - .4byte ScrCmd_setfieldeffect @ 0x9D - .4byte ScrCmd_waitfieldeffect @ 0x9E + .4byte ScrCmd_setdarklevel @ 0x99 + .4byte ScrCmd_animdarklevel @ 0x9A + .4byte ScrCmd_messageautoscroll @ 0x9B + .4byte ScrCmd_dofieldeffect @ 0x9C + .4byte ScrCmd_setfieldeffect @ 0x9D + .4byte ScrCmd_waitfieldeffect @ 0x9E .4byte ScrCmd_sethealplace @ 0x9F - .4byte ScrCmd_checkplayergender @ 0xA0 - .4byte ScrCmd_playpokecry @ 0xA1 + .4byte ScrCmd_checkplayergender @ 0xA0 + .4byte ScrCmd_playpokecry @ 0xA1 .4byte ScrCmd_setmaptile @ 0xA2 .4byte ScrCmd_resetweather @ 0xA3 .4byte ScrCmd_setweather @ 0xA4 .4byte ScrCmd_doweather @ 0xA5 .4byte ScrCmd_tileeffect @ 0xA6 - .4byte ScrCmd_setmaplayoutindex @ 0xA7 - .4byte ScrCmd_setobjectpriority @ 0xA8 - .4byte ScrCmd_resetobjectpriority @ 0xA9 + .4byte ScrCmd_setmaplayoutindex @ 0xA7 + .4byte ScrCmd_setobjectpriority @ 0xA8 + .4byte ScrCmd_resetobjectpriority @ 0xA9 .4byte ScrCmd_createvobject @ 0xAA .4byte ScrCmd_turnvobject @ 0xAB - .4byte ScrCmd_opendoor @ 0xAC - .4byte ScrCmd_closedoor @ 0xAD - .4byte ScrCmd_waitdooranim @ 0xAE - .4byte ScrCmd_setdooropen @ 0xAF - .4byte ScrCmd_setdoorclosed @ 0xB0 - .4byte ScrCmd_addelevmenuitem @ 0xB1 - .4byte ScrCmd_showelevmenu @ 0xB2 + .4byte ScrCmd_opendoor @ 0xAC + .4byte ScrCmd_closedoor @ 0xAD + .4byte ScrCmd_waitdooranim @ 0xAE + .4byte ScrCmd_setdooropen @ 0xAF + .4byte ScrCmd_setdoorclosed @ 0xB0 + .4byte ScrCmd_addelevmenuitem @ 0xB1 + .4byte ScrCmd_showelevmenu @ 0xB2 .4byte ScrCmd_checkcoins @ 0xB3 .4byte ScrCmd_givecoins @ 0xB4 - .4byte ScrCmd_takecoins @ 0xB5 + .4byte ScrCmd_takecoins @ 0xB5 .4byte ScrCmd_setwildbattle @ 0xB6 .4byte ScrCmd_dowildbattle @ 0xB7 .4byte ScrCmd_setvaddress @ 0xB8 .4byte ScrCmd_vgoto @ 0xB9 .4byte ScrCmd_vcall @ 0xBA - .4byte ScrCmd_vgoto_if @ 0xBB - .4byte ScrCmd_vcall_if @ 0xBC - .4byte ScrCmd_vmessage @ 0xBD + .4byte ScrCmd_vgoto_if @ 0xBB + .4byte ScrCmd_vcall_if @ 0xBC + .4byte ScrCmd_vmessage @ 0xBD .4byte ScrCmd_vloadptr @ 0xBE - .4byte ScrCmd_vgetstring @ 0xBF - .4byte ScrCmd_showcoinsbox @ 0xC0 - .4byte ScrCmd_hidecoinsbox @ 0xC1 - .4byte ScrCmd_updatecoinsbox @ 0xC2 - .4byte ScrCmd_incrementgamestat @ 0xC3 - .4byte ScrCmd_setescapewarp @ 0xC4 + .4byte ScrCmd_vgetstring @ 0xBF + .4byte ScrCmd_showcoinsbox @ 0xC0 + .4byte ScrCmd_hidecoinsbox @ 0xC1 + .4byte ScrCmd_updatecoinsbox @ 0xC2 + .4byte ScrCmd_incrementgamestat @ 0xC3 + .4byte ScrCmd_setescapewarp @ 0xC4 .4byte ScrCmd_waitpokecry @ 0xC5 gScriptCmdTableEnd:: -- cgit v1.2.3 From ab3c40fbf6dd7e32d63ef8146edea900d10681d6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 14:39:25 -0500 Subject: vloadptr -> vloadword --- data/script_cmd_table.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 17b872d7c..b6b7401f3 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -190,7 +190,7 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_vgoto_if @ 0xBB .4byte ScrCmd_vcall_if @ 0xBC .4byte ScrCmd_vmessage @ 0xBD - .4byte ScrCmd_vloadptr @ 0xBE + .4byte ScrCmd_vloadword @ 0xBE .4byte ScrCmd_vgetstring @ 0xBF .4byte ScrCmd_showcoinsbox @ 0xC0 .4byte ScrCmd_hidecoinsbox @ 0xC1 -- cgit v1.2.3 From 36732986679e93a4ceb454d494fc2aa1d5e95f6c Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 7 Oct 2017 20:21:11 -0700 Subject: Move all data/party_menu.s data into party_menu.c --- data/party_menu.s | 744 ------------------------------------------------------ 1 file changed, 744 deletions(-) delete mode 100644 data/party_menu.s (limited to 'data') diff --git a/data/party_menu.s b/data/party_menu.s deleted file mode 100644 index 0911ac987..000000000 --- a/data/party_menu.s +++ /dev/null @@ -1,744 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 -gUnknown_08376504:: @ 8376504 - .2byte MOVE_FOCUS_PUNCH - .2byte MOVE_DRAGON_CLAW - .2byte MOVE_WATER_PULSE - .2byte MOVE_CALM_MIND - .2byte MOVE_ROAR - .2byte MOVE_TOXIC - .2byte MOVE_HAIL - .2byte MOVE_BULK_UP - .2byte MOVE_BULLET_SEED - .2byte MOVE_HIDDEN_POWER - .2byte MOVE_SUNNY_DAY - .2byte MOVE_TAUNT - .2byte MOVE_ICE_BEAM - .2byte MOVE_BLIZZARD - .2byte MOVE_HYPER_BEAM - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_PROTECT - .2byte MOVE_RAIN_DANCE - .2byte MOVE_GIGA_DRAIN - .2byte MOVE_SAFEGUARD - .2byte MOVE_FRUSTRATION - .2byte MOVE_SOLAR_BEAM - .2byte MOVE_IRON_TAIL - .2byte MOVE_THUNDERBOLT - .2byte MOVE_THUNDER - .2byte MOVE_EARTHQUAKE - .2byte MOVE_RETURN - .2byte MOVE_DIG - .2byte MOVE_PSYCHIC - .2byte MOVE_SHADOW_BALL - .2byte MOVE_BRICK_BREAK - .2byte MOVE_DOUBLE_TEAM - .2byte MOVE_REFLECT - .2byte MOVE_SHOCK_WAVE - .2byte MOVE_FLAMETHROWER - .2byte MOVE_SLUDGE_BOMB - .2byte MOVE_SANDSTORM - .2byte MOVE_FIRE_BLAST - .2byte MOVE_ROCK_TOMB - .2byte MOVE_AERIAL_ACE - .2byte MOVE_TORMENT - .2byte MOVE_FACADE - .2byte MOVE_SECRET_POWER - .2byte MOVE_REST - .2byte MOVE_ATTRACT - .2byte MOVE_THIEF - .2byte MOVE_STEEL_WING - .2byte MOVE_SKILL_SWAP - .2byte MOVE_SNATCH - .2byte MOVE_OVERHEAT - .2byte MOVE_CUT - .2byte MOVE_FLY - .2byte MOVE_SURF - .2byte MOVE_STRENGTH - .2byte MOVE_FLASH - .2byte MOVE_ROCK_SMASH - .2byte MOVE_WATERFALL - .2byte MOVE_DIVE - - .4byte gTileBuffer @ unreferenced? - -MenuGfx_HoldIcons: - .incbin "graphics/interface/hold_icons.4bpp" -MenuPal_HoldIcons: - .incbin "graphics/interface/hold_icons.gbapal" - - .align 2 -gUnknown_083765DC:: @ 83765DC - obj_tiles MenuGfx_HoldIcons, 64, 0xd750 - - .align 2 -gUnknown_083765E4:: @ 83765E4 - obj_pal MenuPal_HoldIcons, 0xd750 - - .align 2 -gOamData_83765EC:: @ 83765EC - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83765F4:: @ 83765F4 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83765FC:: @ 83765FC - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8376604:: @ 8376604 - .4byte gSpriteAnim_83765F4 - .4byte gSpriteAnim_83765FC - - .align 2 -gSpriteTemplate_837660C:: @ 837660C - spr_template 55120, 55120, gOamData_83765EC, gSpriteAnimTable_8376604, NULL, gDummySpriteAffineAnimTable, SpriteCB_UpdateHeldItemIconPosition - - .align 2 -gUnknown_08376624:: @ 8376624 - .4byte OtherText_ChoosePoke - .4byte OtherText_MovePokeTo - .4byte OtherText_TeachWhat - .4byte OtherText_UseWhat - .4byte OtherText_GiveWhat - .4byte OtherText_DoWhat - .4byte OtherText_NothingToCut - .4byte OtherText_CantSurf - .4byte OtherText_AlreadySurfing - .4byte OtherText_CantUseThatHere - .4byte OtherText_RestoreWhatMove - .4byte OtherText_BoostPP - .4byte gOtherText_CancelWithTerminator - .4byte OtherText_DoWhatWithItem - .4byte OtherText_NoPokeForBattle - .4byte OtherText_ChoosePoke2 - .4byte OtherText_NotEnoughHP - .4byte OtherText_ThreePokeNeeded - .4byte OtherText_PokeCantBeSame - .4byte OtherText_NoIdenticalHoldItems - .4byte OtherText_TeachWhichPoke - - .align 2 -gUnknown_08376678:: @ 8376678 - .byte 16, 40, 0, 0 - .byte 104, 18, 0, 0 - .byte 104, 42, 0, 0 - .byte 104, 66, 0, 0 - .byte 104, 90, 0, 0 - .byte 104, 114, 0, 0 - .byte 16, 24, 0, 0 - .byte 16, 80, 0, 0 - .byte 104, 18, 0, 0 - .byte 104, 50, 0, 0 - .byte 104, 82, 0, 0 - .byte 104, 114, 0, 0 - .byte 16, 24, 0, 0 - .byte 16, 80, 0, 0 - .byte 104, 26, 0, 0 - .byte 104, 50, 0, 0 - .byte 104, 82, 0, 0 - .byte 104, 106, 0, 0 - .byte 16, 24, 0, 0 - .byte 104, 26, 0, 0 - .byte 104, 50, 0, 0 - .byte 16, 80, 0, 0 - .byte 104, 82, 0, 0 - .byte 104, 106, 0, 0 - .byte 5, 4, 0, 0 - .byte 16, 1, 0, 0 - .byte 16, 4, 0, 0 - .byte 16, 7, 0, 0 - .byte 16, 10, 0, 0 - .byte 16, 13, 0, 0 - .byte 5, 2, 0, 0 - .byte 5, 9, 0, 0 - .byte 16, 1, 0, 0 - .byte 16, 5, 0, 0 - .byte 16, 9, 0, 0 - .byte 16, 13, 0, 0 - .byte 5, 2, 0, 0 - .byte 5, 9, 0, 0 - .byte 16, 2, 0, 0 - .byte 16, 5, 0, 0 - .byte 16, 9, 0, 0 - .byte 16, 12, 0, 0 - .byte 5, 2, 0, 0 - .byte 16, 2, 0, 0 - .byte 16, 5, 0, 0 - .byte 5, 9, 0, 0 - .byte 16, 9, 0, 0 - .byte 16, 12, 0, 0 - - .align 2 -gUnknown_08376738:: @ 8376738 - .byte 6, 5, 0, 0 - .byte 17, 2, 0, 0 - .byte 17, 5, 0, 0 - .byte 17, 8, 0, 0 - .byte 17, 11, 0, 0 - .byte 17, 14, 0, 0 - .byte 6, 3, 0, 0 - .byte 6, 10, 0, 0 - .byte 17, 2, 0, 0 - .byte 17, 6, 0, 0 - .byte 17, 10, 0, 0 - .byte 17, 14, 0, 0 - .byte 6, 3, 0, 0 - .byte 6, 10, 0, 0 - .byte 17, 3, 0, 0 - .byte 17, 6, 0, 0 - .byte 17, 10, 0, 0 - .byte 17, 13, 0, 0 - .byte 6, 3, 0, 0 - .byte 17, 3, 0, 0 - .byte 17, 6, 0, 0 - .byte 6, 10, 0, 0 - .byte 17, 10, 0, 0 - .byte 17, 13, 0, 0 - .byte 3, 7, 0, 0 - .byte 22, 2, 0, 0 - .byte 22, 5, 0, 0 - .byte 22, 8, 0, 0 - .byte 22, 11, 0, 0 - .byte 22, 14, 0, 0 - .byte 3, 5, 0, 0 - .byte 3, 12, 0, 0 - .byte 22, 2, 0, 0 - .byte 22, 6, 0, 0 - .byte 22, 10, 0, 0 - .byte 22, 14, 0, 0 - .byte 3, 5, 0, 0 - .byte 3, 12, 0, 0 - .byte 22, 3, 0, 0 - .byte 22, 6, 0, 0 - .byte 22, 10, 0, 0 - .byte 22, 13, 0, 0 - .byte 3, 5, 0, 0 - .byte 22, 3, 0, 0 - .byte 22, 6, 0, 0 - .byte 3, 12, 0, 0 - .byte 22, 10, 0, 0 - .byte 22, 13, 0, 0 - .byte 7, 7, 0, 0 - .byte 26, 2, 0, 0 - .byte 26, 5, 0, 0 - .byte 26, 8, 0, 0 - .byte 26, 11, 0, 0 - .byte 26, 14, 0, 0 - .byte 7, 5, 0, 0 - .byte 7, 12, 0, 0 - .byte 26, 2, 0, 0 - .byte 26, 6, 0, 0 - .byte 26, 10, 0, 0 - .byte 26, 14, 0, 0 - .byte 7, 5, 0, 0 - .byte 7, 12, 0, 0 - .byte 26, 3, 0, 0 - .byte 26, 6, 0, 0 - .byte 26, 10, 0, 0 - .byte 26, 13, 0, 0 - .byte 7, 5, 0, 0 - .byte 26, 3, 0, 0 - .byte 26, 6, 0, 0 - .byte 7, 12, 0, 0 - .byte 26, 10, 0, 0 - .byte 26, 13, 0, 0 - - .align 2 -gUnknown_08376858:: @ 8376858 - .4byte BG_VRAM + 0xF1C8 - .4byte BG_VRAM + 0xF0AE - .4byte BG_VRAM + 0xF16E - .4byte BG_VRAM + 0xF22E - .4byte BG_VRAM + 0xF2EE - .4byte BG_VRAM + 0xF3AE - .4byte BG_VRAM + 0xF148 - .4byte BG_VRAM + 0xF308 - .4byte BG_VRAM + 0xF0AE - .4byte BG_VRAM + 0xF1AE - .4byte BG_VRAM + 0xF2AE - .4byte BG_VRAM + 0xF3AE - .4byte BG_VRAM + 0xF148 - .4byte BG_VRAM + 0xF308 - .4byte BG_VRAM + 0xF0EE - .4byte BG_VRAM + 0xF1AE - .4byte BG_VRAM + 0xF2AE - .4byte BG_VRAM + 0xF36E - .4byte BG_VRAM + 0xF148 - .4byte BG_VRAM + 0xF0EE - .4byte BG_VRAM + 0xF1AE - .4byte BG_VRAM + 0xF308 - .4byte BG_VRAM + 0xF2AE - .4byte BG_VRAM + 0xF36E - - .align 2 -gUnknown_083768B8:: @ 83768B8 - .byte 8, 44, 0, 0 - .byte 92, 22, 0, 0 - .byte 92, 46, 0, 0 - .byte 92, 70, 0, 0 - .byte 92, 94, 0, 0 - .byte 92, 118, 0, 0 - .byte 196, 136, 0, 0 - .byte 196, 152, 0, 0 - .byte 8, 28, 0, 0 - .byte 8, 84, 0, 0 - .byte 92, 22, 0, 0 - .byte 92, 54, 0, 0 - .byte 92, 86, 0, 0 - .byte 92, 118, 0, 0 - .byte 196, 136, 0, 0 - .byte 196, 152, 0, 0 - .byte 8, 28, 0, 0 - .byte 8, 84, 0, 0 - .byte 92, 30, 0, 0 - .byte 92, 54, 0, 0 - .byte 92, 86, 0, 0 - .byte 92, 110, 0, 0 - .byte 196, 136, 0, 0 - .byte 196, 152, 0, 0 - - .align 2 -gUnknown_08376918:: @ 8376918 - .4byte BG_VRAM + 0xF1C6 - .4byte BG_VRAM + 0xF06C - .4byte BG_VRAM + 0xF12C - .4byte BG_VRAM + 0xF1EC - .4byte BG_VRAM + 0xF2AC - .4byte BG_VRAM + 0xF36C - .4byte BG_VRAM + 0xF148 - .4byte BG_VRAM + 0xF308 - .4byte BG_VRAM + 0xF0AE - .4byte BG_VRAM + 0xF1AE - .4byte BG_VRAM + 0xF2AE - .4byte BG_VRAM + 0xF3AE - - .align 2 -gUnknown_08376948:: @ 8376948 - .byte 2, 4, 10, 9 - .byte 16, 1, 29, 3 - .byte 16, 4, 29, 6 - .byte 16, 7, 29, 9 - .byte 16, 10, 29, 12 - .byte 16, 13, 29, 15 - .byte 2, 2, 10, 7 - .byte 2, 9, 10, 14 - .byte 16, 1, 29, 3 - .byte 16, 5, 29, 7 - .byte 16, 9, 29, 11 - .byte 16, 13, 29, 15 - - .align 2 -gUnknown_08376978:: @ 8376978 - .byte 2, 7, 10, 9 - .byte 21, 1, 29, 3 - .byte 21, 4, 29, 6 - .byte 21, 7, 29, 9 - .byte 21, 10, 29, 12 - .byte 21, 13, 29, 15 - .byte 2, 2, 10, 7 - .byte 2, 9, 10, 14 - .byte 16, 1, 29, 3 - .byte 16, 5, 29, 7 - .byte 16, 9, 29, 11 - .byte 16, 13, 29, 15 - - .align 2 -gUnknown_083769A8:: @ 83769A8 - .byte 0, 3, 11, 1, 11, 4, 11, 7, 11, 10, 11, 13 - .byte 0, 1, 0, 8, 11, 1, 11, 5, 11, 9, 11, 13 - - .align 2 -gUnknown_083769C0:: @ 83769C0 - .byte 0, 1 - .byte 0, 8 - .byte 11, 2 - .byte 11, 5 - .byte 11, 9 - .byte 11, 12 - .byte 0, 1 - .byte 0, 8 - .byte 11, 2 - .byte 11, 5 - .byte 11, 9 - .byte 11, 12 - -gUnknown_083769D8:: @ 83769D8 - .byte 0x24,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x27 - .byte 0x34,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x37 - .byte 0x34,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x37 - .byte 0x34,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x35,0x37 - .byte 0x44,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x47 - .byte 0x44,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x45,0x47 - .byte 0x54,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x57 - -gUnknown_08376A25:: @ 8376A25 - .byte 0x50,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x51,0x53 - .byte 0x60,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x63 - .byte 0x70,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x71,0x73 - -gUnknown_08376A5E:: @ 8376A5E - .byte 0x20,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x23 - .byte 0x30,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x31,0x33 - .byte 0x40,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x41,0x43 - -@ unknown, unreferenced data - .byte 0x0C - .byte 0x0D - .byte 0x0E - .byte 0x0F - .byte 0x00 - .byte 0x01 - .byte 0x02 - .byte 0x03 - .byte 0x04 - .byte 0x05 - .byte 0x0F - .byte 0x10 - .byte 0x11 - .byte 0x12 - .byte 0x13 - .byte 0x14 - .byte 0x15 - .byte 0x0F - .byte 0x06 - .byte 0x05 - .byte 0x01 - .byte 0x07 - .byte 0x08 - .byte 0x09 - .byte 0x0F - .byte 0x16 - .byte 0x15 - .byte 0x11 - .byte 0x17 - .byte 0x18 - .byte 0x19 - .byte 0x0F - .byte 0x09 - .byte 0x0A - .byte 0x0B - .byte 0x05 - .byte 0x0C - .byte 0x0F - .byte 0x0F - .byte 0x19 - .byte 0x1A - .byte 0x1B - .byte 0x15 - .byte 0x1C - .byte 0x0F - .byte 0x0F - .byte 0x0D - .byte 0x0B - .byte 0x05 - .byte 0x0C - .byte 0x0F - .byte 0x0F - .byte 0x0F - .byte 0x1D - .byte 0x1B - .byte 0x15 - .byte 0x1C - .byte 0x0F - .byte 0x0F - .byte 0x0F - .byte 0x06 - .byte 0x05 - .byte 0x0B - .byte 0x05 - .byte 0x0C - .byte 0x0F - .byte 0x0F - .byte 0x16 - .byte 0x15 - .byte 0x1B - .byte 0x15 - .byte 0x1C - .byte 0x0F - .byte 0x0F - .byte 0x0F - .byte 0x0F - .byte 0x20 - .byte 0x0C - .byte 0x09 - .byte 0x0F - .byte 0x0F - .byte 0x0F - .byte 0x1F - .byte 0x30 - .byte 0x1C - .byte 0x19 - .byte 0x0F - .byte 0x0F - .byte 0x0F - .byte 0x25 - .byte 0x0F - .byte 0x22 - .byte 0x24 - .byte 0x0F - .byte 0x0F - .byte 0x0F - .byte 0x35 - .byte 0x41 - .byte 0x32 - .byte 0x34 - .byte 0x0F - .byte 0x0F - .byte 0x0F - .byte 0x26 - .byte 0x0F - .byte 0x23 - .byte 0x0E - .byte 0x0F - .byte 0x0F - .byte 0x0F - .byte 0x36 - .byte 0x43 - .byte 0x33 - .byte 0x1E - .byte 0x0F - .byte 0x0F - .byte 0x27 - .byte 0x28 - .byte 0x29 - .byte 0x03 - .byte 0x2A - .byte 0x0F - .byte 0x0F - .byte 0x37 - .byte 0x38 - .byte 0x39 - .byte 0x13 - .byte 0x3A - .byte 0x0F - .byte 0x0F - .byte 0x27 - .byte 0x28 - .byte 0x29 - .byte 0x03 - .byte 0x04 - .byte 0x05 - .byte 0x0F - .byte 0x37 - .byte 0x38 - .byte 0x39 - .byte 0x13 - .byte 0x14 - .byte 0x15 - .byte 0x0F - .byte 0x2B - .byte 0x2C - .byte 0x02 - .byte 0x28 - .byte 0x29 - .byte 0x2D - .byte 0x21 - .byte 0x3B - .byte 0x3C - .byte 0x12 - .byte 0x38 - .byte 0x39 - .byte 0x3D - .byte 0x31 - .byte 0x2B - .byte 0x2C - .byte 0x02 - .byte 0x28 - .byte 0x29 - .byte 0x08 - .byte 0x09 - .byte 0x3B - .byte 0x3C - .byte 0x12 - .byte 0x38 - .byte 0x39 - .byte 0x18 - .byte 0x19 - .byte 0x2E - .byte 0x2F - .byte 0x2B - .byte 0x2C - .byte 0x02 - .byte 0x27 - .byte 0x2D - .byte 0x3E - .byte 0x3F - .byte 0x3B - .byte 0x3C - .byte 0x12 - .byte 0x45 - .byte 0x3D - - .align 2 -gUnknown_08376B54:: @ 8376B54 - .4byte ItemUseMoveMenu_HandleMoveSelection - .4byte ItemUseMoveMenu_HandleCancel - - .align 1 -Unknown_08376B5C: - .2byte 0x4000, 0x4018, 0xF400 - .2byte 0x4000, 0x4038, 0xF404 - .2byte 0x4008, 0x4018, 0xF408 - .2byte 0x4008, 0x4038, 0xF40C - .2byte 0x4010, 0x4020, 0xF410 - .2byte 0x4020, 0x4025, 0xF418 - .2byte 0x4020, 0x4045, 0xF41C - .2byte -1 - - .align 1 -Unknown_08376B88: - .2byte 0x4000, 0x4018, 0xF400 - .2byte 0x4000, 0x4038, 0xF404 - .2byte 0x4008, 0x4018, 0xF408 - .2byte 0x4008, 0x4038, 0xF40C - .2byte 0x4010, 0x4020, 0xF410 - .2byte 0x4010, 0x4065, 0xF418 - .2byte 0x4010, 0x4085, 0xF41C - .2byte -1 - - .align 2 -gUnknown_08376BB4:: @ 8376BB4 - .byte 0x1, 0x4 - .space 2 - .4byte Unknown_08376B5C - - .byte 0xC, 0x1 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0x4 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0x7 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0xA - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0xD - .space 2 - .4byte Unknown_08376B88 - - .byte 0x1, 0x2 - .space 2 - .4byte Unknown_08376B5C - - .byte 0x1, 0x9 - .space 2 - .4byte Unknown_08376B5C - - .byte 0xC, 0x1 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0x5 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0x9 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0xD - .space 2 - .4byte Unknown_08376B88 - - .byte 0x1, 0x2 - .space 2 - .4byte Unknown_08376B5C - - .byte 0x1, 0x9 - .space 2 - .4byte Unknown_08376B5C - - .byte 0xC, 0x2 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0x5 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0x9 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0xC - .space 2 - .4byte Unknown_08376B88 - - .byte 0x1, 0x2 - .space 2 - .4byte Unknown_08376B5C - - .byte 0xC, 0x2 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0x5 - .space 2 - .4byte Unknown_08376B88 - - .byte 0x1, 0x9 - .space 2 - .4byte Unknown_08376B5C - - .byte 0xC, 0x9 - .space 2 - .4byte Unknown_08376B88 - - .byte 0xC, 0xC - .space 2 - .4byte Unknown_08376B88 - - .align 2 -gUnknown_08376C74:: @ 8376C74 - .4byte sub_8089CD4, sub_806AFD0, 0 - .4byte SetUpBattlePokemonMenu, SetUpBattlePartyMenu, 0 - .4byte sub_80F9C6C, sub_80F9ACC, 0 - .4byte sub_80F9C6C, sub_806AFD0, 0 - .4byte sub_81222B0, sub_8121E78, 0 - .4byte sub_8122A48, sub_8122854, 0xFF - .4byte sub_8122E0C, sub_806AFD0, 0x0F - .4byte sub_80F9E64, sub_80F9CE8, 0 - - .align 2 -gUnknown_08376CD4:: @ 8376CD4 - .2byte 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F - .2byte 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F - - .align 2 -gUnknown_08376CEC:: @ 8376CEC - .2byte 0x2A, 0x0B, 0x0C, 0x0D, 0x0E, 0x2F - .2byte 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F - - .align 2 -gUnknown_08376D04:: @ 8376D04 - .4byte gOtherText_HP - .4byte gOtherText_Attack - .4byte gOtherText_Defense - .4byte gOtherText_SpAtk - .4byte gOtherText_SpDef - .4byte gOtherText_Speed - -gUnknown_08376D1C:: @ 8376D1C - .byte 0x3A @ HP - .byte 0x3B @ Attack - .byte 0x3C @ Defense - .byte 0x3E @ Sp. Attack - .byte 0x3F @ Sp. Defense - .byte 0x3D @ Speed -- cgit v1.2.3 From 338a3746c7c3404b32166f142f9a4ae1d920d1aa Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 8 Oct 2017 21:12:24 -0500 Subject: remove berry palettes --- data/graphics/berries/graphics.inc | 172 ++++++++++++++++++------------------- 1 file changed, 86 insertions(+), 86 deletions(-) (limited to 'data') diff --git a/data/graphics/berries/graphics.inc b/data/graphics/berries/graphics.inc index 19207ee32..e8edf9a3b 100644 --- a/data/graphics/berries/graphics.inc +++ b/data/graphics/berries/graphics.inc @@ -1,343 +1,343 @@ .align 2 gBerryPic_Cheri:: @ 8E78D00 - .incbin "graphics/berries/cheri/pic.4bpp.lz" + .incbin "graphics/berries/cheri.4bpp.lz" .align 2 gBerryPic_Oran:: @ 8E78E54 - .incbin "graphics/berries/oran/pic.4bpp.lz" + .incbin "graphics/berries/oran.4bpp.lz" .align 2 gBerryPic_Pecha:: @ 8E78FC8 - .incbin "graphics/berries/pecha/pic.4bpp.lz" + .incbin "graphics/berries/pecha.4bpp.lz" .align 2 gBerryPic_Rawst:: @ 8E7913C - .incbin "graphics/berries/rawst/pic.4bpp.lz" + .incbin "graphics/berries/rawst.4bpp.lz" .align 2 gBerryPic_Aspear:: @ 8E792D4 - .incbin "graphics/berries/aspear/pic.4bpp.lz" + .incbin "graphics/berries/aspear.4bpp.lz" .align 2 gBerryPic_Leppa:: @ 8E7947C - .incbin "graphics/berries/leppa/pic.4bpp.lz" + .incbin "graphics/berries/leppa.4bpp.lz" .align 2 gBerryPic_Chesto:: @ 8E795EC - .incbin "graphics/berries/chesto/pic.4bpp.lz" + .incbin "graphics/berries/chesto.4bpp.lz" .align 2 gBerryPic_Persim:: @ 8E797D0 - .incbin "graphics/berries/persim/pic.4bpp.lz" + .incbin "graphics/berries/persim.4bpp.lz" .align 2 gBerryPic_Lum:: @ 8E79920 - .incbin "graphics/berries/lum/pic.4bpp.lz" + .incbin "graphics/berries/lum.4bpp.lz" .align 2 gBerryPic_Sitrus:: @ 8E79A3C - .incbin "graphics/berries/sitrus/pic.4bpp.lz" + .incbin "graphics/berries/sitrus.4bpp.lz" .align 2 gBerryPic_Figy:: @ 8E79BE0 - .incbin "graphics/berries/figy/pic.4bpp.lz" + .incbin "graphics/berries/figy.4bpp.lz" .align 2 gBerryPic_Wiki:: @ 8E79D8C - .incbin "graphics/berries/wiki/pic.4bpp.lz" + .incbin "graphics/berries/wiki.4bpp.lz" .align 2 gBerryPic_Mago:: @ 8E79F80 - .incbin "graphics/berries/mago/pic.4bpp.lz" + .incbin "graphics/berries/mago.4bpp.lz" .align 2 gBerryPic_Aguav:: @ 8E7A134 - .incbin "graphics/berries/aguav/pic.4bpp.lz" + .incbin "graphics/berries/aguav.4bpp.lz" .align 2 gBerryPic_Iapapa:: @ 8E7A2A8 - .incbin "graphics/berries/iapapa/pic.4bpp.lz" + .incbin "graphics/berries/iapapa.4bpp.lz" .align 2 gBerryPic_Razz:: @ 8E7A560 - .incbin "graphics/berries/razz/pic.4bpp.lz" + .incbin "graphics/berries/razz.4bpp.lz" .align 2 gBerryPic_Bluk:: @ 8E7A790 - .incbin "graphics/berries/bluk/pic.4bpp.lz" + .incbin "graphics/berries/bluk.4bpp.lz" .align 2 gBerryPic_Nanab:: @ 8E7A978 - .incbin "graphics/berries/nanab/pic.4bpp.lz" + .incbin "graphics/berries/nanab.4bpp.lz" .align 2 gBerryPic_Wepear:: @ 8E7AAEC - .incbin "graphics/berries/wepear/pic.4bpp.lz" + .incbin "graphics/berries/wepear.4bpp.lz" .align 2 gBerryPic_Pinap:: @ 8E7ACB4 - .incbin "graphics/berries/pinap/pic.4bpp.lz" + .incbin "graphics/berries/pinap.4bpp.lz" .align 2 gBerryPic_Pomeg:: @ 8E7AEC8 - .incbin "graphics/berries/pomeg/pic.4bpp.lz" + .incbin "graphics/berries/pomeg.4bpp.lz" .align 2 gBerryPic_Kelpsy:: @ 8E7B070 - .incbin "graphics/berries/kelpsy/pic.4bpp.lz" + .incbin "graphics/berries/kelpsy.4bpp.lz" .align 2 gBerryPic_Qualot:: @ 8E7B218 - .incbin "graphics/berries/qualot/pic.4bpp.lz" + .incbin "graphics/berries/qualot.4bpp.lz" .align 2 gBerryPic_Hondew:: @ 8E7B3E4 - .incbin "graphics/berries/hondew/pic.4bpp.lz" + .incbin "graphics/berries/hondew.4bpp.lz" .align 2 gBerryPic_Grepa:: @ 8E7B63C - .incbin "graphics/berries/grepa/pic.4bpp.lz" + .incbin "graphics/berries/grepa.4bpp.lz" .align 2 gBerryPic_Tamato:: @ 8E7B7CC - .incbin "graphics/berries/tamato/pic.4bpp.lz" + .incbin "graphics/berries/tamato.4bpp.lz" .align 2 gBerryPic_Cornn:: @ 8E7BA90 - .incbin "graphics/berries/cornn/pic.4bpp.lz" + .incbin "graphics/berries/cornn.4bpp.lz" .align 2 gBerryPic_Magost:: @ 8E7BC94 - .incbin "graphics/berries/magost/pic.4bpp.lz" + .incbin "graphics/berries/magost.4bpp.lz" .align 2 gBerryPic_Rabuta:: @ 8E7BE38 - .incbin "graphics/berries/rabuta/pic.4bpp.lz" + .incbin "graphics/berries/rabuta.4bpp.lz" .align 2 gBerryPic_Nomel:: @ 8E7C12C - .incbin "graphics/berries/nomel/pic.4bpp.lz" + .incbin "graphics/berries/nomel.4bpp.lz" .align 2 gBerryPic_Spelon:: @ 8E7C308 - .incbin "graphics/berries/spelon/pic.4bpp.lz" + .incbin "graphics/berries/spelon.4bpp.lz" .align 2 gBerryPic_Pamtre:: @ 8E7C4F8 - .incbin "graphics/berries/pamtre/pic.4bpp.lz" + .incbin "graphics/berries/pamtre.4bpp.lz" .align 2 gBerryPic_Watmel:: @ 8E7C748 - .incbin "graphics/berries/watmel/pic.4bpp.lz" + .incbin "graphics/berries/watmel.4bpp.lz" .align 2 gBerryPic_Durin:: @ 8E7CA2C - .incbin "graphics/berries/durin/pic.4bpp.lz" + .incbin "graphics/berries/durin.4bpp.lz" .align 2 gBerryPic_Belue:: @ 8E7CDF8 - .incbin "graphics/berries/belue/pic.4bpp.lz" + .incbin "graphics/berries/belue.4bpp.lz" .align 2 gBerryPic_Liechi:: @ 8E7D0D0 - .incbin "graphics/berries/liechi/pic.4bpp.lz" + .incbin "graphics/berries/liechi.4bpp.lz" .align 2 gBerryPic_Ganlon:: @ 8E7D328 - .incbin "graphics/berries/ganlon/pic.4bpp.lz" + .incbin "graphics/berries/ganlon.4bpp.lz" .align 2 gBerryPic_Salac:: @ 8E7D4C0 - .incbin "graphics/berries/salac/pic.4bpp.lz" + .incbin "graphics/berries/salac.4bpp.lz" .align 2 gBerryPic_Petaya:: @ 8E7D704 - .incbin "graphics/berries/petaya/pic.4bpp.lz" + .incbin "graphics/berries/petaya.4bpp.lz" .align 2 gBerryPic_Apicot:: @ 8E7D9AC - .incbin "graphics/berries/apicot/pic.4bpp.lz" + .incbin "graphics/berries/apicot.4bpp.lz" .align 2 gBerryPic_Lansat:: @ 8E7DB3C - .incbin "graphics/berries/lansat/pic.4bpp.lz" + .incbin "graphics/berries/lansat.4bpp.lz" .align 2 gBerryPic_Starf:: @ 8E7DD30 - .incbin "graphics/berries/starf/pic.4bpp.lz" + .incbin "graphics/berries/starf.4bpp.lz" .align 2 gBerryPic_Enigma:: @ 8E7DF00 - .incbin "graphics/berries/enigma/pic.4bpp.lz" + .incbin "graphics/berries/enigma.4bpp.lz" .align 2 gBerryPalette_Cheri:: @ 8E7E118 - .incbin "graphics/berries/cheri/palette.gbapal.lz" + .incbin "graphics/berries/cheri.gbapal.lz" .align 2 gBerryPalette_Oran:: @ 8E7E140 - .incbin "graphics/berries/oran/palette.gbapal.lz" + .incbin "graphics/berries/oran.gbapal.lz" .align 2 gBerryPalette_Pecha:: @ 8E7E168 - .incbin "graphics/berries/pecha/palette.gbapal.lz" + .incbin "graphics/berries/pecha.gbapal.lz" .align 2 gBerryPalette_Rawst:: @ 8E7E190 - .incbin "graphics/berries/rawst/palette.gbapal.lz" + .incbin "graphics/berries/rawst.gbapal.lz" .align 2 gBerryPalette_Aspear:: @ 8E7E1B8 - .incbin "graphics/berries/aspear/palette.gbapal.lz" + .incbin "graphics/berries/aspear.gbapal.lz" .align 2 gBerryPalette_Leppa:: @ 8E7E1E0 - .incbin "graphics/berries/leppa/palette.gbapal.lz" + .incbin "graphics/berries/leppa.gbapal.lz" .align 2 gBerryPalette_Chesto:: @ 8E7E208 - .incbin "graphics/berries/chesto/palette.gbapal.lz" + .incbin "graphics/berries/chesto.gbapal.lz" .align 2 gBerryPalette_Persim:: @ 8E7E230 - .incbin "graphics/berries/persim/palette.gbapal.lz" + .incbin "graphics/berries/persim.gbapal.lz" .align 2 gBerryPalette_Lum:: @ 8E7E258 - .incbin "graphics/berries/lum/palette.gbapal.lz" + .incbin "graphics/berries/lum.gbapal.lz" .align 2 gBerryPalette_Sitrus:: @ 8E7E280 - .incbin "graphics/berries/sitrus/palette.gbapal.lz" + .incbin "graphics/berries/sitrus.gbapal.lz" .align 2 gBerryPalette_Figy:: @ 8E7E2A8 - .incbin "graphics/berries/figy/palette.gbapal.lz" + .incbin "graphics/berries/figy.gbapal.lz" .align 2 gBerryPalette_Wiki:: @ 8E7E2D0 - .incbin "graphics/berries/wiki/palette.gbapal.lz" + .incbin "graphics/berries/wiki.gbapal.lz" .align 2 gBerryPalette_Mago:: @ 8E7E2F8 - .incbin "graphics/berries/mago/palette.gbapal.lz" + .incbin "graphics/berries/mago.gbapal.lz" .align 2 gBerryPalette_Aguav:: @ 8E7E320 - .incbin "graphics/berries/aguav/palette.gbapal.lz" + .incbin "graphics/berries/aguav.gbapal.lz" .align 2 gBerryPalette_Iapapa:: @ 8E7E348 - .incbin "graphics/berries/iapapa/palette.gbapal.lz" + .incbin "graphics/berries/iapapa.gbapal.lz" .align 2 gBerryPalette_Razz:: @ 8E7E370 - .incbin "graphics/berries/razz/palette.gbapal.lz" + .incbin "graphics/berries/razz.gbapal.lz" .align 2 gBerryPalette_Bluk:: @ 8E7E398 - .incbin "graphics/berries/bluk/palette.gbapal.lz" + .incbin "graphics/berries/bluk.gbapal.lz" .align 2 gBerryPalette_Nanab:: @ 8E7E3C0 - .incbin "graphics/berries/nanab/palette.gbapal.lz" + .incbin "graphics/berries/nanab.gbapal.lz" .align 2 gBerryPalette_Wepear:: @ 8E7E3E8 - .incbin "graphics/berries/wepear/palette.gbapal.lz" + .incbin "graphics/berries/wepear.gbapal.lz" .align 2 gBerryPalette_Pinap:: @ 8E7E410 - .incbin "graphics/berries/pinap/palette.gbapal.lz" + .incbin "graphics/berries/pinap.gbapal.lz" .align 2 gBerryPalette_Pomeg:: @ 8E7E438 - .incbin "graphics/berries/pomeg/palette.gbapal.lz" + .incbin "graphics/berries/pomeg.gbapal.lz" .align 2 gBerryPalette_Kelpsy:: @ 8E7E460 - .incbin "graphics/berries/kelpsy/palette.gbapal.lz" + .incbin "graphics/berries/kelpsy.gbapal.lz" .align 2 gBerryPalette_Qualot:: @ 8E7E488 - .incbin "graphics/berries/qualot/palette.gbapal.lz" + .incbin "graphics/berries/qualot.gbapal.lz" .align 2 gBerryPalette_Hondew:: @ 8E7E4B0 - .incbin "graphics/berries/hondew/palette.gbapal.lz" + .incbin "graphics/berries/hondew.gbapal.lz" .align 2 gBerryPalette_Grepa:: @ 8E7E4D8 - .incbin "graphics/berries/grepa/palette.gbapal.lz" + .incbin "graphics/berries/grepa.gbapal.lz" .align 2 gBerryPalette_Tamato:: @ 8E7E500 - .incbin "graphics/berries/tamato/palette.gbapal.lz" + .incbin "graphics/berries/tamato.gbapal.lz" .align 2 gBerryPalette_Cornn:: @ 8E7E528 - .incbin "graphics/berries/cornn/palette.gbapal.lz" + .incbin "graphics/berries/cornn.gbapal.lz" .align 2 gBerryPalette_Magost:: @ 8E7E550 - .incbin "graphics/berries/magost/palette.gbapal.lz" + .incbin "graphics/berries/magost.gbapal.lz" .align 2 gBerryPalette_Rabuta:: @ 8E7E578 - .incbin "graphics/berries/rabuta/palette.gbapal.lz" + .incbin "graphics/berries/rabuta.gbapal.lz" .align 2 gBerryPalette_Nomel:: @ 8E7E5A0 - .incbin "graphics/berries/nomel/palette.gbapal.lz" + .incbin "graphics/berries/nomel.gbapal.lz" .align 2 gBerryPalette_Spelon:: @ 8E7E5C8 - .incbin "graphics/berries/spelon/palette.gbapal.lz" + .incbin "graphics/berries/spelon.gbapal.lz" .align 2 gBerryPalette_Pamtre:: @ 8E7E5F0 - .incbin "graphics/berries/pamtre/palette.gbapal.lz" + .incbin "graphics/berries/pamtre.gbapal.lz" .align 2 gBerryPalette_Watmel:: @ 8E7E618 - .incbin "graphics/berries/watmel/palette.gbapal.lz" + .incbin "graphics/berries/watmel.gbapal.lz" .align 2 gBerryPalette_Durin:: @ 8E7E640 - .incbin "graphics/berries/durin/palette.gbapal.lz" + .incbin "graphics/berries/durin.gbapal.lz" .align 2 gBerryPalette_Belue:: @ 8E7E668 - .incbin "graphics/berries/belue/palette.gbapal.lz" + .incbin "graphics/berries/belue.gbapal.lz" .align 2 gBerryPalette_Liechi:: @ 8E7E690 - .incbin "graphics/berries/liechi/palette.gbapal.lz" + .incbin "graphics/berries/liechi.gbapal.lz" .align 2 gBerryPalette_Ganlon:: @ 8E7E6B8 - .incbin "graphics/berries/ganlon/palette.gbapal.lz" + .incbin "graphics/berries/ganlon.gbapal.lz" .align 2 gBerryPalette_Salac:: @ 8E7E6E0 - .incbin "graphics/berries/salac/palette.gbapal.lz" + .incbin "graphics/berries/salac.gbapal.lz" .align 2 gBerryPalette_Petaya:: @ 8E7E708 - .incbin "graphics/berries/petaya/palette.gbapal.lz" + .incbin "graphics/berries/petaya.gbapal.lz" .align 2 gBerryPalette_Apicot:: @ 8E7E730 - .incbin "graphics/berries/apicot/palette.gbapal.lz" + .incbin "graphics/berries/apicot.gbapal.lz" .align 2 gBerryPalette_Lansat:: @ 8E7E758 - .incbin "graphics/berries/lansat/palette.gbapal.lz" + .incbin "graphics/berries/lansat.gbapal.lz" .align 2 gBerryPalette_Starf:: @ 8E7E780 - .incbin "graphics/berries/starf/palette.gbapal.lz" + .incbin "graphics/berries/starf.gbapal.lz" .align 2 gBerryPalette_Enigma:: @ 8E7E7A8 - .incbin "graphics/berries/enigma/palette.gbapal.lz" + .incbin "graphics/berries/enigma.gbapal.lz" -- cgit v1.2.3 From f9e69ff2818403e3fb2d5923853db2c0b4dc8971 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 8 Oct 2017 21:38:28 -0500 Subject: remove trainer palettes --- data/graphics/trainers/graphics.inc | 338 ++++++++++++++++++------------------ 1 file changed, 169 insertions(+), 169 deletions(-) (limited to 'data') diff --git a/data/graphics/trainers/graphics.inc b/data/graphics/trainers/graphics.inc index 09f34ca31..3a2be8723 100644 --- a/data/graphics/trainers/graphics.inc +++ b/data/graphics/trainers/graphics.inc @@ -1,675 +1,675 @@ .align 2 gTrainerFrontPic_Lass:: @ 8E48D38 - .incbin "graphics/trainers/lass/front.4bpp.lz" + .incbin "graphics/trainers/lass.4bpp.lz" .align 2 gTrainerFrontPic_Youngster:: @ 8E49010 - .incbin "graphics/trainers/youngster/front.4bpp.lz" + .incbin "graphics/trainers/youngster.4bpp.lz" .align 2 gTrainerFrontPic_Brendan:: @ 8E492B8 - .incbin "graphics/trainers/brendan/front.4bpp.lz" + .incbin "graphics/trainers/brendan.4bpp.lz" .align 2 gTrainerFrontPic_May:: @ 8E495CC - .incbin "graphics/trainers/may/front.4bpp.lz" + .incbin "graphics/trainers/may.4bpp.lz" .align 2 gTrainerFrontPic_Hiker:: @ 8E498CC - .incbin "graphics/trainers/hiker/front.4bpp.lz" + .incbin "graphics/trainers/hiker.4bpp.lz" .align 2 gTrainerFrontPic_Beauty:: @ 8E49D4C - .incbin "graphics/trainers/beauty/front.4bpp.lz" + .incbin "graphics/trainers/beauty.4bpp.lz" .align 2 gTrainerFrontPic_Fisherman:: @ 8E4A034 - .incbin "graphics/trainers/fisherman/front.4bpp.lz" + .incbin "graphics/trainers/fisherman.4bpp.lz" .align 2 gTrainerFrontPic_Lady:: @ 8E4A418 - .incbin "graphics/trainers/lady/front.4bpp.lz" + .incbin "graphics/trainers/lady.4bpp.lz" .align 2 gTrainerFrontPic_CyclingTriathleteM:: @ 8E4A7CC - .incbin "graphics/trainers/cycling_triathlete_m/front.4bpp.lz" + .incbin "graphics/trainers/cycling_triathlete_m.4bpp.lz" .align 2 gTrainerFrontPic_AquaGruntM:: @ 8E4ABDC - .incbin "graphics/trainers/aqua_grunt_m/front.4bpp.lz" + .incbin "graphics/trainers/aqua_grunt_m.4bpp.lz" .align 2 gTrainerFrontPic_Twins:: @ 8E4AF3C - .incbin "graphics/trainers/twins/front.4bpp.lz" + .incbin "graphics/trainers/twins.4bpp.lz" .align 2 gTrainerFrontPic_SwimmerF:: @ 8E4B300 - .incbin "graphics/trainers/swimmer_f/front.4bpp.lz" + .incbin "graphics/trainers/swimmer_f.4bpp.lz" .align 2 gTrainerFrontPic_BugCatcher:: @ 8E4B5D0 - .incbin "graphics/trainers/bug_catcher/front.4bpp.lz" + .incbin "graphics/trainers/bug_catcher.4bpp.lz" .align 2 gTrainerFrontPic_SchoolKidM:: @ 8E4B8FC - .incbin "graphics/trainers/school_kid_m/front.4bpp.lz" + .incbin "graphics/trainers/school_kid_m.4bpp.lz" .align 2 gTrainerFrontPic_RichBoy:: @ 8E4BBBC - .incbin "graphics/trainers/rich_boy/front.4bpp.lz" + .incbin "graphics/trainers/rich_boy.4bpp.lz" .align 2 gTrainerFrontPic_SrAndJr:: @ 8E4BE70 - .incbin "graphics/trainers/sr_and_jr/front.4bpp.lz" + .incbin "graphics/trainers/sr_and_jr.4bpp.lz" .align 2 gTrainerFrontPic_BlackBelt:: @ 8E4C2E0 - .incbin "graphics/trainers/black_belt/front.4bpp.lz" + .incbin "graphics/trainers/black_belt.4bpp.lz" .align 2 gTrainerFrontPic_Wally:: @ 8E4C644 - .incbin "graphics/trainers/wally/front.4bpp.lz" + .incbin "graphics/trainers/wally.4bpp.lz" .align 2 gTrainerFrontPic_AquaGruntF:: @ 8E4C914 - .incbin "graphics/trainers/aqua_grunt_f/front.4bpp.lz" + .incbin "graphics/trainers/aqua_grunt_f.4bpp.lz" .align 2 gTrainerFrontPic_TuberF:: @ 8E4CC50 - .incbin "graphics/trainers/tuber_f/front.4bpp.lz" + .incbin "graphics/trainers/tuber_f.4bpp.lz" .align 2 gTrainerFrontPic_HexManiac:: @ 8E4CEF4 - .incbin "graphics/trainers/hex_maniac/front.4bpp.lz" + .incbin "graphics/trainers/hex_maniac.4bpp.lz" .align 2 gTrainerFrontPic_PokemonBreederF:: @ 8E4D260 - .incbin "graphics/trainers/pokemon_breeder_f/front.4bpp.lz" + .incbin "graphics/trainers/pokemon_breeder_f.4bpp.lz" .align 2 gTrainerFrontPic_MagmaGruntM:: @ 8E4D594 - .incbin "graphics/trainers/magma_grunt_m/front.4bpp.lz" + .incbin "graphics/trainers/magma_grunt_m.4bpp.lz" .align 2 gTrainerFrontPic_MagmaGruntF:: @ 8E4D914 - .incbin "graphics/trainers/magma_grunt_f/front.4bpp.lz" + .incbin "graphics/trainers/magma_grunt_f.4bpp.lz" .align 2 gTrainerFrontPic_Interviewer:: @ 8E4DCA0 - .incbin "graphics/trainers/interviewer/front.4bpp.lz" + .incbin "graphics/trainers/interviewer.4bpp.lz" .align 2 gTrainerFrontPic_TuberM:: @ 8E4E144 - .incbin "graphics/trainers/tuber_m/front.4bpp.lz" + .incbin "graphics/trainers/tuber_m.4bpp.lz" .align 2 gTrainerFrontPic_YoungCouple:: @ 8E4E3D0 - .incbin "graphics/trainers/young_couple/front.4bpp.lz" + .incbin "graphics/trainers/young_couple.4bpp.lz" .align 2 gTrainerFrontPic_Guitarist:: @ 8E4E790 - .incbin "graphics/trainers/guitarist/front.4bpp.lz" + .incbin "graphics/trainers/guitarist.4bpp.lz" .align 2 gTrainerFrontPic_Gentleman:: @ 8E4EB14 - .incbin "graphics/trainers/gentleman/front.4bpp.lz" + .incbin "graphics/trainers/gentleman.4bpp.lz" .align 2 gTrainerFrontPic_Steven:: @ 8E4EE14 - .incbin "graphics/trainers/steven/front.4bpp.lz" + .incbin "graphics/trainers/steven.4bpp.lz" .align 2 gTrainerFrontPic_Maxie:: @ 8E4F14C - .incbin "graphics/trainers/maxie/front.4bpp.lz" + .incbin "graphics/trainers/maxie.4bpp.lz" .align 2 gTrainerFrontPic_RunningTriathleteF:: @ 8E4F440 - .incbin "graphics/trainers/running_triathlete_f/front.4bpp.lz" + .incbin "graphics/trainers/running_triathlete_f.4bpp.lz" .align 2 gTrainerFrontPic_RunningTriathleteM:: @ 8E4F6E4 - .incbin "graphics/trainers/running_triathlete_m/front.4bpp.lz" + .incbin "graphics/trainers/running_triathlete_m.4bpp.lz" .align 2 gTrainerFrontPic_BattleGirl:: @ 8E4F99C - .incbin "graphics/trainers/battle_girl/front.4bpp.lz" + .incbin "graphics/trainers/battle_girl.4bpp.lz" .align 2 gTrainerFrontPic_CyclingTriathleteF:: @ 8E4FCBC - .incbin "graphics/trainers/cycling_triathlete_f/front.4bpp.lz" + .incbin "graphics/trainers/cycling_triathlete_f.4bpp.lz" .align 2 gTrainerFrontPic_SwimmerM:: @ 8E500C8 - .incbin "graphics/trainers/swimmer_m/front.4bpp.lz" + .incbin "graphics/trainers/swimmer_m.4bpp.lz" .align 2 gTrainerFrontPic_PokefanF:: @ 8E50388 - .incbin "graphics/trainers/pokefan_f/front.4bpp.lz" + .incbin "graphics/trainers/pokefan_f.4bpp.lz" .align 2 gTrainerFrontPic_ExpertM:: @ 8E50754 - .incbin "graphics/trainers/expert_m/front.4bpp.lz" + .incbin "graphics/trainers/expert_m.4bpp.lz" .align 2 gTrainerFrontPic_ExpertF:: @ 8E50A94 - .incbin "graphics/trainers/expert_f/front.4bpp.lz" + .incbin "graphics/trainers/expert_f.4bpp.lz" .align 2 gTrainerFrontPic_SwimmingTriathleteM:: @ 8E50DB0 - .incbin "graphics/trainers/swimming_triathlete_m/front.4bpp.lz" + .incbin "graphics/trainers/swimming_triathlete_m.4bpp.lz" .align 2 gTrainerFrontPic_SwimmingTriathleteF:: @ 8E510DC - .incbin "graphics/trainers/swimming_triathlete_f/front.4bpp.lz" + .incbin "graphics/trainers/swimming_triathlete_f.4bpp.lz" .align 2 gTrainerFrontPic_DragonTamer:: @ 8E513B8 - .incbin "graphics/trainers/dragon_tamer/front.4bpp.lz" + .incbin "graphics/trainers/dragon_tamer.4bpp.lz" .align 2 gTrainerFrontPic_BirdKeeper:: @ 8E5170C - .incbin "graphics/trainers/bird_keeper/front.4bpp.lz" + .incbin "graphics/trainers/bird_keeper.4bpp.lz" .align 2 gTrainerFrontPic_NinjaBoy:: @ 8E51A44 - .incbin "graphics/trainers/ninja_boy/front.4bpp.lz" + .incbin "graphics/trainers/ninja_boy.4bpp.lz" .align 2 gTrainerFrontPic_ParasolLady:: @ 8E51D20 - .incbin "graphics/trainers/parasol_lady/front.4bpp.lz" + .incbin "graphics/trainers/parasol_lady.4bpp.lz" .align 2 gTrainerFrontPic_BugManiac:: @ 8E52058 - .incbin "graphics/trainers/bug_maniac/front.4bpp.lz" + .incbin "graphics/trainers/bug_maniac.4bpp.lz" .align 2 gTrainerFrontPic_Sailor:: @ 8E524A8 - .incbin "graphics/trainers/sailor/front.4bpp.lz" + .incbin "graphics/trainers/sailor.4bpp.lz" .align 2 gTrainerFrontPic_Collector:: @ 8E52858 - .incbin "graphics/trainers/collector/front.4bpp.lz" + .incbin "graphics/trainers/collector.4bpp.lz" .align 2 gTrainerFrontPic_PokemonBreederM:: @ 8E52C5C - .incbin "graphics/trainers/pokemon_breeder_m/front.4bpp.lz" + .incbin "graphics/trainers/pokemon_breeder_m.4bpp.lz" .align 2 gTrainerFrontPic_PokemonRangerM:: @ 8E52F8C - .incbin "graphics/trainers/pokemon_ranger_m/front.4bpp.lz" + .incbin "graphics/trainers/pokemon_ranger_m.4bpp.lz" .align 2 gTrainerFrontPic_PokemonRangerF:: @ 8E532D4 - .incbin "graphics/trainers/pokemon_ranger_f/front.4bpp.lz" + .incbin "graphics/trainers/pokemon_ranger_f.4bpp.lz" .align 2 gTrainerFrontPic_MagmaAdminM:: @ 8E53608 - .incbin "graphics/trainers/magma_admin_m/front.4bpp.lz" + .incbin "graphics/trainers/magma_admin_m.4bpp.lz" .align 2 gTrainerFrontPic_MagmaAdminF:: @ 8E539E0 - .incbin "graphics/trainers/magma_admin_f/front.4bpp.lz" + .incbin "graphics/trainers/magma_admin_f.4bpp.lz" .align 2 gTrainerFrontPic_AromaLady:: @ 8E53D90 - .incbin "graphics/trainers/aroma_lady/front.4bpp.lz" + .incbin "graphics/trainers/aroma_lady.4bpp.lz" .align 2 gTrainerFrontPic_RuinManiac:: @ 8E54054 - .incbin "graphics/trainers/ruin_maniac/front.4bpp.lz" + .incbin "graphics/trainers/ruin_maniac.4bpp.lz" .align 2 gTrainerFrontPic_CoolTrainerM:: @ 8E543F0 - .incbin "graphics/trainers/cool_trainer_m/front.4bpp.lz" + .incbin "graphics/trainers/cool_trainer_m.4bpp.lz" .align 2 gTrainerFrontPic_CoolTrainerF:: @ 8E546D8 - .incbin "graphics/trainers/cool_trainer_f/front.4bpp.lz" + .incbin "graphics/trainers/cool_trainer_f.4bpp.lz" .align 2 gTrainerFrontPic_Pokemaniac:: @ 8E549EC - .incbin "graphics/trainers/pokemaniac/front.4bpp.lz" + .incbin "graphics/trainers/pokemaniac.4bpp.lz" .align 2 gTrainerFrontPic_Kindler:: @ 8E54D5C - .incbin "graphics/trainers/kindler/front.4bpp.lz" + .incbin "graphics/trainers/kindler.4bpp.lz" .align 2 gTrainerFrontPic_Camper:: @ 8E550C8 - .incbin "graphics/trainers/camper/front.4bpp.lz" + .incbin "graphics/trainers/camper.4bpp.lz" .align 2 gTrainerFrontPic_Picnicker:: @ 8E553B0 - .incbin "graphics/trainers/picnicker/front.4bpp.lz" + .incbin "graphics/trainers/picnicker.4bpp.lz" .align 2 gTrainerFrontPic_PsychicM:: @ 8E55690 - .incbin "graphics/trainers/psychic_m/front.4bpp.lz" + .incbin "graphics/trainers/psychic_m.4bpp.lz" .align 2 gTrainerFrontPic_PsychicF:: @ 8E559BC - .incbin "graphics/trainers/psychic_f/front.4bpp.lz" + .incbin "graphics/trainers/psychic_f.4bpp.lz" .align 2 gTrainerFrontPic_SchoolKidF:: @ 8E55CE4 - .incbin "graphics/trainers/school_kid_f/front.4bpp.lz" + .incbin "graphics/trainers/school_kid_f.4bpp.lz" .align 2 gTrainerFrontPic_PokefanM:: @ 8E55F80 - .incbin "graphics/trainers/pokefan_m/front.4bpp.lz" + .incbin "graphics/trainers/pokefan_m.4bpp.lz" .align 2 gTrainerFrontPic_SisAndBro:: @ 8E5633C - .incbin "graphics/trainers/sis_and_bro/front.4bpp.lz" + .incbin "graphics/trainers/sis_and_bro.4bpp.lz" .align 2 gTrainerFrontPic_OldCouple:: @ 8E56788 - .incbin "graphics/trainers/old_couple/front.4bpp.lz" + .incbin "graphics/trainers/old_couple.4bpp.lz" .align 2 gTrainerFrontPic_AquaAdminM:: @ 8E56C98 - .incbin "graphics/trainers/aqua_admin_m/front.4bpp.lz" + .incbin "graphics/trainers/aqua_admin_m.4bpp.lz" .align 2 gTrainerFrontPic_AquaAdminF:: @ 8E5704C - .incbin "graphics/trainers/aqua_admin_f/front.4bpp.lz" + .incbin "graphics/trainers/aqua_admin_f.4bpp.lz" .align 2 gTrainerFrontPic_UnusedAqua:: @ 8E57410 - .incbin "graphics/trainers/unused_aqua/front.4bpp.lz" + .incbin "graphics/trainers/unused_aqua.4bpp.lz" .align 2 gTrainerFrontPic_Archie:: @ 8E5778C - .incbin "graphics/trainers/archie/front.4bpp.lz" + .incbin "graphics/trainers/archie.4bpp.lz" .align 2 gTrainerBackPic_Brendan:: @ 8E57AC8 - .incbin "graphics/trainers/brendan/back.4bpp.lz" + .incbin "graphics/trainers/brendan_back.4bpp.lz" .align 2 gTrainerBackPic_May:: @ 8E5889C - .incbin "graphics/trainers/may/back.4bpp.lz" + .incbin "graphics/trainers/may_back.4bpp.lz" .align 2 gTrainerBackPic_Wally:: @ 8E59588 - .incbin "graphics/trainers/wally/back.4bpp.lz" + .incbin "graphics/trainers/wally_back.4bpp.lz" .align 2 gTrainerPalette_Lass:: @ 8E59FD8 - .incbin "graphics/trainers/lass/palette.gbapal.lz" + .incbin "graphics/trainers/lass.gbapal.lz" .align 2 gTrainerPalette_Youngster:: @ 8E5A000 - .incbin "graphics/trainers/youngster/palette.gbapal.lz" + .incbin "graphics/trainers/youngster.gbapal.lz" .align 2 gTrainerPalette_Brendan:: @ 8E5A028 - .incbin "graphics/trainers/brendan/palette.gbapal.lz" + .incbin "graphics/trainers/brendan.gbapal.lz" .align 2 gTrainerPalette_May:: @ 8E5A050 - .incbin "graphics/trainers/may/palette.gbapal.lz" + .incbin "graphics/trainers/may.gbapal.lz" .align 2 gTrainerPalette_Hiker:: @ 8E5A078 - .incbin "graphics/trainers/hiker/palette.gbapal.lz" + .incbin "graphics/trainers/hiker.gbapal.lz" .align 2 gTrainerPalette_Beauty:: @ 8E5A0A0 - .incbin "graphics/trainers/beauty/palette.gbapal.lz" + .incbin "graphics/trainers/beauty.gbapal.lz" .align 2 gTrainerPalette_Fisherman:: @ 8E5A0C8 - .incbin "graphics/trainers/fisherman/palette.gbapal.lz" + .incbin "graphics/trainers/fisherman.gbapal.lz" .align 2 gTrainerPalette_Lady:: @ 8E5A0F0 - .incbin "graphics/trainers/lady/palette.gbapal.lz" + .incbin "graphics/trainers/lady.gbapal.lz" .align 2 gTrainerPalette_CyclingTriathleteM:: @ 8E5A118 - .incbin "graphics/trainers/cycling_triathlete_m/palette.gbapal.lz" + .incbin "graphics/trainers/cycling_triathlete_m.gbapal.lz" .align 2 gTrainerPalette_AquaGruntM:: @ 8E5A140 - .incbin "graphics/trainers/aqua_grunt_m/palette.gbapal.lz" + .incbin "graphics/trainers/aqua_grunt_m.gbapal.lz" .align 2 gTrainerPalette_Twins:: @ 8E5A168 - .incbin "graphics/trainers/twins/palette.gbapal.lz" + .incbin "graphics/trainers/twins.gbapal.lz" .align 2 gTrainerPalette_SwimmerF:: @ 8E5A190 - .incbin "graphics/trainers/swimmer_f/palette.gbapal.lz" + .incbin "graphics/trainers/swimmer_f.gbapal.lz" .align 2 gTrainerPalette_BugCatcher:: @ 8E5A1B8 - .incbin "graphics/trainers/bug_catcher/palette.gbapal.lz" + .incbin "graphics/trainers/bug_catcher.gbapal.lz" .align 2 gTrainerPalette_SchoolKidM:: @ 8E5A1E0 - .incbin "graphics/trainers/school_kid_m/palette.gbapal.lz" + .incbin "graphics/trainers/school_kid_m.gbapal.lz" .align 2 gTrainerPalette_RichBoy:: @ 8E5A208 - .incbin "graphics/trainers/rich_boy/palette.gbapal.lz" + .incbin "graphics/trainers/rich_boy.gbapal.lz" .align 2 gTrainerPalette_SrAndJr:: @ 8E5A230 - .incbin "graphics/trainers/sr_and_jr/palette.gbapal.lz" + .incbin "graphics/trainers/sr_and_jr.gbapal.lz" .align 2 gTrainerPalette_BlackBelt:: @ 8E5A258 - .incbin "graphics/trainers/black_belt/palette.gbapal.lz" + .incbin "graphics/trainers/black_belt.gbapal.lz" .align 2 gTrainerPalette_Wally:: @ 8E5A280 - .incbin "graphics/trainers/wally/palette.gbapal.lz" + .incbin "graphics/trainers/wally.gbapal.lz" .align 2 gTrainerPalette_AquaGruntF:: @ 8E5A2A8 - .incbin "graphics/trainers/aqua_grunt_f/palette.gbapal.lz" + .incbin "graphics/trainers/aqua_grunt_f.gbapal.lz" .align 2 gTrainerPalette_TuberF:: @ 8E5A2D0 - .incbin "graphics/trainers/tuber_f/palette.gbapal.lz" + .incbin "graphics/trainers/tuber_f.gbapal.lz" .align 2 gTrainerPalette_HexManiac:: @ 8E5A2F8 - .incbin "graphics/trainers/hex_maniac/palette.gbapal.lz" + .incbin "graphics/trainers/hex_maniac.gbapal.lz" .align 2 gTrainerPalette_PokemonBreederF:: @ 8E5A320 - .incbin "graphics/trainers/pokemon_breeder_f/palette.gbapal.lz" + .incbin "graphics/trainers/pokemon_breeder_f.gbapal.lz" .align 2 gTrainerPalette_MagmaGruntM:: @ 8E5A348 - .incbin "graphics/trainers/magma_grunt_m/palette.gbapal.lz" + .incbin "graphics/trainers/magma_grunt_m.gbapal.lz" .align 2 gTrainerPalette_MagmaGruntF:: @ 8E5A370 - .incbin "graphics/trainers/magma_grunt_f/palette.gbapal.lz" + .incbin "graphics/trainers/magma_grunt_f.gbapal.lz" .align 2 gTrainerPalette_Interviewer:: @ 8E5A398 - .incbin "graphics/trainers/interviewer/palette.gbapal.lz" + .incbin "graphics/trainers/interviewer.gbapal.lz" .align 2 gTrainerPalette_TuberM:: @ 8E5A3C0 - .incbin "graphics/trainers/tuber_m/palette.gbapal.lz" + .incbin "graphics/trainers/tuber_m.gbapal.lz" .align 2 gTrainerPalette_YoungCouple:: @ 8E5A3E8 - .incbin "graphics/trainers/young_couple/palette.gbapal.lz" + .incbin "graphics/trainers/young_couple.gbapal.lz" .align 2 gTrainerPalette_Guitarist:: @ 8E5A410 - .incbin "graphics/trainers/guitarist/palette.gbapal.lz" + .incbin "graphics/trainers/guitarist.gbapal.lz" .align 2 gTrainerPalette_Gentleman:: @ 8E5A438 - .incbin "graphics/trainers/gentleman/palette.gbapal.lz" + .incbin "graphics/trainers/gentleman.gbapal.lz" .align 2 gTrainerPalette_Steven:: @ 8E5A460 - .incbin "graphics/trainers/steven/palette.gbapal.lz" + .incbin "graphics/trainers/steven.gbapal.lz" .align 2 gTrainerPalette_Maxie:: @ 8E5A488 - .incbin "graphics/trainers/maxie/palette.gbapal.lz" + .incbin "graphics/trainers/maxie.gbapal.lz" .align 2 gTrainerPalette_RunningTriathleteF:: @ 8E5A4B0 - .incbin "graphics/trainers/running_triathlete_f/palette.gbapal.lz" + .incbin "graphics/trainers/running_triathlete_f.gbapal.lz" .align 2 gTrainerPalette_RunningTriathleteM:: @ 8E5A4D8 - .incbin "graphics/trainers/running_triathlete_m/palette.gbapal.lz" + .incbin "graphics/trainers/running_triathlete_m.gbapal.lz" .align 2 gTrainerPalette_BattleGirl:: @ 8E5A500 - .incbin "graphics/trainers/battle_girl/palette.gbapal.lz" + .incbin "graphics/trainers/battle_girl.gbapal.lz" .align 2 gTrainerPalette_CyclingTriathleteF:: @ 8E5A528 - .incbin "graphics/trainers/cycling_triathlete_f/palette.gbapal.lz" + .incbin "graphics/trainers/cycling_triathlete_f.gbapal.lz" .align 2 gTrainerPalette_SwimmerM:: @ 8E5A550 - .incbin "graphics/trainers/swimmer_m/palette.gbapal.lz" + .incbin "graphics/trainers/swimmer_m.gbapal.lz" .align 2 gTrainerPalette_PokefanF:: @ 8E5A578 - .incbin "graphics/trainers/pokefan_f/palette.gbapal.lz" + .incbin "graphics/trainers/pokefan_f.gbapal.lz" .align 2 gTrainerPalette_ExpertM:: @ 8E5A5A0 - .incbin "graphics/trainers/expert_m/palette.gbapal.lz" + .incbin "graphics/trainers/expert_m.gbapal.lz" .align 2 gTrainerPalette_ExpertF:: @ 8E5A5C8 - .incbin "graphics/trainers/expert_f/palette.gbapal.lz" + .incbin "graphics/trainers/expert_f.gbapal.lz" .align 2 gTrainerPalette_SwimmingTriathleteM:: @ 8E5A5F0 - .incbin "graphics/trainers/swimming_triathlete_m/palette.gbapal.lz" + .incbin "graphics/trainers/swimming_triathlete_m.gbapal.lz" .align 2 gTrainerPalette_SwimmingTriathleteF:: @ 8E5A618 - .incbin "graphics/trainers/swimming_triathlete_f/palette.gbapal.lz" + .incbin "graphics/trainers/swimming_triathlete_f.gbapal.lz" .align 2 gTrainerPalette_DragonTamer:: @ 8E5A640 - .incbin "graphics/trainers/dragon_tamer/palette.gbapal.lz" + .incbin "graphics/trainers/dragon_tamer.gbapal.lz" .align 2 gTrainerPalette_BirdKeeper:: @ 8E5A668 - .incbin "graphics/trainers/bird_keeper/palette.gbapal.lz" + .incbin "graphics/trainers/bird_keeper.gbapal.lz" .align 2 gTrainerPalette_NinjaBoy:: @ 8E5A690 - .incbin "graphics/trainers/ninja_boy/palette.gbapal.lz" + .incbin "graphics/trainers/ninja_boy.gbapal.lz" .align 2 gTrainerPalette_ParasolLady:: @ 8E5A6B8 - .incbin "graphics/trainers/parasol_lady/palette.gbapal.lz" + .incbin "graphics/trainers/parasol_lady.gbapal.lz" .align 2 gTrainerPalette_BugManiac:: @ 8E5A6E0 - .incbin "graphics/trainers/bug_maniac/palette.gbapal.lz" + .incbin "graphics/trainers/bug_maniac.gbapal.lz" .align 2 gTrainerPalette_Sailor:: @ 8E5A708 - .incbin "graphics/trainers/sailor/palette.gbapal.lz" + .incbin "graphics/trainers/sailor.gbapal.lz" .align 2 gTrainerPalette_Collector:: @ 8E5A730 - .incbin "graphics/trainers/collector/palette.gbapal.lz" + .incbin "graphics/trainers/collector.gbapal.lz" .align 2 gTrainerPalette_PokemonBreederM:: @ 8E5A758 - .incbin "graphics/trainers/pokemon_breeder_m/palette.gbapal.lz" + .incbin "graphics/trainers/pokemon_breeder_m.gbapal.lz" .align 2 gTrainerPalette_PokemonRangerM:: @ 8E5A780 - .incbin "graphics/trainers/pokemon_ranger_m/palette.gbapal.lz" + .incbin "graphics/trainers/pokemon_ranger_m.gbapal.lz" .align 2 gTrainerPalette_PokemonRangerF:: @ 8E5A7A8 - .incbin "graphics/trainers/pokemon_ranger_f/palette.gbapal.lz" + .incbin "graphics/trainers/pokemon_ranger_f.gbapal.lz" .align 2 gTrainerPalette_MagmaAdminM:: @ 8E5A7D0 - .incbin "graphics/trainers/magma_admin_m/palette.gbapal.lz" + .incbin "graphics/trainers/magma_admin_m.gbapal.lz" .align 2 gTrainerPalette_MagmaAdminF:: @ 8E5A7F8 - .incbin "graphics/trainers/magma_admin_f/palette.gbapal.lz" + .incbin "graphics/trainers/magma_admin_f.gbapal.lz" .align 2 gTrainerPalette_AromaLady:: @ 8E5A820 - .incbin "graphics/trainers/aroma_lady/palette.gbapal.lz" + .incbin "graphics/trainers/aroma_lady.gbapal.lz" .align 2 gTrainerPalette_RuinManiac:: @ 8E5A848 - .incbin "graphics/trainers/ruin_maniac/palette.gbapal.lz" + .incbin "graphics/trainers/ruin_maniac.gbapal.lz" .align 2 gTrainerPalette_CoolTrainerM:: @ 8E5A870 - .incbin "graphics/trainers/cool_trainer_m/palette.gbapal.lz" + .incbin "graphics/trainers/cool_trainer_m.gbapal.lz" .align 2 gTrainerPalette_CoolTrainerF:: @ 8E5A898 - .incbin "graphics/trainers/cool_trainer_f/palette.gbapal.lz" + .incbin "graphics/trainers/cool_trainer_f.gbapal.lz" .align 2 gTrainerPalette_Pokemaniac:: @ 8E5A8C0 - .incbin "graphics/trainers/pokemaniac/palette.gbapal.lz" + .incbin "graphics/trainers/pokemaniac.gbapal.lz" .align 2 gTrainerPalette_Kindler:: @ 8E5A8E8 - .incbin "graphics/trainers/kindler/palette.gbapal.lz" + .incbin "graphics/trainers/kindler.gbapal.lz" .align 2 gTrainerPalette_Camper:: @ 8E5A910 - .incbin "graphics/trainers/camper/palette.gbapal.lz" + .incbin "graphics/trainers/camper.gbapal.lz" .align 2 gTrainerPalette_Picnicker:: @ 8E5A938 - .incbin "graphics/trainers/picnicker/palette.gbapal.lz" + .incbin "graphics/trainers/picnicker.gbapal.lz" .align 2 gTrainerPalette_PsychicM:: @ 8E5A960 - .incbin "graphics/trainers/psychic_m/palette.gbapal.lz" + .incbin "graphics/trainers/psychic_m.gbapal.lz" .align 2 gTrainerPalette_PsychicF:: @ 8E5A988 - .incbin "graphics/trainers/psychic_f/palette.gbapal.lz" + .incbin "graphics/trainers/psychic_f.gbapal.lz" .align 2 gTrainerPalette_SchoolKidF:: @ 8E5A9B0 - .incbin "graphics/trainers/school_kid_f/palette.gbapal.lz" + .incbin "graphics/trainers/school_kid_f.gbapal.lz" .align 2 gTrainerPalette_PokefanM:: @ 8E5A9D8 - .incbin "graphics/trainers/pokefan_m/palette.gbapal.lz" + .incbin "graphics/trainers/pokefan_m.gbapal.lz" .align 2 gTrainerPalette_SisAndBro:: @ 8E5AA00 - .incbin "graphics/trainers/sis_and_bro/palette.gbapal.lz" + .incbin "graphics/trainers/sis_and_bro.gbapal.lz" .align 2 gTrainerPalette_OldCouple:: @ 8E5AA28 - .incbin "graphics/trainers/old_couple/palette.gbapal.lz" + .incbin "graphics/trainers/old_couple.gbapal.lz" .align 2 gTrainerPalette_AquaAdminM:: @ 8E5AA50 - .incbin "graphics/trainers/aqua_admin_m/palette.gbapal.lz" + .incbin "graphics/trainers/aqua_admin_m.gbapal.lz" .align 2 gTrainerPalette_AquaAdminF:: @ 8E5AA78 - .incbin "graphics/trainers/aqua_admin_f/palette.gbapal.lz" + .incbin "graphics/trainers/aqua_admin_f.gbapal.lz" .align 2 gTrainerPalette_UnusedAqua:: @ 8E5AAA0 - .incbin "graphics/trainers/unused_aqua/palette.gbapal.lz" + .incbin "graphics/trainers/unused_aqua.gbapal.lz" .align 2 gTrainerPalette_Archie:: @ 8E5AAC8 - .incbin "graphics/trainers/archie/palette.gbapal.lz" + .incbin "graphics/trainers/archie.gbapal.lz" .align 2 gTrainerFrontPic_Roxanne:: @ 8E5AAF0 - .incbin "graphics/trainers/roxanne/front.4bpp.lz" + .incbin "graphics/trainers/roxanne.4bpp.lz" .align 2 gTrainerFrontPic_Brawly:: @ 8E5ADDC - .incbin "graphics/trainers/brawly/front.4bpp.lz" + .incbin "graphics/trainers/brawly.4bpp.lz" .align 2 gTrainerFrontPic_Wattson:: @ 8E5B170 - .incbin "graphics/trainers/wattson/front.4bpp.lz" + .incbin "graphics/trainers/wattson.4bpp.lz" .align 2 gTrainerFrontPic_Flannery:: @ 8E5B4B8 - .incbin "graphics/trainers/flannery/front.4bpp.lz" + .incbin "graphics/trainers/flannery.4bpp.lz" .align 2 gTrainerFrontPic_Norman:: @ 8E5B838 - .incbin "graphics/trainers/norman/front.4bpp.lz" + .incbin "graphics/trainers/norman.4bpp.lz" .align 2 gTrainerFrontPic_Winona:: @ 8E5BB74 - .incbin "graphics/trainers/winona/front.4bpp.lz" + .incbin "graphics/trainers/winona.4bpp.lz" .align 2 gTrainerFrontPic_TateAndLiza:: @ 8E5BEF4 - .incbin "graphics/trainers/tate_and_liza/front.4bpp.lz" + .incbin "graphics/trainers/tate_and_liza.4bpp.lz" .align 2 gTrainerFrontPic_Wallace:: @ 8E5C338 - .incbin "graphics/trainers/wallace/front.4bpp.lz" + .incbin "graphics/trainers/wallace.4bpp.lz" .align 2 gTrainerFrontPic_Sidney:: @ 8E5C6B0 - .incbin "graphics/trainers/sidney/front.4bpp.lz" + .incbin "graphics/trainers/sidney.4bpp.lz" .align 2 gTrainerFrontPic_Phoebe:: @ 8E5C9E4 - .incbin "graphics/trainers/phoebe/front.4bpp.lz" + .incbin "graphics/trainers/phoebe.4bpp.lz" .align 2 gTrainerFrontPic_Glacia:: @ 8E5CCE4 - .incbin "graphics/trainers/glacia/front.4bpp.lz" + .incbin "graphics/trainers/glacia.4bpp.lz" .align 2 gTrainerFrontPic_Drake:: @ 8E5D068 - .incbin "graphics/trainers/drake/front.4bpp.lz" + .incbin "graphics/trainers/drake.4bpp.lz" .align 2 gTrainerPalette_Roxanne:: @ 8E5D410 - .incbin "graphics/trainers/roxanne/palette.gbapal.lz" + .incbin "graphics/trainers/roxanne.gbapal.lz" .align 2 gTrainerPalette_Brawly:: @ 8E5D438 - .incbin "graphics/trainers/brawly/palette.gbapal.lz" + .incbin "graphics/trainers/brawly.gbapal.lz" .align 2 gTrainerPalette_Wattson:: @ 8E5D460 - .incbin "graphics/trainers/wattson/palette.gbapal.lz" + .incbin "graphics/trainers/wattson.gbapal.lz" .align 2 gTrainerPalette_Flannery:: @ 8E5D488 - .incbin "graphics/trainers/flannery/palette.gbapal.lz" + .incbin "graphics/trainers/flannery.gbapal.lz" .align 2 gTrainerPalette_Norman:: @ 8E5D4B0 - .incbin "graphics/trainers/norman/palette.gbapal.lz" + .incbin "graphics/trainers/norman.gbapal.lz" .align 2 gTrainerPalette_Winona:: @ 8E5D4D8 - .incbin "graphics/trainers/winona/palette.gbapal.lz" + .incbin "graphics/trainers/winona.gbapal.lz" .align 2 gTrainerPalette_TateAndLiza:: @ 8E5D500 - .incbin "graphics/trainers/tate_and_liza/palette.gbapal.lz" + .incbin "graphics/trainers/tate_and_liza.gbapal.lz" .align 2 gTrainerPalette_Wallace:: @ 8E5D528 - .incbin "graphics/trainers/wallace/palette.gbapal.lz" + .incbin "graphics/trainers/wallace.gbapal.lz" .align 2 gTrainerPalette_Sidney:: @ 8E5D550 - .incbin "graphics/trainers/sidney/palette.gbapal.lz" + .incbin "graphics/trainers/sidney.gbapal.lz" .align 2 gTrainerPalette_Phoebe:: @ 8E5D578 - .incbin "graphics/trainers/phoebe/palette.gbapal.lz" + .incbin "graphics/trainers/phoebe.gbapal.lz" .align 2 gTrainerPalette_Glacia:: @ 8E5D5A0 - .incbin "graphics/trainers/glacia/palette.gbapal.lz" + .incbin "graphics/trainers/glacia.gbapal.lz" .align 2 gTrainerPalette_Drake:: @ 8E5D5C8 - .incbin "graphics/trainers/drake/palette.gbapal.lz" + .incbin "graphics/trainers/drake.gbapal.lz" -- cgit v1.2.3 From 80985df175f67ea1b90772d2d82c5f97bda44106 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 14 Oct 2017 22:16:21 -0400 Subject: sub_8123244 --- data/cable_car.s | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'data') diff --git a/data/cable_car.s b/data/cable_car.s index 3075f7651..6523e0314 100644 --- a/data/cable_car.s +++ b/data/cable_car.s @@ -3,47 +3,6 @@ .section .rodata - .align 2 -gCableCarMtChimneyTilemap:: @ 8401820 - .incbin "graphics/misc/cable_car_mt_chimney_map.bin.lz" - - .align 2 -gCableCarTreeTilemap:: @ 8401978 - .incbin "graphics/misc/cable_car_tree_map.bin.lz" - - .align 2 -gCableCarMountainTilemap:: @ 8401AFC - .incbin "graphics/misc/cable_car_mountain_map.bin.lz" - - .align 2 -gCableCarPylonHookTilemapEntries:: @ 8401CC0 - .2byte 0x3000 - .2byte 0x3001 - .2byte 0x3002 - .2byte 0x3003 - .2byte 0x3004 - .2byte 0x3005 - .2byte 0x3006 - .2byte 0x3007 - .2byte 0x3008 - .2byte 0x3009 - - .align 2 -gCableCarPylonStemTilemap:: @ 8401CD4 - .incbin "graphics/misc/cable_car_pylon_stem_map.bin.lz" - - .align 2 -gUnknown_08401CF8:: @ 8401CF8 - obj_tiles gCableCar_Gfx, 0x800, 1 - obj_tiles gCableCarDoor_Gfx, 0x40, 2 - obj_tiles gCableCarCord_Gfx, 0x80, 3 - .space 8 - - .align 2 -gUnknown_08401D18:: @ 8401D18 - obj_pal gCableCar_Pal, 1 - .space 8 - .align 2 gOamData_8401D28:: @ 8401D28 .2byte 0x0300 -- cgit v1.2.3 From 2fff1ae7c56ae2511137d14ea2085bb03e1e2d43 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 15 Oct 2017 15:30:38 -0400 Subject: Decompile remaining data --- data/cable_car.s | 60 -------------------------------------------------------- 1 file changed, 60 deletions(-) delete mode 100644 data/cable_car.s (limited to 'data') diff --git a/data/cable_car.s b/data/cable_car.s deleted file mode 100644 index 6523e0314..000000000 --- a/data/cable_car.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gOamData_8401D28:: @ 8401D28 - .2byte 0x0300 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gOamData_8401D30:: @ 8401D30 - .2byte 0x4300 - .2byte 0x0000 - .2byte 0x0800 - - .align 2 -gOamData_8401D38:: @ 8401D38 - .2byte 0x0300 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gSpriteTemplate_8401D40:: @ 8401D40 - spr_template 1, 1, gOamData_8401D28, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8123CB8 - - .align 2 -gSpriteTemplate_8401D58:: @ 8401D58 - spr_template 2, 1, gOamData_8401D30, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8123CB8 - - .align 2 -gSpriteTemplate_8401D70:: @ 8401D70 - spr_template 3, 1, gOamData_8401D38, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_76 - -gCableCarPlayerGraphicsIDs:: @ 8401D88 - .byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL - .byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL - -gMtChimneyHikerGraphicsIDs:: @ 8401D8A - .byte MAP_OBJ_GFX_HIKER - .byte MAP_OBJ_GFX_CAMPER - .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_POOCHYENA @ not used - - .align 1 -gMtChimneyHikerCoords:: @ 8401D8E - .2byte 0, 80 - .2byte 240, 146 - -gMtChimneyHikerMovementDelayTable:: @ 8401D96 - .byte 0 - .byte 60 - .byte 120 - .byte 170 - - .align 2 -gUnknown_08401D9C:: @ 8401D9C - .4byte sub_8123EB8 - .4byte sub_8123F44 -- cgit v1.2.3 From 9f523630fcfd25896561f66495a3b4f6bd8c0487 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Tue, 17 Oct 2017 18:13:05 -0400 Subject: Fix Task_Truck1. --- data/field_special_scene.s | 41 ----------------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 data/field_special_scene.s (limited to 'data') diff --git a/data/field_special_scene.s b/data/field_special_scene.s deleted file mode 100644 index 9d3958924..000000000 --- a/data/field_special_scene.s +++ /dev/null @@ -1,41 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gMapObjectPic_MovingBox:: @ 83D28AC - .incbin "graphics/map_objects/pics/misc/moving_box.4bpp" - - .align 2 -gMapObjectPalette19:: @ 83D292C - .incbin "graphics/map_objects/palettes/19.gbapal" - -gTruckCamera_HorizontalTable:: @ 83D294C - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 1 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - .byte -1 - .byte -1 - .byte -1 - .byte 0 - -gUnknown_083D295F:: @ 83D295F - step_18 - step_end - -gUnknown_083D2961:: @ 83D2961 - step_17 - step_end -- cgit v1.2.3 From 33f679d08e2efa07826389c6dce089cd407323d7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 22 Oct 2017 15:26:28 -0700 Subject: Move battle_tower trainer data to src/ --- data/battle_tower.s | 3 - data/battle_tower/trainers.inc | 1301 ---------------------------------------- 2 files changed, 1304 deletions(-) delete mode 100644 data/battle_tower/trainers.inc (limited to 'data') diff --git a/data/battle_tower.s b/data/battle_tower.s index a45dcf72c..ac0810eb7 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -3,9 +3,6 @@ .section .rodata -@ 8402F00 - .include "data/battle_tower/trainers.inc" - @ 8403860 .include "data/battle_tower/held_items.inc" diff --git a/data/battle_tower/trainers.inc b/data/battle_tower/trainers.inc deleted file mode 100644 index 05fadc320..000000000 --- a/data/battle_tower/trainers.inc +++ /dev/null @@ -1,1301 +0,0 @@ - .align 2 -gBattleTowerTrainers:: @ 8402F00 -@ 0 - .byte TRAINER_CLASS_YOUNGSTER - .string "ALVIN$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ARE - ec_word YOU - ec_word READY - ec_word QUES - ec_word HERE_I_COME - ec_word EXCL - -@ 1 - .byte TRAINER_CLASS_BIRD_KEEPER - .string "DIRK$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word OKAY - ec_word I_AM - ec_word GOING - ec_word FOR - ec_word IT - ec_word EXCL - -@ 2 - .byte TRAINER_CLASS_LADY - .string "CYBIL$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU_RE - ec_word A - ec_word PUSHOVER - ec_word LET_S - ec_word GET - ec_word GOING - -@ 3 - .byte TRAINER_CLASS_BLACK_BELT - .string "CHEN$", 8 - .byte 0x05 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word MY - ec_word SPIRIT - ec_word IS - ec_word ENOUGH - ec_word SNORT - ec_word ARRGH - -@ 4 - .byte TRAINER_CLASS_NINJA_BOY - .string "YOSHI$", 8 - .byte 0x05 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word GO - ec_word MY - ec_word POKEMON - ec_word FIGHT - ec_word THE - ec_word BATTLE - -@ 5 - .byte TRAINER_CLASS_SCHOOL_KID_F - .string "TINA$", 8 - .byte 0x0A @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word STUDY - ec_word IS - ec_word BORING - ec_word LET_S - ec_word BATTLE - ec_word NOW - -@ 6 - .byte TRAINER_CLASS_BUG_MANIAC - .string "COREY$", 8 - .byte 0x41 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HEY - ec_word I - ec_word WILL - ec_move2 TRANSFORM - ec_word FOR - ec_move1 STRENGTH - -@ 7 - .byte TRAINER_CLASS_FISHERMAN - .string "GORDON$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word NEED - ec_word A - ec_word VACATION - ec_word RIGHT - ec_word NOW - -@ 8 - .byte TRAINER_CLASS_TUBER_F - .string "ANN$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WE - ec_word ALL - ec_word ADORE - ec_word POKEMON - ec_word ABSOLUTELY - ec_word TRULY - -@ 9 - .byte TRAINER_CLASS_POKEFAN_F - .string "JULIA$", 8 - .byte 0x42 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word A - ec_word CUTE - ec_word LADY - ec_word YES - ec_word I_AM - -@ 10 - .byte TRAINER_CLASS_GENTLEMAN - .string "GREGORY$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word THINK - ec_word WE - ec_word SHOULD - ec_word START - ec_word TODAY - -@ 11 - .byte TRAINER_CLASS_CAMPER - .string "KEITH$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU_RE - ec_word MY - ec_word FRIEND - ec_word FROM - ec_word NOW - ec_word ON - -@ 12 - .byte TRAINER_CLASS_RUNNING_TRIATHLETE_F - .string "KENDRA$", 8 - .byte 0x0A @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_move1 SWIFT - ec_word HOW - ec_word ABOUT - ec_word YOU - ec_word QUES - -@ 13 - .byte TRAINER_CLASS_HIKER - .string "DEV$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WAHAHAHA - ec_word I_AM - ec_word FEELING - ec_word LIKE - ec_word IT_S - ec_move2 PAY_DAY - -@ 14 - .byte TRAINER_CLASS_BATTLE_GIRL - .string "CASSIE$", 8 - .byte 0x0A @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU_RE - ec_word STRONG - ec_word AREN_T - .2byte -1 - ec_word YOU - ec_word QUES - -@ 15 - .byte TRAINER_CLASS_PSYCHIC_M - .string "JULIAN$", 8 - .byte 0x05 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word FUFUFU - .2byte -1 - ec_word YOU - ec_word CAN_T - ec_word WIN - ec_word KID - -@ 16 - .byte TRAINER_CLASS_LASS - .string "JOYCE$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BE - ec_word KIND - ec_word TO - ec_word THE - ec_word DIGITAL - ec_word IDOL - -@ 17 - .byte TRAINER_CLASS_GUITARIST - .string "LES$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word GREAT - ec_word YOU_RE - ec_word JUST - ec_word RATHER - ec_word OKAY - -@ 18 - .byte TRAINER_CLASS_RICH_BOY - .string "CLINTON$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word HAVE - ec_word ROUGH_SKIN - ec_word I - ec_word NEED - ec_word NATURAL_CURE - -@ 19 - .byte TRAINER_CLASS_BUG_CATCHER - .string "LEWIS$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word THIS - ec_word IS - ec_word EXCITING - ec_word CAN - ec_word I - ec_word WIN - -@ 20 - .byte TRAINER_CLASS_PICNICKER - .string "RACHAEL$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word LIKE - ec_word WALKING - ec_word WITH - ec_word MY - ec_word POKEMON - -@ 21 - .byte TRAINER_CLASS_COLLECTOR - .string "HAROLD$", 8 - .byte 0x09 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HERE - ec_word THEY - ec_word COME - ec_word MY - ec_move2 SUPERPOWER - ec_word POKEMON - -@ 22 - .byte TRAINER_CLASS_TUBER_M - .string "KIPP$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word A - ec_word GENIUS - ec_word I - ec_word SHOULD - ec_word WIN - -@ 23 - .byte TRAINER_CLASS_KINDLER - .string "IRWIN$", 8 - .byte 0x05 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU - ec_word WILL - ec_word BE - ec_word FEELING - ec_word MY - ec_word FIRE - -@ 24 - .byte TRAINER_CLASS_PSYCHIC_F - .string "EILEEN$", 8 - .byte 0x0A @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word WILL - ec_move1 ASTONISH - ec_word YOU - ec_word IN - ec_word BATTLE - -@ 25 - .byte TRAINER_CLASS_SWIMMER_F - .string "ANNE$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word SORRY - ec_word BUT - ec_word YOU - ec_word WILL - ec_word NOT - ec_word WIN - -@ 26 - .byte TRAINER_CLASS_CYCLING_TRIATHLETE_F - .string "RUTH$", 8 - .byte 0x06 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word A - ec_word STRONG - ec_word GIRL - ec_word WANTS - ec_word TOUGH - ec_word POKEMON - -@ 27 - .byte TRAINER_CLASS_POKEMANIAC - .string "JEREMY$", 8 - .byte 0x40 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word MY - ec_word POKEMON - ec_word ARE - ec_word COOL - ec_word YOURS - ec_word CAN_T_WIN - -@ 28 - .byte TRAINER_CLASS_SAILOR - .string "TREVOR$", 8 - .byte 0x09 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word MY - ec_word OPPONENT - ec_word IS - ec_word FINALLY - ec_word HERE - ec_word EXCELLENT - -@ 29 - .byte TRAINER_CLASS_POKEMON_BREEDER_F - .string "COLETTE$", 8 - .byte 0x06 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word AM - ec_word HUNGRY - ec_move2 POUND - ec_word MY - ec_move2 BELLY_DRUM - -@ 30 - .byte TRAINER_CLASS_HEX_MANIAC - .string "PAULA$", 8 - .byte 0x42 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word IT_S - ec_word HARD - ec_word TO - ec_word TAKE - ec_word UGLY - ec_move1 SPITE - -@ 31 - .byte TRAINER_CLASS_RUIN_MANIAC - .string "STANLY$", 8 - .byte 0x41 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ADVENTURE - ec_word AND - ec_word BATTLE - ec_word ARE - ec_word MY - ec_word LIKES - -@ 32 - .byte TRAINER_CLASS_SWIMMING_TRIATHLETE_M - .string "TROY$", 8 - .byte 0x09 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU - ec_word CAN_T - ec_word LOSE - ec_word TO - ec_word A - ec_word KID - -@ 33 - .byte TRAINER_CLASS_SCHOOL_KID_M - .string "ED$", 8 - .byte 0x08 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word POKEMON - ec_word DAILY - ec_word AT - ec_word SCHOOL - ec_word IT_S - ec_word AWESOME - -@ 34 - .byte TRAINER_CLASS_POKEMON_RANGER_F - .string "ELLEN$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ARE - ec_word YOU - ec_word KIND - ec_word TO - ec_word YOUR - ec_word POKEMON - -@ 35 - .byte TRAINER_CLASS_SWIMMER_M - .string "ARNIE$", 8 - .byte 0x09 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word BATTLE - ec_word SERIOUSLY - ec_word BEAUTIFUL - ec_word YOU - ec_move1 DIG - -@ 36 - .byte TRAINER_CLASS_RUNNING_TRIATHLETE_M - .string "HAL$", 8 - .byte 0x09 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BOY - ec_word I_AM - ec_word TIRED - ec_word READY - ec_word FOR - ec_word SLEEP - -@ 37 - .byte TRAINER_CLASS_BEAUTY - .string "LAUREN$", 8 - .byte 0x06 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word A - ec_word TRAINER - ec_word LIKE - ec_word YOU - ec_word IS - ec_word EXCITING - -@ 38 - .byte TRAINER_CLASS_AROMA_LADY - .string "STACY$", 8 - .byte 0x06 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HAVE - ec_word YOU - ec_word A - ec_word STENCH - ec_word OR - ec_move1 SWEET_SCENT - -@ 39 - .byte TRAINER_CLASS_COLLECTOR - .string "DARYL$", 8 - .byte 0x81 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOUR - ec_word POKEMON - ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS - ec_word I - ec_word WANT - ec_word IT - -@ 40 - .byte TRAINER_CLASS_SWIMMING_TRIATHLETE_F - .string "KATHY$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word WILL - ec_word TRY - ec_word MY - ec_word BEST - ec_word TODAY - -@ 41 - .byte TRAINER_CLASS_POKEMON_RANGER_M - .string "HARRIS$", 8 - .byte 0x0C @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WAAAH - ec_word WAAAH - ec_word WAAAH - ec_word WAAAH - ec_word EHEHE - ec_move1 FAKE_TEARS - -@ 42 - .byte TRAINER_CLASS_POKEFAN_M - .string "GLENN$", 8 - .byte 0x80 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word LISTEN - ec_word TO - ec_word MY - ec_word LOUSY - ec_word ANIME - ec_word SONG - -@ 43 - .byte TRAINER_CLASS_CYCLING_TRIATHLETE_M - .string "NICO$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word DON_T - ec_word JUST - ec_word BATTLE - ec_word DO - ec_word SOMETHING - ec_word ELSE - -@ 44 - .byte TRAINER_CLASS_POKEMON_BREEDER_M - .string "BAILEY$", 8 - .byte 0x41 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ARE - ec_word YOU - ec_word BUSY - ec_word GET - ec_word WITH - ec_word IT - -@ 45 - .byte TRAINER_CLASS_PARASOL_LADY - .string "ABBIE$", 8 - .byte 0x08 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word THE - ec_move1 MORNING_SUN - ec_word HAS - ec_word SO - ec_word MUCH - ec_move1 COSMIC_POWER - -@ 46 - .byte TRAINER_CLASS_CAMPER - .string "AL$", 8 - .byte 0x0C @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word LET_S - ec_word HAVE - ec_word AN - ec_word EXCITING - ec_word BATTLE - ec_word YEEHAW_EXCL - -@ 47 - .byte TRAINER_CLASS_SCHOOL_KID_F - .string "PEGGY$", 8 - .byte 0x42 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word WANT - ec_word TO - ec_word SEE - ec_word SOME - ec_move1 GROWTH - -@ 48 - .byte TRAINER_CLASS_BEAUTY - .string "NAOMI$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word IT - ec_word WAS - ec_word GREAT - ec_word TO - ec_word BE - ec_word YOUNG - -@ 49 - .byte TRAINER_CLASS_NINJA_BOY - .string "KENJI$", 8 - .byte 0x0C @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word PLEASE - .2byte -1 - ec_word DON_T - ec_word BE - ec_word MEAN - ec_word TO_ME - -@ 50 - .byte TRAINER_CLASS_CYCLING_TRIATHLETE_M - .string "ROSS$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WAKE_UP - ec_word MY - ec_move2 HIDDEN_POWER - ec_word AND - ec_move1 ASTONISH - ec_word ME - -@ 51 - .byte TRAINER_CLASS_POKEMON_RANGER_F - .string "EDNA$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BATTLE_TOWER - ec_word IS - ec_word SO - ec_word ENTERTAINING - ec_word IT_S - ec_word AWESOME - -@ 52 - .byte TRAINER_CLASS_RUIN_MANIAC - .string "ANTON$", 8 - .byte 0x41 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BLEND - ec_word THICK_FAT - ec_word AND - ec_word CHLOROPHYLL - ec_word IT_S - ec_word TASTY - -@ 53 - .byte TRAINER_CLASS_SWIMMER_M - .string "MITCH$", 8 - .byte 0x81 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word NEXT - ec_word A - ec_word GIRL - ec_word WITH - ec_word A - ec_move1 SCARY_FACE - -@ 54 - .byte TRAINER_CLASS_HEX_MANIAC - .string "ROD$", 8 - .byte 0x42 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word GIMME - ec_word A - ec_word TOUGH - ec_word BATTLE - ec_word NOT - ec_word WIMPY - -@ 55 - .byte TRAINER_CLASS_RUNNING_TRIATHLETE_M - .string "RICH$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word TASTY - ec_word WATER - ec_word IS - ec_word HIP_AND - ec_word HAPPENING - ec_word YES_SIR_EXCL - -@ 56 - .byte TRAINER_CLASS_POKEFAN_M - .string "DANIEL$", 8 - .byte 0x80 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word GO - ec_word FOR - ec_word IT - ec_word MY - ec_word LOVEY_DOVEY - ec_word POKEMON - -@ 57 - .byte TRAINER_CLASS_PSYCHIC_F - .string "GLORIA$", 8 - .byte 0x82 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word LET_S - ec_word GET - ec_word THIS - ec_word FIERY - ec_word BATTLE - ec_word HAPPENING - -@ 58 - .byte TRAINER_CLASS_GUITARIST - .string "NELSON$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word MUSIC - ec_word IS - ec_word MY - ec_word ALL - ec_word MY - ec_word DESTINY - -@ 59 - .byte TRAINER_CLASS_KINDLER - .string "FERRIS$", 8 - .byte 0x41 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word GOOD - ec_word IT - ec_word IS - ec_word SO - ec_word VERY - ec_word GOOD - -@ 60 - .byte TRAINER_CLASS_AROMA_LADY - .string "AMANDA$", 8 - .byte 0x82 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WHAT - ec_word KIND - ec_word OF - ec_word TRAINER - ec_word ARE - ec_word YOU - -@ 61 - .byte TRAINER_CLASS_SWIMMING_TRIATHLETE_M - .string "MASON$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word DON_T - ec_word KNOW - ec_word HOW - ec_word TO - ec_word LOSE - -@ 62 - .byte TRAINER_CLASS_DRAGON_TAMER - .string "NATE$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word DRAGON - ec_word POKEMON - ec_word ARE - ec_word ALL - ec_word THE - ec_move1 RAGE - -@ 63 - .byte TRAINER_CLASS_LASS - .string "MIRIAM$", 8 - .byte 0x82 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU_RE - ec_word TOO_STRONG - ec_word SERIOUSLY - ec_word IT_S - ec_word BAD - ec_word NEWS - -@ 64 - .byte TRAINER_CLASS_POKEMANIAC - .string "THEO$", 8 - .byte 0x40 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word ADORE - ec_word MY - ec_word MEGA - ec_word CUTE - ec_word PLUSH_DOLL - -@ 65 - .byte TRAINER_CLASS_SWIMMING_TRIATHLETE_F - .string "PAMELA$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HERE_I_COME - ec_word I_AM - ec_word THE - ec_word CUTE - ec_move2 WATER_SPORT - ec_word IDOL - -@ 66 - .byte TRAINER_CLASS_POKEFAN_F - .string "ALISSA$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word IT_S - ec_word A - ec_word PREPOSTEROUS - ec_word MATCH - ec_word I_AM - ec_word SHOCKED - -@ 67 - .byte TRAINER_CLASS_GENTLEMAN - .string "ARTHUR$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word PLEASE - ec_word GIVE - ec_word ME - ec_word A - ec_word GOOD - ec_word BATTLE - -@ 68 - .byte TRAINER_CLASS_SWIMMER_F - .string "MARCY$", 8 - .byte 0x82 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word BEAUTIFUL - ec_word YOU - ec_word CAN_T - ec_word BEAT - ec_word ME - -@ 69 - .byte TRAINER_CLASS_COOL_TRAINER_M - .string "MILLER$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word BATTLE - ec_word DAILY - ec_word I - ec_word WON_T - ec_word LOSE - -@ 70 - .byte TRAINER_CLASS_BIRD_KEEPER - .string "OLIVER$", 8 - .byte 0x11 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS - ec_word GIGGLE - ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS - .2byte -1 - .2byte -1 - .2byte -1 - -@ 71 - .byte TRAINER_CLASS_CYCLING_TRIATHLETE_F - .string "MOLLY$", 8 - .byte 0x12 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HOW - ec_word ARE - ec_word YOU - ec_word ON - ec_word MONDAY - ec_word MORNING - -@ 72 - .byte TRAINER_CLASS_BUG_MANIAC - .string "JASON$", 8 - .byte 0x40 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WATER - ec_word AND - ec_word BUG - ec_word POKEMON - ec_word ARE - ec_word GREAT - -@ 73 - .byte TRAINER_CLASS_BATTLE_GIRL - .string "AVA$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word WHAT - ec_word IS - ec_word THIS - ec_word PRESSURE - ec_word ELLIPSIS - ec_word STATIC - -@ 74 - .byte TRAINER_CLASS_FISHERMAN - .string "HANK$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU_RE - ec_word A - ec_word KID - ec_word YOU - ec_word CAN_T - ec_word WIN - -@ 75 - .byte TRAINER_CLASS_SAILOR - .string "PETER$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word IT_S - ec_word SERIOUSLY - ec_word TERRIBLE - ec_word I - ec_word REALLY - ec_word THINK - -@ 76 - .byte TRAINER_CLASS_EXPERT_F - .string "MINDY$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU - ec_word APPEAR - ec_word TO - ec_word TRAIN - ec_word VERY - ec_word WELL - -@ 77 - .byte TRAINER_CLASS_BUG_MANIAC - .string "DWIGHT$", 8 - .byte 0x11 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word ARE - ec_word YOU - ec_word STRONG - ec_word YOU - ec_word ARE - ec_word SCARY - -@ 78 - .byte TRAINER_CLASS_POKEMON_BREEDER_F - .string "REENA$", 8 - .byte 0x12 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word ALWAYS - ec_word LOSE - ec_word MAYBE - ec_word TODAY - ec_word ELLIPSIS - -@ 79 - .byte TRAINER_CLASS_PARASOL_LADY - .string "MEGAN$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word DON_T - ec_word MAKE - ec_word THAT - ec_move1 SCARY_FACE - ec_word AT - ec_word ME - -@ 80 - .byte TRAINER_CLASS_RUNNING_TRIATHLETE_F - .string "SIERRA$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_VE - ec_word RUN - ec_word A_LOT - ec_word SO - ec_word I_AM - ec_word HEALTHY - -@ 81 - .byte TRAINER_CLASS_POKEMON_RANGER_M - .string "ARNOLD$", 8 - .byte 0x08 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word FEELING - ec_word AWESOME - ec_word MY - ec_word POKEMON - ec_word ROCK - -@ 82 - .byte TRAINER_CLASS_BLACK_BELT - .string "XIN$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word HOO_HAH - ec_word ARE - ec_word YOU - ec_word READY - ec_word TO - ec_word ROCK - -@ 83 - .byte TRAINER_CLASS_COOL_TRAINER_F - .string "KELLY$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YOU - ec_word COULDN_T - ec_word BEAT - ec_word ME - ec_word EVER - ec_word KID - -@ 84 - .byte TRAINER_CLASS_COLLECTOR - .string "VANCE$", 8 - .byte 0x80 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word POKEMON - ec_word ALL - ec_word OVER - ec_word THE - ec_word PLACE - ec_word WOWEE - -@ 85 - .byte TRAINER_CLASS_SWIMMING_TRIATHLETE_M - .string "TOBY$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word THIS - ec_word ISN_T - ec_word SPORTS - ec_word IT_S - ec_word A - ec_word BATTLE - -@ 86 - .byte TRAINER_CLASS_GENTLEMAN - .string "NORTON$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word HAVE - ec_word TO - ec_word WIN - ec_word PLEASE - ec_word LOSE - -@ 87 - .byte TRAINER_CLASS_BATTLE_GIRL - .string "ZOE$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word THIS - ec_word IS - ec_word SCARY - ec_word PLEASE - ec_word BE - ec_word NICE - -@ 88 - .byte TRAINER_CLASS_BEAUTY - .string "EMMA$", 8 - .byte 0x20 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word DON_T - ec_word YOU - ec_move1 FLAIL - ec_word YOU - ec_word CAN_T - ec_move1 WITHDRAW - -@ 89 - .byte TRAINER_CLASS_HIKER - .string "VINCE$", 8 - .byte 0x04 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word YAHOO - ec_word YAHOO - ec_word ARE - ec_word YOU - ec_word LISTENING - ec_word QUES - -@ 90 - .byte TRAINER_CLASS_EXPERT_M - .string "MARV$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word LEARN - ec_word TO - ec_word BATTLE - ec_word THE - ec_word CORRECT - ec_word WAY - -@ 91 - .byte TRAINER_CLASS_POKEMON_BREEDER_M - .string "TODD$", 8 - .byte 0x40 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word THE - ec_word WAY - ec_word YOU - ec_word BATTLE - ec_word IT_S - ec_word CHILD_S_PLAY - -@ 92 - .byte TRAINER_CLASS_GUITARIST - .string "GAVIN$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BABY - ec_word BABY - ec_word BABY - ec_word ROCK - ec_word ME - ec_word HARD - -@ 93 - .byte TRAINER_CLASS_PSYCHIC_M - .string "QUINN$", 8 - .byte 0x08 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word HAVE - ec_word A - ec_word STICKY_HOLD - ec_word ON - ec_word YOU - -@ 94 - .byte TRAINER_CLASS_COOL_TRAINER_F - .string "JENN$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I_AM - ec_word ON - ec_word A - ec_word TOUGH - ec_word TRAINER - ec_word SEARCH - -@ 95 - .byte TRAINER_CLASS_EXPERT_M - .string "JOEL$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word BELIEVE - ec_word IN - ec_word YOUR - ec_word POKEMON - ec_word AND - ec_word WIN - -@ 96 - .byte TRAINER_CLASS_DRAGON_TAMER - .string "KYLE$", 8 - .byte 0x0C @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word I - ec_word LIKE - ec_word A - ec_word GIRL - ec_word WITH - ec_move2 FORESIGHT - -@ 97 - .byte TRAINER_CLASS_COOL_TRAINER_M - .string "BRET$", 8 - .byte 0x01 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word TAKE - ec_word MY - ec_word OVERWHELMING - ec_word POWER - ec_word AND - ec_word DISAPPEAR - -@ 98 - .byte TRAINER_CLASS_EXPERT_F - .string "CARRIE$", 8 - .byte 0x10 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word TRAINER - ec_word I - ec_word SEE - ec_word YOU - ec_word ARE - ec_word CAPABLE - -@ 99 - .byte TRAINER_CLASS_LADY - .string "GILLIAN$", 8 - .byte 0x02 @ team flags - .2byte 0 @ padding -@ pre-battle dialogue - ec_word COME_ON - ec_word SHOW - ec_word ME - ec_word AN - ec_word EXCELLENT - ec_word TIME -- cgit v1.2.3 From 7b4527154ff1a28e793d9aab2b417e0a460b8187 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 22 Oct 2017 15:29:18 -0700 Subject: Move battle_tower held_items to src/ --- data/battle_tower.s | 3 -- data/battle_tower/held_items.inc | 65 ---------------------------------------- 2 files changed, 68 deletions(-) delete mode 100644 data/battle_tower/held_items.inc (limited to 'data') diff --git a/data/battle_tower.s b/data/battle_tower.s index ac0810eb7..a135d68c5 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -3,9 +3,6 @@ .section .rodata -@ 8403860 - .include "data/battle_tower/held_items.inc" - @ 84038E0 .include "data/battle_tower/level_50_mons.inc" diff --git a/data/battle_tower/held_items.inc b/data/battle_tower/held_items.inc deleted file mode 100644 index 6c4f0838b..000000000 --- a/data/battle_tower/held_items.inc +++ /dev/null @@ -1,65 +0,0 @@ - .align 1 -gBattleTowerHeldItems:: @ 8403860 - .2byte ITEM_NONE - .2byte ITEM_KINGS_ROCK - .2byte ITEM_SITRUS_BERRY - .2byte ITEM_ORAN_BERRY - .2byte ITEM_CHESTO_BERRY - .2byte ITEM_HARD_STONE - .2byte ITEM_FOCUS_BAND - .2byte ITEM_PERSIM_BERRY - .2byte ITEM_MIRACLE_SEED - .2byte ITEM_BERRY_JUICE - .2byte ITEM_MACHO_BRACE - .2byte ITEM_SILVER_POWDER - .2byte ITEM_CHERI_BERRY - .2byte ITEM_BLACK_GLASSES - .2byte ITEM_BLACK_BELT - .2byte ITEM_SOUL_DEW - .2byte ITEM_CHOICE_BAND - .2byte ITEM_MAGNET - .2byte ITEM_SILK_SCARF - .2byte ITEM_WHITE_HERB - .2byte ITEM_DEEP_SEA_SCALE - .2byte ITEM_DEEP_SEA_TOOTH - .2byte ITEM_MYSTIC_WATER - .2byte ITEM_SHARP_BEAK - .2byte ITEM_QUICK_CLAW - .2byte ITEM_LEFTOVERS - .2byte ITEM_RAWST_BERRY - .2byte ITEM_LIGHT_BALL - .2byte ITEM_POISON_BARB - .2byte ITEM_NEVER_MELT_ICE - .2byte ITEM_ASPEAR_BERRY - .2byte ITEM_SPELL_TAG - .2byte ITEM_BRIGHT_POWDER - .2byte ITEM_LEPPA_BERRY - .2byte ITEM_SCOPE_LENS - .2byte ITEM_TWISTED_SPOON - .2byte ITEM_METAL_COAT - .2byte ITEM_MENTAL_HERB - .2byte ITEM_CHARCOAL - .2byte ITEM_PECHA_BERRY - .2byte ITEM_SOFT_SAND - .2byte ITEM_LUM_BERRY - .2byte ITEM_DRAGON_SCALE - .2byte ITEM_DRAGON_FANG - .2byte ITEM_IAPAPA_BERRY - .2byte ITEM_WIKI_BERRY - .2byte ITEM_SEA_INCENSE - .2byte ITEM_SHELL_BELL - .2byte ITEM_SALAC_BERRY - .2byte ITEM_LANSAT_BERRY - .2byte ITEM_APICOT_BERRY - .2byte ITEM_STARF_BERRY - .2byte ITEM_LIECHI_BERRY - .2byte ITEM_STICK - .2byte ITEM_LAX_INCENSE - .2byte ITEM_AGUAV_BERRY - .2byte ITEM_FIGY_BERRY - .2byte ITEM_THICK_CLUB - .2byte ITEM_MAGO_BERRY - .2byte ITEM_METAL_POWDER - .2byte ITEM_PETAYA_BERRY - .2byte ITEM_LUCKY_PUNCH - .2byte ITEM_GANLON_BERRY -- cgit v1.2.3 From 949a003bd1c81ae927764401a07bd83e2debb9b5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 22 Oct 2017 15:43:32 -0700 Subject: Move battle_tower level50 mons to src/ --- data/battle_tower.s | 3 - data/battle_tower/level_50_mons.inc | 2701 ----------------------------------- 2 files changed, 2704 deletions(-) delete mode 100644 data/battle_tower/level_50_mons.inc (limited to 'data') diff --git a/data/battle_tower.s b/data/battle_tower.s index a135d68c5..79a7e4f2d 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -3,9 +3,6 @@ .section .rodata -@ 84038E0 - .include "data/battle_tower/level_50_mons.inc" - @ 8404BA0 .include "data/battle_tower/level_100_mons.inc" diff --git a/data/battle_tower/level_50_mons.inc b/data/battle_tower/level_50_mons.inc deleted file mode 100644 index 3dfc269a8..000000000 --- a/data/battle_tower/level_50_mons.inc +++ /dev/null @@ -1,2701 +0,0 @@ - .align 2 -gBattleTowerLevel50Mons:: @ 84038E0 -@ 0 - .2byte SPECIES_PIKACHU - .byte BATTLE_TOWER_ITEM_ORAN_BERRY - .byte 0x42 @ team flags - .2byte MOVE_QUICK_ATTACK, MOVE_THUNDER_WAVE, MOVE_THUNDER_SHOCK, MOVE_GROWL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 1 - .2byte SPECIES_BEAUTIFLY - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x41 @ team flags - .2byte MOVE_ABSORB, MOVE_STUN_SPORE, MOVE_GUST, MOVE_SAFEGUARD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 2 - .2byte SPECIES_SWELLOW - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x07 @ team flags - .2byte MOVE_PECK, MOVE_WING_ATTACK, MOVE_AERIAL_ACE, MOVE_AGILITY - .byte F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 3 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x0B @ team flags - .2byte MOVE_HAIL, MOVE_ENCORE, MOVE_ICE_BALL, MOVE_TOXIC - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 4 - .2byte SPECIES_SEAKING - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x07 @ team flags - .2byte MOVE_PECK, MOVE_FLAIL, MOVE_FURY_ATTACK, MOVE_SURF - .byte F_EV_SPREAD_SPEED - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 5 - .2byte SPECIES_TORCHIC - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x42 @ team flags - .2byte MOVE_FIRE_SPIN, MOVE_PROTECT, MOVE_SAND_ATTACK, MOVE_SLASH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 6 - .2byte SPECIES_MASQUERAIN - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x41 @ team flags - .2byte MOVE_STUN_SPORE, MOVE_WATER_SPORT, MOVE_QUICK_ATTACK, MOVE_GUST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 7 - .2byte SPECIES_ILLUMISE - .byte BATTLE_TOWER_ITEM_NONE - .byte 0x41 @ team flags - .2byte MOVE_FLATTER, MOVE_COVET, MOVE_WISH, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 8 - .2byte SPECIES_DELCATTY - .byte BATTLE_TOWER_ITEM_SILK_SCARF - .byte 0x42 @ team flags - .2byte MOVE_ATTRACT, MOVE_TAIL_WHIP, MOVE_FAINT_ATTACK, MOVE_DIG - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 9 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x0B @ team flags - .2byte MOVE_TAIL_WHIP, MOVE_SLASH, MOVE_LICK, MOVE_SCREECH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 10 - .2byte SPECIES_MIGHTYENA - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x05 @ team flags - .2byte MOVE_BITE, MOVE_TAKE_DOWN, MOVE_ROAR, MOVE_HOWL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 11 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_BLACK_GLASSES - .byte 0x05 @ team flags - .2byte MOVE_FAINT_ATTACK, MOVE_COUNTER, MOVE_SCRATCH, MOVE_TAUNT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 12 - .2byte SPECIES_MACHOKE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x05 @ team flags - .2byte MOVE_LEER, MOVE_DIG, MOVE_LOW_KICK, MOVE_FOCUS_PUNCH - .byte F_EV_SPREAD_SPEED - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 13 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x05 @ team flags - .2byte MOVE_STRENGTH, MOVE_ROCK_TOMB, MOVE_STOMP, MOVE_ROCK_SMASH - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 14 - .2byte SPECIES_CACTURNE - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x0B @ team flags - .2byte MOVE_POISON_STING, MOVE_GROWTH, MOVE_ABSORB, MOVE_SOLAR_BEAM - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 15 - .2byte SPECIES_ZIGZAGOON - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x0A @ team flags - .2byte MOVE_FLAIL, MOVE_SAND_ATTACK, MOVE_REST, MOVE_SURF - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 16 - .2byte SPECIES_DODRIO - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x03 @ team flags - .2byte MOVE_PURSUIT, MOVE_TRI_ATTACK, MOVE_GROWL, MOVE_AGILITY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 17 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x0B @ team flags - .2byte MOVE_WATER_GUN, MOVE_AMNESIA, MOVE_MAGNITUDE, MOVE_MUD_SLAP - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_LAX - .2byte 0 @ padding - -@ 18 - .2byte SPECIES_NINJASK - .byte BATTLE_TOWER_ITEM_SILVER_POWDER - .byte 0x41 @ team flags - .2byte MOVE_SAND_ATTACK, MOVE_FURY_CUTTER, MOVE_AGILITY, MOVE_HARDEN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 19 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x01 @ team flags - .2byte MOVE_PROTECT, MOVE_NIGHT_SHADE, MOVE_ASTONISH, MOVE_WILL_O_WISP - .byte F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 20 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x07 @ team flags - .2byte MOVE_DIG, MOVE_EMBER, MOVE_GROWL, MOVE_ROCK_SMASH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 21 - .2byte SPECIES_SPINDA - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x4A @ team flags - .2byte MOVE_TEETER_DANCE, MOVE_FLAIL, MOVE_PSYCH_UP, MOVE_DOUBLE_EDGE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 22 - .2byte SPECIES_SEVIPER - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x09 @ team flags - .2byte MOVE_SCREECH, MOVE_GLARE, MOVE_DIG, MOVE_POISON_FANG - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 23 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x49 @ team flags - .2byte MOVE_SAND_ATTACK, MOVE_SAND_TOMB, MOVE_FACADE, MOVE_TOXIC - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 24 - .2byte SPECIES_AZUMARILL - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x42 @ team flags - .2byte MOVE_BUBBLE_BEAM, MOVE_TAIL_WHIP, MOVE_RAIN_DANCE, MOVE_ROLLOUT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 25 - .2byte SPECIES_ZANGOOSE - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0x07 @ team flags - .2byte MOVE_STRENGTH, MOVE_TAUNT, MOVE_CRUSH_CLAW, MOVE_DETECT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 26 - .2byte SPECIES_MEDICHAM - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x07 @ team flags - .2byte MOVE_REVERSAL, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 27 - .2byte SPECIES_ROSELIA - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x0A @ team flags - .2byte MOVE_GROWTH, MOVE_MEGA_DRAIN, MOVE_TOXIC, MOVE_CUT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 28 - .2byte SPECIES_SWALOT - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x0B @ team flags - .2byte MOVE_STOCKPILE, MOVE_SPIT_UP, MOVE_SLUDGE, MOVE_POISON_GAS - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 29 - .2byte SPECIES_MAGNETON - .byte BATTLE_TOWER_ITEM_MAGNET - .byte 0x0B @ team flags - .2byte MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SCREECH, MOVE_TRI_ATTACK - .byte F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 30 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x09 @ team flags - .2byte MOVE_CONFUSION, MOVE_TOXIC, MOVE_TORMENT, MOVE_PROTECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 31 - .2byte SPECIES_RELICANTH - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x01 @ team flags - .2byte MOVE_SURF, MOVE_ANCIENT_POWER, MOVE_ROCK_TOMB, MOVE_HARDEN - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 32 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0x03 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_FIRE_SPIN, MOVE_QUICK_ATTACK, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 33 - .2byte SPECIES_SHARPEDO - .byte BATTLE_TOWER_ITEM_BLACK_GLASSES - .byte 0x05 @ team flags - .2byte MOVE_BITE, MOVE_SKULL_BASH, MOVE_RAIN_DANCE, MOVE_SURF - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 34 - .2byte SPECIES_GIRAFARIG - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x03 @ team flags - .2byte MOVE_STRENGTH, MOVE_PSYBEAM, MOVE_AGILITY, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 35 - .2byte SPECIES_PELIPPER - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0B @ team flags - .2byte MOVE_MIST, MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP - .byte F_EV_SPREAD_DEFENSE - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 36 - .2byte SPECIES_SABLEYE - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x09 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_NIGHT_SHADE, MOVE_SNATCH, MOVE_FAKE_OUT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 37 - .2byte SPECIES_LUNATONE - .byte BATTLE_TOWER_ITEM_HARD_STONE - .byte 0x0B @ team flags - .2byte MOVE_COSMIC_POWER, MOVE_SANDSTORM, MOVE_PSYCHIC, MOVE_ROCK_THROW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 38 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_NONE - .byte 0x0B @ team flags - .2byte MOVE_THIEF, MOVE_FAKE_OUT, MOVE_SURF, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 39 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0B @ team flags - .2byte MOVE_ODOR_SLEUTH, MOVE_CONFUSE_RAY, MOVE_MAGIC_COAT, MOVE_PSYCHIC - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 40 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x0B @ team flags - .2byte MOVE_CUT, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_STUN_SPORE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 41 - .2byte SPECIES_WAILORD - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x03 @ team flags - .2byte MOVE_WATER_SPOUT, MOVE_ROLLOUT, MOVE_MIST, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 42 - .2byte SPECIES_WEEZING - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x05 @ team flags - .2byte MOVE_SMOG, MOVE_SELF_DESTRUCT, MOVE_TOXIC, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 43 - .2byte SPECIES_KADABRA - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x0B @ team flags - .2byte MOVE_FUTURE_SIGHT, MOVE_FOCUS_PUNCH, MOVE_SKILL_SWAP, MOVE_SNATCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 44 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_MAGNET - .byte 0x07 @ team flags - .2byte MOVE_THUNDER_WAVE, MOVE_BITE, MOVE_SPARK, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_RASH - .2byte 0 @ padding - -@ 45 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_ASPEAR_BERRY - .byte 0x03 @ team flags - .2byte MOVE_QUICK_ATTACK, MOVE_AGILITY, MOVE_LIGHT_SCREEN, MOVE_THUNDERBOLT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 46 - .2byte SPECIES_XATU - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x03 @ team flags - .2byte MOVE_NIGHT_SHADE, MOVE_PECK, MOVE_CONFUSE_RAY, MOVE_FUTURE_SIGHT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 47 - .2byte SPECIES_LOUDRED - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x05 @ team flags - .2byte MOVE_UPROAR, MOVE_STOMP, MOVE_SCREECH, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_MODEST - .2byte 0 @ padding - -@ 48 - .2byte SPECIES_SOLROCK - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x03 @ team flags - .2byte MOVE_ROCK_THROW, MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_SANDSTORM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_MILD - .2byte 0 @ padding - -@ 49 - .2byte SPECIES_CLAYDOL - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x03 @ team flags - .2byte MOVE_SANDSTORM, MOVE_REFLECT, MOVE_ROCK_TOMB, MOVE_STRENGTH - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 50 - .2byte SPECIES_CRAWDAUNT - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x03 @ team flags - .2byte MOVE_WATER_PULSE, MOVE_KNOCK_OFF, MOVE_HARDEN, MOVE_CUT - .byte F_EV_SPREAD_HP - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 51 - .2byte SPECIES_GOLBAT - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x09 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_WING_ATTACK, MOVE_MEAN_LOOK, MOVE_BITE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 52 - .2byte SPECIES_BELLOSSOM - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x0A @ team flags - .2byte MOVE_SOLAR_BEAM, MOVE_PETAL_DANCE, MOVE_SWEET_SCENT, MOVE_BULLET_SEED - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 53 - .2byte SPECIES_DONPHAN - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x05 @ team flags - .2byte MOVE_ROCK_SMASH, MOVE_RAPID_SPIN, MOVE_FLAIL, MOVE_HORN_ATTACK - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 54 - .2byte SPECIES_NOSEPASS - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x0B @ team flags - .2byte MOVE_SANDSTORM, MOVE_ROCK_SLIDE, MOVE_BLOCK, MOVE_THUNDER_WAVE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 55 - .2byte SPECIES_PINSIR - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x05 @ team flags - .2byte MOVE_SWORDS_DANCE, MOVE_HARDEN, MOVE_CUT, MOVE_SEISMIC_TOSS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 56 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x0B @ team flags - .2byte MOVE_DISABLE, MOVE_PSYCH_UP, MOVE_WATER_PULSE, MOVE_BRICK_BREAK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 57 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0x07 @ team flags - .2byte MOVE_TORMENT, MOVE_EXTRASENSORY, MOVE_SOLAR_BEAM, MOVE_AERIAL_ACE - .byte F_EV_SPREAD_DEFENSE - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 58 - .2byte SPECIES_DUSTOX - .byte BATTLE_TOWER_ITEM_SILVER_POWDER - .byte 0x01 @ team flags - .2byte MOVE_CONFUSION, MOVE_SILVER_WIND, MOVE_PSYBEAM, MOVE_WHIRLWIND - .byte F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 59 - .2byte SPECIES_SHUPPET - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x03 @ team flags - .2byte MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_FAINT_ATTACK, MOVE_CURSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 60 - .2byte SPECIES_SEAKING - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x07 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_HORN_ATTACK, MOVE_HORN_DRILL - .byte F_EV_SPREAD_SP_DEFENSE - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 61 - .2byte SPECIES_SKARMORY - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x07 @ team flags - .2byte MOVE_STEEL_WING, MOVE_SAND_ATTACK, MOVE_SWIFT, MOVE_AGILITY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 62 - .2byte SPECIES_TORKOAL - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x43 @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_IRON_DEFENSE, MOVE_BODY_SLAM, MOVE_PROTECT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 63 - .2byte SPECIES_GOLEM - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0x05 @ team flags - .2byte MOVE_MAGNITUDE, MOVE_EXPLOSION, MOVE_STRENGTH, MOVE_SANDSTORM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 64 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x41 @ team flags - .2byte MOVE_REFLECT, MOVE_PSYCHIC, MOVE_IMPRISON, MOVE_TOXIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 65 - .2byte SPECIES_SANDSLASH - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x07 @ team flags - .2byte MOVE_SANDSTORM, MOVE_SLASH, MOVE_EARTHQUAKE, MOVE_SWIFT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 66 - .2byte SPECIES_WOBBUFFET - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0B @ team flags - .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 67 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x05 @ team flags - .2byte MOVE_CONSTRICT, MOVE_SURF, MOVE_HYPER_BEAM, MOVE_SCREECH - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 68 - .2byte SPECIES_TROPIUS - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x05 @ team flags - .2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_SYNTHESIS, MOVE_RAZOR_LEAF - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 69 - .2byte SPECIES_MAWILE - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x43 @ team flags - .2byte MOVE_IRON_DEFENSE, MOVE_SLUDGE_BOMB, MOVE_CRUNCH, MOVE_STRENGTH - .byte F_EV_SPREAD_ATTACK - .byte NATURE_CALM - .2byte 0 @ padding - -@ 70 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0x09 @ team flags - .2byte MOVE_SLUDGE, MOVE_ACID_ARMOR, MOVE_GIGA_DRAIN, MOVE_DISABLE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 71 - .2byte SPECIES_MAGCARGO - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x0D @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_ROCK_THROW, MOVE_HARDEN, MOVE_AMNESIA - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 72 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x07 @ team flags - .2byte MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF, MOVE_DIG - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 73 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_ASPEAR_BERRY - .byte 0x05 @ team flags - .2byte MOVE_LIGHT_SCREEN, MOVE_THUNDERBOLT, MOVE_SWIFT, MOVE_ROLLOUT - .byte F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 74 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x09 @ team flags - .2byte MOVE_MEAN_LOOK, MOVE_NIGHT_SHADE, MOVE_SKILL_SWAP, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 75 - .2byte SPECIES_VILEPLUME - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x0A @ team flags - .2byte MOVE_TOXIC, MOVE_MOONLIGHT, MOVE_GIGA_DRAIN, MOVE_STUN_SPORE - .byte F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 76 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x05 @ team flags - .2byte MOVE_BITE, MOVE_HAZE, MOVE_WING_ATTACK, MOVE_STEEL_WING - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 77 - .2byte SPECIES_CORSOLA - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x0A @ team flags - .2byte MOVE_RECOVER, MOVE_MIRROR_COAT, MOVE_HAIL, MOVE_SURF - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 78 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x0B @ team flags - .2byte MOVE_RAPID_SPIN, MOVE_WATER_PULSE, MOVE_REFLECT, MOVE_SKILL_SWAP - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 79 - .2byte SPECIES_EXPLOUD - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x41 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_HOWL, MOVE_UPROAR, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 80 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x0B @ team flags - .2byte MOVE_PSYBEAM, MOVE_SNATCH, MOVE_REFLECT, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 81 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x05 @ team flags - .2byte MOVE_HORN_ATTACK, MOVE_COUNTER, MOVE_REVERSAL, MOVE_LEER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 82 - .2byte SPECIES_CASTFORM - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0B @ team flags - .2byte MOVE_WEATHER_BALL, MOVE_SUNNY_DAY, MOVE_RAIN_DANCE, MOVE_HAIL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 83 - .2byte SPECIES_VIGOROTH - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x05 @ team flags - .2byte MOVE_FOCUS_PUNCH, MOVE_REVERSAL, MOVE_COUNTER, MOVE_TAUNT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 84 - .2byte SPECIES_DUSKULL - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x09 @ team flags - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_WILL_O_WISP - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 85 - .2byte SPECIES_LANTURN - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x07 @ team flags - .2byte MOVE_FLAIL, MOVE_SURF, MOVE_SPARK, MOVE_TAKE_DOWN - .byte F_EV_SPREAD_SPEED - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 86 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x05 @ team flags - .2byte MOVE_STRENGTH, MOVE_FAKE_OUT, MOVE_FACADE, MOVE_SAND_ATTACK - .byte F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 87 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x43 @ team flags - .2byte MOVE_AGILITY, MOVE_DIVE, MOVE_ICE_BEAM, MOVE_PROTECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 88 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x41 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_WATER_PULSE, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 89 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x45 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_BRICK_BREAK, MOVE_METAL_CLAW, MOVE_ROAR - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 90 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0xC7 @ team flags - .2byte MOVE_SWORDS_DANCE, MOVE_IRON_TAIL, MOVE_SLASH, MOVE_FACADE - .byte F_EV_SPREAD_ATTACK - .byte NATURE_LAX - .2byte 0 @ padding - -@ 91 - .2byte SPECIES_SWELLOW - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x0F @ team flags - .2byte MOVE_DOUBLE_TEAM, MOVE_FLY, MOVE_TOXIC, MOVE_STEEL_WING - .byte 0 - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 92 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_BLACK_BELT - .byte 0x05 @ team flags - .2byte MOVE_STRENGTH, MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 93 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_NEVER_MELT_ICE - .byte 0x41 @ team flags - .2byte MOVE_PROTECT, MOVE_ICE_BEAM, MOVE_HYPER_BEAM, MOVE_SURF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 94 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x41 @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_DRAGON_CLAW, MOVE_AGILITY, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 95 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x41 @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_MIRROR_MOVE, MOVE_EARTHQUAKE, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 96 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x43 @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_DRAGON_DANCE, MOVE_TOXIC, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 97 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_BLACK_BELT - .byte 0x43 @ team flags - .2byte MOVE_BRICK_BREAK, MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_FOCUS_PUNCH - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 98 - .2byte SPECIES_SABLEYE - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x49 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_SNATCH, MOVE_DIG, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 99 - .2byte SPECIES_ZANGOOSE - .byte BATTLE_TOWER_ITEM_BLACK_GLASSES - .byte 0x0F @ team flags - .2byte MOVE_FACADE, MOVE_THUNDERBOLT, MOVE_CRUSH_CLAW, MOVE_DETECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 100 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x0F @ team flags - .2byte MOVE_IRON_TAIL, MOVE_HEADBUTT, MOVE_ATTRACT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 101 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0x07 @ team flags - .2byte MOVE_MUD_SLAP, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_AMNESIA - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 102 - .2byte SPECIES_SOLROCK - .byte BATTLE_TOWER_ITEM_HARD_STONE - .byte 0x43 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_LIGHT_SCREEN, MOVE_ROCK_SLIDE, MOVE_CONFUSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 103 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x03 @ team flags - .2byte MOVE_RECOVER, MOVE_RAIN_DANCE, MOVE_SURF, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 104 - .2byte SPECIES_CACTURNE - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x0F @ team flags - .2byte MOVE_INGRAIN, MOVE_LEECH_SEED, MOVE_PROTECT, MOVE_FRUSTRATION - .byte 0 - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 105 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x05 @ team flags - .2byte MOVE_FRUSTRATION, MOVE_HYPER_BEAM, MOVE_GIGA_DRAIN, MOVE_TORMENT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 106 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_MAGNET - .byte 0x0F @ team flags - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_IRON_TAIL, MOVE_ROAR - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 107 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xC3 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_FOCUS_PUNCH, MOVE_IRON_TAIL, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 108 - .2byte SPECIES_PINSIR - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0x8D @ team flags - .2byte MOVE_GUILLOTINE, MOVE_SUBMISSION, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 109 - .2byte SPECIES_METANG - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x05 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_METEOR_MASH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 110 - .2byte SPECIES_CLAYDOL - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x43 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SELF_DESTRUCT, MOVE_SANDSTORM, MOVE_PROTECT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 111 - .2byte SPECIES_MASQUERAIN - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x0A @ team flags - .2byte MOVE_TOXIC, MOVE_SILVER_WIND, MOVE_ATTRACT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 112 - .2byte SPECIES_RELICANTH - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0xC5 @ team flags - .2byte MOVE_ROCK_TOMB, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 113 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0D @ team flags - .2byte MOVE_SURF, MOVE_ENCORE, MOVE_BLIZZARD, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 114 - .2byte SPECIES_WAILORD - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x0B @ team flags - .2byte MOVE_WATER_SPOUT, MOVE_REST, MOVE_AMNESIA, MOVE_HAIL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 115 - .2byte SPECIES_GIRAFARIG - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0x4F @ team flags - .2byte MOVE_DOUBLE_TEAM, MOVE_CRUNCH, MOVE_PSYCHIC, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 116 - .2byte SPECIES_MEDICHAM - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x4B @ team flags - .2byte MOVE_CALM_MIND, MOVE_REVERSAL, MOVE_ROCK_TOMB, MOVE_PSYCHIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 117 - .2byte SPECIES_TROPIUS - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0xC7 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SYNTHESIS, MOVE_RAZOR_LEAF, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 118 - .2byte SPECIES_NINJASK - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x05 @ team flags - .2byte MOVE_DOUBLE_TEAM, MOVE_SLASH, MOVE_SWORDS_DANCE, MOVE_LEECH_LIFE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 119 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x0D @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_OVERHEAT, MOVE_SUNNY_DAY, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 120 - .2byte SPECIES_SHARPEDO - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x05 @ team flags - .2byte MOVE_CRUNCH, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_PROTECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 121 - .2byte SPECIES_WIGGLYTUFF - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0E @ team flags - .2byte MOVE_PROTECT, MOVE_TOXIC, MOVE_DOUBLE_TEAM, MOVE_DIG - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_LAX - .2byte 0 @ padding - -@ 122 - .2byte SPECIES_SEVIPER - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x05 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_HAZE, MOVE_CRUNCH, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 123 - .2byte SPECIES_CRADILY - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0xC1 @ team flags - .2byte MOVE_ROCK_TOMB, MOVE_CONFUSE_RAY, MOVE_INGRAIN, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 124 - .2byte SPECIES_ARMALDO - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0xC1 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SANDSTORM, MOVE_PROTECT, MOVE_SLASH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 125 - .2byte SPECIES_MAGNETON - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x0D @ team flags - .2byte MOVE_ZAP_CANNON, MOVE_SUPERSONIC, MOVE_TOXIC, MOVE_PROTECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 126 - .2byte SPECIES_LANTURN - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x06 @ team flags - .2byte MOVE_THUNDER, MOVE_SURF, MOVE_ICE_BEAM, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 127 - .2byte SPECIES_SWALOT - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x8B @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_SNATCH, MOVE_ENCORE, MOVE_BODY_SLAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 128 - .2byte SPECIES_SKARMORY - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x81 @ team flags - .2byte MOVE_STEEL_WING, MOVE_AGILITY, MOVE_TORMENT, MOVE_FACADE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 129 - .2byte SPECIES_DONPHAN - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x0D @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_FLAIL, MOVE_ROAR, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 130 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x41 @ team flags - .2byte MOVE_FACADE, MOVE_REVERSAL, MOVE_MEGAHORN, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 131 - .2byte SPECIES_BANETTE - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x83 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_SKILL_SWAP - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 132 - .2byte SPECIES_SANDSLASH - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x0F @ team flags - .2byte MOVE_SANDSTORM, MOVE_TOXIC, MOVE_SLASH, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 133 - .2byte SPECIES_CRAWDAUNT - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x05 @ team flags - .2byte MOVE_GUILLOTINE, MOVE_CRABHAMMER, MOVE_BLIZZARD, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 134 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x8B @ team flags - .2byte MOVE_MAGIC_COAT, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 135 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x45 @ team flags - .2byte MOVE_IRON_TAIL, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_FIRE_BLAST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_RASH - .2byte 0 @ padding - -@ 136 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x8B @ team flags - .2byte MOVE_PSYCHIC, MOVE_REFLECT, MOVE_RECOVER, MOVE_SKILL_SWAP - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 137 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x41 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_WILL_O_WISP, MOVE_BLIZZARD, MOVE_PSYCHIC - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 138 - .2byte SPECIES_TORKOAL - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x09 @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_AMNESIA, MOVE_IRON_TAIL, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 139 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x09 @ team flags - .2byte MOVE_SCREECH, MOVE_EXPLOSION, MOVE_MIRROR_COAT, MOVE_PROTECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 140 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x0B @ team flags - .2byte MOVE_IRON_TAIL, MOVE_FOCUS_PUNCH, MOVE_DOUBLE_TEAM, MOVE_LEECH_SEED - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 141 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x05 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FLAMETHROWER, MOVE_FOCUS_PUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 142 - .2byte SPECIES_WEEZING - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x05 @ team flags - .2byte MOVE_EXPLOSION, MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 143 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x4E @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_DOUBLE_TEAM, MOVE_FOCUS_PUNCH, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 144 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x09 @ team flags - .2byte MOVE_DOUBLE_TEAM, MOVE_TOXIC, MOVE_SURF, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 145 - .2byte SPECIES_EXPLOUD - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x05 @ team flags - .2byte MOVE_BLIZZARD, MOVE_FLAMETHROWER, MOVE_EARTHQUAKE, MOVE_RETURN - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 146 - .2byte SPECIES_XATU - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x43 @ team flags - .2byte MOVE_PSYCHIC, MOVE_REST, MOVE_CONFUSE_RAY, MOVE_TOXIC - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 147 - .2byte SPECIES_GOLEM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x05 @ team flags - .2byte MOVE_EXPLOSION, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 148 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x83 @ team flags - .2byte MOVE_SURF, MOVE_ATTRACT, MOVE_CALM_MIND, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 149 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x4A @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_ATTRACT, MOVE_TOXIC, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 150 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x13 @ team flags - .2byte MOVE_DOUBLE_TEAM, MOVE_REST, MOVE_SURF, MOVE_DRAGON_BREATH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 151 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x03 @ team flags - .2byte MOVE_CURSE, MOVE_AMNESIA, MOVE_YAWN, MOVE_FOCUS_PUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_LAX - .2byte 0 @ padding - -@ 152 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x03 @ team flags - .2byte MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 153 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x21 @ team flags - .2byte MOVE_BELLY_DRUM, MOVE_ENDURE, MOVE_EARTHQUAKE, MOVE_REVERSAL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 154 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0xC3 @ team flags - .2byte MOVE_FAINT_ATTACK, MOVE_DOUBLE_EDGE, MOVE_SHADOW_BALL, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 155 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x83 @ team flags - .2byte MOVE_DRAGON_DANCE, MOVE_MIRROR_MOVE, MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_RASH - .2byte 0 @ padding - -@ 156 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_BLACK_BELT - .byte 0x11 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_ENCORE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 157 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x43 @ team flags - .2byte MOVE_CRUNCH, MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 158 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x33 @ team flags - .2byte MOVE_COUNTER, MOVE_ROCK_SLIDE, MOVE_FOCUS_PUNCH, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 159 - .2byte SPECIES_GLALIE - .byte BATTLE_TOWER_ITEM_NEVER_MELT_ICE - .byte 0x81 @ team flags - .2byte MOVE_BLIZZARD, MOVE_CRUNCH, MOVE_ICY_WIND, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 160 - .2byte SPECIES_HUNTAIL - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0xA1 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_HYDRO_PUMP, MOVE_CRUNCH, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 161 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0xD3 @ team flags - .2byte MOVE_SURF, MOVE_ATTRACT, MOVE_RECOVER, MOVE_TOXIC - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 162 - .2byte SPECIES_GOREBYSS - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x83 @ team flags - .2byte MOVE_PSYCHIC, MOVE_SURF, MOVE_BLIZZARD, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 163 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x53 @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_ENDEAVOR, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 164 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x53 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_MUD_SHOT, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 165 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0x41 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_FLAMETHROWER, MOVE_IRON_TAIL, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 166 - .2byte SPECIES_CRADILY - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xE1 @ team flags - .2byte MOVE_STOCKPILE, MOVE_SPIT_UP, MOVE_SWALLOW, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 167 - .2byte SPECIES_ARMALDO - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0xC1 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_HYPER_BEAM, MOVE_SLASH, MOVE_SWORDS_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 168 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x82 @ team flags - .2byte MOVE_FOCUS_PUNCH, MOVE_COUNTER, MOVE_MACH_PUNCH, MOVE_SNATCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 169 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x83 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_PROTECT, MOVE_TOXIC - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 170 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x03 @ team flags - .2byte MOVE_TORMENT, MOVE_FAINT_ATTACK, MOVE_SHADOW_BALL, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 171 - .2byte SPECIES_TROPIUS - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0xC3 @ team flags - .2byte MOVE_SUNNY_DAY, MOVE_SYNTHESIS, MOVE_SOLAR_BEAM, MOVE_LEECH_SEED - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 172 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_MACHO_BRACE - .byte 0x23 @ team flags - .2byte MOVE_TRICK, MOVE_SKILL_SWAP, MOVE_PSYCHIC, MOVE_REST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 173 - .2byte SPECIES_TORKOAL - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x81 @ team flags - .2byte MOVE_IRON_DEFENSE, MOVE_TOXIC, MOVE_REST, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 174 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_NONE - .byte 0x03 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_CRUNCH, MOVE_ROAR, MOVE_THIEF - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 175 - .2byte SPECIES_PINSIR - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x61 @ team flags - .2byte MOVE_GUILLOTINE, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 176 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x93 @ team flags - .2byte MOVE_LIGHT_SCREEN, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 177 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x51 @ team flags - .2byte MOVE_MEGAHORN, MOVE_REVERSAL, MOVE_EARTHQUAKE, MOVE_COUNTER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 178 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_NEVER_MELT_ICE - .byte 0x83 @ team flags - .2byte MOVE_BLIZZARD, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 179 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x13 @ team flags - .2byte MOVE_PSYCHIC, MOVE_RECOVER, MOVE_ENCORE, MOVE_SNATCH - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 180 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x93 @ team flags - .2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_RECOVER, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 181 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x11 @ team flags - .2byte MOVE_REST, MOVE_CURSE, MOVE_BLIZZARD, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 182 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x11 @ team flags - .2byte MOVE_REST, MOVE_IRON_DEFENSE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_MILD - .2byte 0 @ padding - -@ 183 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x91 @ team flags - .2byte MOVE_ROCK_TOMB, MOVE_EARTHQUAKE, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 184 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x20 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_EARTHQUAKE, MOVE_BLIZZARD, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 185 - .2byte SPECIES_SEAKING - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0xB2 @ team flags - .2byte MOVE_HORN_DRILL, MOVE_AGILITY, MOVE_SLEEP_TALK, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 186 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x00 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ERUPTION, MOVE_ROCK_SLIDE, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 187 - .2byte SPECIES_LANTURN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x82 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_SURF, MOVE_THUNDER_WAVE, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 188 - .2byte SPECIES_WEEZING - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x20 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FIRE_BLAST, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 189 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x41 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_ROCK_TOMB, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 190 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x11 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 191 - .2byte SPECIES_CACTURNE - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x63 @ team flags - .2byte MOVE_DYNAMIC_PUNCH, MOVE_COUNTER, MOVE_FAINT_ATTACK, MOVE_GIGA_DRAIN - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 192 - .2byte SPECIES_SHARPEDO - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x01 @ team flags - .2byte MOVE_CRUNCH, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_SWAGGER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 193 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x82 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_FACADE, MOVE_SWORDS_DANCE, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 194 - .2byte SPECIES_WAILORD - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x23 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_FISSURE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 195 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x21 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_MIRROR_COAT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 196 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0xA2 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_TOXIC, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 197 - .2byte SPECIES_WOBBUFFET - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x23 @ team flags - .2byte MOVE_ENCORE, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 198 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x21 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_MEGAHORN, MOVE_HORN_DRILL, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 199 - .2byte SPECIES_GLALIE - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x21 @ team flags - .2byte MOVE_CRUNCH, MOVE_BLIZZARD, MOVE_HAIL, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 200 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x13 @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 201 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x17 @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_ROCK_TOMB, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 202 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x17 @ team flags - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_MUD_SHOT, MOVE_BLIZZARD - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 203 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x19 @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_DESTINY_BOND, MOVE_WILL_O_WISP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 204 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0xF6 @ team flags - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_BRICK_BREAK, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 205 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0x1B @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_REFLECT, MOVE_RECOVER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 206 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x89 @ team flags - .2byte MOVE_FAINT_ATTACK, MOVE_SHADOW_BALL, MOVE_DOUBLE_TEAM, MOVE_REST - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 207 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x85 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FACADE, MOVE_FAKE_OUT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 208 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x49 @ team flags - .2byte MOVE_ATTRACT, MOVE_CONFUSE_RAY, MOVE_BITE, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 209 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x15 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_FLAMETHROWER, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 210 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x0B @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ROAR, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 211 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x27 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 212 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x05 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 213 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x4D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 214 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x1B @ team flags - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_RECOVER, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 215 - .2byte SPECIES_DODRIO - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x2B @ team flags - .2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_AGILITY, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 216 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x0A @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_REVERSAL, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 217 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x0A @ team flags - .2byte MOVE_SURF, MOVE_CROSS_CHOP, MOVE_ICE_BEAM, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 218 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x54 @ team flags - .2byte MOVE_MEGAHORN, MOVE_ROCK_TOMB, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 219 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x06 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 220 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x1D @ team flags - .2byte MOVE_SURF, MOVE_TOXIC, MOVE_PROTECT, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 221 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x9C @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 222 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x15 @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 223 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xB5 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_FOCUS_PUNCH, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 224 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x96 @ team flags - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_DOUBLE_TEAM, MOVE_REST - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 225 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x94 @ team flags - .2byte MOVE_METAL_CLAW, MOVE_EARTHQUAKE, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 226 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x96 @ team flags - .2byte MOVE_MIST_BALL, MOVE_THUNDERBOLT, MOVE_REST, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 227 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x95 @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_REFLECT, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 228 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x96 @ team flags - .2byte MOVE_SURF, MOVE_TOXIC, MOVE_RECOVER, MOVE_MIRROR_COAT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 229 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x05 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_NONE, MOVE_NONE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 230 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x1F @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM, MOVE_LEECH_SEED, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 231 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x17 @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_REST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 232 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x17 @ team flags - .2byte MOVE_MUDDY_WATER, MOVE_MUD_SHOT, MOVE_MIRROR_COAT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 233 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x7B @ team flags - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_DESTINY_BOND, MOVE_SNATCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 234 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x56 @ team flags - .2byte MOVE_SPORE, MOVE_COUNTER, MOVE_IRON_TAIL, MOVE_GIGA_DRAIN - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 235 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x0A @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_RECOVER - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 236 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x05 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_ROCK_TOMB, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 237 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x0C @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 238 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x49 @ team flags - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_ATTRACT, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 239 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x15 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_COUNTER, MOVE_EARTHQUAKE, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 240 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x63 @ team flags - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_REST, MOVE_CRUNCH - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 241 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x07 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_SCREECH, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MODEST - .2byte 0 @ padding - -@ 242 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x45 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_ROCK_TOMB, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 243 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x4D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 244 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x1B @ team flags - .2byte MOVE_LIGHT_SCREEN, MOVE_THUNDERBOLT, MOVE_SURF, MOVE_REST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 245 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_OVERHEAT, MOVE_FLAMETHROWER, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 246 - .2byte SPECIES_GOLEM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x25 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ROAR, MOVE_FIRE_BLAST, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 247 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x27 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_CROSS_CHOP, MOVE_BLIZZARD, MOVE_PSYCH_UP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 248 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x55 @ team flags - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 249 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x36 @ team flags - .2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_ROCK_SLIDE, MOVE_SHEER_COLD - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 250 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x5C @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_PROTECT, MOVE_DRAGON_BREATH, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 251 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x9D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 252 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x15 @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 253 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x95 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_TOMB, MOVE_FACADE, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 254 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x96 @ team flags - .2byte MOVE_BLIZZARD, MOVE_THUNDERBOLT, MOVE_HAIL, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 255 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x94 @ team flags - .2byte MOVE_METAL_CLAW, MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 256 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x96 @ team flags - .2byte MOVE_MIST_BALL, MOVE_REFLECT, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 257 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x95 @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 258 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0xD6 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 259 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x69 @ team flags - .2byte MOVE_TRICK, MOVE_REST, MOVE_IRON_TAIL, MOVE_DISABLE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 260 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x5F @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_REST, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 261 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x7F @ team flags - .2byte MOVE_FOCUS_PUNCH, MOVE_COUNTER, MOVE_SWAGGER, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 262 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x57 @ team flags - .2byte MOVE_IRON_TAIL, MOVE_CURSE, MOVE_DOUBLE_TEAM, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 263 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x3B @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_REST, MOVE_IMPRISON - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 264 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x56 @ team flags - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_SLUDGE_BOMB, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 265 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x1A @ team flags - .2byte MOVE_PSYCHIC, MOVE_TRICK, MOVE_RECOVER, MOVE_SNATCH - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 266 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x65 @ team flags - .2byte MOVE_REVENGE, MOVE_COUNTER, MOVE_FOCUS_PUNCH, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 267 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x54 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_PROTECT, MOVE_TOXIC, MOVE_SURF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 268 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x4B @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_BITE, MOVE_AIR_CUTTER, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 269 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x75 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_ROCK_SLIDE, MOVE_DYNAMIC_PUNCH, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 270 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x0A @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 271 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x64 @ team flags - .2byte MOVE_THUNDER, MOVE_DOUBLE_TEAM, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 272 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x49 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_PUNCH - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 273 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xCD @ team flags - .2byte MOVE_PROTECT, MOVE_DIG, MOVE_TOXIC, MOVE_SANDSTORM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 274 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x5B @ team flags - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_BLIZZARD, MOVE_PSYCHIC - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 275 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x1A @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_LEECH_SEED, MOVE_DIVE, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 276 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x4A @ team flags - .2byte MOVE_THUNDER, MOVE_REVERSAL, MOVE_FACADE, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 277 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0A @ team flags - .2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 278 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x15 @ team flags - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FACADE, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 279 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x26 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_FISSURE, MOVE_SHEER_COLD - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 280 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x4D @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_BLIZZARD, MOVE_HYPER_BEAM, MOVE_DISABLE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 281 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x9C @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_HYDRO_PUMP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 282 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0xB5 @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_PURSUIT, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 283 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x95 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_TOXIC, MOVE_SUPERPOWER, MOVE_REST - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 284 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x96 @ team flags - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_ANCIENT_POWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RASH - .2byte 0 @ padding - -@ 285 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0xB4 @ team flags - .2byte MOVE_CURSE, MOVE_AMNESIA, MOVE_RETURN, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 286 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x92 @ team flags - .2byte MOVE_MIST_BALL, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 287 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x91 @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_SURF - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 288 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xB2 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 289 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x65 @ team flags - .2byte MOVE_YAWN, MOVE_SLASH, MOVE_COUNTER, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 290 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0xDF @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_DETECT, MOVE_DRAGON_CLAW, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 291 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0xD7 @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_SKY_UPPERCUT, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 292 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x5F @ team flags - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 293 - .2byte SPECIES_SHEDINJA - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0xDB @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 294 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x94 @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 295 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_MACHO_BRACE - .byte 0x4B @ team flags - .2byte MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_TRICK, MOVE_REFLECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 296 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x92 @ team flags - .2byte MOVE_MIST_BALL, MOVE_RECOVER, MOVE_ATTRACT, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 297 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x91 @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 298 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x1A @ team flags - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 299 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x14 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_COUNTER, MOVE_ROCK_TOMB, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding -- cgit v1.2.3 From f15bbca1ffe425c53c9e4f43f38d97b2e49d2c31 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 22 Oct 2017 15:49:44 -0700 Subject: Move battle_tower level100 mons to src/ --- data/battle_tower.s | 3 - data/battle_tower/level_100_mons.inc | 2701 ---------------------------------- 2 files changed, 2704 deletions(-) delete mode 100644 data/battle_tower/level_100_mons.inc (limited to 'data') diff --git a/data/battle_tower.s b/data/battle_tower.s index 79a7e4f2d..b8ada3c36 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -3,9 +3,6 @@ .section .rodata -@ 8404BA0 - .include "data/battle_tower/level_100_mons.inc" - gUnknown_08405E60:: @ 8405E60 .byte 4 .byte 7 diff --git a/data/battle_tower/level_100_mons.inc b/data/battle_tower/level_100_mons.inc deleted file mode 100644 index 9e678153e..000000000 --- a/data/battle_tower/level_100_mons.inc +++ /dev/null @@ -1,2701 +0,0 @@ - .align 2 -gBattleTowerLevel100Mons:: @ 8404BA0 -@ 0 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0x42 @ team flags - .2byte MOVE_SLASH, MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_SAND_ATTACK - .byte F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 1 - .2byte SPECIES_MIGHTYENA - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x41 @ team flags - .2byte MOVE_BITE, MOVE_HOWL, MOVE_ODOR_SLEUTH, MOVE_SCARY_FACE - .byte F_EV_SPREAD_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 2 - .2byte SPECIES_BEAUTIFLY - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x41 @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_GUST, MOVE_STUN_SPORE, MOVE_PROTECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 3 - .2byte SPECIES_DUSTOX - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x41 @ team flags - .2byte MOVE_PSYBEAM, MOVE_GUST, MOVE_DOUBLE_TEAM, MOVE_SILVER_WIND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 4 - .2byte SPECIES_LOMBRE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x03 @ team flags - .2byte MOVE_ASTONISH, MOVE_GROWL, MOVE_MEGA_DRAIN, MOVE_SURF - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 5 - .2byte SPECIES_NUZLEAF - .byte BATTLE_TOWER_ITEM_WHITE_HERB - .byte 0x01 @ team flags - .2byte MOVE_BULLET_SEED, MOVE_RAZOR_WIND, MOVE_FAINT_ATTACK, MOVE_GROWTH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 6 - .2byte SPECIES_SWELLOW - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x42 @ team flags - .2byte MOVE_AERIAL_ACE, MOVE_GROWL, MOVE_ENDEAVOR, MOVE_FOCUS_ENERGY - .byte F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 7 - .2byte SPECIES_PELIPPER - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x02 @ team flags - .2byte MOVE_SURF, MOVE_WATER_SPORT, MOVE_PROTECT, MOVE_SUPERSONIC - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_MILD - .2byte 0 @ padding - -@ 8 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x42 @ team flags - .2byte MOVE_MACH_PUNCH, MOVE_MEGA_DRAIN, MOVE_HEADBUTT, MOVE_STUN_SPORE - .byte F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 9 - .2byte SPECIES_NINJASK - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0x41 @ team flags - .2byte MOVE_SCRATCH, MOVE_SCREECH, MOVE_LEECH_LIFE, MOVE_FLASH - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 10 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x01 @ team flags - .2byte MOVE_BITE, MOVE_FLY, MOVE_SUPERSONIC, MOVE_HAZE - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 11 - .2byte SPECIES_MAWILE - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x03 @ team flags - .2byte MOVE_VICE_GRIP, MOVE_SWEET_SCENT, MOVE_ASTONISH, MOVE_STRENGTH - .byte F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 12 - .2byte SPECIES_NOSEPASS - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x01 @ team flags - .2byte MOVE_ROCK_THROW, MOVE_SANDSTORM, MOVE_HARDEN, MOVE_PROTECT - .byte F_EV_SPREAD_ATTACK - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 13 - .2byte SPECIES_DELCATTY - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x42 @ team flags - .2byte MOVE_DOUBLE_SLAP, MOVE_TAIL_WHIP, MOVE_ATTRACT, MOVE_CHARM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 14 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x01 @ team flags - .2byte MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_GROWL, MOVE_SANDSTORM - .byte F_EV_SPREAD_SP_DEFENSE - .byte NATURE_RASH - .2byte 0 @ padding - -@ 15 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_ORAN_BERRY - .byte 0x01 @ team flags - .2byte MOVE_POISON_GAS, MOVE_MINIMIZE, MOVE_SLUDGE, MOVE_SCREECH - .byte F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 16 - .2byte SPECIES_SANDSLASH - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0x03 @ team flags - .2byte MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_DEFENSE_CURL, MOVE_SWIFT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 17 - .2byte SPECIES_SPINDA - .byte BATTLE_TOWER_ITEM_SILK_SCARF - .byte 0x42 @ team flags - .2byte MOVE_UPROAR, MOVE_WATER_PULSE, MOVE_THRASH, MOVE_SAFEGUARD - .byte F_EV_SPREAD_SPEED - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 18 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x01 @ team flags - .2byte MOVE_TICKLE, MOVE_MUD_SPORT, MOVE_WATER_GUN, MOVE_WATER_SPORT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 19 - .2byte SPECIES_CACTURNE - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x01 @ team flags - .2byte MOVE_POISON_STING, MOVE_PIN_MISSILE, MOVE_ABSORB, MOVE_COTTON_SPORE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 20 - .2byte SPECIES_JIGGLYPUFF - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x42 @ team flags - .2byte MOVE_SING, MOVE_ROLLOUT, MOVE_POUND, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 21 - .2byte SPECIES_MARILL - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x42 @ team flags - .2byte MOVE_BUBBLE_BEAM, MOVE_DEFENSE_CURL, MOVE_RAIN_DANCE, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SP_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 22 - .2byte SPECIES_MAGNETON - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0x01 @ team flags - .2byte MOVE_THUNDER_SHOCK, MOVE_SUPERSONIC, MOVE_FLASH, MOVE_SCREECH - .byte F_EV_SPREAD_SPEED - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 23 - .2byte SPECIES_CARVANHA - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x01 @ team flags - .2byte MOVE_BITE, MOVE_RAGE, MOVE_SCARY_FACE, MOVE_LEER - .byte F_EV_SPREAD_ATTACK - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 24 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x03 @ team flags - .2byte MOVE_THIEF, MOVE_LICK, MOVE_BIND, MOVE_FURY_SWIPES - .byte F_EV_SPREAD_DEFENSE - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 25 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_CHARCOAL - .byte 0x02 @ team flags - .2byte MOVE_EMBER, MOVE_CONFUSE_RAY, MOVE_FIRE_SPIN, MOVE_SAFEGUARD - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 26 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x42 @ team flags - .2byte MOVE_SHOCK_WAVE, MOVE_GROWL, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_DEFENSE - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 27 - .2byte SPECIES_SEALEO - .byte BATTLE_TOWER_ITEM_NEVER_MELT_ICE - .byte 0x01 @ team flags - .2byte MOVE_ICE_BALL, MOVE_WATER_GUN, MOVE_ENCORE, MOVE_HAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_LAX - .2byte 0 @ padding - -@ 28 - .2byte SPECIES_GRAVELER - .byte BATTLE_TOWER_ITEM_HARD_STONE - .byte 0x01 @ team flags - .2byte MOVE_ROCK_THROW, MOVE_MUD_SPORT, MOVE_SANDSTORM, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 29 - .2byte SPECIES_SHUPPET - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x03 @ team flags - .2byte MOVE_NIGHT_SHADE, MOVE_WILL_O_WISP, MOVE_SCREECH, MOVE_KNOCK_OFF - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 30 - .2byte SPECIES_LUVDISC - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_ATTRACT, MOVE_FLAIL, MOVE_SWEET_KISS, MOVE_WATER_PULSE - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 31 - .2byte SPECIES_LANTURN - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x0A @ team flags - .2byte MOVE_THUNDER_WAVE, MOVE_SUPERSONIC, MOVE_WATER_GUN, MOVE_SPARK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 32 - .2byte SPECIES_CORSOLA - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_MIRROR_COAT, MOVE_BUBBLE, MOVE_HARDEN, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 33 - .2byte SPECIES_WAILMER - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x05 @ team flags - .2byte MOVE_SURF, MOVE_ROAR, MOVE_GROWL, MOVE_MIST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 34 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x05 @ team flags - .2byte MOVE_TAKE_DOWN, MOVE_SCARY_FACE, MOVE_TAIL_WHIP, MOVE_ROAR - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 35 - .2byte SPECIES_DODRIO - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x05 @ team flags - .2byte MOVE_FURY_ATTACK, MOVE_PURSUIT, MOVE_AERIAL_ACE, MOVE_AGILITY - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 36 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x05 @ team flags - .2byte MOVE_FURY_SWIPES, MOVE_TAIL_WHIP, MOVE_DISABLE, MOVE_PSYCH_UP - .byte F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 37 - .2byte SPECIES_BELLOSSOM - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x0A @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_POISON_POWDER, MOVE_STUN_SPORE, MOVE_ACID - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 38 - .2byte SPECIES_TROPIUS - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x05 @ team flags - .2byte MOVE_STOMP, MOVE_RAZOR_LEAF, MOVE_GUST, MOVE_SYNTHESIS - .byte F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 39 - .2byte SPECIES_SABLEYE - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x0A @ team flags - .2byte MOVE_NIGHT_SHADE, MOVE_FAKE_OUT, MOVE_PSYCH_UP, MOVE_DETECT - .byte F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 40 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x03 @ team flags - .2byte MOVE_SONIC_BOOM, MOVE_SCREECH, MOVE_SPARK, MOVE_SELF_DESTRUCT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 41 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x01 @ team flags - .2byte MOVE_ACID, MOVE_WATER_PULSE, MOVE_BARRIER, MOVE_WRAP - .byte F_EV_SPREAD_SPEED - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 42 - .2byte SPECIES_CLAYDOL - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0x05 @ team flags - .2byte MOVE_ANCIENT_POWER, MOVE_MUD_SLAP, MOVE_RAPID_SPIN, MOVE_CONFUSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 43 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_PSYBEAM, MOVE_PSYCH_UP, MOVE_BOUNCE, MOVE_MAGIC_COAT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 44 - .2byte SPECIES_CRAWDAUNT - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0x05 @ team flags - .2byte MOVE_CRABHAMMER, MOVE_BUBBLE_BEAM, MOVE_BRICK_BREAK, MOVE_PROTECT - .byte F_EV_SPREAD_ATTACK - .byte NATURE_CALM - .2byte 0 @ padding - -@ 45 - .2byte SPECIES_SEVIPER - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0x01 @ team flags - .2byte MOVE_POISON_TAIL, MOVE_GLARE, MOVE_WRAP, MOVE_THIEF - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 46 - .2byte SPECIES_ZANGOOSE - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x05 @ team flags - .2byte MOVE_FURY_CUTTER, MOVE_LEER, MOVE_QUICK_ATTACK, MOVE_DETECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 47 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x03 @ team flags - .2byte MOVE_DRAGON_BREATH, MOVE_SING, MOVE_SAFEGUARD, MOVE_TAKE_DOWN - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 48 - .2byte SPECIES_ROSELIA - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x0A @ team flags - .2byte MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GROWTH, MOVE_STUN_SPORE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 49 - .2byte SPECIES_VOLBEAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x09 @ team flags - .2byte MOVE_SIGNAL_BEAM, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 50 - .2byte SPECIES_ILLUMISE - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x09 @ team flags - .2byte MOVE_CHARM, MOVE_ENCORE, MOVE_SOLAR_BEAM, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 51 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_MAGNET - .byte 0x03 @ team flags - .2byte MOVE_BITE, MOVE_HOWL, MOVE_THUNDER_WAVE, MOVE_SPARK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 52 - .2byte SPECIES_MAWILE - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_CRUNCH, MOVE_IRON_DEFENSE, MOVE_TORMENT, MOVE_SANDSTORM - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_RASH - .2byte 0 @ padding - -@ 53 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x05 @ team flags - .2byte MOVE_ARM_THRUST, MOVE_FAKE_OUT, MOVE_WHIRLWIND, MOVE_REVERSAL - .byte F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 54 - .2byte SPECIES_SKARMORY - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x01 @ team flags - .2byte MOVE_STEEL_WING, MOVE_AGILITY, MOVE_TAUNT, MOVE_FLY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 55 - .2byte SPECIES_TORKOAL - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x03 @ team flags - .2byte MOVE_FIRE_SPIN, MOVE_SMOKESCREEN, MOVE_BODY_SLAM, MOVE_AMNESIA - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 56 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x05 @ team flags - .2byte MOVE_THRASH, MOVE_DRAGON_RAGE, MOVE_TWISTER, MOVE_HYDRO_PUMP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 57 - .2byte SPECIES_MIGHTYENA - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x05 @ team flags - .2byte MOVE_CRUNCH, MOVE_HOWL, MOVE_IRON_TAIL, MOVE_TORMENT - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 58 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x06 @ team flags - .2byte MOVE_SLASH, MOVE_ATTRACT, MOVE_SHOCK_WAVE, MOVE_TOXIC - .byte F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 59 - .2byte SPECIES_MASQUERAIN - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0A @ team flags - .2byte MOVE_TOXIC, MOVE_STUN_SPORE, MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_LAX - .2byte 0 @ padding - -@ 60 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x06 @ team flags - .2byte MOVE_BULLET_SEED, MOVE_SLAM, MOVE_SCREECH, MOVE_DETECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 61 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x06 @ team flags - .2byte MOVE_DOUBLE_KICK, MOVE_FLAMETHROWER, MOVE_DOUBLE_TEAM, MOVE_ROAR - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 62 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x49 @ team flags - .2byte MOVE_SURF, MOVE_MUD_SHOT, MOVE_MUD_SPORT, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 63 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x49 @ team flags - .2byte MOVE_DRAGON_BREATH, MOVE_FLY, MOVE_TOXIC, MOVE_FACADE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 64 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x49 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_SMOKESCREEN, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 65 - .2byte SPECIES_CORSOLA - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x03 @ team flags - .2byte MOVE_ANCIENT_POWER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_REFLECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 66 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x41 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_ROAR, MOVE_THUNDERBOLT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 67 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x06 @ team flags - .2byte MOVE_MEGAHORN, MOVE_COUNTER, MOVE_PROTECT, MOVE_LEER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 68 - .2byte SPECIES_GIRAFARIG - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x09 @ team flags - .2byte MOVE_PSYCHIC, MOVE_CRUNCH, MOVE_BATON_PASS, MOVE_AGILITY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 69 - .2byte SPECIES_XATU - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x09 @ team flags - .2byte MOVE_PSYCHIC, MOVE_FLY, MOVE_CONFUSE_RAY, MOVE_TOXIC - .byte F_EV_SPREAD_SPEED - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 70 - .2byte SPECIES_DODRIO - .byte BATTLE_TOWER_ITEM_SHARP_BEAK - .byte 0x03 @ team flags - .2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_PURSUIT, MOVE_TORMENT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SERIOUS - .2byte 0 @ padding - -@ 71 - .2byte SPECIES_VILEPLUME - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x89 @ team flags - .2byte MOVE_POISON_POWDER, MOVE_STUN_SPORE, MOVE_SLEEP_POWDER, MOVE_PETAL_DANCE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MODEST - .2byte 0 @ padding - -@ 72 - .2byte SPECIES_MEDICHAM - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x06 @ team flags - .2byte MOVE_FOCUS_PUNCH, MOVE_LIGHT_SCREEN, MOVE_BULK_UP, MOVE_PSYCHIC - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 73 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x06 @ team flags - .2byte MOVE_SLASH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM, MOVE_ATTRACT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 74 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x4B @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_WILL_O_WISP, MOVE_NIGHT_SHADE, MOVE_DISABLE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_LAX - .2byte 0 @ padding - -@ 75 - .2byte SPECIES_SHUPPET - .byte BATTLE_TOWER_ITEM_SPELL_TAG - .byte 0x43 @ team flags - .2byte MOVE_GRUDGE, MOVE_SHADOW_BALL, MOVE_CURSE, MOVE_KNOCK_OFF - .byte F_EV_SPREAD_SP_ATTACK - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 76 - .2byte SPECIES_CASTFORM - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x82 @ team flags - .2byte MOVE_WEATHER_BALL, MOVE_HAIL, MOVE_SUNNY_DAY, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SPEED - .byte NATURE_MODEST - .2byte 0 @ padding - -@ 77 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x02 @ team flags - .2byte MOVE_SURF, MOVE_REFRESH, MOVE_RECOVER, MOVE_RAIN_DANCE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 78 - .2byte SPECIES_SHARPEDO - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x01 @ team flags - .2byte MOVE_CRUNCH, MOVE_FOCUS_ENERGY, MOVE_SCARY_FACE, MOVE_SCREECH - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_LAX - .2byte 0 @ padding - -@ 79 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x06 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SAND_ATTACK, MOVE_DRAGON_BREATH, MOVE_SAND_TOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 80 - .2byte SPECIES_TRAPINCH - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x09 @ team flags - .2byte MOVE_TOXIC, MOVE_SAND_TOMB, MOVE_CRUNCH, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 81 - .2byte SPECIES_LUNATONE - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x43 @ team flags - .2byte MOVE_PSYCHIC, MOVE_ROCK_THROW, MOVE_HYPNOSIS, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 82 - .2byte SPECIES_SOLROCK - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x43 @ team flags - .2byte MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_COSMIC_POWER, MOVE_CALM_MIND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 83 - .2byte SPECIES_BALTOY - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x43 @ team flags - .2byte MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_REFLECT, MOVE_SELF_DESTRUCT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 84 - .2byte SPECIES_CRAWDAUNT - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x06 @ team flags - .2byte MOVE_CRABHAMMER, MOVE_SURF, MOVE_PROTECT, MOVE_BRICK_BREAK - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 85 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_ASPEAR_BERRY - .byte 0x06 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_TICKLE, MOVE_AMNESIA, MOVE_SURF - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 86 - .2byte SPECIES_SEVIPER - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x09 @ team flags - .2byte MOVE_POISON_TAIL, MOVE_CRUNCH, MOVE_GIGA_DRAIN, MOVE_HAZE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 87 - .2byte SPECIES_MAGCARGO - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x89 @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_LIGHT_SCREEN, MOVE_AMNESIA, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 88 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_BLACK_BELT - .byte 0x09 @ team flags - .2byte MOVE_KARATE_CHOP, MOVE_SEISMIC_TOSS, MOVE_BRICK_BREAK, MOVE_LOW_KICK - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 89 - .2byte SPECIES_SWALOT - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x86 @ team flags - .2byte MOVE_YAWN, MOVE_WATER_PULSE, MOVE_SHADOW_BALL, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 90 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x0C @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_GIGA_DRAIN, MOVE_FURY_CUTTER, MOVE_DETECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 91 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x0C @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_FLAMETHROWER, MOVE_PROTECT, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 92 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x4C @ team flags - .2byte MOVE_SURF, MOVE_MUD_SHOT, MOVE_MUD_SLAP, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 93 - .2byte SPECIES_MIGHTYENA - .byte BATTLE_TOWER_ITEM_BLACK_GLASSES - .byte 0x04 @ team flags - .2byte MOVE_CRUNCH, MOVE_HOWL, MOVE_SWAGGER, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 94 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x04 @ team flags - .2byte MOVE_SLASH, MOVE_REST, MOVE_BELLY_DRUM, MOVE_THUNDERBOLT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_MILD - .2byte 0 @ padding - -@ 95 - .2byte SPECIES_BEAUTIFLY - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x08 @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_ATTRACT, MOVE_MORNING_SUN, MOVE_STUN_SPORE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 96 - .2byte SPECIES_DUSTOX - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x08 @ team flags - .2byte MOVE_PSYCHIC, MOVE_SILVER_WIND, MOVE_MOONLIGHT, MOVE_TOXIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 97 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x0C @ team flags - .2byte MOVE_FAKE_OUT, MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_UPROAR - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 98 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x0C @ team flags - .2byte MOVE_FRUSTRATION, MOVE_GIGA_DRAIN, MOVE_TORMENT, MOVE_SWAGGER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 99 - .2byte SPECIES_SWELLOW - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x88 @ team flags - .2byte MOVE_FLY, MOVE_ENDEAVOR, MOVE_AERIAL_ACE, MOVE_TOXIC - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 100 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_BLACK_GLASSES - .byte 0x4A @ team flags - .2byte MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_PSYCHIC, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 101 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x0C @ team flags - .2byte MOVE_DYNAMIC_PUNCH, MOVE_MIND_READER, MOVE_SNATCH, MOVE_MEGA_DRAIN - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 102 - .2byte SPECIES_VIGOROTH - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x04 @ team flags - .2byte MOVE_SLASH, MOVE_UPROAR, MOVE_ENCORE, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 103 - .2byte SPECIES_NINJASK - .byte BATTLE_TOWER_ITEM_SILVER_POWDER - .byte 0x04 @ team flags - .2byte MOVE_FURY_CUTTER, MOVE_GIGA_DRAIN, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 104 - .2byte SPECIES_SHEDINJA - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0xCA @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY, MOVE_GRUDGE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 105 - .2byte SPECIES_LOUDRED - .byte BATTLE_TOWER_ITEM_PECHA_BERRY - .byte 0x04 @ team flags - .2byte MOVE_HYPER_VOICE, MOVE_HOWL, MOVE_SHADOW_BALL, MOVE_TORMENT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 106 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x04 @ team flags - .2byte MOVE_ARM_THRUST, MOVE_BULK_UP, MOVE_BRICK_BREAK, MOVE_HIDDEN_POWER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 107 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_TWISTED_SPOON - .byte 0x88 @ team flags - .2byte MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_FUTURE_SIGHT, MOVE_DISABLE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 108 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0x88 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_MEAN_LOOK, MOVE_SNATCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 109 - .2byte SPECIES_MAWILE - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x04 @ team flags - .2byte MOVE_CRUNCH, MOVE_IRON_DEFENSE, MOVE_FAKE_TEARS, MOVE_POISON_FANG - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 110 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x45 @ team flags - .2byte MOVE_METAL_CLAW, MOVE_FLAMETHROWER, MOVE_METAL_SOUND, MOVE_ICE_BEAM - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 111 - .2byte SPECIES_GOLEM - .byte BATTLE_TOWER_ITEM_SOFT_SAND - .byte 0xC5 @ team flags - .2byte MOVE_ROLLOUT, MOVE_DEFENSE_CURL, MOVE_DOUBLE_TEAM, MOVE_SELF_DESTRUCT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 112 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_MAGNET - .byte 0x04 @ team flags - .2byte MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_THUNDER_WAVE, MOVE_CHARGE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 113 - .2byte SPECIES_VOLBEAT - .byte BATTLE_TOWER_ITEM_SILVER_POWDER - .byte 0x08 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_SIGNAL_BEAM, MOVE_MOONLIGHT, MOVE_TAIL_GLOW - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 114 - .2byte SPECIES_ILLUMISE - .byte BATTLE_TOWER_ITEM_SILVER_POWDER - .byte 0x08 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_FLATTER, MOVE_WISH, MOVE_ENCORE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 115 - .2byte SPECIES_MASQUERAIN - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x88 @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_SILVER_WIND, MOVE_STUN_SPORE, MOVE_TOXIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 116 - .2byte SPECIES_ROSELIA - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x08 @ team flags - .2byte MOVE_PETAL_DANCE, MOVE_GROWTH, MOVE_SYNTHESIS, MOVE_GRASS_WHISTLE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_IMPISH - .2byte 0 @ padding - -@ 117 - .2byte SPECIES_DELCATTY - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x08 @ team flags - .2byte MOVE_SING, MOVE_ATTRACT, MOVE_DOUBLE_SLAP, MOVE_HEAL_BELL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 118 - .2byte SPECIES_SEAKING - .byte BATTLE_TOWER_ITEM_MYSTIC_WATER - .byte 0x88 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_SURF, MOVE_ATTRACT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 119 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x8C @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_EARTHQUAKE, MOVE_DRAGON_RAGE, MOVE_PROTECT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CALM - .2byte 0 @ padding - -@ 120 - .2byte SPECIES_SWALOT - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x42 @ team flags - .2byte MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP, MOVE_YAWN - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 121 - .2byte SPECIES_MAGCARGO - .byte BATTLE_TOWER_ITEM_ASPEAR_BERRY - .byte 0x41 @ team flags - .2byte MOVE_ROCK_SLIDE, MOVE_FIRE_BLAST, MOVE_BODY_SLAM, MOVE_LIGHT_SCREEN - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 122 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_POISON_BARB - .byte 0xC3 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_ACID_ARMOR, MOVE_DISABLE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 123 - .2byte SPECIES_SPINDA - .byte BATTLE_TOWER_ITEM_SILK_SCARF - .byte 0x42 @ team flags - .2byte MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE, MOVE_PSYCH_UP, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_MODEST - .2byte 0 @ padding - -@ 124 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_DRAGON_FANG - .byte 0x03 @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_REFRESH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 125 - .2byte SPECIES_ZANGOOSE - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x03 @ team flags - .2byte MOVE_CRUSH_CLAW, MOVE_TAUNT, MOVE_SWORDS_DANCE, MOVE_DETECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 126 - .2byte SPECIES_SEVIPER - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x41 @ team flags - .2byte MOVE_SWAGGER, MOVE_TAUNT, MOVE_GLARE, MOVE_POISON_TAIL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 127 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x42 @ team flags - .2byte MOVE_TOXIC, MOVE_BOUNCE, MOVE_CONFUSE_RAY, MOVE_ATTRACT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 128 - .2byte SPECIES_CACTURNE - .byte BATTLE_TOWER_ITEM_MIRACLE_SEED - .byte 0x41 @ team flags - .2byte MOVE_NEEDLE_ARM, MOVE_INGRAIN, MOVE_SPIKES, MOVE_COTTON_SPORE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 129 - .2byte SPECIES_CLAYDOL - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x03 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SANDSTORM, MOVE_COSMIC_POWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 130 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_MENTAL_HERB - .byte 0xC1 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_HYDRO_PUMP, MOVE_BARRIER, MOVE_SUPERSONIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 131 - .2byte SPECIES_WIGGLYTUFF - .byte BATTLE_TOWER_ITEM_RAWST_BERRY - .byte 0xC3 @ team flags - .2byte MOVE_SING, MOVE_FOCUS_PUNCH, MOVE_DISABLE, MOVE_FACADE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_ADAMANT - .2byte 0 @ padding - -@ 132 - .2byte SPECIES_AZUMARILL - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0xC2 @ team flags - .2byte MOVE_SURF, MOVE_ATTRACT, MOVE_DEFENSE_CURL, MOVE_ROLLOUT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RASH - .2byte 0 @ padding - -@ 133 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0xC3 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_MIRROR_COAT, MOVE_LIGHT_SCREEN, MOVE_SELF_DESTRUCT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 134 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x42 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_ATTRACT, MOVE_RECOVER, MOVE_REFRESH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 135 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x43 @ team flags - .2byte MOVE_SKILL_SWAP, MOVE_ANCIENT_POWER, MOVE_WATER_PULSE, MOVE_THUNDERBOLT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 136 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x43 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_REST, MOVE_MEAN_LOOK - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 137 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x41 @ team flags - .2byte MOVE_SLASH, MOVE_SWORDS_DANCE, MOVE_DOUBLE_TEAM, MOVE_SNATCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 138 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0xC2 @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_CONFUSE_RAY, MOVE_DOUBLE_TEAM, MOVE_WILL_O_WISP - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 139 - .2byte SPECIES_PIKACHU - .byte BATTLE_TOWER_ITEM_LIGHT_BALL - .byte 0xC2 @ team flags - .2byte MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_RAIN_DANCE, MOVE_ATTRACT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 140 - .2byte SPECIES_VILEPLUME - .byte BATTLE_TOWER_ITEM_ASPEAR_BERRY - .byte 0xC3 @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_SLEEP_POWDER, MOVE_MOONLIGHT, MOVE_SLUDGE_BOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 141 - .2byte SPECIES_DONPHAN - .byte BATTLE_TOWER_ITEM_PERSIM_BERRY - .byte 0x41 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_DOUBLE_EDGE, MOVE_IRON_TAIL, MOVE_FISSURE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIRKY - .2byte 0 @ padding - -@ 142 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_CHERI_BERRY - .byte 0xC3 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 143 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_NEVER_MELT_ICE - .byte 0x43 @ team flags - .2byte MOVE_ICE_BEAM, MOVE_BODY_SLAM, MOVE_ENCORE, MOVE_HAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 144 - .2byte SPECIES_RELICANTH - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x41 @ team flags - .2byte MOVE_YAWN, MOVE_MUD_SPORT, MOVE_DOUBLE_EDGE, MOVE_SANDSTORM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LONELY - .2byte 0 @ padding - -@ 145 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x43 @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_ICE_BEAM, MOVE_HYDRO_PUMP, MOVE_AGILITY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 146 - .2byte SPECIES_CRADILY - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x43 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_INGRAIN, MOVE_ANCIENT_POWER, MOVE_GIGA_DRAIN - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 147 - .2byte SPECIES_ARMALDO - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x43 @ team flags - .2byte MOVE_SLASH, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_WATER_PULSE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 148 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_METAL_COAT - .byte 0x41 @ team flags - .2byte MOVE_METAL_CLAW, MOVE_PSYCHIC, MOVE_LIGHT_SCREEN, MOVE_AGILITY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 149 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x42 @ team flags - .2byte MOVE_DRAGON_BREATH, MOVE_CRUNCH, MOVE_FLAMETHROWER, MOVE_AERIAL_ACE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 150 - .2byte SPECIES_MIGHTYENA - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x01 @ team flags - .2byte MOVE_CRUNCH, MOVE_YAWN, MOVE_FACADE, MOVE_HOWL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 151 - .2byte SPECIES_LINOONE - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x02 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_FACADE, MOVE_ATTRACT, MOVE_TRICK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 152 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x03 @ team flags - .2byte MOVE_SURF, MOVE_FOCUS_PUNCH, MOVE_FAKE_OUT, MOVE_SYNTHESIS - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 153 - .2byte SPECIES_EXPLOUD - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x01 @ team flags - .2byte MOVE_UPROAR, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 154 - .2byte SPECIES_SWELLOW - .byte BATTLE_TOWER_ITEM_LANSAT_BERRY - .byte 0x02 @ team flags - .2byte MOVE_FACADE, MOVE_SUPERSONIC, MOVE_WING_ATTACK, MOVE_ENDEAVOR - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 155 - .2byte SPECIES_PELIPPER - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x82 @ team flags - .2byte MOVE_STOCKPILE, MOVE_SWALLOW, MOVE_SPIT_UP, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 156 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x01 @ team flags - .2byte MOVE_DYNAMIC_PUNCH, MOVE_COUNTER, MOVE_BULK_UP, MOVE_MIND_READER - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 157 - .2byte SPECIES_SHEDINJA - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x01 @ team flags - .2byte MOVE_RETURN, MOVE_DOUBLE_TEAM, MOVE_TOXIC, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 158 - .2byte SPECIES_EXPLOUD - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x01 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_SUPERSONIC, MOVE_FLAMETHROWER, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 159 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x01 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_COUNTER, MOVE_FACADE, MOVE_FAKE_OUT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 160 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x83 @ team flags - .2byte MOVE_PSYCHIC, MOVE_ENCORE, MOVE_DISABLE, MOVE_RECOVER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 161 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x81 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_AIR_CUTTER, MOVE_TORMENT, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 162 - .2byte SPECIES_SABLEYE - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x83 @ team flags - .2byte MOVE_TOXIC, MOVE_DETECT, MOVE_RECOVER, MOVE_TORMENT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 163 - .2byte SPECIES_MAWILE - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x02 @ team flags - .2byte MOVE_CRUNCH, MOVE_SWORDS_DANCE, MOVE_IRON_DEFENSE, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 164 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x01 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_IRON_DEFENSE, MOVE_ROAR, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 165 - .2byte SPECIES_GOLEM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x01 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_FLAMETHROWER, MOVE_FACADE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 166 - .2byte SPECIES_NOSEPASS - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x81 @ team flags - .2byte MOVE_THUNDER_WAVE, MOVE_ROCK_SLIDE, MOVE_TORMENT, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 167 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x02 @ team flags - .2byte MOVE_THUNDER, MOVE_CRUNCH, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 168 - .2byte SPECIES_ROSELIA - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x82 @ team flags - .2byte MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_GROWTH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 169 - .2byte SPECIES_DELCATTY - .byte BATTLE_TOWER_ITEM_STARF_BERRY - .byte 0x02 @ team flags - .2byte MOVE_ASSIST, MOVE_SING, MOVE_ATTRACT, MOVE_SUBSTITUTE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 170 - .2byte SPECIES_TROPIUS - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0xC2 @ team flags - .2byte MOVE_RAZOR_LEAF, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_SYNTHESIS - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 171 - .2byte SPECIES_SWALOT - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x03 @ team flags - .2byte MOVE_YAWN, MOVE_SLUDGE_BOMB, MOVE_ATTRACT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 172 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_BLACK_BELT - .byte 0x01 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_BULK_UP, MOVE_LOW_KICK, MOVE_BRICK_BREAK - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 173 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_SITRUS_BERRY - .byte 0x40 @ team flags - .2byte MOVE_ERUPTION, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_OVERHEAT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 174 - .2byte SPECIES_MAGCARGO - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x03 @ team flags - .2byte MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_EARTHQUAKE, MOVE_REFLECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 175 - .2byte SPECIES_WEEZING - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x81 @ team flags - .2byte MOVE_WILL_O_WISP, MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 176 - .2byte SPECIES_SPINDA - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x82 @ team flags - .2byte MOVE_TRICK, MOVE_TEETER_DANCE, MOVE_FOCUS_PUNCH, MOVE_FACADE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 177 - .2byte SPECIES_SKARMORY - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x01 @ team flags - .2byte MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_TORMENT, MOVE_PROTECT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 178 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x02 @ team flags - .2byte MOVE_SING, MOVE_DRAGON_CLAW, MOVE_ICE_BEAM, MOVE_EARTHQUAKE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 179 - .2byte SPECIES_GRUMPIG - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x82 @ team flags - .2byte MOVE_PSYCHIC, MOVE_CONFUSE_RAY, MOVE_CALM_MIND, MOVE_REST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 180 - .2byte SPECIES_SHIFTRY - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x20 @ team flags - .2byte MOVE_SWAGGER, MOVE_FRUSTRATION, MOVE_ATTRACT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 181 - .2byte SPECIES_CLAYDOL - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x20 @ team flags - .2byte MOVE_COSMIC_POWER, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 182 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x33 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_BELLY_DRUM, MOVE_REST - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 183 - .2byte SPECIES_NOSEPASS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x20 @ team flags - .2byte MOVE_ROCK_SLIDE, MOVE_THUNDER_WAVE, MOVE_EARTHQUAKE, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_LAX - .2byte 0 @ padding - -@ 184 - .2byte SPECIES_DUSCLOPS - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x33 @ team flags - .2byte MOVE_SHADOW_PUNCH, MOVE_WILL_O_WISP, MOVE_CONFUSE_RAY, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 185 - .2byte SPECIES_SEAKING - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x20 @ team flags - .2byte MOVE_HORN_DRILL, MOVE_AGILITY, MOVE_SLEEP_TALK, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 186 - .2byte SPECIES_CAMERUPT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x73 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ERUPTION, MOVE_ROCK_SLIDE, MOVE_FISSURE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 187 - .2byte SPECIES_LANTURN - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x13 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_SURF, MOVE_THUNDER_WAVE, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 188 - .2byte SPECIES_WEEZING - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x33 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_THUNDERBOLT, MOVE_FIRE_BLAST, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 189 - .2byte SPECIES_WHISCASH - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x20 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_SURF, MOVE_SPARK, MOVE_FISSURE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 190 - .2byte SPECIES_AGGRON - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x51 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 191 - .2byte SPECIES_KECLEON - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x12 @ team flags - .2byte MOVE_TRICK, MOVE_FOCUS_PUNCH, MOVE_ATTRACT, MOVE_SNATCH - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 192 - .2byte SPECIES_SHARPEDO - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x11 @ team flags - .2byte MOVE_CRUNCH, MOVE_DOUBLE_EDGE, MOVE_SURF, MOVE_SWAGGER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 193 - .2byte SPECIES_ABSOL - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x12 @ team flags - .2byte MOVE_DOUBLE_EDGE, MOVE_FACADE, MOVE_SWORDS_DANCE, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 194 - .2byte SPECIES_WAILORD - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x72 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_EARTHQUAKE, MOVE_ATTRACT, MOVE_FISSURE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 195 - .2byte SPECIES_TENTACRUEL - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x20 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_SLUDGE_BOMB, MOVE_BARRIER, MOVE_MIRROR_COAT - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 196 - .2byte SPECIES_SABLEYE - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x32 @ team flags - .2byte MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_RECOVER, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 197 - .2byte SPECIES_WOBBUFFET - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x20 @ team flags - .2byte MOVE_ENCORE, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_DESTINY_BOND - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_MILD - .2byte 0 @ padding - -@ 198 - .2byte SPECIES_RHYDON - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x71 @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_MEGAHORN, MOVE_BRICK_BREAK, MOVE_HORN_DRILL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 199 - .2byte SPECIES_GLALIE - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x31 @ team flags - .2byte MOVE_CRUNCH, MOVE_BLIZZARD, MOVE_HAIL, MOVE_SHEER_COLD - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 200 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x8C @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_EARTHQUAKE, MOVE_DRAGON_CLAW, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 201 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x8C @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_COUNTER, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 202 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x8C @ team flags - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_MIRROR_COAT, MOVE_BLIZZARD - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 203 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x1A @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_DESTINY_BOND, MOVE_SNATCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 204 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x15 @ team flags - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_MACH_PUNCH, MOVE_ATTRACT - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 205 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x58 @ team flags - .2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_RECOVER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 206 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x15 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_FACADE, MOVE_FAKE_OUT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 207 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x55 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SURF, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 208 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x58 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_CONFUSE_RAY, MOVE_AIR_CUTTER, MOVE_DOUBLE_TEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 209 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x5D @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_FLAMETHROWER, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 210 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x1A @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ROAR, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 211 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x60 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 212 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x64 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 213 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x1C @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FLAMETHROWER, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 214 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x5C @ team flags - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_RECOVER, MOVE_CONFUSE_RAY - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 215 - .2byte SPECIES_NINETALES - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x4A @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_TOXIC, MOVE_FIRE_SPIN, MOVE_HEAT_WAVE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 216 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x5A @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_REVERSAL, MOVE_IRON_TAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 217 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x55 @ team flags - .2byte MOVE_SURF, MOVE_CROSS_CHOP, MOVE_ICE_BEAM, MOVE_DIG - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 218 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x5D @ team flags - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 219 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x26 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_EARTHQUAKE, MOVE_SHEER_COLD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 220 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_CHESTO_BERRY - .byte 0x5B @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_DRAGON_BREATH, MOVE_REST - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 221 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x0D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_FIRE_BLAST - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 222 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x3D @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 223 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x3C @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 224 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x3C @ team flags - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 225 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x3C @ team flags - .2byte MOVE_METAL_CLAW, MOVE_EARTHQUAKE, MOVE_THUNDERBOLT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 226 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x0E @ team flags - .2byte MOVE_MIST_BALL, MOVE_THUNDERBOLT, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 227 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x0D @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 228 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x1A @ team flags - .2byte MOVE_SURF, MOVE_TOXIC, MOVE_RECOVER, MOVE_MIRROR_COAT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 229 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x15 @ team flags - .2byte MOVE_YAWN, MOVE_FOCUS_PUNCH, MOVE_COUNTER, MOVE_SLACK_OFF - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 230 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x8C @ team flags - .2byte MOVE_GIGA_DRAIN, MOVE_DOUBLE_TEAM, MOVE_LEECH_SEED, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 231 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x8C @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_QUICK_ATTACK - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 232 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x8C @ team flags - .2byte MOVE_MUDDY_WATER, MOVE_MUD_SHOT, MOVE_MIRROR_COAT, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 233 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x0A @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_HYPNOSIS, MOVE_DREAM_EATER - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 234 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x05 @ team flags - .2byte MOVE_SPORE, MOVE_COUNTER, MOVE_SKY_UPPERCUT, MOVE_GIGA_DRAIN - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 235 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x58 @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_FIRE_PUNCH, MOVE_RECOVER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 236 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x04 @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_COUNTER, MOVE_ENDURE, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 237 - .2byte SPECIES_GYARADOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x44 @ team flags - .2byte MOVE_HYPER_BEAM, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_BOLD - .2byte 0 @ padding - -@ 238 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x48 @ team flags - .2byte MOVE_TOXIC, MOVE_CONFUSE_RAY, MOVE_ATTRACT, MOVE_FLY - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 239 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x5D @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_COUNTER, MOVE_EARTHQUAKE, MOVE_FACADE - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 240 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x0A @ team flags - .2byte MOVE_THUNDER, MOVE_THUNDER_WAVE, MOVE_QUICK_ATTACK, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 241 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x60 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_LIGHT_SCREEN, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 242 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x64 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN, MOVE_FLAMETHROWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 243 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x1C @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_IRON_TAIL, MOVE_CRUNCH - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 244 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x5C @ team flags - .2byte MOVE_BLIZZARD, MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_RECOVER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 245 - .2byte SPECIES_DODRIO - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x5A @ team flags - .2byte MOVE_DRILL_PECK, MOVE_TRI_ATTACK, MOVE_AGILITY, MOVE_FACADE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 246 - .2byte SPECIES_RAICHU - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x4A @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_FOCUS_PUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 247 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x45 @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_CROSS_CHOP, MOVE_BLIZZARD, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 248 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x5D @ team flags - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_COUNTER, MOVE_REVERSAL - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 249 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x26 @ team flags - .2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_ROCK_SLIDE, MOVE_SHEER_COLD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 250 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x5C @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_DRAGON_BREATH, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 251 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_KINGS_ROCK - .byte 0x1D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_CRUNCH, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 252 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x3D @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 253 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x3C @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_THUNDERBOLT, MOVE_FOCUS_PUNCH, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 254 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x3C @ team flags - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_HAIL, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 255 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x3C @ team flags - .2byte MOVE_METAL_CLAW, MOVE_EARTHQUAKE, MOVE_ANCIENT_POWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 256 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x1E @ team flags - .2byte MOVE_MIST_BALL, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 257 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x1D @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 258 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x1A @ team flags - .2byte MOVE_HYDRO_PUMP, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_MIRROR_COAT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 259 - .2byte SPECIES_SLAKING - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x15 @ team flags - .2byte MOVE_YAWN, MOVE_FOCUS_PUNCH, MOVE_COUNTER, MOVE_PURSUIT - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 260 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x8C @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 261 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0x8C @ team flags - .2byte MOVE_FOCUS_PUNCH, MOVE_COUNTER, MOVE_SWAGGER, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 262 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x8C @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_ATTRACT, MOVE_REST - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 263 - .2byte SPECIES_GARDEVOIR - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x0A @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDERBOLT, MOVE_ATTRACT, MOVE_WILL_O_WISP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 264 - .2byte SPECIES_BRELOOM - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x05 @ team flags - .2byte MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_MACH_PUNCH, MOVE_COUNTER - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 265 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_CHOICE_BAND - .byte 0x58 @ team flags - .2byte MOVE_PSYCHIC, MOVE_TRICK, MOVE_RECOVER, MOVE_SNATCH - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 266 - .2byte SPECIES_HARIYAMA - .byte BATTLE_TOWER_ITEM_FOCUS_BAND - .byte 0x05 @ team flags - .2byte MOVE_REVENGE, MOVE_COUNTER, MOVE_FOCUS_PUNCH, MOVE_REVERSAL - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 267 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x0A @ team flags - .2byte MOVE_RAIN_DANCE, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_DIVE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 268 - .2byte SPECIES_CROBAT - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x48 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_SNATCH - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 269 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x5D @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_FIRE_BLAST, MOVE_LOW_KICK, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 270 - .2byte SPECIES_MANECTRIC - .byte BATTLE_TOWER_ITEM_LUM_BERRY - .byte 0x08 @ team flags - .2byte MOVE_THUNDERBOLT, MOVE_THUNDER_WAVE, MOVE_ATTRACT, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 271 - .2byte SPECIES_ELECTRODE - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x60 @ team flags - .2byte MOVE_THUNDER, MOVE_SWIFT, MOVE_MIRROR_COAT, MOVE_EXPLOSION - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_BASHFUL - .2byte 0 @ padding - -@ 272 - .2byte SPECIES_MUK - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x64 @ team flags - .2byte MOVE_SLUDGE_BOMB, MOVE_FLAMETHROWER, MOVE_THUNDERBOLT, MOVE_SHADOW_PUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 273 - .2byte SPECIES_FLYGON - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x0C @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_SANDSTORM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_TIMID - .2byte 0 @ padding - -@ 274 - .2byte SPECIES_STARMIE - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x4C @ team flags - .2byte MOVE_SURF, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_PSYCHIC - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 275 - .2byte SPECIES_LUDICOLO - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x4A @ team flags - .2byte MOVE_LEECH_SEED, MOVE_ATTRACT, MOVE_DOUBLE_TEAM, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 276 - .2byte SPECIES_SKARMORY - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x4B @ team flags - .2byte MOVE_DRILL_PECK, MOVE_STEEL_WING, MOVE_ATTRACT, MOVE_PURSUIT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SPEED - .byte NATURE_SASSY - .2byte 0 @ padding - -@ 277 - .2byte SPECIES_GOLDUCK - .byte BATTLE_TOWER_ITEM_SCOPE_LENS - .byte 0x49 @ team flags - .2byte MOVE_SURF, MOVE_PSYCHIC, MOVE_ICE_BEAM, MOVE_CROSS_CHOP - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_JOLLY - .2byte 0 @ padding - -@ 278 - .2byte SPECIES_HERACROSS - .byte BATTLE_TOWER_ITEM_QUICK_CLAW - .byte 0x5D @ team flags - .2byte MOVE_MEGAHORN, MOVE_EARTHQUAKE, MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 279 - .2byte SPECIES_WALREIN - .byte BATTLE_TOWER_ITEM_LEPPA_BERRY - .byte 0x26 @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_FISSURE, MOVE_SHEER_COLD - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 280 - .2byte SPECIES_KINGDRA - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x5C @ team flags - .2byte MOVE_SURF, MOVE_BLIZZARD, MOVE_HYPER_BEAM, MOVE_FLAIL - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 281 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x1D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_EARTHQUAKE, MOVE_FIRE_BLAST, MOVE_HYDRO_PUMP - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_NAUGHTY - .2byte 0 @ padding - -@ 282 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x3D @ team flags - .2byte MOVE_METEOR_MASH, MOVE_PSYCHIC, MOVE_EARTHQUAKE, MOVE_HYPER_BEAM - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 283 - .2byte SPECIES_REGIROCK - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x3C @ team flags - .2byte MOVE_EARTHQUAKE, MOVE_THUNDERBOLT, MOVE_SUPERPOWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 284 - .2byte SPECIES_REGICE - .byte BATTLE_TOWER_ITEM_LAX_INCENSE - .byte 0x3C @ team flags - .2byte MOVE_ICE_BEAM, MOVE_THUNDERBOLT, MOVE_ANCIENT_POWER, MOVE_EXPLOSION - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_ATTACK - .byte NATURE_CAREFUL - .2byte 0 @ padding - -@ 285 - .2byte SPECIES_REGISTEEL - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x3C @ team flags - .2byte MOVE_METAL_CLAW, MOVE_THUNDERBOLT, MOVE_HYPER_BEAM, MOVE_EXPLOSION - .byte F_EV_SPREAD_ATTACK | F_EV_SPREAD_HP - .byte NATURE_GENTLE - .2byte 0 @ padding - -@ 286 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x1E @ team flags - .2byte MOVE_MIST_BALL, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 287 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0x1D @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_EARTHQUAKE, MOVE_ICE_BEAM - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 288 - .2byte SPECIES_MILOTIC - .byte BATTLE_TOWER_ITEM_APICOT_BERRY - .byte 0x1A @ team flags - .2byte MOVE_SURF, MOVE_ICE_BEAM, MOVE_RECOVER, MOVE_ATTRACT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_BRAVE - .2byte 0 @ padding - -@ 289 - .2byte SPECIES_ALTARIA - .byte BATTLE_TOWER_ITEM_GANLON_BERRY - .byte 0x0A @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_ICE_BEAM, MOVE_SING, MOVE_FLAMETHROWER - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED | F_EV_SPREAD_DEFENSE - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 290 - .2byte SPECIES_SCEPTILE - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x9C @ team flags - .2byte MOVE_LEAF_BLADE, MOVE_DETECT, MOVE_DRAGON_CLAW, MOVE_CRUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 291 - .2byte SPECIES_BLAZIKEN - .byte BATTLE_TOWER_ITEM_SALAC_BERRY - .byte 0x9C @ team flags - .2byte MOVE_BLAZE_KICK, MOVE_SKY_UPPERCUT, MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_ATTACK - .byte NATURE_DOCILE - .2byte 0 @ padding - -@ 292 - .2byte SPECIES_SWAMPERT - .byte BATTLE_TOWER_ITEM_PETAYA_BERRY - .byte 0x9C @ team flags - .2byte MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_ROCK_TOMB - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_HP - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 293 - .2byte SPECIES_SHEDINJA - .byte BATTLE_TOWER_ITEM_BRIGHT_POWDER - .byte 0x20 @ team flags - .2byte MOVE_CONFUSE_RAY, MOVE_SHADOW_BALL, MOVE_TOXIC, MOVE_GRUDGE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 294 - .2byte SPECIES_METAGROSS - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x1D @ team flags - .2byte MOVE_METEOR_MASH, MOVE_EARTHQUAKE, MOVE_DOUBLE_TEAM, MOVE_PROTECT - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_DEFENSE | F_EV_SPREAD_HP - .byte NATURE_NAIVE - .2byte 0 @ padding - -@ 295 - .2byte SPECIES_ALAKAZAM - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x58 @ team flags - .2byte MOVE_PSYCHIC, MOVE_THUNDER_PUNCH, MOVE_ICE_PUNCH, MOVE_FIRE_PUNCH - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HASTY - .2byte 0 @ padding - -@ 296 - .2byte SPECIES_LATIAS - .byte BATTLE_TOWER_ITEM_LEFTOVERS - .byte 0x1E @ team flags - .2byte MOVE_MIST_BALL, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_QUIET - .2byte 0 @ padding - -@ 297 - .2byte SPECIES_LATIOS - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x1D @ team flags - .2byte MOVE_LUSTER_PURGE, MOVE_THUNDERBOLT, MOVE_ICE_BEAM, MOVE_DRAGON_CLAW - .byte F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_SPEED - .byte NATURE_HARDY - .2byte 0 @ padding - -@ 298 - .2byte SPECIES_SALAMENCE - .byte BATTLE_TOWER_ITEM_SHELL_BELL - .byte 0x1D @ team flags - .2byte MOVE_DRAGON_CLAW, MOVE_FLAMETHROWER, MOVE_EARTHQUAKE, MOVE_AERIAL_ACE - .byte F_EV_SPREAD_SP_DEFENSE | F_EV_SPREAD_SP_ATTACK | F_EV_SPREAD_DEFENSE - .byte NATURE_RELAXED - .2byte 0 @ padding - -@ 299 - .2byte SPECIES_MACHAMP - .byte BATTLE_TOWER_ITEM_LIECHI_BERRY - .byte 0x5D @ team flags - .2byte MOVE_CROSS_CHOP, MOVE_EARTHQUAKE, MOVE_LOW_KICK, MOVE_ROCK_SLIDE - .byte F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK - .byte NATURE_HARDY - .2byte 0 @ padding -- cgit v1.2.3 From b4f9d6d92ea3bf2ce0227324e85311aaa0f828f0 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 23 Oct 2017 19:09:35 -0400 Subject: document berry.c. --- data/scripts/berry_tree.inc | 2 +- data/specials.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 9e219a339..be1cafbdd 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -41,7 +41,7 @@ Route102_EventScript_1A1558:: @ 81A1558 Route102_EventScript_1A1577:: @ 81A1577 fadescreen 1 closemessage - special sub_80B4EE4 + special Berry_FadeAndGoToBerryBagMenu waitstate compare ITEM_ID, 0 goto_if_eq Route102_EventScript_1A1593 diff --git a/data/specials.inc b/data/specials.inc index 6ce9b5b1e..c11cedf00 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -51,7 +51,7 @@ gSpecials:: def_special sub_80C5568 def_special sub_8083BDC def_special FieldObjectInteractionGetBerryTreeData - def_special sub_80B4EE4 + def_special Berry_FadeAndGoToBerryBagMenu def_special FieldObjectInteractionPlantBerryTree def_special FieldObjectInteractionPickBerryTree def_special FieldObjectInteractionRemoveBerryTree -- cgit v1.2.3 From f90bc99a49a3d4fa60e96cd6fbcb546f8e3a1da0 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 23 Oct 2017 17:45:02 -0700 Subject: Move all battle_tower data into src/ --- data/battle_tower.s | 147 ---------------------------------------------------- 1 file changed, 147 deletions(-) delete mode 100644 data/battle_tower.s (limited to 'data') diff --git a/data/battle_tower.s b/data/battle_tower.s deleted file mode 100644 index b8ada3c36..000000000 --- a/data/battle_tower.s +++ /dev/null @@ -1,147 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_08405E60:: @ 8405E60 - .byte 4 - .byte 7 - .byte 8 - .byte 13 - .byte 14 - .byte 15 - .byte 16 - .byte 17 - .byte 18 - .byte 19 - .byte 20 - .byte 21 - .byte 23 - .byte 29 - .byte 32 - .byte 34 - .byte 36 - .byte 38 - .byte 39 - .byte 41 - .byte 43 - .byte 45 - .byte 46 - .byte 47 - .byte 53 - .byte 56 - .byte 64 - .byte 66 - .byte 72 - .byte 73 - -gUnknown_08405E7E:: @ 8405E7E - .byte 3 - .byte 6 - .byte 9 - .byte 10 - .byte 11 - .byte 12 - .byte 22 - .byte 30 - .byte 33 - .byte 35 - .byte 40 - .byte 42 - .byte 44 - .byte 48 - .byte 49 - .byte 50 - .byte 51 - .byte 65 - .byte 67 - .byte 71 - -gUnknown_08405E92:: @ 8405E92 - .byte MAP_OBJ_GFX_HIKER - .byte MAP_OBJ_GFX_TUBER_M - .byte MAP_OBJ_GFX_MAN_4 - .byte MAP_OBJ_GFX_BOY_4 - .byte MAP_OBJ_GFX_MANIAC - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_M - .byte MAP_OBJ_GFX_BLACK_BELT - .byte MAP_OBJ_GFX_MAN_6 - .byte MAP_OBJ_GFX_MAN_6 - .byte MAP_OBJ_GFX_CAMPER - .byte MAP_OBJ_GFX_MANIAC - .byte MAP_OBJ_GFX_PSYCHIC_M - .byte MAP_OBJ_GFX_GENTLEMAN - .byte MAP_OBJ_GFX_SCHOOL_KID_M - .byte MAP_OBJ_GFX_MAN_3 - .byte MAP_OBJ_GFX_OLD_MAN_1 - .byte MAP_OBJ_GFX_YOUNGSTER - .byte MAP_OBJ_GFX_FISHERMAN - .byte MAP_OBJ_GFX_CYCLING_TRIATHLETE_M - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_M - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_M - .byte MAP_OBJ_GFX_MAN_4 - .byte MAP_OBJ_GFX_MAN_6 - .byte MAP_OBJ_GFX_LITTLE_BOY_1 - .byte MAP_OBJ_GFX_SAILOR - .byte MAP_OBJ_GFX_MANIAC - .byte MAP_OBJ_GFX_MAN_5 - .byte MAP_OBJ_GFX_CAMPER - .byte MAP_OBJ_GFX_BUG_CATCHER - .byte MAP_OBJ_GFX_HIKER - -gUnknown_08405EB0:: @ 8405EB0 - .byte MAP_OBJ_GFX_WOMAN_3 - .byte MAP_OBJ_GFX_TUBER_F - .byte MAP_OBJ_GFX_WOMAN_7 - .byte MAP_OBJ_GFX_WOMAN_1 - .byte MAP_OBJ_GFX_WOMAN_3 - .byte MAP_OBJ_GFX_BEAUTY - .byte MAP_OBJ_GFX_LASS - .byte MAP_OBJ_GFX_GIRL_3 - .byte MAP_OBJ_GFX_WOMAN_2 - .byte MAP_OBJ_GFX_OLD_WOMAN_1 - .byte MAP_OBJ_GFX_CYCLING_TRIATHLETE_F - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_F - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_F - .byte MAP_OBJ_GFX_GIRL_3 - .byte MAP_OBJ_GFX_WOMAN_7 - .byte MAP_OBJ_GFX_RUNNING_TRIATHLETE_F - .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_WOMAN_3 - .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_LASS - - .align 1 -gBattleTowerBanlist:: @ 8405EC4 - .2byte SPECIES_MEW - .2byte SPECIES_MEWTWO - .2byte SPECIES_HO_OH - .2byte SPECIES_LUGIA - .2byte SPECIES_CELEBI - .2byte SPECIES_KYOGRE - .2byte SPECIES_GROUDON - .2byte SPECIES_RAYQUAZA - .2byte SPECIES_JIRACHI - .2byte SPECIES_DEOXYS - .2byte -1 - - .align 1 -gUnknown_08405EDA:: @ 8405EDA - .2byte ITEM_HP_UP - .2byte ITEM_PROTEIN - .2byte ITEM_IRON - .2byte ITEM_CALCIUM - .2byte ITEM_CARBOS - .2byte ITEM_ZINC - - .align 1 -gUnknown_08405EE6:: @ 8405EE6 - .2byte ITEM_BRIGHT_POWDER - .2byte ITEM_WHITE_HERB - .2byte ITEM_QUICK_CLAW - .2byte ITEM_LEFTOVERS - .2byte ITEM_MENTAL_HERB - .2byte ITEM_KINGS_ROCK - .2byte ITEM_FOCUS_BAND - .2byte ITEM_SCOPE_LENS - .2byte ITEM_CHOICE_BAND -- cgit v1.2.3 From c5cda9f16442780794852af54635f6526c4c031a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 1 Nov 2017 23:52:26 -0700 Subject: Use descriptive variable and function names for battle_tower code --- data/scripts/maps/BattleTower_BattleRoom.inc | 4 ++-- data/scripts/maps/BattleTower_Lobby.inc | 6 +++--- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 4 ++-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 4 ++-- data/specials.inc | 16 ++++++++-------- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'data') diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 3f1aad4a0..dbab17a8b 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -16,7 +16,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA addobject 1 applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 - special sub_8135474 + special PrintBattleTowerTrainerGreeting msgbox 0x20234cc, 4 waitmessage closemessage @@ -116,7 +116,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1 fadescreen 1 - special sub_8135C38 + special BattleTower_SoftReset end BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 3227df991..75d4f8731 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -79,7 +79,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D - special sub_8135E50 + special AwardBattleTowerRibbons compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE @@ -97,7 +97,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D waitmessage setvar 0x8004, 13 special sub_8135668 - special sub_8135D84 + special DetermineBattleTowerPrize setvar 0x8004, 3 special sub_8135BA0 playse 55 @@ -109,7 +109,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD special sub_8135668 message BattleTower_Lobby_Text_19A4BB waitmessage - special sub_8135DEC + special GiveBattleTowerPrize switch RESULT case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 66ad747f9..cef02df2c 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 sub_813601C + special ValidateEReaderTrainer compare RESULT, 1 call_if 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 sub_813601C + special ValidateEReaderTrainer compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E compare 0x40c0, 0 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 886c64d29..11b3ce7a3 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 sub_8134AB4 + special SetEReaderTrainerGfxId end MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 @@ -15,7 +15,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E lockall applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 waitmovement 0 - special sub_81360C0 + special PrintEReaderTrainerGreeting msgbox 0x20234cc, 4 closemessage setvar 0x8004, 2 diff --git a/data/specials.inc b/data/specials.inc index 6ce9b5b1e..841385233 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -241,19 +241,19 @@ gSpecials:: def_special sub_8134548 def_special sub_81347F8 def_special CheckPartyBattleTowerBanlist - def_special sub_8135474 - def_special sub_81360C0 + def_special PrintBattleTowerTrainerGreeting + def_special PrintEReaderTrainerGreeting 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 BattleTower_SoftReset + def_special DetermineBattleTowerPrize + def_special GiveBattleTowerPrize + def_special AwardBattleTowerRibbons def_special ChooseBattleTowerPlayerParty - def_special sub_813601C + def_special ValidateEReaderTrainer def_special sub_810F404 def_special ReducePlayerPartyToThree def_special BedroomPC @@ -329,7 +329,7 @@ gSpecials:: def_special sp13F_fall_to_last_warp def_special ShowContestEntryMonPic def_special sub_80C5164 - def_special sub_8134AB4 + def_special SetEReaderTrainerGfxId def_special ScrSpecial_StartSouthernIslandBattle def_special SetRoute119Weather def_special SetRoute123Weather -- cgit v1.2.3 From eecafbaec17ba0721d091d1a12ac20fa71da352a Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 9 Nov 2017 03:13:09 -0500 Subject: depreciate use of shared_syms --- data/credits.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/credits.s b/data/credits.s index fe82968c0..72a7b22ac 100644 --- a/data/credits.s +++ b/data/credits.s @@ -120,11 +120,11 @@ gSpriteAnimTable_0840CA94:: @ 840CA94 gUnknown_0840CAA0:: @ 840CAA0 - obj_tiles gHallOfFame, 6144, 1001 + obj_tiles 0x201E000, 6144, 1001 @ can't believe im making this a pointer again... this should be eHallOfFame, when represented in the original C file again. Please fix this by migrating data/credits.s to credits.c. null_obj_tiles gUnknown_0840CAB0:: @ 840CAB0 - obj_pal unk_201f800, 1001 + obj_pal 0x201F800, 1001 @ same as above. When this is in credits.c, it will be able to proper see its definition in ewram.h, which is EWRAM_1F800. null_obj_pal .align 2 -- cgit v1.2.3 From bd0f0777aa718d47e89bfbddb4aa53b12f508a03 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 10 Nov 2017 22:09:54 -0500 Subject: move credits data to C file (todo, german) --- data/credits.s | 159 -------- data/text/credits.inc | 1011 ------------------------------------------------- 2 files changed, 1170 deletions(-) delete mode 100644 data/credits.s delete mode 100644 data/text/credits.inc (limited to 'data') diff --git a/data/credits.s b/data/credits.s deleted file mode 100644 index 72a7b22ac..000000000 --- a/data/credits.s +++ /dev/null @@ -1,159 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0840B83C:: @ 840B83C - .byte 0, 1, 0 - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - -gUnknown_0840B84B:: @ 840B84B - .byte 1,0xFF, 1 - .byte 1,0xFF, 1 - .byte 1, 2, 1 - .byte 1,0xFF, 1 - .byte 1,0xFF, 1 - -gUnknown_0840B85A:: @ 840B85A - .byte 1, 0, 0 - .byte 1,0xFF,0xFF - .byte 1, 2, 2 - .byte 1,0xFF,0xFF - .byte 1,0x80,0x80 - -gUnknown_0840B869:: @ 840B869 - .byte 1, 3, 1 - .byte 1, 4, 1 - .byte 1, 5, 1 - .byte 1,0xC4, 1 - .byte 1,0xC3, 1 - -gUnknown_0840B878:: @ 840B878 - .byte 1, 6, 7 - .byte 1, 8, 9 - .byte 1,0xFF, 1 - .byte 1,0x88,0x89 - .byte 1,0x86,0x87 - -.ifdef GERMAN - .byte 1, 0, 0 - .byte 1,0xFF,0xFF - .byte 1,0x80,0x8A - .byte 1,0xFF,0xFF - .byte 1,0xFF,0xFF - .byte 0, 1, 0 - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0xFF, 1,0xFF - .byte 0x80, 1,0x80 -.endif - - .include "data/text/credits.inc" - -gUnknown_0840CA00:: @ 840CA00 - .byte 104, 36 - .byte 120, 36 - .byte 136, 36 - - .align 2 -gSpriteAnim_840CA08: - obj_image_anim_frame 0, 8 - obj_image_anim_frame 64, 8 - obj_image_anim_frame 128, 8 - obj_image_anim_frame 192, 8 - obj_image_anim_jump 0 - -gSpriteAnim_840CA1C: - obj_image_anim_frame 0, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 128, 4 - obj_image_anim_frame 192, 4 - obj_image_anim_jump 0 - -gSpriteAnim_840CA30: - obj_image_anim_frame 256, 4 - obj_image_anim_frame 320, 4 - obj_image_anim_frame 384, 4 - obj_image_anim_end - -gSpriteAnim_840CA40: - obj_image_anim_frame 384, 30 - obj_image_anim_frame 320, 30 - obj_image_anim_frame 256, 30 - obj_image_anim_frame 256, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_0840CA54:: @ 840CA54 - .4byte gSpriteAnim_840CA08 - .4byte gSpriteAnim_840CA1C - .4byte gSpriteAnim_840CA30 - .4byte gSpriteAnim_840CA40 - - -gSpriteAnim_840CA64: - obj_image_anim_frame 0, 8 - obj_image_anim_frame 64, 8 - obj_image_anim_frame 128, 8 - obj_image_anim_frame 192, 8 - obj_image_anim_jump 0 - -gSpriteAnim_840CA78: - obj_image_anim_frame 0, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 128, 4 - obj_image_anim_frame 192, 4 - obj_image_anim_jump 0 - -gSpriteAnim_840CA8C: - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_0840CA94:: @ 840CA94 - .4byte gSpriteAnim_840CA64 - .4byte gSpriteAnim_840CA78 - .4byte gSpriteAnim_840CA8C - - -gUnknown_0840CAA0:: @ 840CAA0 - obj_tiles 0x201E000, 6144, 1001 @ can't believe im making this a pointer again... this should be eHallOfFame, when represented in the original C file again. Please fix this by migrating data/credits.s to credits.c. - null_obj_tiles - -gUnknown_0840CAB0:: @ 840CAB0 - obj_pal 0x201F800, 1001 @ same as above. When this is in credits.c, it will be able to proper see its definition in ewram.h, which is EWRAM_1F800. - null_obj_pal - - .align 2 -gOamData_840CAC0:: @ 840CAC0 - .2byte 0x00A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_840CAC8:: @ 840CAC8 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840CAD0:: @ 840CAD0 - obj_image_anim_frame 64, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_840CAD8:: @ 840CAD8 - obj_image_anim_frame 128, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840CAE0:: @ 840CAE0 - .4byte gSpriteAnim_840CAC8 - .4byte gSpriteAnim_840CAD0 - .4byte gSpriteAnim_840CAD8 - - .align 2 -gSpriteTemplate_840CAEC:: @ 840CAEC - spr_template 1001, 1001, gOamData_840CAC0, gSpriteAnimTable_840CAE0, NULL, gDummySpriteAffineAnimTable, spritecb_814580C diff --git a/data/text/credits.inc b/data/text/credits.inc deleted file mode 100644 index 29abccf91..000000000 --- a/data/text/credits.inc +++ /dev/null @@ -1,1011 +0,0 @@ -Category_Credits: - .string "{PALETTE 9}Credits$" -Category_ExecutiveDirector: - .string "{PALETTE 9}Executive Director$" -Category_Director: - .string "{PALETTE 9}Director$" -Category_ArtDirector: - .string "{PALETTE 9}Art Director$" -Category_BattleDirector: - .string "{PALETTE 9}Battle Director$" -Category_MainProgrammer: - .string "{PALETTE 9}Main Programmer$" -Category_BattleSystemProgrammer: - .string "{PALETTE 9}Battle System Programmer$" -Category_FieldSystemProgrammer: - .string "{PALETTE 9}Field System Programmer$" -Category_Programmers: - .string "{PALETTE 9}Programmers$" -Category_MainGraphicDesigner: - .string "{PALETTE 9}Main Graphic Designer$" -Category_POKeMONGraphicDesigners: - .string "{PALETTE 9}POKéMON & Graphic Designers$" -Category_POKeMONDesigners: - .string "{PALETTE 9}POKéMON Designers$" -Category_MusicComposition: - .string "{PALETTE 9}Music Composition$" -Category_SoundEffectsPOKeMONVoices: - .string "{PALETTE 9}Sound Effects & POKéMON Voices$" -Category_GameDesigners: - .string "{PALETTE 9}Game Designers$" -Category_PlotScenario: - .string "{PALETTE 9}Plot Scenario$" -Category_GameScenario: - .string "{PALETTE 9}Game Scenario$" -Category_ScriptDesigners: - .string "{PALETTE 9}Script Designers$" -Category_MapDesigners: - .string "{PALETTE 9}Map Designers$" -Category_MapDataDesigners: - .string "{PALETTE 9}Map Data Designers$" -Category_ParametricDesigners: - .string "{PALETTE 9}Parametric Designers$" -Category_POKeDEXText: - .string "{PALETTE 9}POKéDEX Text$" -Category_EnvironmentToolProgrammers: - .string "{PALETTE 9}Environment & Tool Programmers$" -Category_ProductTesting: - .string "{PALETTE 9}Product Testing$" -Category_SpecialThanks: - .string "{PALETTE 9}Special Thanks$" -Category_Coordinators: - .string "{PALETTE 9}Coordinators$" -Category_Producers: - .string "{PALETTE 9}Producers$" -Category_ExecutiveProducers: - .string "{PALETTE 9}Executive Producers$" -Category_InformationSupervisors: - .string "{PALETTE 9}Information Supervisors$" -Category_TaskManagers: - .string "{PALETTE 9}Task Managers$" -Category_BrailleCodeCheck: - .string "{PALETTE 9}Braille Code Check$" -Category_EnglishVersionCoordinators: - .string "{PALETTE 9}English Version Coordinators$" -Category_Translator: - .string "{PALETTE 9}Translator$" -Category_ProductSupport: - .string "{PALETTE 9}Product Support$" -Category_Artwork: - .string "{PALETTE 9}Artwork$" -Category_TextEditor: - .string "{PALETTE 9}Text Editor$" -Category_NOAProductTesting: - .string "{PALETTE 9}NOA Product Testing$" -Category_GraphicDesigners: - .string "{PALETTE 9}Graphic Designers$" -Text_SatoshiTajiri: - .string "Satoshi Tajiri$" -Text_Masuda: - .string "Junichi Masuda$" -Text_Sugimori: - .string "Ken Sugimori$" -Text_Morimoto: - .string "Shigeki Morimoto$" -Text_TetsuyaWatanabe: - .string "Tetsuya Watanabe$" -Text_Sogabe: - .string "Hisashi Sogabe$" -Text_Tamada: - .string "Sousuke Tamada$" -Text_Mori: - .string "Akito Mori$" -Text_Kagaya: - .string "Keita Kagaya$" -Text_Matsuda: - .string "Yoshinori Matsuda$" -Text_HiroyukiNakamura: - .string "Hiroyuki Nakamura$" -Text_Taya: - .string "Masao Taya$" -Text_Nohara: - .string "Satoshi Nohara$" -Text_TomomichiOhta: - .string "Tomomichi Ohta$" -Text_Iwasawa: - .string "Miyuki Iwasawa$" -Text_TakenoriOhta: - .string "Takenori Ohta$" -Text_Yoshida: - .string "Hironobu Yoshida$" -Text_Fujiwara: - .string "Motofumi Fujiwara$" -Text_SatoshiOhta: - .string "Satoshi Ohta$" -Text_Iwashita: - .string "Asuka Iwashita$" -Text_Tomita: - .string "Aimi Tomita$" -Text_Unno: - .string "Takao Unno$" -Text_Eo: - .string "Kanako Eo$" -Text_Okutani: - .string "Jun Okutani$" -Text_Nishida: - .string "Atsuko Nishida$" -Text_Saito: - .string "Muneo Saito$" -Text_Yoshikawa: - .string "Rena Yoshikawa$" -Text_Ichinose: - .string "Go Ichinose$" -Text_Aoki: - .string "Morikazu Aoki$" -Text_Nishino: - .string "Koji Nishino$" -Text_Matsushima: - .string "Kenji Matsushima$" -Text_TetsujiOhta: - .string "Tetsuji Ohta$" -Text_Sato: - .string "Hitomi Sato$" -Text_Kawachimaru: - .string "Takeshi Kawachimaru$" -Text_Shimoyamada: - .string "Teruyuki Shimoyamada$" -Text_Ohmori: - .string "Shigeru Ohmori$" -Text_Takahashi: - .string "Tadashi Takahashi$" -Text_ToshinobuMatsumiya: - .string "Toshinobu Matsumiya$" -Text_Tomisawa: - .string "Akihito Tomisawa$" -Text_Enomoto: - .string "Hiroki Enomoto$" -Text_Terada: - .string "Kazuyuki Terada$" -Text_Sakurai: - .string "Yuri Sakurai$" -Text_Sagawa: - .string "Hiromi Sagawa$" -Text_Tominaga: - .string "Kenji Tominaga$" -Text_YoshioTajiri: - .string "Yoshio Tajiri$" -Text_Sasaki: - .string "Teiko Sasaki$" -Text_Hamano: - .string "Sachiko Hamano$" -Text_ChieMatsumiya: - .string "Chie Matsumiya$" -Text_Shinozaki: - .string "Akiko Shinozaki$" -Text_Fujii: - .string "Atsuko Fujii$" -Text_SuperMarioClub: - .string "NCL Super Mario Club$" -Text_Tada: - .string "Atsushi Tada$" -Text_Ohnishi: - .string "Takahiro Ohnishi$" -Text_Okamura: - .string "Norihide Okamura$" -Text_HiroNakamura: - .string "Hiro Nakamura$" -Text_Uesugi: - .string "Hiroyuki Uesugi$" -Text_Murakawa: - .string "Teruki Murakawa$" -Text_Kinashi: - .string "Akira Kinashi$" -Text_Takizawa: - .string "Michiko Takizawa$" -Text_Takada: - .string "Makiko Takada$" -Text_Kondo: - .string "Takanao Kondo$" -Text_Mashima: - .string "Ai Mashima$" -Text_Nomoto: - .string "Gakuji Nomoto$" -Text_Izushi: - .string "Takehiro Izushi$" -Text_Yamagami: - .string "Hitoshi Yamagami$" -Text_KyokoWatanabe: - .string "Kyoko Watanabe$" -Text_Nakano: - .string "Takao Nakano$" -Text_Jinnai: - .string "Hiroyuki Jinnai$" -Text_Tsuru: - .string "Hiroaki Tsuru$" -Text_Ishihara: - .string "Tsunekaz Ishihara$" -Text_Iwata: - .string "Satoru Iwata$" -Text_Suyama: - .string "Kazuya Suyama$" -Text_Mitsuhara: - .string "Satoshi Mitsuhara$" -Text_JapanBrailleLibrary: - .string "Japan Braille Library$" -Text_Komura: - .string "Tomotaka Komura$" -Text_Ohashi: - .string "Mikiko Ohashi$" -Text_McMahill: - .string "Seth McMahill$" -Text_Ogasawara: - .string "Nob Ogasawara$" -Text_Yamamoto: - .string "Souichi Yamamoto$" -Text_Funakoshi: - .string "Masanori Funakoshi$" -Text_Fujihara: - .string "Kazuhiro Fujihara$" -Text_Nakamichi: - .string "Kimiko Nakamichi$" -Text_Hara: - .string "Daisuke Hara$" -Text_Okada: - .string "Atsushi Okada$" -Text_Lillygren: - .string "Teresa Lillygren$" -Text_Hertzog: - .string "Thomas Hertzog$" -Text_Ridgeway: - .string "Ed Ridgeway$" -Text_NFotB: - .string "National Federation of the Blind$" -Text_Maurer: - .string "Patricia A. Maurer$" -Text_Ford: - .string "Sayoko Blodgett-Ford$" -Text_Barlow: - .string "Nicola Pratt-Barlow$" -Text_Uyama: - .string "Koji Uyama$" -Text_Howitt: - .string "Anthony Howitt$" -Text_Tilden: - .string "Gail Tilden$" -Text_EBU: - .string "European Blind Union$" -Text_ABA: - .string "Australian Braille Authority$" -Text_RNZFotB: - .string "Royal New Zealand Federation for the Blind$" -Text_CreditsTerminator: - .string "$" -Text_Version: - .ifdef SAPPHIRE - .string "{PALETTE 9}POKéMON SAPPHIRE VERSION$" - .else - .string "{PALETTE 9}POKéMON RUBY VERSION$" - .endif - -@ pointer table - -CreditsTerminator:: - credits_entry 0, Text_CreditsTerminator - -CreditsVersion:: - .ifdef SAPPHIRE - credits_entry 7, Text_Version - .else - credits_entry 8, Text_Version - .endif - -CreditsCredits:: - credits_entry 11, Category_Credits - -CreditsExecutiveDirector:: - credits_entry 8, Category_ExecutiveDirector - -CreditsDirector:: - credits_entry 12, Category_Director - -CreditsArtDirector:: - credits_entry 10, Category_ArtDirector - -CreditsBattleDirector:: - credits_entry 10, Category_BattleDirector - -CreditsMainProgrammer:: - credits_entry 10, Category_MainProgrammer - -CreditsBattleSystemProgrammer:: - credits_entry 8, Category_BattleSystemProgrammer - -CreditsFieldSystemProgrammer:: - credits_entry 7, Category_FieldSystemProgrammer - -CreditsProgrammers:: - credits_entry 12, Category_Programmers - -CreditsMainGraphicDesigner:: - credits_entry 7, Category_MainGraphicDesigner - -CreditsPOKeMONGraphicDesigners:: - credits_entry 6, Category_POKeMONGraphicDesigners - -CreditsPOKeMONDesigners:: - credits_entry 10, Category_POKeMONDesigners - -CreditsMusicComposition:: - credits_entry 13, Category_MusicComposition - -CreditsSoundEffectsPOKeMONVoices:: - credits_entry 4, Category_SoundEffectsPOKeMONVoices - -CreditsGameDesigners:: - credits_entry 11, Category_GameDesigners - -CreditsPlotScenario:: - credits_entry 11, Category_PlotScenario - -CreditsGameScenario:: - credits_entry 13, Category_GameScenario - -CreditsScriptDesigners:: - credits_entry 10, Category_ScriptDesigners - -CreditsMapDesigners:: - credits_entry 11, Category_MapDesigners - -CreditsMapDataDesigners:: - credits_entry 9, Category_MapDataDesigners - -CreditsParametricDesigners:: - credits_entry 9, Category_ParametricDesigners - -CreditsPOKeDEXText:: - credits_entry 11, Category_POKeDEXText - -CreditsEnvironmentToolProgrammers:: - credits_entry 6, Category_EnvironmentToolProgrammers - -CreditsProductTesting:: - credits_entry 11, Category_ProductTesting - -CreditsSpecialThanks:: - credits_entry 10, Category_SpecialThanks - -CreditsCoordinators:: - credits_entry 11, Category_Coordinators - -CreditsProducers:: - credits_entry 11, Category_Producers - -CreditsExecutiveProducers:: - credits_entry 7, Category_ExecutiveProducers - -CreditsInformationSupervisors:: - credits_entry 10, Category_InformationSupervisors - -CreditsTaskManagers:: - credits_entry 8, Category_TaskManagers - -CreditsBrailleCodeCheck:: - credits_entry 10, Category_BrailleCodeCheck - -CreditsSatoshiTajiri:: - credits_entry 11, Text_SatoshiTajiri - -CreditsMasuda:: - credits_entry 11, Text_Masuda - -CreditsSugimori:: - credits_entry 11, Text_Sugimori - -CreditsMorimoto:: - credits_entry 11, Text_Morimoto - -CreditsTetsuyaWatanabe:: - credits_entry 11, Text_TetsuyaWatanabe - -CreditsSogabe:: - credits_entry 11, Text_Sogabe - -CreditsTamada:: - credits_entry 11, Text_Tamada - -CreditsMori:: - credits_entry 11, Text_Mori - -CreditsKagaya:: - credits_entry 11, Text_Kagaya - -CreditsMatsuda:: - credits_entry 11, Text_Matsuda - -CreditsHiroyukiNakamura:: - credits_entry 11, Text_HiroyukiNakamura - -CreditsTaya:: - credits_entry 11, Text_Taya - -CreditsNohara:: - credits_entry 11, Text_Nohara - -CreditsTomomichiOhta:: - credits_entry 11, Text_TomomichiOhta - -CreditsIwasawa:: - credits_entry 11, Text_Iwasawa - -CreditsTakenoriOhta:: - credits_entry 11, Text_TakenoriOhta - -CreditsYoshida:: - credits_entry 11, Text_Yoshida - -CreditsFujiwara:: - credits_entry 11, Text_Fujiwara - -CreditsSatoshiOhta:: - credits_entry 11, Text_SatoshiOhta - -CreditsIwashita:: - credits_entry 11, Text_Iwashita - -CreditsTomita:: - credits_entry 11, Text_Tomita - -CreditsUnno:: - credits_entry 11, Text_Unno - -CreditsEo:: - credits_entry 11, Text_Eo - -CreditsOkutani:: - credits_entry 11, Text_Okutani - -CreditsNishida:: - credits_entry 11, Text_Nishida - -CreditsSaito:: - credits_entry 11, Text_Saito - -CreditsYoshikawa:: - credits_entry 11, Text_Yoshikawa - -CreditsIchinose:: - credits_entry 11, Text_Ichinose - -CreditsAoki:: - credits_entry 11, Text_Aoki - -CreditsNishino:: - credits_entry 11, Text_Nishino - -CreditsMatsushima:: - credits_entry 11, Text_Matsushima - -CreditsTetsujiOhta:: - credits_entry 11, Text_TetsujiOhta - -CreditsSato:: - credits_entry 11, Text_Sato - -CreditsKawachimaru:: - credits_entry 11, Text_Kawachimaru - -CreditsShimoyamada:: - credits_entry 11, Text_Shimoyamada - -CreditsOhmori:: - credits_entry 11, Text_Ohmori - -CreditsTakahashi:: - credits_entry 11, Text_Takahashi - -CreditsToshinobuMatsumiya:: - credits_entry 11, Text_ToshinobuMatsumiya - -CreditsTomisawa:: - credits_entry 11, Text_Tomisawa - -CreditsEnomoto:: - credits_entry 11, Text_Enomoto - -CreditsTerada:: - credits_entry 11, Text_Terada - -CreditsSakurai:: - credits_entry 11, Text_Sakurai - -CreditsSagawa:: - credits_entry 11, Text_Sagawa - -CreditsTominaga:: - credits_entry 11, Text_Tominaga - -CreditsYoshiroTajiri:: - credits_entry 11, Text_YoshioTajiri - -CreditsSasaki:: - credits_entry 11, Text_Sasaki - -CreditsHamano:: - credits_entry 11, Text_Hamano - -CreditsChieMatsumiya:: - credits_entry 11, Text_ChieMatsumiya - -CreditsShinozaki:: - credits_entry 11, Text_Shinozaki - -CreditsFujii:: - credits_entry 11, Text_Fujii - -CreditsSuperMarioClub:: - credits_entry 11, Text_SuperMarioClub - -CreditsTada:: - credits_entry 11, Text_Tada - -CreditsOhnishi:: - credits_entry 11, Text_Ohnishi - -CreditsOkamura:: - credits_entry 11, Text_Okamura - -CreditsHiroNakamura:: - credits_entry 11, Text_HiroNakamura - -CreditsUesugi:: - credits_entry 11, Text_Uesugi - -CreditsMurakawa:: - credits_entry 11, Text_Murakawa - -CreditsKinashi:: - credits_entry 11, Text_Kinashi - -CreditsTakizawa:: - credits_entry 11, Text_Takizawa - -CreditsTakada:: - credits_entry 11, Text_Takada - -CreditsKondo:: - credits_entry 11, Text_Kondo - -CreditsMashima:: - credits_entry 11, Text_Mashima - -CreditsNomoto:: - credits_entry 11, Text_Nomoto - -CreditsIzushi:: - credits_entry 11, Text_Izushi - -CreditsYamagami:: - credits_entry 11, Text_Yamagami - -CreditsKyokoWatanabe:: - credits_entry 11, Text_KyokoWatanabe - -CreditsNakano:: - credits_entry 11, Text_Nakano - -CreditsJinnai:: - credits_entry 11, Text_Jinnai - -CreditsTsuru:: - credits_entry 11, Text_Tsuru - -CreditsIshihara:: - credits_entry 11, Text_Ishihara - -CreditsIwata:: - credits_entry 11, Text_Iwata - -CreditsSuyama:: - credits_entry 11, Text_Suyama - -CreditsMitsuhara:: - credits_entry 11, Text_Mitsuhara - -CreditsJapanBrailleLibrary:: - credits_entry 9, Text_JapanBrailleLibrary - -CreditsKomura:: - credits_entry 11, Text_Komura - -CreditsOhashi:: - credits_entry 11, Text_Ohashi - -CreditsEnglishVersionCoordinators:: - credits_entry 0, Category_EnglishVersionCoordinators - -CreditsTranslator:: - credits_entry 0, Category_Translator - -CreditsProductSupport:: - credits_entry 0, Category_ProductSupport - -CreditsArtwork:: - credits_entry 0, Category_Artwork - -CreditsTextEditor:: - credits_entry 0, Category_TextEditor - -CreditsNOAProductTesting:: - credits_entry 0, Category_NOAProductTesting - -CreditsGraphicDesigners:: - credits_entry 0, Category_GraphicDesigners - -CreditsMcMahill:: - credits_entry 0, Text_McMahill - -CreditsOgasawara:: - credits_entry 0, Text_Ogasawara - -CreditsYamamoto:: - credits_entry 0, Text_Yamamoto - -CreditsFunakoshi:: - credits_entry 0, Text_Funakoshi - -CreditsFujihara:: - credits_entry 0, Text_Fujihara - -CreditsNakamichi:: - credits_entry 0, Text_Nakamichi - -CreditsHara:: - credits_entry 0, Text_Hara - -CreditsOkada:: - credits_entry 0, Text_Okada - -CreditsLillygren:: - credits_entry 0, Text_Lillygren - -CreditsHertzog:: - credits_entry 0, Text_Hertzog - -CreditsRidgeway:: - credits_entry 0, Text_Ridgeway - -CreditsNFotB:: - credits_entry 0, Text_NFotB - -CreditsMaurer:: - credits_entry 0, Text_Maurer - -CreditsFord:: - credits_entry 0, Text_Ford - -CreditsBarlow:: - credits_entry 0, Text_Barlow - -CreditsUyama:: - credits_entry 0, Text_Uyama - -CreditsHowitt:: - credits_entry 0, Text_Howitt - -CreditsTilden:: - credits_entry 0, Text_Tilden - -CreditsEBU:: - credits_entry 0, Text_EBU - -CreditsABA:: - credits_entry 0, Text_ABA - -CreditsRNZFotB:: - credits_entry 0, Text_RNZFotB - -@ pointer table to credits entries - - .align 2 -gCreditsEntryPointerTable:: @ 840C5F0 - .4byte CreditsTerminator - .4byte CreditsVersion - .4byte CreditsCredits - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsDirector - .4byte CreditsMasuda - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsArtDirector - .4byte CreditsSugimori - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsBattleDirector - .4byte CreditsMorimoto - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsMainProgrammer - .4byte CreditsTetsuyaWatanabe - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsBattleSystemProgrammer - .4byte CreditsSogabe - .4byte CreditsFieldSystemProgrammer - .4byte CreditsTamada - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsMori - .4byte CreditsKagaya - .4byte CreditsMatsuda - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsHiroyukiNakamura - .4byte CreditsTaya - .4byte CreditsNohara - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsTomomichiOhta - .4byte CreditsIwasawa - .4byte CreditsTakenoriOhta - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsMainGraphicDesigner - .4byte CreditsYoshida - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsPOKeMONGraphicDesigners - .4byte CreditsSugimori - .4byte CreditsYoshida - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsPOKeMONGraphicDesigners - .4byte CreditsFujiwara - .4byte CreditsSatoshiOhta - .4byte CreditsIwashita - .4byte CreditsTerminator - - .4byte CreditsPOKeMONGraphicDesigners - .4byte CreditsTomita - .4byte CreditsUnno - .4byte CreditsEo - .4byte CreditsTerminator - - .4byte CreditsPOKeMONDesigners - .4byte CreditsMorimoto - .4byte CreditsOkutani - .4byte CreditsNishida - .4byte CreditsTerminator - - .4byte CreditsPOKeMONDesigners - .4byte CreditsSaito - .4byte CreditsYoshikawa - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsMusicComposition - .4byte CreditsIchinose - .4byte CreditsAoki - .4byte CreditsMasuda - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsSoundEffectsPOKeMONVoices - .4byte CreditsAoki - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsGameDesigners - .4byte CreditsMasuda - .4byte CreditsMorimoto - .4byte CreditsNishino - .4byte CreditsTerminator - - .4byte CreditsGameDesigners - .4byte CreditsMatsushima - .4byte CreditsTetsujiOhta - .4byte CreditsSato - .4byte CreditsKawachimaru - - .4byte CreditsGameDesigners - .4byte CreditsShimoyamada - .4byte CreditsOhmori - .4byte CreditsTakahashi - .4byte CreditsTerminator - - .4byte CreditsPlotScenario - .4byte CreditsMasuda - .4byte CreditsTomisawa - .4byte CreditsNishino - .4byte CreditsTerminator - - .4byte CreditsGameScenario - .4byte CreditsToshinobuMatsumiya - .4byte CreditsTomisawa - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsScriptDesigners - .4byte CreditsNohara - .4byte CreditsTetsujiOhta - .4byte CreditsTomomichiOhta - .4byte CreditsTerminator - - .4byte CreditsMapDesigners - .4byte CreditsOhmori - .4byte CreditsTetsujiOhta - .4byte CreditsNishino - .4byte CreditsTerminator - - .4byte CreditsMapDataDesigners - .4byte CreditsTetsujiOhta - .4byte CreditsTakahashi - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsParametricDesigners - .4byte CreditsNishino - .4byte CreditsMorimoto - .4byte CreditsTetsujiOhta - .4byte CreditsShimoyamada - - .4byte CreditsTerminator - .4byte CreditsPOKeDEXText - .4byte CreditsMatsushima - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsEnvironmentToolProgrammers - .4byte CreditsSogabe - .4byte CreditsTamada - .4byte CreditsHiroyukiNakamura - .4byte CreditsMori - - .4byte CreditsProductTesting - .4byte CreditsSuperMarioClub - .4byte CreditsTada - .4byte CreditsOhnishi - .4byte CreditsOkamura - - .4byte CreditsSpecialThanks - .4byte CreditsTominaga - .4byte CreditsYoshiroTajiri - .4byte CreditsSasaki - .4byte CreditsTerminator - - .4byte CreditsSpecialThanks - .4byte CreditsHamano - .4byte CreditsChieMatsumiya - .4byte CreditsShinozaki - .4byte CreditsFujii - - .4byte CreditsSpecialThanks - .4byte CreditsSuyama - .4byte CreditsMitsuhara - .4byte CreditsKomura - .4byte CreditsOhashi - - .4byte CreditsSpecialThanks - .4byte CreditsTakizawa - .4byte CreditsTakada - .4byte CreditsKondo - .4byte CreditsMashima - - .4byte CreditsInformationSupervisors - .4byte CreditsEnomoto - .4byte CreditsTerada - .4byte CreditsSakurai - .4byte CreditsSagawa - - .4byte CreditsCoordinators - .4byte CreditsKyokoWatanabe - .4byte CreditsNakano - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTaskManagers - .4byte CreditsYamagami - .4byte CreditsNomoto - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsProducers - .4byte CreditsJinnai - .4byte CreditsIzushi - .4byte CreditsTsuru - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsExecutiveDirector - .4byte CreditsSatoshiTajiri - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsExecutiveProducers - .4byte CreditsIwata - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsExecutiveProducers - .4byte CreditsIshihara - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsEnglishVersionCoordinators - .4byte CreditsHiroNakamura - .4byte CreditsMcMahill - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsTranslator - .4byte CreditsOgasawara - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsProgrammers - .4byte CreditsMurakawa - .4byte CreditsYamamoto - .4byte CreditsFunakoshi - .4byte CreditsKinashi - - .4byte CreditsGraphicDesigners - .4byte CreditsYamamoto - .4byte CreditsKinashi - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsProductSupport - .4byte CreditsNakamichi - .4byte CreditsHara - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsArtwork - .4byte CreditsOkada - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsTerminator - .4byte CreditsTextEditor - .4byte CreditsLillygren - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsNOAProductTesting - .4byte CreditsHertzog - .4byte CreditsRidgeway - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsBrailleCodeCheck - .4byte CreditsNFotB - .4byte CreditsMaurer - .4byte CreditsJapanBrailleLibrary - .4byte CreditsEBU - - .4byte CreditsBrailleCodeCheck - .4byte CreditsABA - .4byte CreditsRNZFotB - .4byte CreditsTerminator - .4byte CreditsTerminator - - .4byte CreditsSpecialThanks - .4byte CreditsFord - .4byte CreditsBarlow - .4byte CreditsUesugi - .4byte CreditsUyama - - .4byte CreditsSpecialThanks - .4byte CreditsHowitt - .4byte CreditsTilden - .4byte CreditsFujihara - .4byte CreditsTerminator -- cgit v1.2.3 From 7485560810130fe8bb6a78e4352f3613fdc09653 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 10 Nov 2017 23:40:12 -0500 Subject: eliminate remaining RAM pointers in data/ --- data/battle_scripts_1.s | 814 +++++++++++----------- data/battle_scripts_2.s | 10 +- data/contest.s | 8 +- data/data2a.s | 32 +- data/data2b.s | 8 +- data/easy_chat.s | 18 +- data/field_weather.s | 2 +- data/mail.s | 2 +- data/pokedex_area_screen.s | 4 +- data/pokedex_cry_screen.s | 2 +- data/pokemon_storage_system.s | 6 +- data/pokenav.s | 2 +- data/roulette.s | 26 +- data/scripts/maps/BattleTower_BattleRoom.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 2 +- data/slot_machine.s | 70 +- 16 files changed, 504 insertions(+), 504 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index e046794b3..83bacd844 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -244,10 +244,10 @@ MoveEffect_Unused83: @ 81D6F14 MoveEffect_Unused8D: @ 81D6F14 MoveEffect_UnusedA3: @ 81D6F14 MoveEffect_VitalThrow: @ 81D6F14 - jumpifhalfword 1, 0x2024be6, 57, BattleScript_1D6F3A + jumpifhalfword 1, gCurrentMove, 57, BattleScript_1D6F3A jumpifspecialstatusflag TARGET, 0x40000, 1, BattleScript_1D6F3A - orword 0x2024c6c, 0x40000 - setbyte 0x201601f, 2 + orword gHitMarker, 0x40000 + setbyte gSharedMem + 0x1601F, 2 BattleScript_1D6F3A: @ 81D6F3A attackcanceler @@ -281,12 +281,12 @@ BattleScript_1D6F48: @ 81D6F48 faintpokemon TARGET, 0, 0x0 BattleScript_EndTurn:: @ 81D6F62 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 0, 0 end BattleScript_1D6F6C: @ 81D6F6C - orbyte 0x2024c68, 1 + orbyte gBattleMoveFlags, 1 BattleScript_1D6F72: @ 81D6F72 attackstring @@ -313,7 +313,7 @@ MoveEffect_Sleep: @ 81D6F81 jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 1 + setbyte gUnknown_02024D1F + 0x2, 1 seteffecttarget jump BattleScript_EndTurn @@ -337,7 +337,7 @@ BattleScript_1D6FE0: @ 81D6FE0 MoveEffect_PoisonHit: @ 81D6FF0 MoveEffect_PoisonTail: @ 81D6FF0 - setbyte 0x2024d21, 2 + setbyte gUnknown_02024D1F + 0x2, 2 jump BattleScript_1D6F14 MoveEffect_Absorb: @ 81D6FFB @@ -361,19 +361,19 @@ MoveEffect_Absorb: @ 81D6FFB resultmessage waitmessage 64 negativedamage - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_1D7037 - setbyte 0x2024d23, 0 + setbyte gUnknown_02024D1F + 0x4, 0 jump BattleScript_1D703F BattleScript_1D7037: @ 81D7037 manipulatedamage 0 - setbyte 0x2024d23, 1 + setbyte gUnknown_02024D1F + 0x4, 1 BattleScript_1D703F: @ 81D703F graphicalhpupdate USER datahpupdate USER - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7056 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7056 printfromtable BattleTextList_4015D0 waitmessage 64 @@ -384,15 +384,15 @@ BattleScript_1D7056: @ 81D7056 MoveEffect_BlazeKick: @ 81D7069 MoveEffect_BurnHit: @ 81D7069 - setbyte 0x2024d21, 3 + setbyte gUnknown_02024D1F + 0x2, 3 jump BattleScript_1D6F14 MoveEffect_FreezeHit: @ 81D7074 - setbyte 0x2024d21, 4 + setbyte gUnknown_02024D1F + 0x2, 4 jump BattleScript_1D6F14 MoveEffect_ParalyzeHit: @ 81D707F - setbyte 0x2024d21, 5 + setbyte gUnknown_02024D1F + 0x2, 5 jump BattleScript_1D6F14 MoveEffect_Explosion: @ 81D708A @@ -402,7 +402,7 @@ MoveEffect_Explosion: @ 81D708A faintifabilitynotdamp setuserhptozero waitstateatk - jumpifbyte 5, 0x2024c68, 1, BattleScript_1D70A5 + jumpifbyte 5, gBattleMoveFlags, 1, BattleScript_1D70A5 callatk BattleScript_1D70FB jump BattleScript_1D70A7 @@ -427,7 +427,7 @@ BattleScript_1D70A7: @ 81D70A7 resultmessage waitmessage 64 faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jumpwhiletargetvalid BattleScript_1D70A7 faintpokemon USER, 0, 0x0 @@ -437,17 +437,17 @@ BattleScript_1D70E0: @ 81D70E0 missmessage resultmessage waitmessage 64 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jumpwhiletargetvalid BattleScript_1D70A7 faintpokemon USER, 0, 0x0 end BattleScript_1D70FB: @ 81D70FB - bicbyte 0x2024c68, 1 + bicbyte gBattleMoveFlags, 1 attackanimation waitanimation - orbyte 0x2024c68, 1 + orbyte gBattleMoveFlags, 1 return MoveEffect_DreamEater: @ 81D710A @@ -481,10 +481,10 @@ BattleScript_1D7129: @ 81D7129 resultmessage waitmessage 64 negativedamage - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7167 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7167 printstring BATTLE_TEXT_DreamEaten waitmessage 64 @@ -498,25 +498,25 @@ MoveEffect_MirrorMove: @ 81D7173 pause 64 jumptolastusedattack ppreduce - orbyte 0x2024c68, 32 + orbyte gBattleMoveFlags, 32 printstring BATTLE_TEXT_MirrorFail waitmessage 64 jump BattleScript_EndTurn MoveEffect_AttackUp: @ 81D718B - setbyte 0x201601e, 17 + setbyte gSharedMem + 0x1601E, 17 jump BattleScript_1D71B2 MoveEffect_DefenseUp: @ 81D7196 - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 jump BattleScript_1D71B2 MoveEffect_SpecialAttackUp: @ 81D71A1 - setbyte 0x201601e, 20 + setbyte gSharedMem + 0x1601E, 20 jump BattleScript_1D71B2 MoveEffect_EvasionUp: @ 81D71AC - setbyte 0x201601e, 23 + setbyte gSharedMem + 0x1601E, 23 BattleScript_1D71B2: @ 81D71B2 attackcanceler @@ -525,7 +525,7 @@ BattleScript_1D71B3: @ 81D71B3 attackstring ppreduce statbuffchange 65, BattleScript_1D71E0 - jumpifbyte 1, 0x2024d23, 2, BattleScript_1D71CE + jumpifbyte 1, gUnknown_02024D1F + 0x4, 2, BattleScript_1D71CE pause 32 jump BattleScript_1D71D8 @@ -535,7 +535,7 @@ BattleScript_1D71CE: @ 81D71CE BattleScript_1D71D0: @ 81D71D0 atk47 - playanimation USER, 1, 0x20160a4 + playanimation USER, 1, gSharedMem + 0x160A4 BattleScript_1D71D8: @ 81D71D8 printfromtable BattleTextList_401570 @@ -545,29 +545,29 @@ BattleScript_1D71E0: @ 81D71E0 jump BattleScript_EndTurn BattleScript_StatUp:: @ 81D71E5 - playanimation 2, 1, 0x20160a4 + playanimation 2, 1, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 return MoveEffect_AttackDown: @ 81D71F5 - setbyte 0x201601e, 145 + setbyte gSharedMem + 0x1601E, 145 jump BattleScript_1D7227 MoveEffect_DefenseDown: @ 81D7200 - setbyte 0x201601e, 146 + setbyte gSharedMem + 0x1601E, 146 jump BattleScript_1D7227 MoveEffect_SpeedDown: @ 81D720B - setbyte 0x201601e, 147 + setbyte gSharedMem + 0x1601E, 147 jump BattleScript_1D7227 MoveEffect_AccuracyDown: @ 81D7216 - setbyte 0x201601e, 150 + setbyte gSharedMem + 0x1601E, 150 jump BattleScript_1D7227 MoveEffect_EvasionDown: @ 81D7221 - setbyte 0x201601e, 151 + setbyte gSharedMem + 0x1601E, 151 BattleScript_1D7227: @ 81D7227 attackcanceler @@ -576,8 +576,8 @@ BattleScript_1D7227: @ 81D7227 attackstring ppreduce statbuffchange 1, BattleScript_1D7271 - jumpifbyte 3, 0x2024d23, 2, BattleScript_1D725F - jumpifbyte 0, 0x2024d23, 3, BattleScript_1D7271 + jumpifbyte 3, gUnknown_02024D1F + 0x4, 2, BattleScript_1D725F + jumpifbyte 0, gUnknown_02024D1F + 0x4, 3, BattleScript_1D7271 pause 32 jump BattleScript_1D7269 @@ -585,7 +585,7 @@ BattleScript_1D725F: @ 81D725F attackanimation waitanimation atk47 - playanimation TARGET, 1, 0x20160a4 + playanimation TARGET, 1, gSharedMem + 0x160A4 BattleScript_1D7269: @ 81D7269 printfromtable BattleTextList_40157C @@ -595,7 +595,7 @@ BattleScript_1D7271: @ 81D7271 jump BattleScript_EndTurn BattleScript_StatDown:: @ 81D7276 - playanimation 2, 1, 0x20160a4 + playanimation 2, 1, gSharedMem + 0x160A4 printfromtable BattleTextList_40157C waitmessage 64 return @@ -617,7 +617,7 @@ MoveEffect_Bide: @ 81D7297 ppreduce attackanimation waitanimation - orword 0x2024c6c, 0x8000000 + orword gHitMarker, 0x8000000 setbide jump BattleScript_EndTurn @@ -649,21 +649,21 @@ MoveEffect_MultiHit: @ 81D72ED ppreduce setloopcounter 0 atk8e - setbyte 0x2016112, 0 + setbyte gSharedMem + 0x16112, 0 BattleScript_1D7300: @ 81D7300 jumpiffainted USER, BattleScript_1D7396 jumpiffainted TARGET, BattleScript_1D7377 - jumpifhalfword 0, 0x2024be8, 214, BattleScript_1D7322 + jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7322 jumpifstatus USER, SLP, BattleScript_1D7377 BattleScript_1D7322: @ 81D7322 atk25 - copyarray 0x2024d21, 0x2016112, 1 + copyarray gUnknown_02024D1F + 0x2, gSharedMem + 0x16112, 1 critcalc atk5 atk6 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7374 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7374 atk7 attackanimation waitanimation @@ -676,10 +676,10 @@ BattleScript_1D7322: @ 81D7322 waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - addbyte 0x20160e4, 1 - setbyte 0x201600c, 0 + addbyte gSharedMem + 0x160E4, 1 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 - jumpifbyte 4, 0x2024c68, 64, BattleScript_1D7377 + jumpifbyte 4, gBattleMoveFlags, 64, BattleScript_1D7377 atk27 BattleScript_1D7300 jump BattleScript_1D7377 @@ -689,17 +689,17 @@ BattleScript_1D7374: @ 81D7374 BattleScript_1D7377: @ 81D7377 resultmessage waitmessage 64 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7396 - copyarray gBattleTextBuff1, 0x20160e0, 6 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7396 + copyarray gBattleTextBuff1, gSharedMem + 0x160E0, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 BattleScript_1D7396: @ 81D7396 seteffectwithchancetarget faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 2 + setbyte gSharedMem + 0x1600C, 2 atk49 1, 0 - setbyte 0x201600c, 4 + setbyte gSharedMem + 0x1600C, 4 atk49 0, 0 end @@ -715,7 +715,7 @@ MoveEffect_Conversion: @ 81D73B1 jump BattleScript_EndTurn MoveEffect_FlinchHit: @ 81D73C6 - setbyte 0x2024d21, 8 + setbyte gUnknown_02024D1F + 0x2, 8 jump BattleScript_1D6F14 MoveEffect_RestoreHp: @ 81D73D1 @@ -725,7 +725,7 @@ MoveEffect_RestoreHp: @ 81D73D1 setdamageasrestorehalfmaxhp BattleScript_1D83B5, 1 attackanimation waitanimation - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_RegainedHealth @@ -747,7 +747,7 @@ MoveEffect_Toxic: @ 81D73F4 jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 6 + setbyte gUnknown_02024D1F + 0x2, 6 seteffecttarget resultmessage waitmessage 64 @@ -760,13 +760,13 @@ BattleScript_1D7455: @ 81D7455 jump BattleScript_EndTurn BattleScript_1D7463: @ 81D7463 - copyarray 0x2024c0a, 0x2024c08, 1 - setbyte 0x2024d23, 0 + copyarray gEffectBank, gBankTarget, 1 + setbyte gUnknown_02024D1F + 0x4, 0 callatk BattleScript_PSNPrevention jump BattleScript_EndTurn MoveEffect_PayDay: @ 81D747D - setbyte 0x2024d21, 11 + setbyte gUnknown_02024D1F + 0x2, 11 jump BattleScript_1D6F14 MoveEffect_LightScreen: @ 81D7488 @@ -777,7 +777,7 @@ MoveEffect_LightScreen: @ 81D7488 jump BattleScript_1D7786 MoveEffect_TriAttack: @ 81D7491 - setbyte 0x2024d21, 9 + setbyte gUnknown_02024D1F + 0x2, 9 jump BattleScript_1D6F14 MoveEffect_Rest: @ 81D749C @@ -812,7 +812,7 @@ MoveEffect_Ohko: @ 81D74E4 ppreduce accuracycheck BattleScript_ButItFailed, 65535 atk6 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D6F48 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D6F48 koplussomethings BattleScript_1D7505 atkab jump BattleScript_1D6F48 @@ -825,19 +825,19 @@ BattleScript_1D7505: @ 81D7505 MoveEffect_RazorWind: @ 81D7515 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D - setbyte 0x2016055, 0 + jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D + setbyte gSharedMem + 0x16055, 0 callatk BattleScript_1D756C jump BattleScript_EndTurn BattleScript_1D753D: @ 81D753D attackcanceler - setbyte 0x2024d21, 12 - setbyte 0x2016002, 1 + setbyte gUnknown_02024D1F + 0x2, 12 + setbyte gSharedMem + 0x16002, 1 clearstatus USER - orword 0x2024c6c, 0x800 - jumpifhalfword 1, 0x2024be6, 143, BattleScript_1D6F3B - setbyte 0x2024d21, 8 + orword gHitMarker, 0x800 + jumpifhalfword 1, gCurrentMove, 143, BattleScript_1D6F3B + setbyte gUnknown_02024D1F + 0x2, 8 jump BattleScript_1D6F3B BattleScript_1D756C: @ 81D756C @@ -846,10 +846,10 @@ BattleScript_1D756C: @ 81D756C ppreduce attackanimation waitanimation - orword 0x2024c6c, 0x8000000 - setbyte 0x2024d21, 76 + orword gHitMarker, 0x8000000 + setbyte gUnknown_02024D1F + 0x2, 76 seteffecttarget - copyarray 0x2024d23, 0x2016055, 1 + copyarray gUnknown_02024D1F + 0x4, gSharedMem + 0x16055, 1 printfromtable BattleTextList_401584 waitmessage 64 return @@ -860,7 +860,7 @@ MoveEffect_SuperFang: @ 81D7596 attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 + bicbyte gBattleMoveFlags, 6 gethalfcurrentenemyhp jump BattleScript_1D6F48 @@ -870,22 +870,22 @@ MoveEffect_DragonRage: @ 81D75AD attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 - setbyte 0x2024bec, 40 - setbyte 0x2024bed, 0 - setbyte 0x2024bee, 0 - setbyte 0x2024bef, 0 + bicbyte gBattleMoveFlags, 6 + setbyte gBattleMoveDamage, 40 + setbyte gBattleMoveDamage + 0x1, 0 + setbyte gBattleMoveDamage + 0x2, 0 + setbyte gBattleMoveDamage + 0x3, 0 atk69 jump BattleScript_1D6F48 MoveEffect_Trap: @ 81D75DC - jumpifhalfword 1, 0x2024be6, 250, BattleScript_1D7602 + jumpifhalfword 1, gCurrentMove, 250, BattleScript_1D7602 jumpifspecialstatusflag TARGET, 0x40000, 1, BattleScript_1D7602 - orword 0x2024c6c, 0x40000 - setbyte 0x201601f, 2 + orword gHitMarker, 0x40000 + setbyte gSharedMem + 0x1601F, 2 BattleScript_1D7602: @ 81D7602 - setbyte 0x2024d21, 13 + setbyte gUnknown_02024D1F + 0x2, 13 jump BattleScript_1D6F14 MoveEffect_DoubleHit: @ 81D760D @@ -895,7 +895,7 @@ MoveEffect_DoubleHit: @ 81D760D ppreduce setloopcounter 2 atk8e - setbyte 0x2016112, 0 + setbyte gSharedMem + 0x16112, 0 jump BattleScript_1D7300 MoveEffect_RecoilIfMiss: @ 81D7625 @@ -909,19 +909,19 @@ BattleScript_1D7632: @ 81D7632 pause 64 resultmessage waitmessage 64 - jumpifbyte 4, 0x2024c68, 8, BattleScript_EndTurn + jumpifbyte 4, gBattleMoveFlags, 8, BattleScript_EndTurn printstring BATTLE_TEXT_KeptGoingCrash waitmessage 64 atk5 atk6 atk7 manipulatedamage 1 - bicbyte 0x2024c68, 1 - orword 0x2024c6c, 0x100 + bicbyte gBattleMoveFlags, 1 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 - orbyte 0x2024c68, 1 + orbyte gBattleMoveFlags, 1 jump BattleScript_EndTurn MoveEffect_Mist: @ 81D7676 @@ -948,8 +948,8 @@ MoveEffect_FocusEnergy: @ 81D7689 jump BattleScript_EndTurn MoveEffect_Recoil: @ 81D76A6 - setbyte 0x2024d21, 206 - jumpifhalfword 1, 0x2024be6, 165, BattleScript_1D6F14 + setbyte gUnknown_02024D1F + 0x2, 206 + jumpifhalfword 1, gCurrentMove, 165, BattleScript_1D6F14 atk60 27 jump BattleScript_1D6F14 @@ -964,7 +964,7 @@ MoveEffect_Confuse: @ 81D76BF jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 7 + setbyte gUnknown_02024D1F + 0x2, 7 seteffecttarget resultmessage waitmessage 64 @@ -977,23 +977,23 @@ BattleScript_1D76FE: @ 81D76FE jump BattleScript_EndTurn MoveEffect_AttackUp2: @ 81D770C - setbyte 0x201601e, 33 + setbyte gSharedMem + 0x1601E, 33 jump BattleScript_1D71B2 MoveEffect_DefenseUp2: @ 81D7717 - setbyte 0x201601e, 34 + setbyte gSharedMem + 0x1601E, 34 jump BattleScript_1D71B2 MoveEffect_SpeedUp2: @ 81D7722 - setbyte 0x201601e, 35 + setbyte gSharedMem + 0x1601E, 35 jump BattleScript_1D71B2 MoveEffect_SpecialAttackUp2: @ 81D772D - setbyte 0x201601e, 36 + setbyte gSharedMem + 0x1601E, 36 jump BattleScript_1D71B2 MoveEffect_SpecialDefenseUp2: @ 81D7738 - setbyte 0x201601e, 37 + setbyte gSharedMem + 0x1601E, 37 jump BattleScript_1D71B2 MoveEffect_Transform: @ 81D7743 @@ -1008,19 +1008,19 @@ MoveEffect_Transform: @ 81D7743 jump BattleScript_EndTurn MoveEffect_AttackDown2: @ 81D7756 - setbyte 0x201601e, 161 + setbyte gSharedMem + 0x1601E, 161 jump BattleScript_1D7227 MoveEffect_DefenseDown2: @ 81D7761 - setbyte 0x201601e, 162 + setbyte gSharedMem + 0x1601E, 162 jump BattleScript_1D7227 MoveEffect_SpeedDown2: @ 81D776C - setbyte 0x201601e, 163 + setbyte gSharedMem + 0x1601E, 163 jump BattleScript_1D7227 MoveEffect_SpecialDefenseDown2: @ 81D7777 - setbyte 0x201601e, 165 + setbyte gSharedMem + 0x1601E, 165 jump BattleScript_1D7227 MoveEffect_Reflect: @ 81D7782 @@ -1051,7 +1051,7 @@ MoveEffect_Poison: @ 81D7795 jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 2 + setbyte gUnknown_02024D1F + 0x2, 2 seteffecttarget resultmessage waitmessage 64 @@ -1064,14 +1064,14 @@ MoveEffect_Paralyze: @ 81D77F6 jumpifability TARGET, ABILITY_LIMBER, BattleScript_1D7859 jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed atk6 - jumpifbyte 4, 0x2024c68, 41, BattleScript_ButItFailed + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_ButItFailed jumpifstatus TARGET, PAR, BattleScript_1D784B jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, 0 jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 5 + setbyte gUnknown_02024D1F + 0x2, 5 seteffecttarget resultmessage waitmessage 64 @@ -1084,50 +1084,50 @@ BattleScript_1D784B: @ 81D784B jump BattleScript_EndTurn BattleScript_1D7859: @ 81D7859 - copyarray 0x2024c0a, 0x2024c08, 1 - setbyte 0x2024d23, 0 + copyarray gEffectBank, gBankTarget, 1 + setbyte gUnknown_02024D1F + 0x4, 0 callatk BattleScript_PRLZPrevention jump BattleScript_EndTurn MoveEffect_AttackDownHit: @ 81D7873 - setbyte 0x2024d21, 22 + setbyte gUnknown_02024D1F + 0x2, 22 jump BattleScript_1D6F14 MoveEffect_DefenseDownHit: @ 81D787E - setbyte 0x2024d21, 23 + setbyte gUnknown_02024D1F + 0x2, 23 jump BattleScript_1D6F14 MoveEffect_SpeedDownHit: @ 81D7889 - setbyte 0x2024d21, 24 + setbyte gUnknown_02024D1F + 0x2, 24 jump BattleScript_1D6F14 MoveEffect_SpecialAttackDownHit: @ 81D7894 - setbyte 0x2024d21, 25 + setbyte gUnknown_02024D1F + 0x2, 25 jump BattleScript_1D6F14 MoveEffect_SpecialDefenseDownHit: @ 81D789F - setbyte 0x2024d21, 26 + setbyte gUnknown_02024D1F + 0x2, 26 jump BattleScript_1D6F14 MoveEffect_AccuracyDownHit: @ 81D78AA - setbyte 0x2024d21, 27 + setbyte gUnknown_02024D1F + 0x2, 27 jump BattleScript_1D6F14 MoveEffect_SkyAttack: @ 81D78B5 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D - setbyte 0x2016055, 3 + jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D + setbyte gSharedMem + 0x16055, 3 callatk BattleScript_1D756C jump BattleScript_EndTurn MoveEffect_ConfuseHit: @ 81D78DD - setbyte 0x2024d21, 7 + setbyte gUnknown_02024D1F + 0x2, 7 jump BattleScript_1D6F14 MoveEffect_Twineedle: @ 81D78E8 attackcanceler accuracycheck BattleScript_1D6F72, 0 - setbyte 0x2016112, 2 + setbyte gSharedMem + 0x16112, 2 attackstring ppreduce setloopcounter 2 @@ -1141,7 +1141,7 @@ MoveEffect_Substitute: @ 81D7900 waitstateatk jumpifsecondarytstatus USER, S_SUBSTITUTE, BattleScript_1D7935 setsubstituteeffect - jumpifbyte 1, 0x2024d23, 1, BattleScript_1D7922 + jumpifbyte 1, gUnknown_02024D1F + 0x4, 1, BattleScript_1D7922 pause 32 jump BattleScript_1D7928 @@ -1165,7 +1165,7 @@ BattleScript_1D7935: @ 81D7935 MoveEffect_Recharge: @ 81D7943 attackcanceler accuracycheck BattleScript_1D6F72, 0 - setbyte 0x2024d21, 221 + setbyte gUnknown_02024D1F + 0x2, 221 jump BattleScript_1D6F42 BattleScript_MoveUsedMustRecharge:: @ 81D7956 @@ -1176,13 +1176,13 @@ BattleScript_MoveUsedMustRecharge:: @ 81D7956 MoveEffect_Rage: @ 81D7961 attackcanceler accuracycheck BattleScript_1D797B, 0 - setbyte 0x2024d21, 30 + setbyte gUnknown_02024D1F + 0x2, 30 seteffecttarget - setbyte 0x2024d21, 0 + setbyte gUnknown_02024D1F + 0x2, 0 jump BattleScript_1D6F42 BattleScript_1D797B: @ 81D797B - setbyte 0x2024d21, 30 + setbyte gUnknown_02024D1F + 0x2, 30 clearstatus USER jump BattleScript_1D6F72 @@ -1205,8 +1205,8 @@ MoveEffect_Metronome: @ 81D79AE pause 32 attackanimation waitanimation - setbyte 0x2016002, 0 - setbyte 0x20160a1, 0 + setbyte gSharedMem + 0x16002, 0 + setbyte gSharedMem + 0x160A1, 0 metronomeeffect MoveEffect_LeechSeed: @ 81D79C2 @@ -1254,7 +1254,7 @@ MoveEffect_LevelDamage: @ 81D7A17 attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 + bicbyte gBattleMoveFlags, 6 nightshadedamageeffect atk69 jump BattleScript_1D6F48 @@ -1265,7 +1265,7 @@ MoveEffect_Psywave: @ 81D7A2F attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 + bicbyte gBattleMoveFlags, 6 psywavedamageeffect atk69 jump BattleScript_1D6F48 @@ -1300,10 +1300,10 @@ MoveEffect_PainSplit: @ 81D7A79 painsplitdamagecalculator BattleScript_ButItFailed attackanimation waitanimation - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER - copyarray 0x2024bec, 0x2016014, 4 + copyarray gBattleMoveDamage, gSharedMem + 0x16014, 4 graphicalhpupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_PainSplit @@ -1318,7 +1318,7 @@ MoveEffect_Snore: @ 81D7AB0 jump BattleScript_ButItFailed BattleScript_1D7AC2: @ 81D7AC2 - jumpifhalfword 0, 0x2024be8, 214, BattleScript_1D7AD6 + jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7AD6 printstring BATTLE_TEXT_FastAsleep waitmessage 64 statusanimation USER @@ -1327,7 +1327,7 @@ BattleScript_1D7AD6: @ 81D7AD6 attackstring ppreduce accuracycheck BattleScript_1D6F77, 0 - setbyte 0x2024d21, 8 + setbyte gUnknown_02024D1F + 0x2, 8 jump BattleScript_1D6F44 MoveEffect_Conversion2: @ 81D7AEA @@ -1379,7 +1379,7 @@ BattleScript_1D7B52: @ 81D7B52 statusanimation USER attackstring ppreduce - orword 0x2024c6c, 0x800 + orword gHitMarker, 0x800 selectrandommovefromusermoves BattleScript_1D7B72 pause 64 jump BattleScript_ButItFailed @@ -1387,8 +1387,8 @@ BattleScript_1D7B52: @ 81D7B52 BattleScript_1D7B72: @ 81D7B72 attackanimation waitanimation - setbyte 0x2016002, 0 - setbyte 0x20160a1, 0 + setbyte gSharedMem + 0x16002, 0 + setbyte gSharedMem + 0x160A1, 0 jumptoattack USER MoveEffect_DestinyBond: @ 81D7B82 @@ -1428,13 +1428,13 @@ MoveEffect_HealBell: @ 81D7BB5 waitanimation printfromtable BattleTextList_4015D8 waitmessage 64 - jumpifhalfword 1, 0x2024be6, 215, BattleScript_1D7BF2 - jumpifbyte 5, 0x2024d23, 1, BattleScript_1D7BE1 + jumpifhalfword 1, gCurrentMove, 215, BattleScript_1D7BF2 + jumpifbyte 5, gUnknown_02024D1F + 0x4, 1, BattleScript_1D7BE1 printstring BATTLE_TEXT_BlocksOther waitmessage 64 BattleScript_1D7BE1: @ 81D7BE1 - jumpifbyte 5, 0x2024d23, 2, BattleScript_1D7BF2 + jumpifbyte 5, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7BF2 printstring BATTLE_TEXT_BlocksOther2 waitmessage 64 @@ -1447,28 +1447,28 @@ MoveEffect_TripleKick: @ 81D7BFA attackcanceler attackstring ppreduce - setbyte 0x20160de, 0 - setbyte 0x20160df, 0 + setbyte gSharedMem + 0x160DE, 0 + setbyte gSharedMem + 0x160DF, 0 atk8e atk26 3 BattleScript_1D7C0C: @ 81D7C0C jumpiffainted USER, BattleScript_1D7CAF jumpiffainted TARGET, BattleScript_1D7C8D - jumpifhalfword 0, 0x2024be8, 214, BattleScript_1D7C2E + jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7C2E jumpifstatus USER, SLP, BattleScript_1D7C8D BattleScript_1D7C2E: @ 81D7C2E atk25 accuracycheck BattleScript_1D7C8D, 0 - addbyte 0x20160de, 10 - addbyte 0x20160e4, 1 - copyarray 0x2024dec, 0x20160de, 2 + addbyte gSharedMem + 0x160DE, 10 + addbyte gSharedMem + 0x160E4, 1 + copyarray gDynamicBasePower, gSharedMem + 0x160DE, 2 critcalc atk5 atk6 atk7 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7C8D + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7C8D attackanimation waitanimation missmessage @@ -1480,9 +1480,9 @@ BattleScript_1D7C2E: @ 81D7C2E waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 - jumpifbyte 4, 0x2024c68, 64, BattleScript_1D7C90 + jumpifbyte 4, gBattleMoveFlags, 64, BattleScript_1D7C90 atk27 BattleScript_1D7C0C jump BattleScript_1D7C90 @@ -1492,20 +1492,20 @@ BattleScript_1D7C8D: @ 81D7C8D BattleScript_1D7C90: @ 81D7C90 resultmessage waitmessage 64 - jumpifbyte 0, 0x20160e4, 0, BattleScript_1D7CAF - copyarray gBattleTextBuff1, 0x20160e0, 6 + jumpifbyte 0, gSharedMem + 0x160E4, 0, BattleScript_1D7CAF + copyarray gBattleTextBuff1, gSharedMem + 0x160E0, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 BattleScript_1D7CAF: @ 81D7CAF seteffectwithchancetarget faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 14 + setbyte gSharedMem + 0x1600C, 14 atk49 0, 0 end MoveEffect_Thief: @ 81D7CC1 - setbyte 0x2024d21, 31 + setbyte gUnknown_02024D1F + 0x2, 31 jump BattleScript_1D6F14 MoveEffect_MeanLook: @ 81D7CCC @@ -1516,7 +1516,7 @@ MoveEffect_MeanLook: @ 81D7CCC jumpifsecondarytstatus TARGET, S_MEAN_LOOK, BattleScript_ButItFailed attackanimation waitanimation - setbyte 0x2024d21, 32 + setbyte gUnknown_02024D1F + 0x2, 32 seteffecttarget printstring BATTLE_TEXT_CantEscapeNow waitmessage 64 @@ -1534,7 +1534,7 @@ MoveEffect_Nightmare: @ 81D7CF4 BattleScript_1D7D1A: @ 81D7D1A attackanimation waitanimation - setbyte 0x2024d21, 33 + setbyte gUnknown_02024D1F + 0x2, 33 seteffecttarget printstring BATTLE_TEXT_NightmareStart waitmessage 64 @@ -1543,7 +1543,7 @@ BattleScript_1D7D1A: @ 81D7D1A MoveEffect_Minimize: @ 81D7D2E attackcanceler setminimize - setbyte 0x201601e, 23 + setbyte gSharedMem + 0x1601E, 23 jump BattleScript_1D71B3 MoveEffect_Curse: @ 81D7D3B @@ -1556,23 +1556,23 @@ MoveEffect_Curse: @ 81D7D3B jumpifstat USER, 0, 2, 12, BattleScript_ButItFailed BattleScript_1D7D60: @ 81D7D60 - copyarray 0x2024c08, 0x2024c07, 1 - setbyte 0x2016002, 1 + copyarray gBankTarget, gBankAttacker, 1 + setbyte gSharedMem + 0x16002, 1 attackanimation waitanimation - setbyte 0x201601e, 147 + setbyte gSharedMem + 0x1601E, 147 statbuffchange 65, BattleScript_1D7D86 printfromtable BattleTextList_40157C waitmessage 64 BattleScript_1D7D86: @ 81D7D86 - setbyte 0x201601e, 17 + setbyte gSharedMem + 0x1601E, 17 statbuffchange 65, BattleScript_1D7D9A printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D7D9A: @ 81D7D9A - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D7DAE printfromtable BattleTextList_401570 waitmessage 64 @@ -1581,7 +1581,7 @@ BattleScript_1D7DAE: @ 81D7DAE jump BattleScript_EndTurn BattleScript_1D7DB3: @ 81D7DB3 - jumpifarraynotequal 0x2024c07, 0x2024c08, 1, BattleScript_1D7DC4 + jumpifarraynotequal gBankAttacker, gBankTarget, 1, BattleScript_1D7DC4 atk76 USER, 3 BattleScript_1D7DC4: @ 81D7DC4 @@ -1590,8 +1590,8 @@ BattleScript_1D7DC4: @ 81D7DC4 ppreduce jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed cursetarget BattleScript_ButItFailed - orword 0x2024c6c, 0x100 - setbyte 0x2016002, 0 + orword gHitMarker, 0x100 + setbyte gSharedMem + 0x16002, 0 attackanimation waitanimation graphicalhpupdate USER @@ -1645,14 +1645,14 @@ MoveEffect_PerishSong: @ 81D7E3D waitanimation printstring BATTLE_TEXT_PerishSong waitmessage 64 - setbyte 0x2016003, 0 + setbyte gSharedMem + 0x16003, 0 BattleScript_1D7E53: @ 81D7E53 jumpifability 10, ABILITY_SOUNDPROOF, BattleScript_1D7E73 BattleScript_1D7E5A: @ 81D7E5A - addbyte 0x2016003, 1 - jumpifarraynotequal 0x2016003, 0x2024a68, 1, BattleScript_1D7E53 + addbyte gSharedMem + 0x16003, 1 + jumpifarraynotequal gSharedMem + 0x16003, gNoOfAllBanks, 1, BattleScript_1D7E53 jump BattleScript_EndTurn BattleScript_1D7E73: @ 81D7E73 @@ -1690,18 +1690,18 @@ MoveEffect_Swagger: @ 81D7EA2 jumpifconfusedandattackmaxed 1, BattleScript_ButItFailed attackanimation waitanimation - setbyte 0x201601e, 33 + setbyte gSharedMem + 0x1601E, 33 statbuffchange 1, BattleScript_1D7EE5 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D7EE5 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7EE5 atk47 - playanimation TARGET, 1, 0x20160a4 + playanimation TARGET, 1, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D7EE5: @ 81D7EE5 jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 jumpifhalverset TARGET, 32, BattleScript_1D9037 - setbyte 0x2024d21, 7 + setbyte gUnknown_02024D1F + 0x2, 7 seteffecttarget jump BattleScript_EndTurn @@ -1716,7 +1716,7 @@ BattleScript_1D7F0A: @ 81D7F0A critcalc atk5 atk6 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7F0A + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7F0A atk7 jump BattleScript_1D6F48 @@ -1755,7 +1755,7 @@ MoveEffect_Safeguard: @ 81D7F55 jump BattleScript_1D7786 MoveEffect_ThawHit: @ 81D7F5E - setbyte 0x2024d21, 3 + setbyte gUnknown_02024D1F + 0x2, 3 jump BattleScript_1D6F14 MoveEffect_Magnitude: @ 81D7F69 @@ -1791,7 +1791,7 @@ MoveEffect_BatonPass: @ 81D7F7C jump BattleScript_EndTurn MoveEffect_RapidSpin: @ 81D7FA9 - setbyte 0x2024d21, 163 + setbyte gUnknown_02024D1F + 0x2, 163 jump BattleScript_1D6F14 MoveEffect_Sonicboom: @ 81D7FB4 @@ -1800,11 +1800,11 @@ MoveEffect_Sonicboom: @ 81D7FB4 attackstring ppreduce atk6 - bicbyte 0x2024c68, 6 - setbyte 0x2024bec, 20 - setbyte 0x2024bed, 0 - setbyte 0x2024bee, 0 - setbyte 0x2024bef, 0 + bicbyte gBattleMoveFlags, 6 + setbyte gBattleMoveDamage, 20 + setbyte gBattleMoveDamage + 0x1, 0 + setbyte gBattleMoveDamage + 0x2, 0 + setbyte gBattleMoveDamage + 0x3, 0 atk69 jump BattleScript_1D6F48 @@ -1843,15 +1843,15 @@ MoveEffect_SunnyDay: @ 81D800E jump BattleScript_1D7FFA MoveEffect_DefenseUpHit: @ 81D8017 - setbyte 0x2024d21, 80 + setbyte gUnknown_02024D1F + 0x2, 80 jump BattleScript_1D6F14 MoveEffect_AttackUpHit: @ 81D8022 - setbyte 0x2024d21, 79 + setbyte gUnknown_02024D1F + 0x2, 79 jump BattleScript_1D6F14 MoveEffect_AllStatsUpHit: @ 81D802D - setbyte 0x2024d21, 98 + setbyte gUnknown_02024D1F + 0x2, 98 jump BattleScript_1D6F14 MoveEffect_BellyDrum: @ 81D8038 @@ -1859,7 +1859,7 @@ MoveEffect_BellyDrum: @ 81D8038 attackstring ppreduce maxattackhalvehp BattleScript_ButItFailed - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 attackanimation waitanimation graphicalhpupdate USER @@ -1891,14 +1891,14 @@ MoveEffect_MirrorCoat: @ 81D806F MoveEffect_SkullBash: @ 81D8085 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D - setbyte 0x2016055, 2 + jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D + setbyte gSharedMem + 0x16055, 2 callatk BattleScript_1D756C - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D80CF - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D80CF + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D80CF atk47 - playanimation USER, 1, 0x20160a4 + playanimation USER, 1, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 @@ -1907,11 +1907,11 @@ BattleScript_1D80CF: @ 81D80CF MoveEffect_Twister: @ 81D80D4 jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D80EE - orword 0x2024c6c, 0x10000 - setbyte 0x201601f, 2 + orword gHitMarker, 0x10000 + setbyte gSharedMem + 0x1601F, 2 BattleScript_1D80EE: @ 81D80EE - setbyte 0x2024d21, 8 + setbyte gUnknown_02024D1F + 0x2, 8 jump BattleScript_1D6F14 MoveEffect_Earthquake: @ 81D80F9 @@ -1923,13 +1923,13 @@ MoveEffect_Earthquake: @ 81D80F9 BattleScript_1D80FD: @ 81D80FD atk25 jumpifspecialstatusflag TARGET, 0x80, 1, BattleScript_1D811D - orword 0x2024c6c, 0x20000 - setbyte 0x201601f, 2 + orword gHitMarker, 0x20000 + setbyte gSharedMem + 0x1601F, 2 jump BattleScript_1D812C BattleScript_1D811D: @ 81D811D - bicword 0x2024c6c, 0x20000 - setbyte 0x201601f, 1 + bicword gHitMarker, 0x20000 + setbyte gSharedMem + 0x1601F, 1 BattleScript_1D812C: @ 81D812C accuracycheck BattleScript_1D8165, 0 @@ -1951,7 +1951,7 @@ BattleScript_1D812C: @ 81D812C printstring BATTLE_TEXT_Terminator2 waitmessage 1 faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jumpwhiletargetvalid BattleScript_1D80FD end @@ -1962,7 +1962,7 @@ BattleScript_1D8165: @ 81D8165 missmessage resultmessage waitmessage 64 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jumpwhiletargetvalid BattleScript_1D80FD end @@ -1980,52 +1980,52 @@ MoveEffect_FutureSight: @ 81D817D MoveEffect_Gust: @ 81D8194 jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D6F14 - orword 0x2024c6c, 0x10000 - setbyte 0x201601f, 2 + orword gHitMarker, 0x10000 + setbyte gSharedMem + 0x1601F, 2 jump BattleScript_1D6F14 MoveEffect_FlinchHit2: @ 81D81B3 jumpifspecialstatusflag TARGET, 0x100, 1, BattleScript_1D80EE - setbyte 0x201601f, 2 + setbyte gSharedMem + 0x1601F, 2 jump BattleScript_1D80EE MoveEffect_Solarbeam: @ 81D81C9 jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_1D81E1 jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_1D81E1 - jumpifhalfword 4, 0x2024db8, 96, BattleScript_1D8209 + jumpifhalfword 4, gBattleWeather, 96, BattleScript_1D8209 BattleScript_1D81E1: @ 81D81E1 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D - setbyte 0x2016055, 1 + jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D + setbyte gSharedMem + 0x16055, 1 callatk BattleScript_1D756C jump BattleScript_EndTurn BattleScript_1D8209: @ 81D8209 - orword 0x2024c6c, 0x8000000 - setbyte 0x2024d21, 76 + orword gHitMarker, 0x8000000 + setbyte gUnknown_02024D1F + 0x2, 76 seteffecttarget ppreduce jump BattleScript_1D753D MoveEffect_Thunder: @ 81D821F - setbyte 0x2024d21, 5 - orword 0x2024c6c, 0x10000 + setbyte gUnknown_02024D1F + 0x2, 5 + orword gHitMarker, 0x10000 jump BattleScript_1D6F14 MoveEffect_Teleport: @ 81D8233 attackcanceler attackstring ppreduce - jumpifhalfword 4, 0x20239f8, 8, BattleScript_ButItFailed + jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_ButItFailed atk76 USER, 2 - jumpifbyte 0, 0x2024d1e, 1, BattleScript_ButItFailed - jumpifbyte 0, 0x2024d1e, 2, BattleScript_1D8839 + jumpifbyte 0, gBattleCommunication, 1, BattleScript_ButItFailed + jumpifbyte 0, gBattleCommunication, 2, BattleScript_1D8839 attackanimation waitanimation printstring BATTLE_TEXT_FledBattle waitmessage 64 - setbyte 0x2024d26, 5 + setbyte gBattleOutcome, 5 jump BattleScript_EndTurn MoveEffect_BeatUp: @ 81D826E @@ -2034,14 +2034,14 @@ MoveEffect_BeatUp: @ 81D826E attackstring pause 32 ppreduce - setbyte 0x2024d1e, 0 + setbyte gBattleCommunication, 0 BattleScript_1D8281: @ 81D8281 atk25 beatupcalculation BattleScript_1D82C4, BattleScript_ButItFailed printstring BATTLE_TEXT_PokeAttack critcalc - jumpifbyte 1, 0x2024c0d, 2, BattleScript_1D829C + jumpifbyte 1, gCritMultiplier, 2, BattleScript_1D829C manipulatedamage 2 BattleScript_1D829C: @ 81D829C @@ -2058,7 +2058,7 @@ BattleScript_1D829C: @ 81D829C resultmessage waitmessage 64 faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 jump BattleScript_1D8281 @@ -2067,23 +2067,23 @@ BattleScript_1D82C4: @ 81D82C4 MoveEffect_Fly: @ 81D82C5 jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D8333 - jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D8333 - jumpifhalfword 0, 0x2024be6, 19, BattleScript_1D8322 - jumpifhalfword 0, 0x2024be6, 291, BattleScript_1D8317 - jumpifhalfword 0, 0x2024be6, 340, BattleScript_1D830C - setbyte 0x2016055, 5 + jumpifword 4, gHitMarker, 0x200, BattleScript_1D8333 + jumpifhalfword 0, gCurrentMove, 19, BattleScript_1D8322 + jumpifhalfword 0, gCurrentMove, 291, BattleScript_1D8317 + jumpifhalfword 0, gCurrentMove, 340, BattleScript_1D830C + setbyte gSharedMem + 0x16055, 5 jump BattleScript_1D8328 BattleScript_1D830C: @ 81D830C - setbyte 0x2016055, 7 + setbyte gSharedMem + 0x16055, 7 jump BattleScript_1D8328 BattleScript_1D8317: @ 81D8317 - setbyte 0x2016055, 6 + setbyte gSharedMem + 0x16055, 6 jump BattleScript_1D8328 BattleScript_1D8322: @ 81D8322 - setbyte 0x2016055, 4 + setbyte gSharedMem + 0x16055, 4 BattleScript_1D8328: @ 81D8328 callatk BattleScript_1D756C @@ -2092,12 +2092,12 @@ BattleScript_1D8328: @ 81D8328 BattleScript_1D8333: @ 81D8333 attackcanceler - setbyte 0x2024d21, 12 - setbyte 0x2016002, 1 + setbyte gUnknown_02024D1F + 0x2, 12 + setbyte gSharedMem + 0x16002, 1 clearstatus USER - orword 0x2024c6c, 0x800 - jumpifhalfword 1, 0x2024be6, 340, BattleScript_1D835D - setbyte 0x2024d21, 5 + orword gHitMarker, 0x800 + jumpifhalfword 1, gCurrentMove, 340, BattleScript_1D835D + setbyte gUnknown_02024D1F + 0x2, 5 BattleScript_1D835D: @ 81D835D accuracycheck BattleScript_1D836A, 0 @@ -2113,9 +2113,9 @@ MoveEffect_DefenseCurl: @ 81D8370 attackstring ppreduce setcurled - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D838D - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D71D8 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D71D8 attackanimation waitanimation @@ -2131,7 +2131,7 @@ MoveEffect_Softboiled: @ 81D8392 BattleScript_1D839B:: @ 81D839B attackanimation waitanimation - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth @@ -2147,7 +2147,7 @@ BattleScript_1D83B5:: @ 81D83B5 MoveEffect_FakeOut: @ 81D83C3 attackcanceler jumpifnotfirstturn BattleScript_1D83D4 - setbyte 0x2024d21, 136 + setbyte gUnknown_02024D1F + 0x2, 136 jump BattleScript_1D6F14 BattleScript_1D83D4: @ 81D83D4 @@ -2158,14 +2158,14 @@ BattleScript_1D83D5: @ 81D83D5 BattleScript_ButItFailed:: @ 81D83D6 pause 32 - orbyte 0x2024c68, 32 + orbyte gBattleMoveFlags, 32 resultmessage waitmessage 64 jump BattleScript_EndTurn BattleScript_1D83E8: @ 81D83E8 pause 32 - orbyte 0x2024c68, 8 + orbyte gBattleMoveFlags, 8 resultmessage waitmessage 64 jump BattleScript_EndTurn @@ -2173,7 +2173,7 @@ BattleScript_1D83E8: @ 81D83E8 MoveEffect_Uproar: @ 81D83FA attackcanceler accuracycheck BattleScript_1D6F72, 0 - setbyte 0x2024d21, 74 + setbyte gUnknown_02024D1F + 0x2, 74 attackstring jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D8414 ppreduce @@ -2195,7 +2195,7 @@ MoveEffect_Stockpile: @ 81D841A MoveEffect_SpitUp: @ 81D842D attackcanceler - jumpifbyte 0, 0x2024d24, 1, BattleScript_1D845C + jumpifbyte 0, gUnknown_02024D1F + 0x5, 1, BattleScript_1D845C attackstring ppreduce accuracycheck BattleScript_1D6F72, 0 @@ -2260,18 +2260,18 @@ MoveEffect_Flatter: @ 81D84B1 jumpifconfusedandattackmaxed 4, BattleScript_ButItFailed attackanimation waitanimation - setbyte 0x201601e, 20 + setbyte gSharedMem + 0x1601E, 20 statbuffchange 1, BattleScript_1D84F4 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D84F4 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D84F4 atk47 - playanimation TARGET, 1, 0x20160a4 + playanimation TARGET, 1, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D84F4: @ 81D84F4 jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 jumpifhalverset TARGET, 32, BattleScript_1D9037 - setbyte 0x2024d21, 7 + setbyte gUnknown_02024D1F + 0x2, 7 seteffecttarget jump BattleScript_EndTurn @@ -2288,13 +2288,13 @@ MoveEffect_WillOWisp: @ 81D850F jumpifhalverset TARGET, 32, BattleScript_1D9037 attackanimation waitanimation - setbyte 0x2024d21, 3 + setbyte gUnknown_02024D1F + 0x2, 3 seteffecttarget jump BattleScript_EndTurn BattleScript_1D855B: @ 81D855B - copyarray 0x2024c0a, 0x2024c08, 1 - setbyte 0x2024d23, 0 + copyarray gEffectBank, gBankTarget, 1 + setbyte gUnknown_02024D1F + 0x4, 0 callatk BattleScript_BRNPrevention jump BattleScript_EndTurn @@ -2306,7 +2306,7 @@ BattleScript_1D8575: @ 81D8575 MoveEffect_Memento: @ 81D8583 attackcanceler - jumpifbyte 0, 0x2024d24, 1, BattleScript_1D860A + jumpifbyte 0, gUnknown_02024D1F + 0x5, 1, BattleScript_1D860A attackstring ppreduce jumpifattackandspecialattackcannotfall BattleScript_ButItFailed @@ -2314,20 +2314,20 @@ MoveEffect_Memento: @ 81D8583 attackanimation waitanimation jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D85FF - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation TARGET, 18, 7 playstatchangeanimation TARGET, 2, 3 - setbyte 0x201601e, 161 + setbyte gSharedMem + 0x1601E, 161 statbuffchange 1, BattleScript_1D85D0 - jumpifbyte 2, 0x2024d23, 1, BattleScript_1D85D0 + jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D85D0 printfromtable BattleTextList_40157C waitmessage 64 BattleScript_1D85D0: @ 81D85D0 playstatchangeanimation TARGET, 16, 3 - setbyte 0x201601e, 164 + setbyte gSharedMem + 0x1601E, 164 statbuffchange 1, BattleScript_1D85F3 - jumpifbyte 2, 0x2024d23, 1, BattleScript_1D85F3 + jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D85F3 printfromtable BattleTextList_40157C waitmessage 64 @@ -2359,7 +2359,7 @@ MoveEffect_Facade: @ 81D8626 jump BattleScript_1D6F14 BattleScript_1D8635: @ 81D8635 - setbyte 0x201601f, 2 + setbyte gSharedMem + 0x1601F, 2 jump BattleScript_1D6F14 MoveEffect_FocusPunch: @ 81D8640 @@ -2372,12 +2372,12 @@ MoveEffect_FocusPunch: @ 81D8640 MoveEffect_Smellingsalt: @ 81D8652 jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F14 - setbyte 0x2024d21, 164 + setbyte gUnknown_02024D1F + 0x2, 164 jumpifstatus TARGET, PAR, BattleScript_1D8671 jump BattleScript_1D6F14 BattleScript_1D8671: @ 81D8671 - setbyte 0x201601f, 2 + setbyte gSharedMem + 0x1601F, 2 jump BattleScript_1D6F14 MoveEffect_FollowMe: @ 81D867C @@ -2476,8 +2476,8 @@ MoveEffect_Assist: @ 81D8736 assistattackselect BattleScript_1D83D5 attackanimation waitanimation - setbyte 0x2016002, 0 - setbyte 0x20160a1, 0 + setbyte gSharedMem + 0x16002, 0 + setbyte gSharedMem + 0x160A1, 0 jumptoattack USER MoveEffect_Ingrain: @ 81D874D @@ -2492,7 +2492,7 @@ MoveEffect_Ingrain: @ 81D874D jump BattleScript_EndTurn MoveEffect_Superpower: @ 81D8762 - setbyte 0x2024d21, 229 + setbyte gUnknown_02024D1F + 0x2, 229 jump BattleScript_1D6F14 MoveEffect_MagicCoat: @ 81D876D @@ -2531,13 +2531,13 @@ MoveEffect_BrickBreak: @ 81D879D atk5 atk6 atk7 - jumpifbyte 0, 0x2016002, 0, BattleScript_1D87BD - bicbyte 0x2024c68, 9 + jumpifbyte 0, gSharedMem + 0x16002, 0, BattleScript_1D87BD + bicbyte gBattleMoveFlags, 9 BattleScript_1D87BD: @ 81D87BD attackanimation waitanimation - jumpifbyte 3, 0x2016002, 2, BattleScript_1D87D0 + jumpifbyte 3, gSharedMem + 0x16002, 2, BattleScript_1D87D0 printstring BATTLE_TEXT_BrokeWall waitmessage 64 @@ -2574,7 +2574,7 @@ MoveEffect_Yawn: @ 81D87EE jump BattleScript_EndTurn BattleScript_1D882F: @ 81D882F - copyarray 0x2016003, 0x20160f8, 1 + copyarray gSharedMem + 0x16003, gSharedMem + 0x160F8, 1 BattleScript_1D8839: @ 81D8839 pause 32 @@ -2583,7 +2583,7 @@ BattleScript_1D8839: @ 81D8839 jump BattleScript_EndTurn MoveEffect_KnockOff: @ 81D8847 - setbyte 0x2024d21, 54 + setbyte gUnknown_02024D1F + 0x2, 54 jump BattleScript_1D6F14 MoveEffect_Endeavor: @ 81D8852 @@ -2591,12 +2591,12 @@ MoveEffect_Endeavor: @ 81D8852 attackstring ppreduce setdamagetohealthdifference BattleScript_ButItFailed - copyarray 0x2024bf0, 0x2024bec, 4 + copyarray gHP_dealt, gBattleMoveDamage, 4 accuracycheck BattleScript_1D6F77, 0 atk6 - jumpifbyte 4, 0x2024c68, 41, BattleScript_1D6F48 - bicbyte 0x2024c68, 6 - copyarray 0x2024bec, 0x2024bf0, 4 + jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D6F48 + bicbyte gBattleMoveFlags, 6 + copyarray gBattleMoveDamage, gHP_dealt, 4 atk69 jump BattleScript_1D6F48 @@ -2675,19 +2675,19 @@ MoveEffect_SecretPower: @ 81D8918 jump BattleScript_1D6F14 MoveEffect_DoubleEdge: @ 81D891E - setbyte 0x2024d21, 230 + setbyte gUnknown_02024D1F + 0x2, 230 jump BattleScript_1D6F14 MoveEffect_TeeterDance: @ 81D8929 attackcanceler attackstring ppreduce - setbyte 0x2024c08, 0 + setbyte gBankTarget, 0 BattleScript_1D8932: @ 81D8932 atk25 - setbyte 0x2024d21, 7 - jumpifarrayequal 0x2024c07, 0x2024c08, 1, BattleScript_1D8978 + setbyte gUnknown_02024D1F + 0x2, 7 + jumpifarrayequal gBankAttacker, gBankTarget, 1, BattleScript_1D8978 jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D8996 jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D89B2 jumpifsecondarytstatus TARGET, S_CONFUSED, BattleScript_1D89C0 @@ -2700,10 +2700,10 @@ BattleScript_1D8932: @ 81D8932 waitmessage 64 BattleScript_1D8978: @ 81D8978 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 - addbyte 0x2024c08, 1 - jumpifarraynotequal 0x2024c08, 0x2024a68, 1, BattleScript_1D8932 + addbyte gBankTarget, 1 + jumpifarraynotequal gBankTarget, gNoOfAllBanks, 1, BattleScript_1D8932 end BattleScript_1D8996: @ 81D8996 @@ -2748,7 +2748,7 @@ MoveEffect_WaterSport: @ 81D89D7 jump BattleScript_EndTurn MoveEffect_PoisonFang: @ 81D89EE - setbyte 0x2024d21, 6 + setbyte gUnknown_02024D1F + 0x2, 6 jump BattleScript_1D6F14 MoveEffect_WeatherBall: @ 81D89F9 @@ -2756,7 +2756,7 @@ MoveEffect_WeatherBall: @ 81D89F9 jump BattleScript_1D6F14 MoveEffect_Overheat: @ 81D89FF - setbyte 0x2024d21, 251 + setbyte gUnknown_02024D1F + 0x2, 251 jump BattleScript_1D6F14 MoveEffect_Tickle: @ 81D8A0A @@ -2770,20 +2770,20 @@ BattleScript_1D8A1F: @ 81D8A1F accuracycheck BattleScript_ButItFailed, 0 attackanimation waitanimation - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation TARGET, 6, 5 playstatchangeanimation TARGET, 2, 1 - setbyte 0x201601e, 145 + setbyte gSharedMem + 0x1601E, 145 statbuffchange 1, BattleScript_1D8A55 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8A55 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8A55 printfromtable BattleTextList_40157C waitmessage 64 BattleScript_1D8A55: @ 81D8A55 playstatchangeanimation TARGET, 4, 1 - setbyte 0x201601e, 146 + setbyte gSharedMem + 0x1601E, 146 statbuffchange 1, BattleScript_1D8A78 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8A78 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8A78 printfromtable BattleTextList_40157C waitmessage 64 @@ -2792,7 +2792,7 @@ BattleScript_1D8A78: @ 81D8A78 BattleScript_1D8A7D: @ 81D8A7D pause 32 - orbyte 0x2024c68, 32 + orbyte gBattleMoveFlags, 32 printstring BATTLE_TEXT_StatNoLower waitmessage 64 jump BattleScript_EndTurn @@ -2807,18 +2807,18 @@ MoveEffect_CosmicPower: @ 81D8A91 BattleScript_1D8AA6: @ 81D8AA6 attackanimation waitanimation - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 36, 0 - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D8AD1 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8AD1 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8AD1 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D8AD1: @ 81D8AD1 - setbyte 0x201601e, 21 + setbyte gSharedMem + 0x1601E, 21 statbuffchange 65, BattleScript_1D8AF0 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8AF0 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8AF0 printfromtable BattleTextList_401570 waitmessage 64 @@ -2826,7 +2826,7 @@ BattleScript_1D8AF0: @ 81D8AF0 jump BattleScript_EndTurn MoveEffect_SkyUppercut: @ 81D8AF5 - orword 0x2024c6c, 0x10000 + orword gHitMarker, 0x10000 jump BattleScript_1D6F14 MoveEffect_BulkUp: @ 81D8B03 @@ -2839,18 +2839,18 @@ MoveEffect_BulkUp: @ 81D8B03 BattleScript_1D8B18: @ 81D8B18 attackanimation waitanimation - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 6, 0 - setbyte 0x201601e, 17 + setbyte gSharedMem + 0x1601E, 17 statbuffchange 65, BattleScript_1D8B43 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8B43 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8B43 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D8B43: @ 81D8B43 - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D8B62 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8B62 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8B62 printfromtable BattleTextList_401570 waitmessage 64 @@ -2867,18 +2867,18 @@ MoveEffect_CalmMind: @ 81D8B67 BattleScript_1D8B7C: @ 81D8B7C attackanimation waitanimation - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 48, 0 - setbyte 0x201601e, 20 + setbyte gSharedMem + 0x1601E, 20 statbuffchange 65, BattleScript_1D8BA7 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8BA7 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8BA7 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D8BA7: @ 81D8BA7 - setbyte 0x201601e, 21 + setbyte gSharedMem + 0x1601E, 21 statbuffchange 65, BattleScript_1D8BC6 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8BC6 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8BC6 printfromtable BattleTextList_401570 waitmessage 64 @@ -2887,7 +2887,7 @@ BattleScript_1D8BC6: @ 81D8BC6 BattleScript_1D8BCB: @ 81D8BCB pause 32 - orbyte 0x2024c68, 32 + orbyte gBattleMoveFlags, 32 printstring BATTLE_TEXT_StatNoHigher waitmessage 64 jump BattleScript_EndTurn @@ -2902,18 +2902,18 @@ MoveEffect_DragonDance: @ 81D8BDF BattleScript_1D8BF4: @ 81D8BF4 attackanimation waitanimation - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 10, 0 - setbyte 0x201601e, 17 + setbyte gSharedMem + 0x1601E, 17 statbuffchange 65, BattleScript_1D8C1F - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8C1F + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8C1F printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D8C1F: @ 81D8C1F - setbyte 0x201601e, 19 + setbyte gSharedMem + 0x1601E, 19 statbuffchange 65, BattleScript_1D8C3E - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8C3E + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8C3E printfromtable BattleTextList_401570 waitmessage 64 @@ -2948,40 +2948,40 @@ gUnknown_081D8C65:: @ 81D8C65 return gUnknown_081D8C72:: @ 81D8C72 - setbyte 0x201600f, 0 + setbyte gSharedMem + 0x1600F, 0 atk23 0 end2 gUnknown_081D8C7B:: @ 81D8C7B atk24 BattleScript_1D8D87 - jumpifbyte 1, 0x2024d26, 0, BattleScript_1D8D86 - jumpifhalfword 4, 0x20239f8, 8, BattleScript_1D8CC2 - jumpifword 5, 0x2024c6c, 0x400000, BattleScript_1D8CC2 + jumpifbyte 1, gBattleOutcome, 0, BattleScript_1D8D86 + jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_1D8CC2 + jumpifword 5, gHitMarker, 0x400000, BattleScript_1D8CC2 printstring BATTLE_TEXT_UseNext - setbyte 0x2024d1e, 0 + setbyte gBattleCommunication, 0 atk67 - jumpifbyte 0, 0x2024d1f, 0, BattleScript_1D8CC2 + jumpifbyte 0, gUnknown_02024D1F, 0, BattleScript_1D8CC2 atk72 BattleScript_1D8D86 printstring BATTLE_TEXT_CantEscape BattleScript_1D8CC2: @ 81D8CC2 openpartyscreen 3, BattleScript_1D8D86 atk51 3, 2 - jumpifhalfword 5, 0x20239f8, 8, BattleScript_1D8D66 - jumpifhalfword 4, 0x20239f8, 2, BattleScript_1D8D66 - jumpifhalfword 4, 0x20239f8, 256, BattleScript_1D8D66 - jumpifhalfword 4, 0x20239f8, 1, BattleScript_1D8D66 - jumpifword 4, 0x2024c6c, 0x400000, BattleScript_1D8D66 - jumpifbyte 0, 0x2016084, 1, BattleScript_1D8D66 + jumpifhalfword 5, gBattleTypeFlags, 8, BattleScript_1D8D66 + jumpifhalfword 4, gBattleTypeFlags, 2, BattleScript_1D8D66 + jumpifhalfword 4, gBattleTypeFlags, 256, BattleScript_1D8D66 + jumpifhalfword 4, gBattleTypeFlags, 1, BattleScript_1D8D66 + jumpifword 4, gHitMarker, 0x400000, BattleScript_1D8D66 + jumpifbyte 0, gSharedMem + 0x16084, 1, BattleScript_1D8D66 jumpifcannotswitch USER, BattleScript_1D8D66 printstring BATTLE_TEXT_WillSwitch - setbyte 0x2024d1e, 0 + setbyte gBattleCommunication, 0 atk67 - jumpifbyte 0, 0x2024d1f, 1, BattleScript_1D8D66 + jumpifbyte 0, gUnknown_02024D1F, 1, BattleScript_1D8D66 atk6e openpartyscreen 129, BattleScript_1D8D66 atk51 USER, 2 - jumpifbyte 0, 0x2024d1e, 6, BattleScript_1D8D66 + jumpifbyte 0, gBattleCommunication, 6, BattleScript_1D8D66 atk6b atk76 USER, 5 atk74 1 @@ -3011,7 +3011,7 @@ BattleScript_1D8D66: @ 81D8D66 switch3 3, 0 waitstateatk atk52 3 - jumpifhalfword 4, 0x20239f8, 1, BattleScript_1D8D86 + jumpifhalfword 4, gBattleTypeFlags, 1, BattleScript_1D8D86 atk68 BattleScript_1D8D86: @ 81D8D86 @@ -3036,7 +3036,7 @@ BattleScript_1D8D99: @ 81D8D99 switch3 3, 0 waitstateatk atk52 5 - jumpifarraynotequal 0x2024c09, 0x2024a68, 1, BattleScript_1D8D99 + jumpifarraynotequal gBank1, gNoOfAllBanks, 1, BattleScript_1D8D99 BattleScript_1D8DBD: @ 81D8DBD end2 @@ -3056,9 +3056,9 @@ gUnknown_081D8DCE:: @ 81D8DCE end2 gUnknown_081D8DD1:: @ 81D8DD1 - jumpifhalfword 4, 0x20239f8, 256, BattleScript_1D8E01 - jumpifhalfword 4, 0x20239f8, 2048, BattleScript_1D8E01 - jumpifhalfword 0, 0x202ff5e, 1024, BattleScript_1D8E01 + jumpifhalfword 4, gBattleTypeFlags, 256, BattleScript_1D8E01 + jumpifhalfword 4, gBattleTypeFlags, 2048, BattleScript_1D8E01 + jumpifhalfword 0, gTrainerBattleOpponent, 1024, BattleScript_1D8E01 printstring BATTLE_TEXT_OutOfUsablePoke waitmessage 64 printstring BATTLE_TEXT_WhitedOut @@ -3121,8 +3121,8 @@ gUnknown_081D8E4A:: @ 81D8E4A gUnknown_081D8E4E:: @ 81D8E4E atk74 1 printstring 2 - setbyte 0x201601f, 2 - jumpifbyte 4, 0x20239f8, 1, BattleScript_1D8E6B + setbyte gSharedMem + 0x1601F, 2 + jumpifbyte 4, gBattleTypeFlags, 1, BattleScript_1D8E6B atk26 1 jump BattleScript_1D8E6D @@ -3152,9 +3152,9 @@ BattleScript_1D8E7A: @ 81D8E7A switch3 USER, 0 waitstateatk atk52 USER - setbyte 0x201600c, 4 + setbyte gSharedMem + 0x1600C, 4 atk49 1, 0 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 end2 @@ -3178,11 +3178,11 @@ BattleScript_1D8EAD: @ 81D8EAD resultmessage waitmessage 64 faintpokemon TARGET, 0, 0x0 - setbyte 0x201600c, 3 + setbyte gSharedMem + 0x1600C, 3 atk49 2, 6 atk76 TARGET, 4 - jumpifbyte 0, 0x2024d1e, 0, BattleScript_1D8EEE - setbyte 0x201600f, 0 + jumpifbyte 0, gBattleCommunication, 0, BattleScript_1D8EEE + setbyte gSharedMem + 0x1600F, 0 atk23 0 BattleScript_1D8EEE: @ 81D8EEE @@ -3195,7 +3195,7 @@ BattleScript_Pausex20:: @ 81D8EEF BattleScript_LevelUp:: @ 81D8EF3 atk55 0xe10016f attackcanceler - setbyte 0x201609c, 0 + setbyte gSharedMem + 0x1609C, 0 atk6c checkiflearnmoveinbattle BattleScript_1D8F4F, BattleScript_1D8F61, 1 jump BattleScript_1D8F19 @@ -3209,11 +3209,11 @@ BattleScript_1D8F19: @ 81D8F19 printstring BATTLE_TEXT_CantLearnMore printstring BATTLE_TEXT_DeleteMove waitstateatk - setbyte 0x201601a, 0 + setbyte gSharedMem + 0x1601A, 0 atk5a BattleScript_1D8F46 printstring BATTLE_TEXT_StopLearning waitstateatk - setbyte 0x201601a, 0 + setbyte gSharedMem + 0x1601A, 0 atk5b BattleScript_1D8F19 printstring BATTLE_TEXT_DidNotLearn jump BattleScript_1D8F0F @@ -3237,7 +3237,7 @@ BattleScript_1D8F61: @ 81D8F61 gUnknown_081D8F62:: @ 81D8F62 printfromtable BattleTextList_401534 waitmessage 64 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8F7C + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8F7C playanimation USER, 10, 0x0 BattleScript_1D8F7C: @ 81D8F7C @@ -3246,16 +3246,16 @@ BattleScript_1D8F7C: @ 81D8F7C gUnknown_081D8F7D:: @ 81D8F7D printfromtable BattleTextList_401528 waitmessage 64 - atk46 1, 0x20160a4, 0x0 - setbyte 0x2024d1e, 0 + atk46 1, gSharedMem + 0x160A4, 0x0 + setbyte gBattleCommunication, 0 BattleScript_1D8F95: @ 81D8F95 - atk32 0x2024c07, 0x2024a7a, 0x2024d1e, 1 + atk32 gBankAttacker, gTurnOrder, gBattleCommunication, 1 weatherdamage - jumpifword 0, 0x2024bec, 0x0, BattleScript_1D8FD6 + jumpifword 0, gBattleMoveDamage, 0x0, BattleScript_1D8FD6 printfromtable BattleTextList_40152C waitmessage 64 - orword 0x2024c6c, 0x1100120 + orword gHitMarker, 0x1100120 missmessage atk5c USER graphicalhpupdate USER @@ -3264,12 +3264,12 @@ BattleScript_1D8F95: @ 81D8F95 atk24 BattleScript_1D8FD6 BattleScript_1D8FD6: @ 81D8FD6 - jumpifbyte 1, 0x2024d26, 0, BattleScript_1D8FF5 - addbyte 0x2024d1e, 1 - jumpifarraynotequal 0x2024d1e, 0x2024a68, 1, BattleScript_1D8F95 + jumpifbyte 1, gBattleOutcome, 0, BattleScript_1D8FF5 + addbyte gBattleCommunication, 1 + jumpifarraynotequal gBattleCommunication, gNoOfAllBanks, 1, BattleScript_1D8F95 BattleScript_1D8FF5: @ 81D8FF5 - bicword 0x2024c6c, 0x1100120 + bicword gHitMarker, 0x1100120 end2 gUnknown_081D8FFF:: @ 81D8FFF @@ -3291,7 +3291,7 @@ gUnknown_081D9016:: @ 81D9016 gUnknown_081D901D:: @ 81D901D printfromtable BattleTextList_4015EE waitmessage 64 - atk46 1, 0x20160a4, 0x0 + atk46 1, gSharedMem + 0x160A4, 0x0 end3 gUnknown_081D9030:: @ 81D9030 @@ -3312,21 +3312,21 @@ gUnknown_081D9041:: @ 81D9041 end2 BattleScript_LeechSeedTurnDrain:: @ 81D904B - playanimation USER, 14, 0x20160a4 - orword 0x2024c6c, 0x100100 + playanimation USER, 14, gSharedMem + 0x160A4 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER - copyarray 0x2024bec, 0x2024bf0, 4 + copyarray gBattleMoveDamage, gHP_dealt, 4 jumpifability USER, ABILITY_LIQUID_OOZE, BattleScript_1D907D manipulatedamage 0 - setbyte 0x2024d23, 3 + setbyte gUnknown_02024D1F + 0x4, 3 jump BattleScript_1D9083 BattleScript_1D907D: @ 81D907D - setbyte 0x2024d23, 4 + setbyte gUnknown_02024D1F + 0x4, 4 BattleScript_1D9083: @ 81D9083 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate TARGET datahpupdate TARGET printfromtable BattleTextList_40154C @@ -3345,10 +3345,10 @@ BattleScript_BideAttack:: @ 81D90B2 waitmessage 64 accuracycheck BattleScript_1D6F77, 0 atk6 - bicbyte 0x2024c68, 6 - copyarray 0x2024bec, 0x2016090, 4 + bicbyte gBattleMoveFlags, 6 + copyarray gBattleMoveDamage, gSharedMem + 0x16090, 4 atk69 - setbyte 0x2016002, 1 + setbyte gSharedMem + 0x16002, 1 attackanimation waitanimation missmessage @@ -3372,8 +3372,8 @@ gUnknown_081D90FC:: @ 81D90FC atke2 TARGET atk58 TARGET waitstateatk - jumpifhalfword 4, 0x20239f8, 8, BattleScript_1D9116 - setbyte 0x2024d26, 5 + jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_1D9116 + setbyte gBattleOutcome, 5 atkf6 BattleScript_1D9116: @ 81D9116 @@ -3418,14 +3418,14 @@ BattleScript_EncoredNoMore:: @ 81D914F gUnknown_081D9156:: @ 81D9156 printstring BATTLE_TEXT_DestinyBondTaken waitmessage 64 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 return gUnknown_081D9171:: @ 81D9171 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER callatk BattleScript_1D91FB @@ -3434,12 +3434,12 @@ gUnknown_081D9171:: @ 81D9171 return BattleScript_1D9192: @ 81D9192 - setbyte 0x201600f, 0 + setbyte gSharedMem + 0x1600F, 0 atk23 1 jump gUnknown_081D8C7B gUnknown_081D919F:: @ 81D919F - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate TARGET datahpupdate TARGET callatk BattleScript_1D91FB @@ -3448,12 +3448,12 @@ gUnknown_081D919F:: @ 81D919F return BattleScript_1D91C0: @ 81D91C0 - setbyte 0x201600f, 0 + setbyte gSharedMem + 0x1600F, 0 atk23 0 jump gUnknown_081D8C7B gUnknown_081D91CD:: @ 81D91CD - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate 3 datahpupdate 3 callatk BattleScript_1D91FB @@ -3462,7 +3462,7 @@ gUnknown_081D91CD:: @ 81D91CD return BattleScript_1D91EE: @ 81D91EE - setbyte 0x201600f, 0 + setbyte gSharedMem + 0x1600F, 0 atk23 3 jump gUnknown_081D8C7B @@ -3474,7 +3474,7 @@ BattleScript_1D91FB: @ 81D91FB BattleScript_PerishSongHits:: @ 81D9202 printstring BATTLE_TEXT_PerishSongFell waitmessage 64 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 @@ -3493,33 +3493,33 @@ BattleScript_AllStatsUp:: @ 81D9224 jumpifstat USER, 0, 5, 12, BattleScript_1D92BF BattleScript_1D9251: @ 81D9251 - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 62, 0 - setbyte 0x201601e, 17 + setbyte gSharedMem + 0x1601E, 17 statbuffchange 65, BattleScript_1D926F printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D926F: @ 81D926F - setbyte 0x201601e, 18 + setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D9283 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D9283: @ 81D9283 - setbyte 0x201601e, 19 + setbyte gSharedMem + 0x1601E, 19 statbuffchange 65, BattleScript_1D9297 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D9297: @ 81D9297 - setbyte 0x201601e, 20 + setbyte gSharedMem + 0x1601E, 20 statbuffchange 65, BattleScript_1D92AB printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D92AB: @ 81D92AB - setbyte 0x201601e, 21 + setbyte gSharedMem + 0x1601E, 21 statbuffchange 65, BattleScript_1D92BF printfromtable BattleTextList_401570 waitmessage 64 @@ -3549,7 +3549,7 @@ BattleScript_SpikesFree:: @ 81D92D0 BattleScript_FutureSightHits:: @ 81D92D7 printstring BATTLE_TEXT_TookAttack waitmessage 64 - jumpifbyte 1, 0x2024d23, 0, BattleScript_1D92F4 + jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D92F4 accuracycheck BattleScript_1D934B, 248 jump BattleScript_1D92FB @@ -3558,7 +3558,7 @@ BattleScript_1D92F4: @ 81D92F4 BattleScript_1D92FB: @ 81D92FB atk8 - jumpifbyte 1, 0x2024d23, 0, BattleScript_1D9313 + jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D9313 playanimation USER, 18, 0x0 jump BattleScript_1D931A @@ -3577,20 +3577,20 @@ BattleScript_1D931A: @ 81D931A atk24 BattleScript_1D9332 BattleScript_1D9332: @ 81D9332 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 1, 0 - setbyte 0x201600c, 8 + setbyte gSharedMem + 0x1600C, 8 atk49 2, 14 - setbyte 0x2024c68, 0 + setbyte gBattleMoveFlags, 0 end2 BattleScript_1D934B: @ 81D934B pause 32 - setbyte 0x2024c68, 0 - orbyte 0x2024c68, 32 + setbyte gBattleMoveFlags, 0 + orbyte gBattleMoveFlags, 32 resultmessage waitmessage 64 - setbyte 0x2024c68, 0 + setbyte gBattleMoveFlags, 0 end2 BattleScript_NoMovesLeft:: @ 81D9365 @@ -3629,7 +3629,7 @@ BattleScript_WishComesTrue:: @ 81D939A playanimation TARGET, 22, 0x0 printstring BATTLE_TEXT_WishTrue waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth @@ -3648,7 +3648,7 @@ BattleScript_IngrainTurnHeal:: @ 81D93D1 playanimation USER, 21, 0x0 printstring BATTLE_TEXT_AbsorbNutrients waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER end2 @@ -3660,20 +3660,20 @@ BattleScript_1D93EC: @ 81D93EC jump BattleScript_EndTurn BattleScript_AtkDefDown:: @ 81D93FA - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 6, 13 playstatchangeanimation USER, 2, 9 - setbyte 0x201601e, 145 + setbyte gSharedMem + 0x1601E, 145 statbuffchange 193, BattleScript_1D9427 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D9427 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D9427 printfromtable BattleTextList_40157C waitmessage 64 BattleScript_1D9427: @ 81D9427 playstatchangeanimation USER, 4, 9 - setbyte 0x201601e, 146 + setbyte gSharedMem + 0x1601E, 146 statbuffchange 193, BattleScript_1D944A - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D944A + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D944A printfromtable BattleTextList_40157C waitmessage 64 @@ -3706,7 +3706,7 @@ BattleScript_MagicCoatBounce:: @ 81D946F pause 32 printstring BATTLE_TEXT_MagicCoatBounce waitmessage 64 - orword 0x2024c6c, 0x800c00 + orword gHitMarker, 0x800c00 atk76 USER, 1 return @@ -3717,7 +3717,7 @@ BattleScript_SnatchedMove:: @ 81D9487 playanimation TARGET, 17, 0x0 printstring BATTLE_TEXT_SnatchedMove waitmessage 64 - orword 0x2024c6c, 0x800c00 + orword gHitMarker, 0x800c00 atk5f return @@ -3732,11 +3732,11 @@ BattleScript_OneHitKOMsg:: @ 81D94A9 return BattleScript_SAtkDown2:: @ 81D94B0 - setbyte 0x20160dc, 0 + setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation USER, 16, 11 - setbyte 0x201601e, 164 + setbyte gSharedMem + 0x1601E, 164 statbuffchange 193, BattleScript_1D94D9 - jumpifbyte 0, 0x2024d23, 2, BattleScript_1D94D9 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D94D9 printfromtable BattleTextList_40157C waitmessage 64 @@ -3758,7 +3758,7 @@ BattleScript_MoveUsedIsAsleep:: @ 81D94EE jump BattleScript_EndTurn BattleScript_MoveUsedWokeUp:: @ 81D94FB - bicword 0x2024c6c, 0x10 + bicword gHitMarker, 0x10 printfromtable BattleTextList_401562 waitmessage 64 atk98 1 @@ -3778,7 +3778,7 @@ BattleScript_1D951E: @ 81D951E statusanimation USER BattleScript_1D9520: @ 81D9520 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 @@ -3836,7 +3836,7 @@ BattleScript_MoveUsedIsConfused:: @ 81D9595 printstring BATTLE_TEXT_Confused waitmessage 64 atk65 1, 0x7 - jumpifbyte 0, 0x2024d23, 0, BattleScript_1D95D3 + jumpifbyte 0, gUnknown_02024D1F + 0x4, 0, BattleScript_1D95D3 BattleScript_1D95AC: @ 81D95AC atk76 USER, 0 @@ -3846,7 +3846,7 @@ BattleScript_1D95AC: @ 81D95AC missmessage atk5c USER waitstateatk - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER faintpokemon USER, 0, 0x0 @@ -3866,7 +3866,7 @@ gUnknown_081D95DB:: @ 81D95DB return BattleScript_WrapTurnDmg:: @ 81D95E2 - playanimation USER, 6, 0x20160a4 + playanimation USER, 6, gSharedMem + 0x160A4 printstring BATTLE_TEXT_HurtBy waitmessage 64 jump BattleScript_1D9520 @@ -3976,11 +3976,11 @@ BattleScript_1D96BA:: @ 81D96BA return BattleScript_1D96C8:: @ 81D96C8 - jumpifhalfword 0, 0x2024be6, 165, BattleScript_1D96DB + jumpifhalfword 0, gCurrentMove, 165, BattleScript_1D96DB jumpifability USER, ABILITY_ROCK_HEAD, BattleScript_1D96F5 BattleScript_1D96DB: @ 81D96DB - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_HitRecoil @@ -4005,7 +4005,7 @@ BattleScript_DrizzleActivates:: @ 81D9704 end3 BattleScript_SpeedBoostActivates:: @ 81D9718 - playanimation USER, 1, 0x20160a4 + playanimation USER, 1, gSharedMem + 0x160A4 printstring BATTLE_TEXT_SpeedRisen waitmessage 64 end3 @@ -4019,7 +4019,7 @@ BattleScript_TraceActivates:: @ 81D9726 BattleScript_RainDishActivates:: @ 81D9730 printstring BATTLE_TEXT_RestoredHPByItem waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER end3 @@ -4039,12 +4039,12 @@ BattleScript_ShedSkinActivates:: @ 81D9758 end3 BattleScript_1D9761: @ 81D9761 - setbyte 0x2016003, 0 + setbyte gSharedMem + 0x16003, 0 BattleScript_1D9767: @ 81D9767 castformswitch - addbyte 0x2016003, 1 - jumpifarraynotequal 0x2016003, 0x2024a68, 1, BattleScript_1D9767 + addbyte gSharedMem + 0x16003, 1 + jumpifarraynotequal gSharedMem + 0x16003, gNoOfAllBanks, 1, BattleScript_1D9767 return BattleScript_CastformChange:: @ 81D977D @@ -4066,8 +4066,8 @@ BattleScript_1D9792: @ 81D9792 pause 32 gUnknown_081D9795:: @ 81D9795 - setbyte 0x2024c08, 0 - setbyte 0x201601e, 145 + setbyte gBankTarget, 0 + setbyte gSharedMem + 0x1601E, 145 BattleScript_1D97A1: @ 81D97A1 atke1 BattleScript_1D97EF @@ -4076,14 +4076,14 @@ BattleScript_1D97A1: @ 81D97A1 jumpifability TARGET, ABILITY_HYPER_CUTTER, BattleScript_1D97F0 jumpifability TARGET, ABILITY_WHITE_SMOKE, BattleScript_1D97F0 statbuffchange 33, BattleScript_1D97E4 - jumpifbyte 2, 0x2024d23, 1, BattleScript_1D97E4 + jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D97E4 atk47 - playanimation TARGET, 1, 0x20160a4 + playanimation TARGET, 1, gSharedMem + 0x160A4 printstring BATTLE_TEXT_CutsAttack waitmessage 64 BattleScript_1D97E4: @ 81D97E4 - addbyte 0x2024c08, 1 + addbyte gBankTarget, 1 jump BattleScript_1D97A1 BattleScript_1D97EF: @ 81D97EF @@ -4108,7 +4108,7 @@ BattleScript_TookAttack:: @ 81D9812 pause 32 printstring BATTLE_TEXT_TookAttack2 waitmessage 64 - orword 0x2024c6c, 0x400 + orword gHitMarker, 0x400 return gUnknown_081D9826:: @ 81D9826 @@ -4129,12 +4129,12 @@ BattleScript_MoveHPDrain_PPLoss:: @ 81D9842 BattleScript_MoveHPDrain:: @ 81D9843 attackstring pause 32 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_HPRestoredUsing waitmessage 64 - orbyte 0x2024c68, 8 + orbyte gBattleMoveFlags, 8 jump BattleScript_EndTurn BattleScript_MoveHPDrain_FullHP_PPLoss:: @ 81D9865 @@ -4145,7 +4145,7 @@ BattleScript_MoveHPDrain_FullHP:: @ 81D9866 pause 32 printstring BATTLE_TEXT_MadeUseless waitmessage 64 - orbyte 0x2024c68, 8 + orbyte gBattleMoveFlags, 8 jump BattleScript_EndTurn BattleScript_FlashFireBoost_PPLoss:: @ 81D987B @@ -4218,7 +4218,7 @@ BattleScript_AbilityNoSpecificStatLoss:: @ 81D9903 pause 32 printstring BATTLE_TEXT_PreventedLoss waitmessage 64 - setbyte 0x2024d23, 3 + setbyte gUnknown_02024D1F + 0x4, 3 return BattleScript_NoItemSteal:: @ 81D9913 @@ -4233,7 +4233,7 @@ BattleScript_ColorChangeActivates:: @ 81D9921 return BattleScript_RoughSkinActivates:: @ 81D9928 - orword 0x2024c6c, 0x100100 + orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_HurtOther @@ -4266,7 +4266,7 @@ gUnknown_081D9956:: @ 81D9956 gUnknown_081D995F:: @ 81D995F printstring BATTLE_TEXT_IgnoredOrdersSLP waitmessage 64 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 end @@ -4278,16 +4278,16 @@ gUnknown_081D996F:: @ 81D996F BattleScript_MoveUsedLoafingAround:: @ 81D9977 printfromtable BattleTextList_40160E waitmessage 64 - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 end gUnknown_081D9989:: @ 81D9989 printstring BATTLE_TEXT_BeganNap waitmessage 64 - setbyte 0x2024d21, 65 + setbyte gUnknown_02024D1F + 0x2, 65 seteffecttarget - setbyte 0x201600c, 0 + setbyte gSharedMem + 0x1600C, 0 atk49 2, 16 end @@ -4399,7 +4399,7 @@ BattleScript_ItemHealHP_RemoveItem:: @ 81D9A74 playanimation USER, 7, 0x0 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER removeitem USER @@ -4420,7 +4420,7 @@ BattleScript_ItemHealHP_Ret:: @ 81D9AA7 playanimation USER, 7, 0x0 printstring BATTLE_TEXT_RestoredHPLittle waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER return @@ -4439,12 +4439,12 @@ BattleScript_BerryConfuseHealEnd2:: @ 81D9AD4 playanimation USER, 7, 0x0 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - orword 0x2024c6c, 0x100 + orword gHitMarker, 0x100 graphicalhpupdate USER datahpupdate USER printstring BATTLE_TEXT_UnknownString2 waitmessage 64 - setbyte 0x2024d21, 71 + setbyte gUnknown_02024D1F + 0x2, 71 seteffecttarget removeitem USER end2 @@ -4454,7 +4454,7 @@ BattleScript_BerryStatRaiseEnd2:: @ 81D9AFE statbuffchange 65, BattleScript_1D9B0B BattleScript_1D9B0B: @ 81D9B0B - setbyte 0x2024d23, 4 + setbyte gUnknown_02024D1F + 0x4, 4 callatk BattleScript_StatUp removeitem USER end2 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index b10b7f96f..0833b7bf2 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -102,7 +102,7 @@ BattleScript_TrainerBallBlock:: @ 81D9F35 atkf6 BattleScript_1D9F45: @ 81D9F45 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 end @@ -118,7 +118,7 @@ BattleScript_1D9F4F: @ 81D9F4F printstring BATTLE_TEXT_RestoredHealth waitmessage 64 atk98 1 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -131,7 +131,7 @@ BattleScript_1D9F7B: @ 81D9F7B printfromtable BattleTextList_401620 waitmessage 64 atk98 1 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -143,7 +143,7 @@ BattleScript_1D9F9C: @ 81D9F9C atk75 printfromtable BattleTextList_401570 waitmessage 64 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -155,7 +155,7 @@ BattleScript_1D9FBB: @ 81D9FBB atk75 printfromtable BattleTextList_4015A0 waitmessage 64 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 diff --git a/data/contest.s b/data/contest.s index 0e06e9290..181d5ed13 100644 --- a/data/contest.s +++ b/data/contest.s @@ -297,10 +297,10 @@ gUnknown_083CC4B4:: @ 83CC4B4 .align 2 gUnknown_083CC4D4:: @ 83CC4D4 - obj_pal 0x20180A4, 33000 - obj_pal 0x20180C4, 33001 - obj_pal 0x20180E4, 33002 - obj_pal 0x2018104, 33003 + obj_pal gSharedMem + 0x180A4, 33000 + obj_pal gSharedMem + 0x180C4, 33001 + obj_pal gSharedMem + 0x180E4, 33002 + obj_pal gSharedMem + 0x18104, 33003 .align 2 gOamData_83CC4F4:: @ 83CC4F4 diff --git a/data/data2a.s b/data/data2a.s index 657fc6908..30803120d 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -7,31 +7,31 @@ .align 2 gSpriteImageTable_81E7A10:: @ 81E7A10 - obj_frame_tiles 0x2008000, 0x800 - obj_frame_tiles 0x2008800, 0x800 - obj_frame_tiles 0x2009000, 0x800 - obj_frame_tiles 0x2009800, 0x800 + obj_frame_tiles gSharedMem + 0x8000, 0x800 + obj_frame_tiles gSharedMem + 0x8800, 0x800 + obj_frame_tiles gSharedMem + 0x9000, 0x800 + obj_frame_tiles gSharedMem + 0x9800, 0x800 .align 2 gSpriteImageTable_81E7A30:: @ 81E7A30 - obj_frame_tiles 0x200A000, 0x800 - obj_frame_tiles 0x200A800, 0x800 - obj_frame_tiles 0x200B000, 0x800 - obj_frame_tiles 0x200B800, 0x800 + obj_frame_tiles gSharedMem + 0xA000, 0x800 + obj_frame_tiles gSharedMem + 0xA800, 0x800 + obj_frame_tiles gSharedMem + 0xB000, 0x800 + obj_frame_tiles gSharedMem + 0xB800, 0x800 .align 2 gSpriteImageTable_81E7A50:: @ 81E7A50 - obj_frame_tiles 0x200C000, 0x800 - obj_frame_tiles 0x200C800, 0x800 - obj_frame_tiles 0x200D000, 0x800 - obj_frame_tiles 0x200D800, 0x800 + obj_frame_tiles gSharedMem + 0xC000, 0x800 + obj_frame_tiles gSharedMem + 0xC800, 0x800 + obj_frame_tiles gSharedMem + 0xD000, 0x800 + obj_frame_tiles gSharedMem + 0xD800, 0x800 .align 2 gSpriteImageTable_81E7A70:: @ 81E7A70 - obj_frame_tiles 0x200E000, 0x800 - obj_frame_tiles 0x200E800, 0x800 - obj_frame_tiles 0x200F000, 0x800 - obj_frame_tiles 0x200F800, 0x800 + obj_frame_tiles gSharedMem + 0xE000, 0x800 + obj_frame_tiles gSharedMem + 0xE800, 0x800 + obj_frame_tiles gSharedMem + 0xF000, 0x800 + obj_frame_tiles gSharedMem + 0xF800, 0x800 .align 2 gSpriteAnim_81E7A90:: @ 81E7A90 diff --git a/data/data2b.s b/data/data2b.s index 329384396..e82e221c1 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -72,7 +72,7 @@ gSpriteTemplate_81FAF34:: @ 81FAF34 .align 2 gUnknown_081FAF4C:: @ 81FAF4C - .4byte 0x02008000 - .4byte 0x0200a000 - .4byte 0x0200c000 - .4byte 0x0200e000 + .4byte gSharedMem + 0x8000 + .4byte gSharedMem + 0xA000 + .4byte gSharedMem + 0xC000 + .4byte gSharedMem + 0xE000 diff --git a/data/easy_chat.s b/data/easy_chat.s index 436835d19..e0844b902 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -45,7 +45,7 @@ gBerryMasterWifePhrases:: @ 83DB680 .endif gUnknown_083DB694:: @ 83DB694 - .4byte 0x02001000 + .4byte gSharedMem + 0x1000 .align 2 gUnknown_083DB698:: @ 83DB698 @@ -114,15 +114,15 @@ gUnknown_083DB7C0:: @ 83DB7C0 .align 2 gUnknown_083DB7DC:: @ 83DB7DC .ifdef ENGLISH - .4byte 0x0200ac80 - .4byte 0x0200acc9 - .4byte 0x0200ad12 - .4byte 0x0200ad5b + .4byte gSharedMem + 0xAC80 + .4byte gSharedMem + 0xACC9 + .4byte gSharedMem + 0xAD12 + .4byte gSharedMem + 0xAD5B .else - .4byte 0x0200AFAC - .4byte 0x0200AFF5 - .4byte 0x0200B03E - .4byte 0x0200B087 + .4byte gSharedMem + 0xAFAC + .4byte gSharedMem + 0xAFF5 + .4byte gSharedMem + 0xB03E + .4byte gSharedMem + 0xB087 .endif .align 1 diff --git a/data/field_weather.s b/data/field_weather.s index 836bfbe99..86a7351bc 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -35,7 +35,7 @@ gUnknown_08396FA8:: @ 8396FA8 .4byte DroughtPaletteData_3 .4byte DroughtPaletteData_4 .4byte DroughtPaletteData_5 - .4byte 0x2000000 + .4byte gSharedMem .align 2 gUnknown_08396FC4:: @ 8396FC4 diff --git a/data/mail.s b/data/mail.s index f5ae7f102..e82212a42 100644 --- a/data/mail.s +++ b/data/mail.s @@ -175,4 +175,4 @@ gUnknown_083E57A4:: @ 83E57A4 @ XXX: what is this? .align 2 - .4byte 0x2000000 + .4byte gSharedMem diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index 9c23f8e89..0734a44d7 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -26,7 +26,7 @@ gUnknown_083F857A:: @ 83F857A @ XXX: what is this? .align 2 - .4byte 0x2000000 + .4byte gSharedMem .align 2 gUnknown_083F858C:: @ 83F858C @@ -60,7 +60,7 @@ gUnknown_083F865C:: @ 83F865C .align 2 gUnknown_083F8664:: @ 83F8664 - obj_tiles 0x02000FB4, 0x600, 3 + obj_tiles gSharedMem + 0xFB4, 0x600, 3 .align 2 gOamData_83F866C:: @ 83F866C diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s index d5faa24de..0908ddacb 100644 --- a/data/pokedex_cry_screen.s +++ b/data/pokedex_cry_screen.s @@ -37,7 +37,7 @@ gUnknown_083FB274:: @ 83FB274 .2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F .align 2 - .4byte 0x201C000 + .4byte gSharedMem + 0x1C000 .align 1 gUnknown_083FB6F8:: @ 83FB6F8 diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index e5d3e9282..b765656f7 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -126,7 +126,7 @@ gUnknown_083B6D94:: @ 83B6D94 .align 2 gUnknown_083B6DB4:: @ 83B6DB4 - .4byte 0x02000000 + .4byte gSharedMem .align 2 gUnknown_083B6DB8:: @ 83B6DB8 @@ -142,11 +142,11 @@ gWaveformSpriteSheet:: @ 83B6DC4 .align 2 gUnknown_083B6DCC:: @ 83B6DCC - obj_tiles 0x02002784, 0x800, 2 + obj_tiles gSharedMem + 0x2784, 0x800, 2 .align 2 gUnknown_083B6DD4:: @ 83B6DD4 - obj_pal 0x02002704, 56007 + obj_pal gSharedMem + 0x2704, 56007 .align 2 gSpriteTemplate_83B6DDC:: @ 83B6DDC diff --git a/data/pokenav.s b/data/pokenav.s index 3ea704c03..f84e45596 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -5,7 +5,7 @@ .align 2 gUnknown_083DFEC4:: @ 83DFEC4 - .4byte 0x2000000 + .4byte gSharedMem .align 2 gUnknown_083DFEC8:: @ 83DFEC8 diff --git a/data/roulette.s b/data/roulette.s index 47aa45215..64b7b82e2 100644 --- a/data/roulette.s +++ b/data/roulette.s @@ -621,10 +621,10 @@ gOamData_83FA328:: @ 83FA328 .align 2 gSpriteImageTable_83FA330:: @ 83FA330 - obj_frame_tiles 0x02017E00, 0x80 - obj_frame_tiles 0x02017E80, 0x80 - obj_frame_tiles 0x02017F00, 0x80 - obj_frame_tiles 0x02017F80, 0x80 + obj_frame_tiles gSharedMem + 0x17E00, 0x80 + obj_frame_tiles gSharedMem + 0x17E80, 0x80 + obj_frame_tiles gSharedMem + 0x17F00, 0x80 + obj_frame_tiles gSharedMem + 0x17F80, 0x80 .align 2 gSpriteAnim_83FA350:: @ 83FA350 @@ -732,13 +732,13 @@ gOamData_83FA454:: @ 83FA454 .align 2 gSpriteImageTable_83FA45C:: @ 83FA45C - obj_frame_tiles 0x02017000, 0x200 - obj_frame_tiles 0x02017200, 0x200 - obj_frame_tiles 0x02017400, 0x200 - obj_frame_tiles 0x02017600, 0x200 - obj_frame_tiles 0x02017800, 0x200 - obj_frame_tiles 0x02017A00, 0x200 - obj_frame_tiles 0x02017C00, 0x200 + obj_frame_tiles gSharedMem + 0x17000, 0x200 + obj_frame_tiles gSharedMem + 0x17200, 0x200 + obj_frame_tiles gSharedMem + 0x17400, 0x200 + obj_frame_tiles gSharedMem + 0x17600, 0x200 + obj_frame_tiles gSharedMem + 0x17800, 0x200 + obj_frame_tiles gSharedMem + 0x17A00, 0x200 + obj_frame_tiles gSharedMem + 0x17C00, 0x200 .align 2 gSpriteAnim_83FA494:: @ 83FA494 @@ -825,11 +825,11 @@ gOamData_83FA54C:: @ 83FA54C .align 2 gSpriteImageTable_83FA554: @ 83FA554 - obj_frame_tiles 0x02018000, 0x80 + obj_frame_tiles gSharedMem + 0x18000, 0x80 .align 2 gSpriteImageTable_83FA55C: @ 83FA55C - obj_frame_tiles 0x02018080, 0x100 + obj_frame_tiles gSharedMem + 0x18080, 0x100 .align 2 gSpriteAffineAnim_83FA564:: @ 83FA564 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index dbab17a8b..c3ff67902 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -17,7 +17,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 special PrintBattleTowerTrainerGreeting - msgbox 0x20234cc, 4 + msgbox gStringVar4, 4 waitmessage closemessage special ScrSpecial_HealPlayerParty diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 11b3ce7a3..5a526bd60 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -16,7 +16,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 waitmovement 0 special PrintEReaderTrainerGreeting - msgbox 0x20234cc, 4 + msgbox gStringVar4, 4 closemessage setvar 0x8004, 2 setvar 0x8005, 0 diff --git a/data/slot_machine.s b/data/slot_machine.s index 5f97c1f5e..9bd6fe5c9 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -534,23 +534,23 @@ gOamData_83ED0B8:: @ 83ED0B8 .align 2 gSpriteImageTable_83ED0C0:: @ 83ED0C0 - obj_frame_tiles 0x02013200, 0x800 - obj_frame_tiles 0x02013A00, 0x800 - obj_frame_tiles 0x02014200, 0x800 - obj_frame_tiles 0x02014A00, 0x800 - obj_frame_tiles 0x02015200, 0x800 + obj_frame_tiles gSharedMem + 0x13200, 0x800 + obj_frame_tiles gSharedMem + 0x13A00, 0x800 + obj_frame_tiles gSharedMem + 0x14200, 0x800 + obj_frame_tiles gSharedMem + 0x14A00, 0x800 + obj_frame_tiles gSharedMem + 0x15200, 0x800 .align 2 gSpriteImageTable_83ED0E8:: @ 83ED0E8 - obj_frame_tiles 0x02015A00, 0x300 + obj_frame_tiles gSharedMem + 0x15A00, 0x300 .align 2 gSpriteImageTable_83ED0F0:: @ 83ED0F0 - obj_frame_tiles 0x02015D00, 0x500 + obj_frame_tiles gSharedMem + 0x15D00, 0x500 .align 2 gSpriteImageTable_83ED0F8:: @ 83ED0F8 - obj_frame_tiles 0x02016200, 0x600 + obj_frame_tiles gSharedMem + 0x16200, 0x600 .align 2 gSpriteImageTable_83ED100:: @ 83ED100 @@ -593,67 +593,67 @@ gSpriteImageTable_83ED170:: @ 83ED170 .align 2 gSpriteImageTable_83ED178:: @ 83ED178 - obj_frame_tiles 0x02010000, 0x600 + obj_frame_tiles gSharedMem + 0x10000, 0x600 .align 2 gSpriteImageTable_83ED180:: @ 83ED180 - obj_frame_tiles 0x02010600, 0x200 + obj_frame_tiles gSharedMem + 0x10600, 0x200 .align 2 gSpriteImageTable_83ED188:: @ 83ED188 - obj_frame_tiles 0x02010800, 0x200 + obj_frame_tiles gSharedMem + 0x10800, 0x200 .align 2 gSpriteImageTable_83ED190:: @ 83ED190 - obj_frame_tiles 0x02010A00, 0x200 + obj_frame_tiles gSharedMem + 0x10A00, 0x200 .align 2 gSpriteImageTable_83ED198:: @ 83ED198 - obj_frame_tiles 0x02010C00, 0x300 + obj_frame_tiles gSharedMem + 0x10C00, 0x300 .align 2 gSpriteImageTable_83ED1A0:: @ 83ED1A0 - obj_frame_tiles 0x02011000, 0x400 + obj_frame_tiles gSharedMem + 0x11000, 0x400 .align 2 gSpriteImageTable_83ED1A8:: @ 83ED1A8 - obj_frame_tiles 0x02011400, 0x200 + obj_frame_tiles gSharedMem + 0x11400, 0x200 .align 2 gSpriteImageTable_83ED1B0:: @ 83ED1B0 - obj_frame_tiles 0x02011600, 0x300 + obj_frame_tiles gSharedMem + 0x11600, 0x300 .align 2 gSpriteImageTable_83ED1B8:: @ 83ED1B8 - obj_frame_tiles 0x02011900, 0x300 + obj_frame_tiles gSharedMem + 0x11900, 0x300 .align 2 gSpriteImageTable_83ED1C0:: @ 83ED1C0 - obj_frame_tiles 0x02011C00, 0x200 - obj_frame_tiles 0x02011E00, 0x200 - obj_frame_tiles 0x02011E00, 0x200 + obj_frame_tiles gSharedMem + 0x11C00, 0x200 + obj_frame_tiles gSharedMem + 0x11E00, 0x200 + obj_frame_tiles gSharedMem + 0x11E00, 0x200 @ is this a typo? .align 2 gSpriteImageTable_83ED1D8:: @ 83ED1D8 - obj_frame_tiles 0x02012000, 0x280 + obj_frame_tiles gSharedMem + 0x12000, 0x280 .align 2 gSpriteImageTable_83ED1E0:: @ 83ED1E0 - obj_frame_tiles 0x02012280, 0x80 - obj_frame_tiles 0x02012300, 0x80 - obj_frame_tiles 0x02012380, 0x80 - obj_frame_tiles 0x02012400, 0x80 - obj_frame_tiles 0x02012480, 0x80 + obj_frame_tiles gSharedMem + 0x12280, 0x80 + obj_frame_tiles gSharedMem + 0x12300, 0x80 + obj_frame_tiles gSharedMem + 0x12380, 0x80 + obj_frame_tiles gSharedMem + 0x12400, 0x80 + obj_frame_tiles gSharedMem + 0x12480, 0x80 .align 2 gSpriteImageTable_83ED208:: @ 83ED208 - obj_frame_tiles 0x02012600, 0x480 - obj_frame_tiles 0x02012A80, 0x480 + obj_frame_tiles gSharedMem + 0x12600, 0x480 + obj_frame_tiles gSharedMem + 0x12A80, 0x480 .align 2 gSpriteImageTable_83ED218:: @ 83ED218 - obj_frame_tiles 0x02012F00, 0x180 - obj_frame_tiles 0x02013080, 0x180 + obj_frame_tiles gSharedMem + 0x12F00, 0x180 + obj_frame_tiles gSharedMem + 0x13080, 0x180 .align 2 gSpriteImageTable_83ED228:: @ 83ED228 @@ -1402,15 +1402,15 @@ gUnknown_083EDC2C:: @ 83EDC2C obj_tiles gSlotMachineNumber7Tiles, 0x40, 14 obj_tiles gSlotMachineNumber8Tiles, 0x40, 15 obj_tiles gSlotMachineNumber9Tiles, 0x40, 16 - obj_tiles 0x2010a00, 0x200, 18 - obj_tiles 0x2011400, 0x200, 19 - obj_tiles 0x2011600, 0x300, 20 - obj_tiles 0x2011900, 0x300, 21 + obj_tiles gSharedMem + 0x10A00, 0x200, 18 + obj_tiles gSharedMem + 0x11400, 0x200, 19 + obj_tiles gSharedMem + 0x11600, 0x300, 20 + obj_tiles gSharedMem + 0x11900, 0x300, 21 null_obj_tiles .align 2 gUnknown_083EDCDC:: @ 83EDCDC - obj_tiles 0x02010000, 2048, 0x0011 + obj_tiles gSharedMem + 0x10000, 2048, 0x0011 .align 2 gUnknown_083EDCE4:: @ 83EDCE4 -- cgit v1.2.3 From fbdf867ce7bce6239c34c53beaabbcd555302a4f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 12 Nov 2017 16:40:04 -0800 Subject: Cleanup and document daycare.c --- data/scripts/day_care.inc | 34 +++++++++++++++++----------------- data/specials.inc | 20 ++++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'data') diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index f8151b86a..22d99f2a4 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -1,8 +1,8 @@ Route117_EventScript_1B222D:: @ 81B222D lock faceplayer - special sp0B5_daycare - specialvar RESULT, sp0B6_daycare + special GetDaycareMonNicknames + specialvar RESULT, GetDaycareState compare RESULT, 1 goto_if_eq Route117_EventScript_1B2262 compare RESULT, 2 @@ -22,7 +22,7 @@ Route117_EventScript_1B2262:: @ 81B2262 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 clearflag 134 - special sub_8041E7C + special RejectEggFromDayCare release end @@ -41,7 +41,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 waitmessage waitbutton msgbox Route117_Text_1B27CD, 4 - special sp0B8_daycare + special GiveEggFromDaycare clearflag 134 release end @@ -57,7 +57,7 @@ Route117_EventScript_1B22DE:: @ 81B22DE return Route117_EventScript_1B22E7:: @ 81B22E7 - special sp0B5_daycare + special GetDaycareMonNicknames msgbox Route117_Text_1B2710, 4 setvar 0x8004, 0 call Route117_EventScript_1B22CD @@ -65,9 +65,9 @@ Route117_EventScript_1B22E7:: @ 81B22E7 end Route117_EventScript_1B22FE:: @ 81B22FE - special sp0B5_daycare + special GetDaycareMonNicknames msgbox Route117_Text_1B2897, 4 - special sp0B9_daycare_relationship_comment + special SetDaycareCompatibilityString special ShowFieldMessageStringVar4 waitmessage waitbutton @@ -81,7 +81,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 lock faceplayer - specialvar RESULT, sp0B6_daycare + specialvar RESULT, GetDaycareState compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B2407 compare RESULT, 2 @@ -108,14 +108,14 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C specialvar RESULT, sub_8095C10 compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD - specialvar 0x8005, sub_8042328 + specialvar 0x8005, GetSelectedDaycareMonNickname waitse playpokecry 0x8005, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 waitpokecry - special Daycare_SendPokemon_Special + special StoreSelectedPokemonInDaycare incrementgamestat GAME_STAT_USED_DAYCARE - specialvar RESULT, sp0B6_daycare + specialvar RESULT, GetDaycareState compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23DA release @@ -153,7 +153,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 return Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A - specialvar RESULT, sub_80417B8 + specialvar RESULT, GetNumLevelsGainedFromDaycare compare RESULT, 0 call_if 5, Route117_PokemonDayCare_EventScript_1B2411 return @@ -175,7 +175,7 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 specialvar RESULT, CalculatePlayerPartyCount compare RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 - specialvar RESULT, sp0B6_daycare + specialvar RESULT, GetDaycareState setvar 0x8004, 0 compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 @@ -188,7 +188,7 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 end Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 - special sub_8041770 + special GetDaycareCost msgbox Route117_PokemonDayCare_Text_1B2B49, 5 compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4 @@ -206,7 +206,7 @@ Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE applymovement 1, Route117_PokemonDayCare_Movement_1B2543 waitmovement 0 - specialvar RESULT, sub_8041648 + specialvar RESULT, TakePokemonFromDaycare special sub_80B7D0C playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 @@ -214,7 +214,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE playpokecry RESULT, 0 msgbox Route117_PokemonDayCare_Text_1B2B93, 4 waitpokecry - specialvar RESULT, sp0B6_daycare + specialvar RESULT, GetDaycareState compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 goto Route117_PokemonDayCare_EventScript_1B23D0 @@ -276,7 +276,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 copyvar 0x8004, RESULT - specialvar RESULT, sub_8041648 + specialvar RESULT, TakePokemonFromDaycare msgbox Route117_PokemonDayCare_Text_1B2B75, 4 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release diff --git a/data/specials.inc b/data/specials.inc index 0b3648c4a..efa8da174 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -188,18 +188,18 @@ gSpecials:: 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 GetDaycareMonNicknames + def_special GetDaycareState + def_special RejectEggFromDayCare + def_special GiveEggFromDaycare + def_special SetDaycareCompatibilityString + def_special GetSelectedDaycareMonNickname + def_special StoreSelectedPokemonInDaycare def_special ChooseSendDaycareMon def_special ShowDaycareLevelMenu - def_special sub_80417B8 - def_special sub_8041770 - def_special sub_8041648 + def_special GetNumLevelsGainedFromDaycare + def_special GetDaycareCost + def_special TakePokemonFromDaycare def_special ScriptHatchMon def_special EggHatch def_special sub_8042B4C -- cgit v1.2.3 From 92d37c52fd3be7c3382d9a2e51a81afd843816fa Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 13 Nov 2017 04:37:00 -0500 Subject: migrate battle_message data to src (TODO, german) --- data/battle_message.s | 131 --- data/text/battle_strings.inc | 1830 ------------------------------------------ 2 files changed, 1961 deletions(-) delete mode 100644 data/battle_message.s delete mode 100644 data/text/battle_strings.inc (limited to 'data') diff --git a/data/battle_message.s b/data/battle_message.s deleted file mode 100644 index 0ad61bfc0..000000000 --- a/data/battle_message.s +++ /dev/null @@ -1,131 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .include "data/text/battle_strings.inc" - - .align 1 -gUnknown_084016BC:: @ 84016BC - .2byte 0xE - .2byte 0x46 - .2byte 0x4A - .2byte 0x6A - .2byte 0x6B - .2byte 0x6C - .2byte 0x6E - .2byte 0x6F - .2byte 0x79 - .2byte 0x7B - .2byte 0x7D - .2byte 0x94 - .2byte 0x96 - .2byte 0x97 - .2byte 0x9B - .2byte 0x9C - .2byte 0x9F - .2byte 0xA4 - .2byte 0xAA - .2byte 0xAD - .2byte 0xB6 - .2byte 0xBF - .2byte 0xCB - .2byte 0xCD - .2byte 0xCF - .2byte 0xD6 - .2byte 0xED - .2byte 0xF4 - .2byte 0xF5 - .2byte 0x10A - .2byte 0x10F - .2byte 0x112 - .2byte 0x113 - .2byte 0x11A - .2byte 0x125 - .2byte 0x136 - .2byte 0x13C - .2byte 0x140 - .2byte 0x149 - .2byte 0x14A - .2byte 0x14E - .2byte 0x154 - .2byte 0x0 - .2byte 0x64 - .2byte 0x69 - .2byte 0x75 - .2byte 0x85 - .2byte 0xAF - .2byte 0x10D - .2byte 0x153 - .2byte 0x0 - .2byte 0x60 - .2byte 0x61 - .2byte 0x66 - .2byte 0x68 - .2byte 0x8C - .2byte 0x90 - .2byte 0xA5 - .2byte 0xB8 - .2byte 0x10C - .2byte 0x111 - .2byte 0x118 - .2byte 0x119 - .2byte 0x129 - .2byte 0x12A - .2byte 0x12C - .2byte 0x139 - .2byte 0x15A - .2byte 0x15B - .2byte 0x0 - .2byte 0x1 - .2byte 0xA - .2byte 0xB - .2byte 0x11 - .2byte 0x13 - .2byte 0x14 - .2byte 0x15 - .2byte 0x1E - .2byte 0x23 - .2byte 0x25 - .2byte 0x27 - .2byte 0x2B - .2byte 0x2C - .2byte 0x2D - .2byte 0x2E - .2byte 0x2F - .2byte 0x40 - .2byte 0x47 - .2byte 0x51 - .2byte 0x59 - .2byte 0x5A - .2byte 0x5B - .2byte 0x5C - .2byte 0x67 - .2byte 0x76 - .2byte 0x7A - .2byte 0x80 - .2byte 0x84 - .2byte 0x8B - .2byte 0x91 - .2byte 0xA3 - .2byte 0xA9 - .2byte 0xAB - .2byte 0xAE - .2byte 0xC1 - .2byte 0xCC - .2byte 0xD5 - .2byte 0xF9 - .2byte 0xFD - .2byte 0xFF - .2byte 0x100 - .2byte 0x103 - .2byte 0x104 - .2byte 0x110 - .2byte 0x11B - .2byte 0x141 - .2byte 0x157 - .2byte 0x0 - - .align 2 -gUnknown_084017A8:: @ 84017A8 - .4byte -1, -1 diff --git a/data/text/battle_strings.inc b/data/text/battle_strings.inc deleted file mode 100644 index 7a47caa0e..000000000 --- a/data/text/battle_strings.inc +++ /dev/null @@ -1,1830 +0,0 @@ -BattleText_UnknownString: - .string "{STRING 33}$" -BattleText_GainExpPoints: - .string "{STRING 0} gained{STRING 1}\n{STRING 42} EXP. Points!\p$" -BattleText_Terminator: - .string "$" -BattleText_BoostedExp: - .string " a boosted$" -BattleText_GrewLevel: - .string "{STRING 0} grew to\nLV. {STRING 1}!{UNKNOWN_A}\p$" -BattleText_LearnedMove: - .string "{STRING 0} learned\n{STRING 1}!{UNKNOWN_A}\p$" -BattleText_TryingToLearnMove: - .string "{STRING 0} is trying to\nlearn {STRING 1}.\p$" -BattleText_CantLearnMore: - .string "But, {STRING 0} can’t learn\nmore than four moves.\p$" -BattleText_DeleteMove: - .string "Delete a move to make\nroom for {STRING 1}?$" -BattleText_DeletedMove: - .string "{STRING 0} forgot\n{STRING 1}.\p$" -BattleText_StopLearning: - .string "{PAUSE 32}Stop learning\n{STRING 1}?$" -BattleText_DidNotLearn: - .string "{STRING 0} did not learn\n{STRING 1}.\p$" -BattleText_UseNext: - .string "Use next POKéMON?$" -BattleText_AttackMissed: - .string "{ATTACKING_MON}’s\nattack missed!$" -BattleText_ProtectedItself: - .string "{DEFENDING_MON}\nprotected itself!$" -BattleText_AvoidedDamage: - .string "{DEFENDING_MON} avoided\ndamage with {STRING 22}!$" -BattleText_GroundMoveNegate: - .string "{DEFENDING_MON} makes GROUND\nmoves miss with {STRING 22}!$" -BattleText_AvoidedAttack: - .string "{DEFENDING_MON} avoided\nthe attack!$" -BattleText_DoesntAffect: - .string "It doesn’t affect\n{DEFENDING_MON}...$" -BattleText_AttackingFainted: - .string "{ATTACKING_MON}\nfainted!\p$" -BattleText_DefendingFainted: - .string "{DEFENDING_MON}\nfainted!\p$" -BattleText_WinningPrize: - .string "{STRING 32} got ¥{STRING 0}\nfor winning!\p$" -BattleText_OutOfUsablePoke: - .string "{STRING 32} is out of\nuseable POKéMON!\p$" -BattleText_WhitedOut: - .string "{STRING 32} whited out!{PAUSE_UNTIL_PRESS}$" -BattleText_PreventEscape: - .string "{STRING 16} prevents\nescape with {STRING 23}!\p$" -BattleText_CantEscape: - .string "Can’t escape!\p$" -BattleText_AttackingCantEscape: - .string "{ATTACKING_MON}\ncan’t escape!$" -BattleText_HitMulti: - .string "Hit {STRING 0} time(s)!$" -BattleText_FellAsleep: - .string "{STRING 14}\nfell asleep!$" -BattleText_MadeAsleep: - .string "{STRING 16}’s {STRING 23}\nmade {STRING 14} sleep!$" -BattleText_DefendingAsleep: - .string "{DEFENDING_MON} is\nalready asleep!$" -BattleText_AttackingAsleep: - .string "{ATTACKING_MON} is\nalready asleep!$" -BattleText_WasntAffected: - .string "{DEFENDING_MON}\nwasn’t affected!$" -BattleText_Poisoned: - .string "{STRING 14}\nwas poisoned!$" -BattleText_Poisoned2: - .string "{STRING 16}’s {STRING 23}\npoisoned {STRING 14}!$" -BattleText_PoisonHurt: - .string "{ATTACKING_MON} is hurt\nby poison!$" -BattleText_AlreadyPoisoned: - .string "{DEFENDING_MON} is already\npoisoned.$" -BattleText_BadlyPoisoned: - .string "{STRING 14} is badly\npoisoned!$" -BattleText_EnergyDrained: - .string "{DEFENDING_MON} had its\nenergy drained!$" -BattleText_Burned: - .string "{STRING 14} was burned!$" -BattleText_Burned2: - .string "{STRING 16}’s {STRING 23}\nburned {STRING 14}!$" -BattleText_BurnHurt: - .string "{ATTACKING_MON} is hurt\nby its burn!$" -BattleText_AlreadyBurned: - .string "{DEFENDING_MON} already\nhas a burn.$" -BattleText_Frozen: - .string "{STRING 14} was\nfrozen solid!$" -BattleText_Frozen2: - .string "{STRING 16}’s {STRING 23}\nfroze {STRING 14} solid!$" -BattleText_FrozenSolid: - .string "{ATTACKING_MON} is\nfrozen solid!$" -BattleText_DefendingDefrosted: - .string "{DEFENDING_MON} was\ndefrosted!$" -BattleText_AttackingDefrosted: - .string "{ATTACKING_MON} was\ndefrosted!$" -BattleText_Defrosted: - .string "{ATTACKING_MON} was\ndefrosted by {STRING 17}!$" -BattleText_Paralyzed: - .string "{STRING 14} is paralyzed!\nIt may be unable to move!$" -BattleText_Paralyzed2: - .string "{STRING 16}’s {STRING 23}\nparalyzed {STRING 14}!\lIt may be unable to move!$" -BattleText_Paralyzed3: - .string "{ATTACKING_MON} is paralyzed!\nIt can’t move!$" -BattleText_AlreadyParalyzed: - .string "{DEFENDING_MON} is\nalready paralyzed!$" -BattleText_ParalysisHealed: - .string "{DEFENDING_MON} was\nhealed of paralysis!$" -BattleText_DreamEaten: - .string "{DEFENDING_MON}’s\ndream was eaten!$" -BattleText_AttackingStatNoHigher: - .string "{ATTACKING_MON}’s {STRING 0}\nwon’t go higher!$" -BattleText_DefendingStatNoHigher: - .string "{DEFENDING_MON}’s {STRING 0}\nwon’t go lower!$" -BattleText_StoppedWorking: - .string "Your team’s {STRING 0}\nstopped working!$" -BattleText_StoppedWorking2: - .string "The foe’s {STRING 0}\nstopped working!$" -BattleText_Confused: - .string "{ATTACKING_MON} is\nconfused!$" -BattleText_ConfusionSnapOut: - .string "{ATTACKING_MON} snapped\nout of confusion!$" -BattleText_BecameConfused: - .string "{STRING 14} became\nconfused!$" -BattleText_AlreadyConfused: - .string "{DEFENDING_MON} is\nalready confused!$" -BattleText_FellLove: - .string "{DEFENDING_MON}\nfell in love!$" -BattleText_InLoveWith: - .string "{ATTACKING_MON} is in love\nwith {STRING 16}!$" -BattleText_ImmobilizedBy: - .string "{ATTACKING_MON} is\nimmobilized by love!$" -BattleText_BlownAway: - .string "{DEFENDING_MON} was\nblown away!$" -BattleText_TypeTransform: - .string "{ATTACKING_MON} transformed\ninto the {STRING 0} type!$" -BattleText_Flinched: - .string "{ATTACKING_MON} flinched!$" -BattleText_RegainedHealth: - .string "{DEFENDING_MON} regained\nhealth!$" -BattleText_HPFull: - .string "{DEFENDING_MON}’s\nHP is full!$" -BattleText_RaisedSpDef: - .string "{STRING 38}’s {STRING 17}\nraised SP. DEF!$" -BattleText_RaisedSpDefLittle: - .string "{STRING 38}’s {STRING 17}\nraised SP. DEF a little!$" -BattleText_RaisedDefense: - .string "{STRING 38}’s {STRING 17}\nraised DEFENSE!$" -BattleText_RaisedDefenseLittle: - .string "{STRING 38}’s {STRING 17}\nraised DEFENSE a little!$" -BattleText_CoveredVeil: - .string "{STRING 38} is covered\nby a veil!$" -BattleText_SafeguardActive: - .string "{DEFENDING_MON} is protected\nby SAFEGUARD!$" -BattleText_SafeguardFaded: - .string "{STRING 40}’s SAFEGUARD\nfaded!$" -BattleText_WentToSleep: - .string "{ATTACKING_MON} went\nto sleep!$" -BattleText_SpeltHealthy: - .string "{ATTACKING_MON} slept and\nbecame healthy!$" -BattleText_WhipWhirlwind: - .string "{ATTACKING_MON} whipped\nup a whirlwind!$" -BattleText_TookSunlight: - .string "{ATTACKING_MON} took\nin sunlight!$" -BattleText_LoweredHead: - .string "{ATTACKING_MON} lowered\nits head!$" -BattleText_IsGlowing: - .string "{ATTACKING_MON} is glowing!$" -BattleText_FlewHigh: - .string "{ATTACKING_MON} flew\nup high!$" -BattleText_DugHole: - .string "{ATTACKING_MON} dug a hole!$" -BattleText_HidUnderwater: - .string "{ATTACKING_MON} hid\nunderwater!$" -BattleText_SprangUp: - .string "{ATTACKING_MON} sprang up!$" -BattleText_SqueezedBind: - .string "{DEFENDING_MON} was squeezed by\n{ATTACKING_MON}’s BIND!$" -BattleText_TrappedVortex: - .string "{DEFENDING_MON} was trapped\nin the vortex!$" -BattleText_SandTombTrapped: - .string "{DEFENDING_MON} was trapped\nby SAND TOMB!$" -BattleText_Wrapped: - .string "{DEFENDING_MON} was WRAPPED by\n{ATTACKING_MON}!$" -BattleText_Clamped: - .string "{ATTACKING_MON} CLAMPED\n{DEFENDING_MON}!$" -BattleText_HurtBy: - .string "{ATTACKING_MON} is hurt\nby {STRING 0}!$" -BattleText_FreedFrom: - .string "{ATTACKING_MON} was freed\nfrom {STRING 0}!$" -BattleText_KeptGoingCrash: - .string "{ATTACKING_MON} kept going\nand crashed!$" - -gUnknown_083FEE5D:: @ 83FEE5D -BattleText_MistShroud: - .string "{STRING 38} became\nshrouded in MIST!$" -BattleText_MistProtect: - .string "{STRING 16} is protected\nby MIST!$" - -gUnknown_083FEE92:: @ 83FEE92 -BattleText_GetPumped: - .string "{ATTACKING_MON} is getting\npumped!$" -BattleText_HitRecoil: - .string "{ATTACKING_MON} is hit\nwith recoil!$" -BattleText_ProtectedItself2: - .string "{ATTACKING_MON} protected\nitself!$" -BattleText_SandBuffeted: - .string "{ATTACKING_MON} is buffeted\nby the sandstorm!$" -BattleText_HailStricken: - .string "{ATTACKING_MON} is stricken\nby HAIL!$" -BattleText_WoreOff: - .string "{STRING 36}’s {STRING 0}\nwore off!$" -BattleText_WasSeeded: - .string "{DEFENDING_MON} was seeded!$" -BattleText_EvadedAttack: - .string "{DEFENDING_MON} evaded\nthe attack!$" -BattleText_HealthSapped: - .string "{ATTACKING_MON}’s health is\nsapped by LEECH SEED!$" -BattleText_FastAsleep: - .string "{ATTACKING_MON} is fast\nasleep.$" -BattleText_WokeUp: - .string "{ATTACKING_MON} woke up!$" -BattleText_UproarAwake: - .string "But {STRING 16}’s UPROAR\nkept it awake!$" -BattleText_UproarWoke: - .string "{ATTACKING_MON} woke up\nin the UPROAR!$" -BattleText_UproarCaused: - .string "{ATTACKING_MON} caused\nan UPROAR!$" -BattleText_UproarMaking: - .string "{ATTACKING_MON} is making\nan UPROAR!$" -BattleText_CalmedDown: - .string "{ATTACKING_MON} calmed down.$" -BattleText_UproarCantSleep: - .string "But {DEFENDING_MON} can’t\nsleep in an UPROAR!$" -BattleText_Stockpiled: - .string "{ATTACKING_MON} STOCKPILED\n{STRING 0}!$" -BattleText_StockpiledCant: - .string "{ATTACKING_MON} can’t\nSTOCKPILE any more!$" -BattleText_UproarCantSleep2: - .string "But {DEFENDING_MON} can’t\nsleep in an UPROAR!$" -BattleText_UproarKeptAwake: - .string "But the UPROAR kept\n{DEFENDING_MON} awake!$" -BattleText_StayedAwake: - .string "{DEFENDING_MON} stayed awake\nusing its {STRING 22}!$" -BattleText_StoringEnergy: - .string "{ATTACKING_MON} is storing\nenergy!$" -BattleText_UnleashedEnergy: - .string "{ATTACKING_MON} unleashed\nenergy!$" -BattleText_FatigueConfuse: - .string "{ATTACKING_MON} became\nconfused out of fatigue!$" -BattleText_PickedUpYen: - .string "{STRING 32} picked up\n¥{STRING 0}!\p$" -BattleText_Unaffected: - .string "{DEFENDING_MON} is\nunaffected!$" -BattleText_Transformed: - .string "{ATTACKING_MON} transformed\ninto {STRING 0}!$" -BattleText_SubMade: - .string "{ATTACKING_MON} made\na SUBSTITUTE!$" -BattleText_SubAlready: - .string "{ATTACKING_MON} already\nhas a SUBSTITUTE!$" -BattleText_SubTookDamage: - .string "The SUBSTITUTE took damage\nfor {DEFENDING_MON}!\p$" -BattleText_SubFaded: - .string "{DEFENDING_MON}’s\nSUBSTITUTE faded!\p$" -BattleText_MustRecharge: - .string "{ATTACKING_MON} must\nrecharge!$" -BattleText_RageBuilding: - .string "{DEFENDING_MON}’s RAGE\nis building!$" -BattleText_MoveWasDisabled: - .string "{DEFENDING_MON}’s {STRING 0}\nwas disabled!$" -BattleText_DisabledNoMore: - .string "{ATTACKING_MON} is disabled\nno more!$" -BattleText_EncoreGot: - .string "{DEFENDING_MON} got\nan ENCORE!$" -BattleText_EncoreEnded: - .string "{ATTACKING_MON}’s ENCORE\nended!$" -BattleText_TookAim: - .string "{ATTACKING_MON} took aim\nat {DEFENDING_MON}!$" -BattleText_SketchedMove: - .string "{ATTACKING_MON} SKETCHED\n{STRING 0}!$" -BattleText_DestinyBondTake: - .string "{ATTACKING_MON} is trying\nto take its foe with it!$" -BattleText_DestinyBondTaken: - .string "{DEFENDING_MON} took\n{ATTACKING_MON} with it!$" -BattleText_ReducedBy: - .string "Reduced {DEFENDING_MON}’s\n{STRING 0} by {STRING 1}!$" -BattleText_StoleSomething: - .string "{ATTACKING_MON} stole\n{DEFENDING_MON}’s {STRING 19}!$" -BattleText_CantEscapeNow: - .string "{DEFENDING_MON} can’t\nescape now!$" -BattleText_NightmareStart: - .string "{DEFENDING_MON} fell into\na NIGHTMARE!$" -BattleText_NightmareLock: - .string "{ATTACKING_MON} is locked\nin a NIGHTMARE!$" -BattleText_CurseLay: - .string "{ATTACKING_MON} cut its own HP\nand laid a CURSE on\l{DEFENDING_MON}!$" -BattleText_CurseAfflict: - .string "{ATTACKING_MON} is afflicted\nby the CURSE!$" -BattleText_SpikesScattered: - .string "{STRING 37} POKéMON team had SPIKES\nscattered around it!$" -BattleText_SpikesHurt: - .string "{STRING 16} is hurt\nby SPIKES!$" -BattleText_IdentifiedPoke: - .string "{ATTACKING_MON} identified\n{DEFENDING_MON}!$" -BattleText_PerishSongFell: - .string "{ATTACKING_MON}’s PERISH count\nfell to {STRING 0}!$" -BattleText_BracedItself: - .string "{ATTACKING_MON} braced\nitself!$" -BattleText_EnduredHit: - .string "{DEFENDING_MON} ENDURED\nthe hit!$" -BattleText_MagnitudeCount: - .string "MAGNITUDE {STRING 0}!$" -BattleText_CutHPMaxATK: - .string "{ATTACKING_MON} cut its own HP\nand maximized ATTACK!$" -BattleText_CopyStatChanges: - .string "{ATTACKING_MON} copied\n{DEFENDING_MON}’s stat changes!$" -BattleText_GotFreeFrom: - .string "{ATTACKING_MON} got free of\n{DEFENDING_MON}’s {STRING 0}!$" -BattleText_LeechShed: - .string "{ATTACKING_MON} shed\nLEECH SEED!$" -BattleText_SpikesBlownAway: - .string "{ATTACKING_MON} blew away\nSPIKES!$" -BattleText_FledBattle: - .string "{ATTACKING_MON} fled from\nbattle!$" -BattleText_ForesawAttack: - .string "{ATTACKING_MON} foresaw\nan attack!$" -BattleText_TookAttack: - .string "{DEFENDING_MON} took\n{STRING 0}’s attack!$" -BattleText_ChoseDestiny: - .string "{ATTACKING_MON} chose\n{STRING 17} as its destiny!$" -BattleText_PokeAttack: - .string "{STRING 0}’s attack!$" -BattleText_CenterAttention: - .string "{ATTACKING_MON} became the\ncenter of attention!$" -BattleText_ChargingPower: - .string "{ATTACKING_MON} began\ncharging power!$" -BattleText_NaturePower: - .string "NATURE POWER turned into\n{STRING 17}!$" -BattleText_StatusNormal: - .string "{ATTACKING_MON}’s status\nreturned to normal!$" -BattleText_TormentSubject: - .string "{DEFENDING_MON} was subjected\nto TORMENT!$" -BattleText_TightenFocus: - .string "{ATTACKING_MON} is tightening\nits focus!$" -BattleText_TauntFell: - .string "{DEFENDING_MON} fell for\nthe TAUNT!$" -BattleText_ReadyToHelp: - .string "{ATTACKING_MON} is ready to\nhelp {DEFENDING_MON}!$" -BattleText_SwitchedItems: - .string "{ATTACKING_MON} switched\nitems with its opponent!$" -BattleText_Obtained1: - .string "{ATTACKING_MON} obtained\n{STRING 0}.$" -BattleText_Obtained2: - .string "{DEFENDING_MON} obtained\n{STRING 1}.$" -BattleText_Obtained3: - .string "{ATTACKING_MON} obtained\n{STRING 0}.\p{DEFENDING_MON} obtained\n{STRING 1}.$" -BattleText_CopiedObject: - .string "{ATTACKING_MON} copied\n{DEFENDING_MON}’s {STRING 22}!$" -BattleText_WishMade: - .string "{ATTACKING_MON} made a WISH!$" -BattleText_WishTrue: - .string "{STRING 0}’s WISH\ncame true!$" -BattleText_PlantedRoots: - .string "{ATTACKING_MON} planted its roots!$" -BattleText_AbsorbNutrients: - .string "{ATTACKING_MON} absorbed\nnutrients with its roots!$" -BattleText_AnchoredItself: - .string "{DEFENDING_MON} anchored\nitself with its roots!$" -BattleText_DrowsyMade: - .string "{ATTACKING_MON} made\n{DEFENDING_MON} drowsy!$" -BattleText_KnockedOffItem: - .string "{ATTACKING_MON} knocked off\n{DEFENDING_MON}’s {STRING 19}!$" -BattleText_AbilitySwap: - .string "{ATTACKING_MON} swapped abilities\nwith its opponent!$" -BattleText_SealedMove: - .string "{ATTACKING_MON} sealed the\nopponent’s move(s)!$" -BattleText_GrudgeBear: - .string "{ATTACKING_MON} wants the\nopponent to bear a GRUDGE!$" -BattleText_GrudgeLosePP: - .string "{ATTACKING_MON}’s {STRING 0}\nlost all its PP due to\lthe GRUDGE!$" -BattleText_ShroudedItself: - .string "{ATTACKING_MON} shrouded\nitself in {STRING 17}!$" -BattleText_MagicCoatBounce: - .string "{ATTACKING_MON}’s {STRING 17}\nwas bounced back by MAGIC COAT!$" -BattleText_AwaitMove: - .string "{ATTACKING_MON} awaits its foe\nto make a move!$" -BattleText_SnatchedMove: - .string "{DEFENDING_MON} SNATCHED\n{STRING 16}’s move!$" -BattleText_ElecWeakened: - .string "Electricity’s power was\nweakened!$" -BattleText_FireWeakened: - .string "Fire’s power was\nweakened!$" -BattleText_FoundOne: - .string "{ATTACKING_MON} found\none {STRING 19}!$" -BattleText_SoothingAroma: - .string "A soothing aroma wafted\nthrough the area!$" -BattleText_CantUseItems: - .string "Items can’t be used now.{PAUSE 64}$" -BattleText_UnknownString2: - .string "For {STRING 16},\n{STRING 19} {STRING 0}$" -BattleText_HustleUse: - .string "{STRING 16} used\n{STRING 19} to hustle!$" -BattleText_LostFocus: - .string "{ATTACKING_MON} lost its\nfocus and couldn’t move!$" -BattleText_DraggedOut: - .string "{DEFENDING_MON} was\ndragged out!\p$" -BattleText_BrokeWall: - .string "The wall shattered!$" -BattleText_NoEffect: - .string "But it had no effect!$" -BattleText_NoMovesLeft: - .string "{STRING 15} has no\nmoves left!\p$" -BattleText_MoveIsDisabled: - .string "{STRING 15}’s {STRING 17}\nis disabled!\p$" -BattleText_TormentNoUse: - .string "{STRING 15} can’t use the same\nmove twice in a row due to the TORMENT!\p$" -BattleText_TauntNoUse: - .string "{STRING 15} can’t use\n{STRING 17} after the TAUNT!\p$" -BattleText_SealedNoUse: - .string "{STRING 15} can’t use the\nsealed {STRING 17}!\p$" -BattleText_RainMade: - .string "{STRING 16}’s {STRING 23}\nmade it rain!$" -BattleText_SpeedRisen: - .string "{STRING 16}’s {STRING 23}\nraised its SPEED!$" -BattleText_ProtectedBy: - .string "{DEFENDING_MON} was protected\nby {STRING 22}!$" -BattleText_PreventedBy: - .string "{DEFENDING_MON}’s {STRING 22}\nprevents {ATTACKING_MON}\lfrom using {STRING 17}!$" -BattleText_HPRestoredUsing: - .string "{DEFENDING_MON} restored HP\nusing its {STRING 22}!$" -BattleText_MadeUseless: - .string "{DEFENDING_MON}’s {STRING 22}\nmade {STRING 17} useless!$" -BattleText_MadeType: - .string "{DEFENDING_MON}’s {STRING 22}\nmade it the {STRING 0} type!$" -BattleText_PreventedPara: - .string "{STRING 14}’s {STRING 22}\nprevents paralysis!$" -BattleText_PreventedRomance: - .string "{DEFENDING_MON}’s {STRING 22}\nprevents romance!$" -BattleText_PreventedPoison: - .string "{STRING 14}’s {STRING 22}\nprevents poisoning!$" -BattleText_PreventedConfusion: - .string "{DEFENDING_MON}’s {STRING 22}\nprevents confusion!$" -BattleText_RaisedFirePower: - .string "{DEFENDING_MON}’s {STRING 22}\nraised its FIRE power!$" -BattleText_AnchorsItself: - .string "{DEFENDING_MON} anchors\nitself with {STRING 22}!$" -BattleText_CutsAttack: - .string "{STRING 16}’s {STRING 23}\ncuts {DEFENDING_MON}’s ATTACK!$" -BattleText_PreventedStatLoss: - .string "{STRING 16}’s {STRING 23}\nprevents stat loss!$" -BattleText_HurtOther: - .string "{DEFENDING_MON}’s {STRING 22}\nhurt {ATTACKING_MON}!$" -BattleText_Traced: - .string "{STRING 16} TRACED\n{STRING 0}’s {STRING 1}!$" -BattleText_PreventedBurn: - .string "{STRING 14}’s {STRING 24}\nprevents burns!$" -BattleText_BlocksOther: - .string "{DEFENDING_MON}’s {STRING 22}\nblocks {STRING 17}!$" -BattleText_BlocksOther2: - .string "{STRING 16}’s {STRING 23}\nblocks {STRING 17}!$" -BattleText_RestoredHPByItem: - .string "{ATTACKING_MON}’s {STRING 21}\nrestored some HP!$" -BattleText_WhipSandstorm: - .string "{STRING 16}’s {STRING 23}\nwhipped up a sandstorm!$" -BattleText_SunIntensified: - .string "{STRING 16}’s {STRING 23}\nintensified the sun’s rays!$" -BattleText_PreventedLoss: - .string "{STRING 16}’s {STRING 23}\nprevents {STRING 0} loss!$" -BattleText_InfatuatedPoke: - .string "{DEFENDING_MON}’s {STRING 22}\ninfatuated {ATTACKING_MON}!$" -BattleText_MadeIneffective: - .string "{DEFENDING_MON}’s {STRING 22}\nmade {STRING 17} ineffective!$" -BattleText_CuredProblem: - .string "{STRING 16}’s {STRING 23}\ncured its {STRING 0} problem!$" -BattleText_OozeSuckup: - .string "It sucked up the\nLIQUID OOZE!$" -BattleText_Transformed2: - .string "{STRING 16} transformed!$" -BattleText_TookAttack2: - .string "{DEFENDING_MON}’s {STRING 22}\ntook the attack!$" - -gUnknown_083FFCCA:: @ 83FFCCA -BattleText_PreventedSwitch:: - .string "{STRING 0}’s {STRING 20}\nprevents switching!\p$" -BattleText_PreventedOther: - .string "{DEFENDING_MON}’s {STRING 22}\nprevented {STRING 16}’s\l{STRING 0} from working!$" -BattleText_MadeIneffective2: - .string "{STRING 16}’s {STRING 23}\nmade it ineffective!$" -BattleText_PreventedFlinching: - .string "{STRING 14}’s {STRING 24}\nprevents flinching!$" -BattleText_PreventedOther2: - .string "{ATTACKING_MON}’s {STRING 21}\nprevents {DEFENDING_MON}’s\l{STRING 22} from working!$" -BattleText_CuredOfProblem: - .string "{STRING 16}’s {STRING 23}\ncured its {STRING 0} problem!$" -BattleText_NoEffectOn: - .string "{STRING 16}’s {STRING 23}\nhad no effect on {STRING 14}!$" -BattleText_Sharply: - .string "sharply $" - -gUnknown_083FFDB3:: @ 83FFDB3 -BattleText_Rose: - .string "rose!$" -BattleText_Harshly: - .string "harshly $" -BattleText_Fell: - .string "fell!$" -BattleText_UnknownString7: - .string "{ATTACKING_MON}’s {STRING 0}\n{STRING 1}$" - -gUnknown_083FFDD3:: @ 83FFDD3 -BattleText_UnknownString3: - .string "{DEFENDING_MON}’s {STRING 0}\n{STRING 1}$" -BattleText_UnknownString4: - .string "Using {STRING 19}, the {STRING 0}\nof {STRING 16} {STRING 1}$" -BattleText_UnknownString5: - .string "{ATTACKING_MON}’s {STRING 0}\n{STRING 1}$" -BattleText_UnknownString6: - .string "{DEFENDING_MON}’s {STRING 0}\n{STRING 1}$" -BattleText_StatNoHigher: - .string "{ATTACKING_MON}’s stats won’t\ngo any higher!$" -BattleText_StatNoLower: - .string "{DEFENDING_MON}’s stats won’t\ngo any lower!$" -BattleText_Critical: - .string "A critical hit!$" -BattleText_GrandSlam: - .string "It’s a one-hit KO!$" -BattleText_MoveForget123: - .string "{PAUSE 32}1, {PAUSE 15}2 and...{PAUSE 15} ...{PAUSE 15} ...{PAUSE 15}\n{PAUSE 15}{PLAY_SE SE_KON}Poof!\p$" -BattleText_MoveForgetAnd: - .string "And...\p$" -BattleText_CantForgetHM: - .string "HM moves can’t be\nforgotten now.\p$" -BattleText_NotEffective: - .string "It’s not very effective...$" -BattleText_SuperEffective: - .string "It’s super effective!$" - -gUnknown_083FFEFC:: @ 83FFEFC -BattleText_GotAwaySafely: - .string "{PLAY_SE SE_NIGERU}Got away safely!\p$" -BattleText_FledUsingItem: - .string "{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing its {STRING 19}!\p$" -BattleText_FledUsingOther: - .string "{PLAY_SE SE_NIGERU}{ATTACKING_MON} fled\nusing {STRING 21}!\p$" -BattleText_FledWild: - .string "{PLAY_SE SE_NIGERU}Wild {STRING 0} fled!$" - -gUnknown_083FFF56:: @ 83FFF56 -BattleText_PlayerDefeatedTrainer: - .string "Player defeated\n{STRING 29}!$" - -gUnknown_083FFF6A:: @ 83FFF6A -BattleText_PlayerDefeatedTrainers: - .string "Player beat {STRING 30}\nand {STRING 29}!$" - -gUnknown_083FFF81:: @ 83FFF81 -BattleText_PlayerLostTrainer: - .string "Player lost against\n{STRING 29}!$" - -gUnknown_083FFF99:: @ 83FFF99 -BattleText_PlayerLostTrainers: - .string "Player lost to {STRING 30}\nand {STRING 29}!$" - -gUnknown_083FFFB3:: @ 83FFFB3 -BattleText_PlayerTiedTrainer: - .string "Player tied against\n{STRING 29}!$" - -gUnknown_083FFFCB:: @ 83FFFCB -BattleText_PlayerTiedTrainers: - .string "Player tied against {STRING 30}\nand {STRING 29}!$" - -gUnknown_083FFFEA:: @ 83FFFEA -BattleText_FledSingle: - .string "{PLAY_SE SE_NIGERU}{STRING 29} fled!$" - -gUnknown_083FFFF7:: @ 83FFFF7 -BattleText_FledDouble: - .string "{PLAY_SE SE_NIGERU}{STRING 29} and\n{STRING 30} fled!$" -BattleText_NoRunning: - .string "No! There’s no running\nfrom a TRAINER battle!\p$" -BattleText_CantEscape2: - .string "Can’t escape!\p$" -BattleText_BirchDontLeaveMe: - .string "PROF. BIRCH: D-don’t leave\nme here like this!\p$" -BattleText_Nothing: - .string "But nothing happened!$" -BattleText_Failed: - .string "But it failed!$" -BattleText_HurtItself: - .string "It hurt itself in its\nconfusion!$" -BattleText_MirrorFail: - .string "The MIRROR MOVE failed!$" -BattleText_RainStart: - .string "It started to rain!$" -BattleText_PourStart: - .string "A downpour started!$" -BattleText_RainCont1: - .string "Rain continues to fall.$" -BattleText_PourCont: - .string "The downpour continues.$" -BattleText_RainStop: - .string "The rain stopped.$" -BattleText_SandBrewed: - .string "A sandstorm brewed!$" -BattleText_SandRages: - .string "The sandstorm rages.$" -BattleText_SandSubsided: - .string "The sandstorm subsided.$" -BattleText_SunBright: - .string "The sunlight got bright!$" -BattleText_SunStrong: - .string "The sunlight is strong.$" -BattleText_SunFaded: - .string "The sunlight faded.$" -BattleText_HailStart: - .string "It started to hail!$" -BattleText_HailCont: - .string "Hail continues to fall.$" -BattleText_HailStop: - .string "The hail stopped.$" -BattleText_SpitUpFail: - .string "But it failed to SPIT UP\na thing!$" -BattleText_SwallowFail: - .string "But it failed to SWALLOW\na thing!$" -BattleText_WindHeatWave: - .string "The wind turned into a\nHEAT WAVE!$" -BattleText_StatElim: - .string "All stat changes were\neliminated!$" -BattleText_CoinScatter: - .string "Coins scattered everywhere!$" -BattleText_SubWeak: - .string "It was too weak to make\na SUBSTITUTE!$" -BattleText_PainSplit: - .string "The battlers shared\ntheir pain!$" -BattleText_BellChime: - .string "A bell chimed!$" -BattleText_PerishSong: - .string "All affected POKéMON will\nfaint in 3 turns!$" -BattleText_NoPP1: - .string "There’s no PP left for\nthis move!\p$" -BattleText_NoPP2: - .string "But there was no PP left\nfor the move!$" -BattleText_IgnoredOrdersSLP: - .string "{ATTACKING_MON} ignored\norders while asleep!$" -BattleText_IgnoredOrders: - .string "{ATTACKING_MON} ignored\norders!$" -BattleText_BeganNap: - .string "{ATTACKING_MON} began to nap!$" -BattleText_LoafingAround: - .string "{ATTACKING_MON} is\nloafing around!$" -BattleText_WontObey: - .string "{ATTACKING_MON} won’t\nobey!$" -BattleText_TurnedAway: - .string "{ATTACKING_MON} turned away!$" -BattleText_NotNotice: - .string "{ATTACKING_MON} pretended\nto not notice!$" -BattleText_WillSwitch: - .string "{STRING 25} {STRING 26} is\nabout to use {STRING 1}.\pWill {STRING 32} change\nPOKéMON?$" -BattleText_LearnedMove2: - .string "{ATTACKING_MON} learned\n{STRING 0}!$" -BattleText_PlayerDefeatedTrainer2: - .string "Player defeated\n{STRING 25} {STRING 26}!\p$" -BattleText_CreptCloser: - .string "{STRING 32} crept closer to\n{STRING 3}!$" -BattleText_CantGetCloser: - .string "{STRING 32} can’t get any closer!$" -BattleText_WatchingCarefully: - .string "{STRING 3} is watching\ncarefully!$" -BattleText_CuriousAbout: - .string "{STRING 3} is curious about\nthe {STRING 0}!$" -BattleText_EnthralledBy: - .string "{STRING 3} is enthralled by\nthe {STRING 0}!$" -BattleText_IgnoredThing: - .string "{STRING 3} completely ignored\nthe {STRING 0}!$" -BattleText_ThrewBlock: - .string "{STRING 32} threw a {POKEBLOCK}\nat the {STRING 3}!$" -BattleText_SafariOver: - .string "{PLAY_SE SE_PINPON}ANNOUNCER: You’re out of\nSAFARI BALLS! Game over!\p$" - -gUnknown_08400555:: @ 8400555 -BattleText_WildAppeared1: - .string "Wild {STRING 3} appeared!\p$" - -gUnknown_08400568:: @ 8400568 -BattleText_WildAppeared2: - .string "Wild {STRING 3} appeared!\p$" - -gUnknown_0840057B:: @ 840057B -BattleText_WildAppeared3: - .string "Wild {STRING 3} appeared!{PAUSE 127}$" - -gUnknown_08400590:: @ 8400590 -BattleText_WildDoubleAppeared: - .string "Wild {STRING 5} and\n{STRING 3} appeared!\p$" - -gUnknown_084005AA:: @ 84005AA -BattleText_SingleWantToBattle1: - .string "{STRING 25} {STRING 26}\nwould like to battle!\p$" - -gUnknown_084005C7:: @ 84005C7 -BattleText_SingleWantToBattle2: - .string "{STRING 29}\nwants to battle!$" - -gUnknown_084005DB:: @ 84005DB -BattleText_DoubleWantToBattle: - .string "{STRING 29} and {STRING 30}\nwant to battle!$" - -gUnknown_084005F5:: @ 84005F5 -BattleText_SentOutSingle1: - .string "{STRING 25} {STRING 26} sent\nout {STRING 3}!$" - -gUnknown_08400608:: @ 8400608 -BattleText_SentOutDouble1: - .string "{STRING 25} {STRING 26} sent\nout {STRING 3} and {STRING 5}!$" - -gUnknown_08400622:: @ 8400622 -BattleText_SentOutSingle2: - .string "{STRING 25} {STRING 26} sent\nout {STRING 0}!$" - -gUnknown_08400635:: @ 8400635 -BattleText_SentOutSingle3: - .string "{STRING 29} sent\nout {STRING 3}!$" - -gUnknown_08400645:: @ 8400645 -BattleText_SentOutDouble2: - .string "{STRING 29} sent out\n{STRING 3} and {STRING 5}!$" - -gUnknown_0840065C:: @ 840065C -BattleText_SentOutDouble3: - .string "{STRING 29} sent out\n{STRING 7}!\p{STRING 30} sent out\n{STRING 9}!$" - -gUnknown_0840067C:: @ 840067C -BattleText_SentOutSingle4: - .string "{STRING 29} sent out\n{STRING 0}!$" - -gUnknown_0840068C:: @ 840068C -BattleText_SentOutSingle5: - .string "{STRING 31} sent out\n{STRING 0}!$" - -gUnknown_0840069C:: @ 840069C -BattleText_SentOutSingle6: - .string "Go! {STRING 2}!$" - -gUnknown_084006A4:: @ 84006A4 -BattleText_SentOutDouble4: - .string "Go! {STRING 2} and\n{STRING 4}!$" - -gUnknown_084006B3:: @ 84006B3 -BattleText_SentOutSingle7: - .string "Go! {STRING 0}!$" - -gUnknown_084006BB:: @ 84006BB -BattleText_SentOutSingle8: - .string "Do it! {STRING 0}!$" - -gUnknown_084006C6:: @ 84006C6 -BattleText_SentOutSingle9: - .string "Go for it, {STRING 0}!$" - -gUnknown_084006D5:: @ 84006D5 -BattleText_SentOutSingle10: - .string "Your foe’s weak!\nGet’m, {STRING 0}!$" - -gUnknown_084006F1:: @ 84006F1 -BattleText_SentOutSingle11: - .string "{STRING 28} sent out\n{STRING 8}!\pGo! {STRING 6}!$" - -gUnknown_08400709:: @ 8400709 -BattleText_ComeBackSingle1: - .string "{STRING 0}, that’s enough!\nCome back!$" - -gUnknown_08400727:: @ 8400727 -BattleText_ComeBackSingle2: - .string "{STRING 0}, come back!$" - -gUnknown_08400736:: @ 8400736 -BattleText_ComeBackSingle3: - .string "{STRING 0}, OK!\nCome back!$" - -gUnknown_08400749:: @ 8400749 -BattleText_ComeBackSingle4: - .string "{STRING 0}, good!\nCome back!$" - -gUnknown_0840075E:: @ 840075E -BattleText_WithdrewPoke1: - .string "{STRING 25} {STRING 26}\nwithdrew {STRING 0}!$" - -gUnknown_08400771:: @ 8400771 -BattleText_WithdrewPoke2: - .string "{STRING 29} withdrew\n{STRING 0}!$" - -gUnknown_08400781:: @ 8400781 -BattleText_WithdrewPoke3: - .string "{STRING 31} withdrew\n{STRING 0}!$" - -gUnknown_08400791:: @ 8400791 -BattleText_Wild: - .string "Wild $" - -gUnknown_08400797:: @ 8400797 -BattleText_Foe: - .string "Foe $" - -gUnknown_0840079C:: @ 840079C -BattleText_Foe2: - .string "Foe $" - -gUnknown_084007A1:: @ 84007A1 -BattleText_Ally: - .string "Ally $" - -gUnknown_084007A7:: @ 84007A7 -BattleText_Foe3: - .string "Foe $" - -gUnknown_084007AC:: @ 84007AC -BattleText_Ally2: - .string "Ally $" - -gUnknown_084007B2:: @ 84007B2 -BattleText_Foe4: - .string "Foe $" - -gUnknown_084007B7:: @ 84007B7 -BattleText_Ally3: - .string "Ally $" - -gUnknown_084007BD:: @ 84007BD -BattleText_OpponentUsedMove: - .string "{ATTACKING_MON} used\n{STRING 1}$" - -gUnknown_084007C8:: @ 84007C8 -BattleText_Exclamation2: @ out of order but whatever - .string "!$" - -gUnknown_084007CA:: @ 84007CA -BattleText_Exclamation3: - .string "!$" - -gUnknown_084007CC:: @ 84007CC -BattleText_Exclamation4: - .string "!$" - -gUnknown_084007CE:: @ 84007CE -BattleText_Exclamation5: - .string "!$" - -gUnknown_084007D0:: @ 84007D0 -BattleText_Exclamation: - .string "!$" -BattleStatText_HP: - .string "HP$" -BattleStatText_Attack: - .string "ATTACK$" -BattleStatText_Defense: - .string "DEFENSE$" -BattleStatText_Speed: - .string "SPEED$" -BattleStatText_SpAtk: - .string "SP. ATK$" -BattleStatText_SpDef: - .string "SP. DEF$" -BattleStatText_Accuracy: - .string "accuracy$" -BattleStatText_Evasion: - .string "evasiveness$" -ContestStatText_TooSpicy: - .string "was too spicy!$" -ContestStatText_TooDry: - .string "was too dry!$" -ContestStatText_TooSweet: - .string "was too sweet!$" -ContestStatText_TooBitter: - .string "was too bitter!$" -ContestStatText_TooSour: - .string "was too sour!$" -BattleText_Used1: - .string "{STRING 32} used\n{STRING 19}!$" -BattleText_TutorialUsed: - .string "WALLY used\n{STRING 19}!$" -BattleText_Used2: - .string "{STRING 25} {STRING 26}\nused {STRING 19}!$" -BattleText_BlockBall: - .string "The TRAINER blocked the BALL!$" -BattleText_DontBeAThief: - .string "Don’t be a thief!$" -BattleText_DodgeBall: - .string "It dodged the thrown BALL!\nThis POKéMON can’t be caught!$" -BattleText_MissPoke: - .string "You missed the POKéMON!$" -BattleText_BallBrokeOhNo: - .string "Oh, no!\nThe POKéMON broke free!$" -BattleText_BallBrokeAppeared: - .string "Aww!\nIt appeared to be caught!$" -BattleText_BallBrokeAlmost: - .string "Aargh!\nAlmost had it!$" -BattleText_BallBrokeSoClose: - .string "Shoot!\nIt was so close, too!$" -BattleText_BallCaught1: - .string "Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}\p$" -BattleText_BallCaught2: - .string "Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}{PAUSE 127}$" -BattleText_GiveNickname: - .string "Give a nickname to the\ncaptured {STRING 3}?$" -BattleText_SentToPC: - .string "{STRING 3} was sent to\n{STRING 35} PC.$" - -gUnknown_084009ED:: @ 84009ED -BattleText_Someone: - .string "someone’s$" - -gUnknown_084009F7:: @ 84009F7 -BattleText_Lanette: - .string "LANETTE’s$" -BattleText_AddedToDex: - .string "{STRING 3}’s data was\nadded to the POKéDEX.\p$" -BattleText_Raining: - .string "It is raining.$" -BattleText_Sandstorm: - .string "A sandstorm is raging.$" -BattleText_BoxFull: - .string "The BOX is full!\nYou can’t catch any more!\p$" - -gUnknown_08400A78:: @ 8400A78 -BattleText_EnigmaBerry: - .string "ENIGMA BERRY$" - -gUnknown_08400A85:: @ 8400A85 -BattleText_Berry: - .string " BERRY$" -BattleText_CuredParalysis: - .string "{STRING 16}’s {STRING 19}\ncured paralysis!$" -BattleText_CuredPoison: - .string "{STRING 16}’s {STRING 19}\ncured poison!$" -BattleText_CuredBurn: - .string "{STRING 16}’s {STRING 19}\nhealed its burn!$" -BattleText_CuredFreeze: - .string "{STRING 16}’s {STRING 19}\ndefrosted it!$" -BattleText_CuredSleep: - .string "{STRING 16}’s {STRING 19}\nwoke it from its sleep!$" -BattleText_CuredConfusion: - .string "{STRING 16}’s {STRING 19}\nsnapped it out of confusion!$" -BattleText_CuredStatus: - .string "{STRING 16}’s {STRING 19}\ncured its {STRING 0} problem!$" -BattleText_NormalizedStatus: - .string "{STRING 16}’s {STRING 19}\nnormalized its status!$" -BattleText_RestoredHealth: - .string "{STRING 16}’s {STRING 19}\nrestored health!$" -BattleText_RestoredPP: - .string "{STRING 16}’s {STRING 19}\nrestored {STRING 0}’s PP!$" -BattleText_RestoredStatus: - .string "{STRING 16}’s {STRING 19}\nrestored its status!$" -BattleText_RestoredHPLittle: - .string "{STRING 16}’s {STRING 19}\nrestored its HP a little!$" -BattleText_ChoiceBand: - .string "{STRING 19} allows the\nuse of only {STRING 17}!\p$" -BattleText_FocusSash: - .string "{DEFENDING_MON} hung on\nusing its {STRING 19}!$" -BattleText_Terminator2: - .string "$" -BattleText_WallyBall: - .string "You throw a BALL now, right?\nI... I’ll do my best!$" - -gUnknown_08400C4A:: @ 8400C4A -BattleText_StartEvo: - .string "What?\n{STRING 2} is evolving!$" - -gUnknown_08400C60:: @ 8400C60 -BattleText_FinishEvo: - .string "Congratulations! Your {STRING 2}\nevolved into {STRING 3}!{UNKNOWN_A}\p$" - -gUnknown_08400C8D:: @ 8400C8D -BattleText_StopEvo: - .string "Huh? {STRING 2}\nstopped evolving!\p$" - -gUnknown_08400CA8:: @ 8400CA8 -BattleText_OtherMenu: - .string "What should\n{STRING 15} do?$" - -gUnknown_08400CBB:: @ 8400CBB -BattleText_PlayerMenu: - .string "What will\n{STRING 32} do?$" - -gUnknown_08400CCC:: @ 8400CCC -BattleText_WallyMenu: - .string "What will\nWALLY do?$" - -gUnknown_08400CE0:: @ 8400CE0 -BattleText_LinkStandby: - .string "{PAUSE 16}Link standby...$" - -gUnknown_08400CF3:: @ 8400CF3 -BattleText_MenuOptions: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}FIGHT{CLEAR_TO 0x2E}BAG\nPOKéMON{CLEAR_TO 0x2E}RUN$" - -gUnknown_08400D15:: @ 8400D15 -BattleText_MenuOptionsSafari: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}BALL{CLEAR_TO 0x2E}{POKEBLOCK}\nGO NEAR{CLEAR_TO 0x2E}RUN$" - -gUnknown_08400D38:: @ 8400D38 -BattleText_PP: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}PP\nTYPE/$" - -gUnknown_08400D49:: @ 8400D49 -BattleText_Format: @ cant think of a better name - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}$" - -gUnknown_08400D52:: @ 8400D52 -BattleText_ForgetMove: - .string "{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}{PALETTE 5}Which move should\nbe forgotten?$" - -gUnknown_08400D7A:: @ 8400D7A -BattleText_YesNo: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}Yes\nNo$" - -gUnknown_08400D89:: @ 8400D89 -BattleText_SwitchWhich: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}Switch\nwhich?$" - -gUnknown_08400D9F:: @ 8400D9F -BattleText_Format2: - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW SKY_BLUE LIGHT_BLUE WHITE2}$" -BattleText_RightArrow: - .string "{RIGHT_ARROW}$" - -gUnknown_08400DAA:: @ 8400DAA -BattleText_Plus: - .string "+$" - -gUnknown_08400DAC:: @ 8400DAC -@ someone improve the formatting of this please -BattleText_Dash: - .string "-$" -BattleText_HP: - .string "HP $" -BattleText_Attack: - .string "ATTACK $" -BattleText_Defense: - .string "DEFENSE$" -BattleText_SpAtk: - .string "SP. ATK$" -BattleText_SpDef: - .string "SP. DEF$" - -gUnknown_08400DD6:: @ 8400DD6 -BattleText_SafariBalls:: - .string "{HIGHLIGHT RED}SAFARI BALLS$" - -gUnknown_08400DE6:: @ 8400DE6 -BattleText_SafariBallsLeft:: - .string "{HIGHLIGHT RED}Left: $" - -gUnknown_08400DF0:: @ 8400DF0 -BattleText_HighlightRed:: - .string "{HIGHLIGHT RED}$" - -BattleText_Sleep:: - .string "sleep$" -BattleText_PoisonStatus:: - .string "poison$" -BattleText_Burn:: - .string "burn$" -BattleText_Paralysis:: - .string "paralysis$" -BattleText_IceStatus:: - .string "ice$" -BattleText_Confusion:: - .string "confusion$" -BattleText_Love:: - .string "love$" - -gUnknown_08400E23:: @ 8400E23 -BattleText_Format3: - .string " and $" - -gUnknown_08400E29:: @ 8400E29 -BattleText_Format4: - .string ", $" - -gUnknown_08400E2C:: @ 8400E2C -BattleText_Format5: - .string " $" - -gUnknown_08400E2E:: @ 8400E2E -BattleText_Format6: - .string "\l$" - -gUnknown_08400E30:: @ 8400E30 -BattleText_Format7: - .string "\n$" - -gUnknown_08400E32:: @ 8400E32 -BattleText_Format8: - .string "are$" - -gUnknown_08400E36:: @ 8400E36 -BattleText_Format9: - .string "are$" - -gBadEggNickname:: @ 8400E3A - .string "Bad EGG$" - -gUnknown_08400E42:: @ 8400E42 -BattleText_Wally:: - .string "WALLY$" - -BattleText_Win:: @ 8400E48 - .string "{HIGHLIGHT TRANSPARENT}Win$" - -BattleText_Loss:: @ 8400E4F - .string "{HIGHLIGHT TRANSPARENT}Loss$" - -BattleText_Tie:: @ 8400E57 - .string "{HIGHLIGHT TRANSPARENT}Tie$" - -gUnknown_08400E5E:: @ 8400E5E -BattleText_Format10: - .string " is$" - -gUnknown_08400E62:: @ 8400E62 -BattleText_Format11: - .string "’s$" -BattleText_Normal: - .string "a NORMAL move$" -BattleText_Fighting: - .string "a FIGHTING move$" -BattleText_Flying: - .string "a FLYING move$" -BattleText_Poison: - .string "a POISON move$" -BattleText_Ground: - .string "a GROUND move$" -BattleText_Rock: - .string "a ROCK move$" -BattleText_Bug: - .string "a BUG move$" -BattleText_Ghost: - .string "a GHOST move$" -BattleText_Steel: - .string "a STEEL move$" -BattleText_Typeless: - .string "a ??? move$" -BattleText_Fire: - .string "a FIRE move$" -BattleText_Water: - .string "a WATER move$" -BattleText_Grass: - .string "a GRASS move$" -BattleText_Electric: - .string "an ELECTRIC move$" -BattleText_Psychic: - .string "a PSYCHIC move$" -BattleText_Ice: - .string "an ICE move$" -BattleText_Dragon: - .string "a DRAGON move$" -BattleText_Dark: - .string "a DARK move$" - - .align 2 -gUnknown_08400F58:: @ 8400F58 - .4byte BattleStatText_HP - .4byte BattleStatText_Attack - .4byte BattleStatText_Defense - .4byte BattleStatText_Speed - .4byte BattleStatText_SpAtk - .4byte BattleStatText_SpDef - .4byte BattleStatText_Accuracy - .4byte BattleStatText_Evasion - - .align 2 -gUnknown_08400F78:: @ 8400F78 - .4byte ContestStatText_TooSpicy - .4byte ContestStatText_TooDry - .4byte ContestStatText_TooSweet - .4byte ContestStatText_TooBitter - .4byte ContestStatText_TooSour - - .align 2 -gBattleStringsTable:: @ 8400F8C - .4byte BattleText_UnknownString - .4byte BattleText_GainExpPoints - .4byte BattleText_GrewLevel - .4byte BattleText_LearnedMove - .4byte BattleText_TryingToLearnMove - .4byte BattleText_CantLearnMore - .4byte BattleText_DeleteMove - .4byte BattleText_DeletedMove - .4byte BattleText_StopLearning - .4byte BattleText_DidNotLearn - .4byte BattleText_LearnedMove2 - .4byte BattleText_AttackMissed - .4byte BattleText_ProtectedItself - .4byte BattleText_StatNoHigher - .4byte BattleText_AvoidedDamage - .4byte BattleText_DoesntAffect - .4byte BattleText_AttackingFainted - .4byte BattleText_DefendingFainted - .4byte BattleText_WinningPrize - .4byte BattleText_OutOfUsablePoke - .4byte BattleText_WhitedOut - .4byte BattleText_PreventEscape - .4byte BattleText_HitMulti - .4byte BattleText_FellAsleep - .4byte BattleText_MadeAsleep - .4byte BattleText_DefendingAsleep - .4byte BattleText_AttackingAsleep - .4byte BattleText_WasntAffected - .4byte BattleText_Poisoned - .4byte BattleText_Poisoned2 - .4byte BattleText_PoisonHurt - .4byte BattleText_AlreadyPoisoned - .4byte BattleText_BadlyPoisoned - .4byte BattleText_EnergyDrained - .4byte BattleText_Burned - .4byte BattleText_Burned2 - .4byte BattleText_BurnHurt - .4byte BattleText_Frozen - .4byte BattleText_Frozen2 - .4byte BattleText_FrozenSolid - .4byte BattleText_DefendingDefrosted - .4byte BattleText_AttackingDefrosted - .4byte BattleText_Defrosted - .4byte BattleText_Paralyzed - .4byte BattleText_Paralyzed2 - .4byte BattleText_Paralyzed3 - .4byte BattleText_AlreadyParalyzed - .4byte BattleText_ParalysisHealed - .4byte BattleText_DreamEaten - .4byte BattleText_AttackingStatNoHigher - .4byte BattleText_DefendingStatNoHigher - .4byte BattleText_StoppedWorking - .4byte BattleText_StoppedWorking2 - .4byte BattleText_Confused - .4byte BattleText_ConfusionSnapOut - .4byte BattleText_BecameConfused - .4byte BattleText_AlreadyConfused - .4byte BattleText_FellLove - .4byte BattleText_InLoveWith - .4byte BattleText_ImmobilizedBy - .4byte BattleText_BlownAway - .4byte BattleText_TypeTransform - .4byte BattleText_Flinched - .4byte BattleText_RegainedHealth - .4byte BattleText_HPFull - .4byte BattleText_RaisedSpDef - .4byte BattleText_RaisedDefense - .4byte BattleText_CoveredVeil - .4byte BattleText_SafeguardActive - .4byte BattleText_SafeguardFaded - .4byte BattleText_WentToSleep - .4byte BattleText_SpeltHealthy - .4byte BattleText_WhipWhirlwind - .4byte BattleText_TookSunlight - .4byte BattleText_LoweredHead - .4byte BattleText_IsGlowing - .4byte BattleText_FlewHigh - .4byte BattleText_DugHole - .4byte BattleText_SqueezedBind - .4byte BattleText_TrappedVortex - .4byte BattleText_Wrapped - .4byte BattleText_Clamped - .4byte BattleText_HurtBy - .4byte BattleText_FreedFrom - .4byte BattleText_KeptGoingCrash - .4byte BattleText_MistShroud - .4byte BattleText_MistProtect - .4byte BattleText_GetPumped - .4byte BattleText_HitRecoil - .4byte BattleText_ProtectedItself2 - .4byte BattleText_SandBuffeted - .4byte BattleText_HailStricken - .4byte BattleText_WasSeeded - .4byte BattleText_EvadedAttack - .4byte BattleText_HealthSapped - .4byte BattleText_FastAsleep - .4byte BattleText_WokeUp - .4byte BattleText_UproarAwake - .4byte BattleText_UproarWoke - .4byte BattleText_UproarCaused - .4byte BattleText_UproarMaking - .4byte BattleText_CalmedDown - .4byte BattleText_UproarCantSleep - .4byte BattleText_Stockpiled - .4byte BattleText_StockpiledCant - .4byte BattleText_UproarCantSleep2 - .4byte BattleText_UproarKeptAwake - .4byte BattleText_StayedAwake - .4byte BattleText_StoringEnergy - .4byte BattleText_UnleashedEnergy - .4byte BattleText_FatigueConfuse - .4byte BattleText_PickedUpYen - .4byte BattleText_Unaffected - .4byte BattleText_Transformed - .4byte BattleText_SubMade - .4byte BattleText_SubAlready - .4byte BattleText_SubTookDamage - .4byte BattleText_SubFaded - .4byte BattleText_MustRecharge - .4byte BattleText_RageBuilding - .4byte BattleText_MoveWasDisabled - .4byte BattleText_MoveIsDisabled - .4byte BattleText_DisabledNoMore - .4byte BattleText_EncoreGot - .4byte BattleText_EncoreEnded - .4byte BattleText_TookAim - .4byte BattleText_SketchedMove - .4byte BattleText_DestinyBondTake - .4byte BattleText_DestinyBondTaken - .4byte BattleText_ReducedBy - .4byte BattleText_StoleSomething - .4byte BattleText_CantEscapeNow - .4byte BattleText_NightmareStart - .4byte BattleText_NightmareLock - .4byte BattleText_CurseLay - .4byte BattleText_CurseAfflict - .4byte BattleText_SpikesScattered - .4byte BattleText_SpikesHurt - .4byte BattleText_IdentifiedPoke - .4byte BattleText_PerishSongFell - .4byte BattleText_BracedItself - .4byte BattleText_EnduredHit - .4byte BattleText_MagnitudeCount - .4byte BattleText_CutHPMaxATK - .4byte BattleText_CopyStatChanges - .4byte BattleText_GotFreeFrom - .4byte BattleText_LeechShed - .4byte BattleText_SpikesBlownAway - .4byte BattleText_FledBattle - .4byte BattleText_ForesawAttack - .4byte BattleText_TookAttack - .4byte BattleText_PokeAttack - .4byte BattleText_CenterAttention - .4byte BattleText_ChargingPower - .4byte BattleText_NaturePower - .4byte BattleText_StatusNormal - .4byte BattleText_NoMovesLeft - .4byte BattleText_TormentSubject - .4byte BattleText_TormentNoUse - .4byte BattleText_TightenFocus - .4byte BattleText_TauntFell - .4byte BattleText_TauntNoUse - .4byte BattleText_ReadyToHelp - .4byte BattleText_SwitchedItems - .4byte BattleText_CopiedObject - .4byte BattleText_WishMade - .4byte BattleText_WishTrue - .4byte BattleText_PlantedRoots - .4byte BattleText_AbsorbNutrients - .4byte BattleText_AnchoredItself - .4byte BattleText_DrowsyMade - .4byte BattleText_KnockedOffItem - .4byte BattleText_AbilitySwap - .4byte BattleText_SealedMove - .4byte BattleText_SealedNoUse - .4byte BattleText_GrudgeBear - .4byte BattleText_GrudgeLosePP - .4byte BattleText_ShroudedItself - .4byte BattleText_MagicCoatBounce - .4byte BattleText_AwaitMove - .4byte BattleText_SnatchedMove - .4byte BattleText_RainMade - .4byte BattleText_SpeedRisen - .4byte BattleText_ProtectedBy - .4byte BattleText_PreventedBy - .4byte BattleText_HPRestoredUsing - .4byte BattleText_MadeType - .4byte BattleText_PreventedPara - .4byte BattleText_PreventedRomance - .4byte BattleText_PreventedPoison - .4byte BattleText_PreventedConfusion - .4byte BattleText_RaisedFirePower - .4byte BattleText_AnchorsItself - .4byte BattleText_CutsAttack - .4byte BattleText_PreventedStatLoss - .4byte BattleText_HurtOther - .4byte BattleText_Traced - .4byte BattleText_Sharply - .4byte BattleText_Rose - .4byte BattleText_Harshly - .4byte BattleText_Fell - .4byte BattleText_UnknownString7 - .4byte BattleText_UnknownString3 - .4byte BattleText_UnknownString5 - .4byte BattleText_UnknownString6 - .4byte BattleText_Critical - .4byte BattleText_GrandSlam - .4byte BattleText_MoveForget123 - .4byte BattleText_MoveForgetAnd - .4byte BattleText_NotEffective - .4byte BattleText_SuperEffective - .4byte BattleText_GotAwaySafely - .4byte BattleText_FledWild - .4byte BattleText_NoRunning - .4byte BattleText_CantEscape2 - .4byte BattleText_BirchDontLeaveMe - .4byte BattleText_Nothing - .4byte BattleText_Failed - .4byte BattleText_HurtItself - .4byte BattleText_MirrorFail - .4byte BattleText_RainStart - .4byte BattleText_PourStart - .4byte BattleText_RainCont1 - .4byte BattleText_PourCont - .4byte BattleText_RainStop - .4byte BattleText_SandBrewed - .4byte BattleText_SandRages - .4byte BattleText_SandSubsided - .4byte BattleText_SunBright - .4byte BattleText_SunStrong - .4byte BattleText_SunFaded - .4byte BattleText_HailStart - .4byte BattleText_HailCont - .4byte BattleText_HailStop - .4byte BattleText_SpitUpFail - .4byte BattleText_SwallowFail - .4byte BattleText_WindHeatWave - .4byte BattleText_StatElim - .4byte BattleText_CoinScatter - .4byte BattleText_SubWeak - .4byte BattleText_PainSplit - .4byte BattleText_BellChime - .4byte BattleText_PerishSong - .4byte BattleText_NoPP1 - .4byte BattleText_NoPP2 - .4byte BattleText_Used1 - .4byte BattleText_TutorialUsed - .4byte BattleText_BlockBall - .4byte BattleText_DontBeAThief - .4byte BattleText_DodgeBall - .4byte BattleText_MissPoke - .4byte BattleText_BallBrokeOhNo - .4byte BattleText_BallBrokeAppeared - .4byte BattleText_BallBrokeAlmost - .4byte BattleText_BallBrokeSoClose - .4byte BattleText_BallCaught1 - .4byte BattleText_BallCaught2 - .4byte BattleText_GiveNickname - .4byte BattleText_SentToPC - .4byte BattleText_AddedToDex - .4byte BattleText_Raining - .4byte BattleText_Sandstorm - .4byte BattleText_CantEscape - .4byte BattleText_IgnoredOrdersSLP - .4byte BattleText_IgnoredOrders - .4byte BattleText_BeganNap - .4byte BattleText_LoafingAround - .4byte BattleText_WontObey - .4byte BattleText_TurnedAway - .4byte BattleText_NotNotice - .4byte BattleText_WillSwitch - .4byte BattleText_CreptCloser - .4byte BattleText_CantGetCloser - .4byte BattleText_WatchingCarefully - .4byte BattleText_CuriousAbout - .4byte BattleText_EnthralledBy - .4byte BattleText_IgnoredThing - .4byte BattleText_ThrewBlock - .4byte BattleText_SafariOver - .4byte BattleText_CuredParalysis - .4byte BattleText_CuredPoison - .4byte BattleText_CuredBurn - .4byte BattleText_CuredFreeze - .4byte BattleText_CuredSleep - .4byte BattleText_CuredConfusion - .4byte BattleText_CuredStatus - .4byte BattleText_RestoredHealth - .4byte BattleText_RestoredPP - .4byte BattleText_RestoredStatus - .4byte BattleText_RestoredHPLittle - .4byte BattleText_ChoiceBand - .4byte BattleText_FocusSash - .4byte BattleText_Terminator2 @ terminator? - .4byte BattleText_PreventedBurn - .4byte BattleText_BlocksOther - .4byte BattleText_RestoredHPByItem - .4byte BattleText_WhipSandstorm - .4byte BattleText_PreventedLoss - .4byte BattleText_InfatuatedPoke - .4byte BattleText_MadeIneffective - .4byte BattleText_CuredProblem - .4byte BattleText_OozeSuckup - .4byte BattleText_Transformed2 - .4byte BattleText_ElecWeakened - .4byte BattleText_FireWeakened - .4byte BattleText_HidUnderwater - .4byte BattleText_SprangUp - .4byte BattleText_CantForgetHM - .4byte BattleText_FoundOne - .4byte BattleText_PlayerDefeatedTrainer2 - .4byte BattleText_SoothingAroma - .4byte BattleText_CantUseItems - .4byte BattleText_UnknownString2 - .4byte BattleText_UnknownString4 - .4byte BattleText_HustleUse - .4byte BattleText_MadeUseless - .4byte BattleText_SandTombTrapped @ sand tomb - .4byte BattleText_Terminator - .4byte BattleText_BoostedExp - .4byte BattleText_SunIntensified - .4byte BattleText_GroundMoveNegate - .4byte BattleText_WallyBall - .4byte BattleText_TookAttack2 - .4byte BattleText_ChoseDestiny - .4byte BattleText_LostFocus - .4byte BattleText_UseNext - .4byte BattleText_FledUsingItem - .4byte BattleText_FledUsingOther - .4byte BattleText_DraggedOut - .4byte BattleText_PreventedOther - .4byte BattleText_NormalizedStatus - .4byte BattleText_Used2 - .4byte BattleText_BoxFull - .4byte BattleText_AvoidedAttack - .4byte BattleText_MadeIneffective2 - .4byte BattleText_PreventedFlinching - .4byte BattleText_AlreadyBurned - .4byte BattleText_StatNoLower - .4byte BattleText_BlocksOther2 - .4byte BattleText_WoreOff - .4byte BattleText_RaisedDefenseLittle - .4byte BattleText_RaisedSpDefLittle - .4byte BattleText_BrokeWall - .4byte BattleText_PreventedOther2 - .4byte BattleText_CuredOfProblem - .4byte BattleText_AttackingCantEscape - .4byte BattleText_Obtained1 - .4byte BattleText_Obtained2 - .4byte BattleText_Obtained3 - .4byte BattleText_NoEffect - .4byte BattleText_NoEffectOn - - .align 1 -gMissStrings:: @ 8401508 -@ Each entry refers to a text pointer in gBattleStringsTable, but the values are offset -@ by 0xc. For example, 0x0017 refers to BattleText_AttackMissed because it is the -@ 11th entry in the pointer table. - .2byte BATTLE_TEXT_AttackMissed - .2byte BATTLE_TEXT_ProtectedItself - .2byte BATTLE_TEXT_AvoidedAttack - .2byte BATTLE_TEXT_AvoidedDamage - .2byte BATTLE_TEXT_GroundMoveNegate - -BattleTextList_401512:: @ 8401512 - .2byte BATTLE_TEXT_CantEscape2 - .2byte BATTLE_TEXT_BirchDontLeaveMe - .2byte BATTLE_TEXT_PreventEscape - .2byte BATTLE_TEXT_CantEscape - .2byte BATTLE_TEXT_AttackingCantEscape - -BattleTextList_40151C:: @ 840151C - .2byte BATTLE_TEXT_RainStart - .2byte BATTLE_TEXT_PourStart - .2byte BATTLE_TEXT_Failed - .2byte BATTLE_TEXT_SandBrewed - .2byte BATTLE_TEXT_SunBright - .2byte BATTLE_TEXT_HailStart - -BattleTextList_401528:: @ 8401528 - .2byte BATTLE_TEXT_SandRages - .2byte BATTLE_TEXT_HailCont - -BattleTextList_40152C:: @ 840152C - .2byte BATTLE_TEXT_SandBuffeted - .2byte BATTLE_TEXT_HailStricken - -BattleTextList_401530:: @ 8401530 - .2byte BATTLE_TEXT_SandSubsided - .2byte BATTLE_TEXT_HailStop - -BattleTextList_401534:: @ 8401534 - .2byte BATTLE_TEXT_RainCont1 - .2byte BATTLE_TEXT_PourCont - .2byte BATTLE_TEXT_RainStop - -BattleTextList_40153A:: @ 840153A - .2byte BATTLE_TEXT_ProtectedItself2 - .2byte BATTLE_TEXT_BracedItself - .2byte BATTLE_TEXT_Failed - -BattleTextList_401540:: @ 8401540 - .2byte BATTLE_TEXT_Failed - .2byte BATTLE_TEXT_RaisedDefense - .2byte BATTLE_TEXT_RaisedDefenseLittle - .2byte BATTLE_TEXT_RaisedSpDef - .2byte BATTLE_TEXT_RaisedSpDefLittle - .2byte BATTLE_TEXT_CoveredVeil - -BattleTextList_40154C:: @ 840154C - .2byte BATTLE_TEXT_WasSeeded - .2byte BATTLE_TEXT_EvadedAttack - .2byte BATTLE_TEXT_DoesntAffect - .2byte BATTLE_TEXT_HealthSapped - .2byte BATTLE_TEXT_OozeSuckup - -BattleTextList_401556:: @ 8401556 - .2byte BATTLE_TEXT_WentToSleep - .2byte BATTLE_TEXT_SpeltHealthy - -BattleTextList_40155A:: @ 840155A - .2byte BATTLE_TEXT_UproarMaking - .2byte BATTLE_TEXT_CalmedDown - -BattleTextList_40155E:: @ 840155E - .2byte BATTLE_TEXT_Stockpiled - .2byte BATTLE_TEXT_StockpiledCant - -BattleTextList_401562:: @ 8401562 - .2byte BATTLE_TEXT_WokeUp - .2byte BATTLE_TEXT_UproarWoke - -BattleTextList_401566:: @ 8401566 - .2byte BATTLE_TEXT_SwallowFail - .2byte BATTLE_TEXT_HPFull - -BattleTextList_40156A:: @ 840156A - .2byte BATTLE_TEXT_UproarCantSleep2 - .2byte BATTLE_TEXT_UproarKeptAwake - .2byte BATTLE_TEXT_StayedAwake - -BattleTextList_401570:: @ 8401570 - .2byte BATTLE_TEXT_UnknownString7 - .2byte BATTLE_TEXT_UnknownString3 - .2byte BATTLE_TEXT_AttackingStatNoHigher - .2byte BATTLE_TEXT_Terminator2 - .2byte BATTLE_TEXT_UnknownString4 - .2byte BATTLE_TEXT_HustleUse - -BattleTextList_40157C:: @ 840157C - .2byte BATTLE_TEXT_UnknownString5 - .2byte BATTLE_TEXT_UnknownString6 - .2byte BATTLE_TEXT_DefendingStatNoHigher - .2byte BATTLE_TEXT_Terminator2 - -BattleTextList_401584:: @ 8401584 - .2byte BATTLE_TEXT_WhipWhirlwind - .2byte BATTLE_TEXT_TookSunlight - .2byte BATTLE_TEXT_LoweredHead - .2byte BATTLE_TEXT_IsGlowing - .2byte BATTLE_TEXT_FlewHigh - .2byte BATTLE_TEXT_DugHole - .2byte BATTLE_TEXT_HidUnderwater - .2byte BATTLE_TEXT_SprangUp - -BattleTextList_401594:: @ 8401594 - .2byte BATTLE_TEXT_SqueezedBind - .2byte BATTLE_TEXT_Wrapped - .2byte BATTLE_TEXT_TrappedVortex - .2byte BATTLE_TEXT_Clamped - .2byte BATTLE_TEXT_TrappedVortex - .2byte BATTLE_TEXT_SandTombTrapped - -BattleTextList_4015A0:: @ 84015A0 - .2byte BATTLE_TEXT_MistShroud - .2byte BATTLE_TEXT_Failed - -BattleTextList_4015A4:: @ 84015A4 - .2byte BATTLE_TEXT_GetPumped - .2byte BATTLE_TEXT_Failed - -BattleTextList_4015A8:: @ 84015A8 - .2byte BATTLE_TEXT_Transformed - .2byte BATTLE_TEXT_Failed - -BattleTextList_4015AC:: @ 84015AC - .2byte BATTLE_TEXT_SubMade - .2byte BATTLE_TEXT_SubWeak - -BattleTextList_4015B0:: @ 84015B0 - .2byte BATTLE_TEXT_Poisoned - .2byte BATTLE_TEXT_Poisoned2 - -BattleTextList_4015B4:: @ 84015B4 - .2byte BATTLE_TEXT_Paralyzed - .2byte BATTLE_TEXT_Paralyzed2 - -BattleTextList_4015B8:: @ 84015B8 - .2byte BATTLE_TEXT_FellAsleep - .2byte BATTLE_TEXT_MadeAsleep - -BattleTextList_4015BC:: @ 84015BC - .2byte BATTLE_TEXT_Burned - .2byte BATTLE_TEXT_Burned2 - -BattleTextList_4015C0:: @ 84015C0 - .2byte BATTLE_TEXT_Frozen - .2byte BATTLE_TEXT_Frozen2 - -BattleTextList_4015C4:: @ 84015C4 - .2byte BATTLE_TEXT_AttackingDefrosted - .2byte BATTLE_TEXT_Defrosted - -BattleTextList_4015C8:: @ 84015C8 - .2byte BATTLE_TEXT_AttackMissed - .2byte BATTLE_TEXT_Unaffected - .2byte BATTLE_TEXT_FellLove - .2byte BATTLE_TEXT_InfatuatedPoke - -BattleTextList_4015D0:: @ 84015D0 - .2byte BATTLE_TEXT_EnergyDrained - .2byte BATTLE_TEXT_OozeSuckup - -BattleTextList_4015D4:: @ 84015D4 - .2byte BATTLE_TEXT_ElecWeakened - .2byte BATTLE_TEXT_FireWeakened - -BattleTextList_4015D8:: @ 84015D8 - .2byte BATTLE_TEXT_BellChime - .2byte BATTLE_TEXT_BellChime - .2byte BATTLE_TEXT_BellChime - .2byte BATTLE_TEXT_BellChime - .2byte BATTLE_TEXT_SoothingAroma - -BattleTextList_4015E2:: @ 84015E2 - .2byte BATTLE_TEXT_ForesawAttack - .2byte BATTLE_TEXT_ChoseDestiny - -BattleTextList_4015E6:: @ 84015E6 - .2byte BATTLE_TEXT_BallBrokeOhNo - .2byte BATTLE_TEXT_BallBrokeAppeared - .2byte BATTLE_TEXT_BallBrokeAlmost - .2byte BATTLE_TEXT_BallBrokeSoClose - -BattleTextList_4015EE:: @ 84015EE - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Sandstorm - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_SunStrong - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - .2byte BATTLE_TEXT_Raining - -BattleTextList_40160E:: @ 840160E - .2byte BATTLE_TEXT_LoafingAround - .2byte BATTLE_TEXT_WontObey - .2byte BATTLE_TEXT_TurnedAway - .2byte BATTLE_TEXT_NotNotice - -BattleTextList_401616:: @ 8401616 - .2byte BATTLE_TEXT_CreptCloser - .2byte BATTLE_TEXT_CantGetCloser - -BattleTextList_40161A:: @ 840161A - .2byte BATTLE_TEXT_CuriousAbout - .2byte BATTLE_TEXT_EnthralledBy - .2byte BATTLE_TEXT_IgnoredThing - -BattleTextList_401620:: @ 8401620 - .2byte BATTLE_TEXT_CuredConfusion - .2byte BATTLE_TEXT_CuredParalysis - .2byte BATTLE_TEXT_CuredFreeze - .2byte BATTLE_TEXT_CuredBurn - .2byte BATTLE_TEXT_CuredPoison - .2byte BATTLE_TEXT_CuredSleep - -BattleTextList_40162C:: @ 840162C - .2byte BATTLE_TEXT_CuredStatus - .2byte BATTLE_TEXT_NormalizedStatus - -BattleTextList_401630:: @ 8401630 - .2byte BATTLE_TEXT_PreventedBurn - .2byte BATTLE_TEXT_PreventedOther2 - .2byte BATTLE_TEXT_NoEffectOn - -BattleTextList_401636:: @ 8401636 - .2byte BATTLE_TEXT_PreventedPara - .2byte BATTLE_TEXT_PreventedOther2 - .2byte BATTLE_TEXT_NoEffectOn - -BattleTextList_40163C:: @ 840163C - .2byte BATTLE_TEXT_PreventedPoison - .2byte BATTLE_TEXT_PreventedOther2 - .2byte BATTLE_TEXT_NoEffectOn - -BattleTextList_401642:: @ 8401642 - .2byte BATTLE_TEXT_Obtained1 - .2byte BATTLE_TEXT_Obtained2 - .2byte BATTLE_TEXT_Obtained3 - -BattleTextList_401648:: @ 8401648 - .2byte BATTLE_TEXT_RaisedFirePower - .2byte BATTLE_TEXT_MadeIneffective - -gTrappingMoves:: @ 840164C - .2byte MOVE_BIND - .2byte MOVE_WRAP - .2byte MOVE_FIRE_SPIN - .2byte MOVE_CLAMP - .2byte MOVE_WHIRLPOOL - .2byte MOVE_SAND_TOMB - .2byte 0xFFFF - - .align 2 -gUnknown_0840165C:: @ 840165C - .4byte BattleText_HP - .4byte BattleText_SpAtk - .4byte BattleText_Attack - .4byte BattleText_SpDef - .4byte BattleText_Defense - .4byte BattleStatText_Speed - - .align 2 -gUnknown_08401674:: @ 8401674 - .4byte BattleText_Normal - .4byte BattleText_Fighting - .4byte BattleText_Flying - .4byte BattleText_Poison - .4byte BattleText_Ground - .4byte BattleText_Rock - .4byte BattleText_Bug - .4byte BattleText_Ghost - .4byte BattleText_Steel - .4byte BattleText_Typeless - .4byte BattleText_Fire - .4byte BattleText_Water - .4byte BattleText_Grass - .4byte BattleText_Electric - .4byte BattleText_Psychic - .4byte BattleText_Ice - .4byte BattleText_Dragon - .4byte BattleText_Dark -- cgit v1.2.3 From e4e81453ba710688451f9024cb76004114315c74 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 13 Nov 2017 15:02:27 -0500 Subject: migrate cable_club and mori_debug_menu data to src --- data/cable_club.s | 32 ---------------------- data/mori_debug_menu.s | 72 -------------------------------------------------- 2 files changed, 104 deletions(-) delete mode 100644 data/cable_club.s delete mode 100644 data/mori_debug_menu.s (limited to 'data') diff --git a/data/cable_club.s b/data/cable_club.s deleted file mode 100644 index f0ced6292..000000000 --- a/data/cable_club.s +++ /dev/null @@ -1,32 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -.ifdef ENGLISH -TrainerCardColorName_Bronze: - .string "BRONZE$", 7 -TrainerCardColorName_Copper: - .string "COPPER$", 7 -TrainerCardColorName_Silver: - .string "SILVER$", 7 -TrainerCardColorName_Gold: - .string "GOLD$", 7 -.else -TrainerCardColorName_Bronze: - .string "BRONZE$", 7 -TrainerCardColorName_Copper: - .string "KUPFER$", 7 -TrainerCardColorName_Silver: - .string "SILBER$", 7 -TrainerCardColorName_Gold: - .string "GOLD$", 7 -.endif - - - .align 2 -gTrainerCardColorNames:: @ 839B21C - .4byte TrainerCardColorName_Bronze - .4byte TrainerCardColorName_Copper - .4byte TrainerCardColorName_Silver - .4byte TrainerCardColorName_Gold diff --git a/data/mori_debug_menu.s b/data/mori_debug_menu.s deleted file mode 100644 index 2545b2b15..000000000 --- a/data/mori_debug_menu.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ These seem to be strings for keypad test code. -gUnknown_0839B22C:: @ 839B22C - .string " A$" @ A - .string " B$" @ B - .string "SL$" @ SELECT - .string "ST$" @ START - .string "RK$" @ right - .string "LK$" @ left - .string "UK$" @ up - .string "DK$" @ down - .string "RT$" @ R - .string "LT$" @ L - -gUnknown_0839B24A:: @ 839B24A - .string "ND$" - -gUnknown_0839B24D:: @ 839B24D - .string "の　こどもは\n$" @ "'s child " - -gUnknown_0839B255:: @ 839B255 - .string " $" - -gUnknown_0839B257:: @ 839B257 - .string "ながいなまえぽけもん$" @ "long name pokemon" (used as test name) - -Text_39B262: @ 839B262 - .string "Search a child$" - -Text_39B271: @ 839B271 - .string "Egg$" - -Text_39B275: @ 839B275 - .string "Egg (male)$" - -Text_39B280: @ 839B280 - .string "1000 steps$" - -Text_39B28B: @ 839B28B - .string "10000 steps$" - -Text_39B297: @ 839B297 - .string "MOVE TUTOR$" - -Text_39B2A2: @ 839B2A2 - .string "Breed an egg$" - -Text_39B2AF: @ 839B2AF - .string "Long name$" - -Text_39B2B9: @ 839B2B9 -.ifdef ENGLISH - .string "ポロックけす$" @ "{POKEBLOCK} CASE$" -.else - .string "Delete {POKEBLOCK}$" -.endif - - .align 2 -gMoriDebugMenuActions:: @ 839B2C0 - .4byte Text_39B262, MoriDebugMenu_SearchChild - .4byte Text_39B271, MoriDebugMenu_Egg - .4byte Text_39B275, MoriDebugMenu_MaleEgg - .4byte Text_39B280, MoriDebugMenu_1000Steps - .4byte Text_39B28B, MoriDebugMenu_10000Steps - .4byte Text_39B297, MoriDebugMenu_MoveTutor - .4byte Text_39B2A2, MoriDebugMenu_BreedEgg - .4byte Text_39B2AF, MoriDebugMenu_LongName - .4byte Text_39B2B9, MoriDebugMenu_PokeblockCase -- cgit v1.2.3 From f4562d618ccae091f6ca3cfff15b4b22db334d50 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 13 Nov 2017 17:34:34 -0500 Subject: migrate tv data to src --- data/tv.s | 205 -------------------------------------------------------------- 1 file changed, 205 deletions(-) delete mode 100644 data/tv.s (limited to 'data') diff --git a/data/tv.s b/data/tv.s deleted file mode 100644 index 293f84217..000000000 --- a/data/tv.s +++ /dev/null @@ -1,205 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gPokeOutbreakSpeciesList:: @ 83D13F8 - .2byte SPECIES_SURSKIT - .2byte MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE - .byte 3 - .byte MAPSEC_Route102 - - .2byte SPECIES_SURSKIT - .2byte MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE - .byte 15 - .byte MAPSEC_Route114 - - .2byte SPECIES_SURSKIT - .2byte MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE - .byte 15 - .byte MAPSEC_Route117 - - .2byte SPECIES_SURSKIT - .2byte MOVE_BUBBLE, MOVE_QUICK_ATTACK, MOVE_NONE, MOVE_NONE - .byte 28 - .byte MAPSEC_Route120 - - .2byte SPECIES_SKITTY - .2byte MOVE_GROWL, MOVE_TACKLE, MOVE_NONE, MOVE_NONE - .byte 15 - .byte MAPSEC_Route116 - - .align 2 -gTVNewsTextGroup1:: @ 83D1434 - .4byte 0x0 - .4byte gTVNewsText_EnergyGuru1 - .4byte gTVNewsText_GameCorner1 - .4byte gTVNewsText_LilycoveDepartment1 - - .align 2 -gTVNewsTextGroup2:: @ 83D1444 - .4byte 0x0 - .4byte gTVNewsText_EnergyGuru2 - .4byte gTVNewsText_GameCorner2 - .4byte gTVNewsText_LilycoveDepartment2 - - .align 2 -gTVNewsTextGroup3:: @ 83D1454 - .4byte 0x0 - .4byte gTVNewsText_EnergyGuru3 - .4byte gTVNewsText_GameCorner3 - .4byte gTVNewsText_LilycoveDepartment3 - - .align 2 -gUnknown_083D1464:: @ 83D1464 - .4byte gStringVar1 - .4byte gStringVar2 - .4byte gStringVar3 - - .align 2 -gTVFanClubTextGroup:: @ 83D1470 - .4byte gTVFanClubText1 - .4byte gTVFanClubText2 - .4byte gTVFanClubText3 - .4byte gTVFanClubText4 - .4byte gTVFanClubText5 - .4byte gTVFanClubText6 - .4byte gTVFanClubText7 - .4byte gTVFanClubText8 - - .align 2 -gTVRecentHappeningsTextGroup:: @ 83D1490 - .4byte gTVRecentHappeningsText1 - .4byte gTVRecentHappeningsText2 - .4byte gTVRecentHappeningsText3 - .4byte gTVRecentHappeningsText4 - .4byte gTVRecentHappeningsText5 - .4byte gTVRecentHappeningsText6 - - .align 2 -gTVFanClubOpinionsTextGroup:: @ 83D14A8 - .4byte gTVFanClubOpinionsText1 - .4byte gTVFanClubOpinionsText2 - .4byte gTVFanClubOpinionsText3 - .4byte gTVFanClubOpinionsText4 - .4byte gTVFanClubOpinionsText5 - - .align 2 -gTVPokemonOutbreakTextGroup:: @ 83D14BC - .4byte gTVPokemonOutbreakText - - .align 2 -gTVPokemonTodayTextGroup:: @ 83D14C0 - .4byte gTVPokemonTodayText1 - .4byte gTVPokemonTodayText2 - .4byte gTVPokemonTodayText3 - .4byte gTVPokemonTodayText4 - .4byte gTVPokemonTodayText5 - .4byte gTVPokemonTodayText6 - .4byte gTVPokemonTodayText7 - .4byte gTVPokemonTodayText8 - .4byte gTVPokemonTodayText9 - .4byte gTVPokemonTodayText10 - .4byte gTVPokemonTodayText11 - .4byte gTVPokemonTodayText12 - - .align 2 -gTVSmartShopperTextGroup:: @ 83D14F0 - .4byte gTVSmartShopperText1 - .4byte gTVSmartShopperText2 - .4byte gTVSmartShopperText3 - .4byte gTVSmartShopperText4 - .4byte gTVSmartShopperText5 - .4byte gTVSmartShopperText6 - .4byte gTVSmartShopperText7 - .4byte gTVSmartShopperText8 - .4byte gTVSmartShopperText9 - .4byte gTVSmartShopperText10 - .4byte gTVSmartShopperText11 - .4byte gTVSmartShopperText12 - .4byte gTVSmartShopperText13 - - .align 2 -gTVBravoTrainerTextGroup:: @ 83D1524 - .4byte gTVBravoTrainerText1 - .4byte gTVBravoTrainerText2 - .4byte gTVBravoTrainerText3 - .4byte gTVBravoTrainerText4 - .4byte gTVBravoTrainerText5 - .4byte gTVBravoTrainerText6 - .4byte gTVBravoTrainerText7 - .4byte gTVBravoTrainerText8 - .4byte gTVBravoTrainerText9 - - .align 2 -gTVBravoTrainerBattleTowerTextGroup:: @ 83D1548 - .4byte gTVBravoTrainerBattleTowerText1 - .4byte gTVBravoTrainerBattleTowerText2 - .4byte gTVBravoTrainerBattleTowerText3 - .4byte gTVBravoTrainerBattleTowerText4 - .4byte gTVBravoTrainerBattleTowerText5 - .4byte gTVBravoTrainerBattleTowerText6 - .4byte gTVBravoTrainerBattleTowerText7 - .4byte gTVBravoTrainerBattleTowerText8 - .4byte gTVBravoTrainerBattleTowerText9 - .4byte gTVBravoTrainerBattleTowerText10 - .4byte gTVBravoTrainerBattleTowerText11 - .4byte gTVBravoTrainerBattleTowerText12 - .4byte gTVBravoTrainerBattleTowerText13 - .4byte gTVBravoTrainerBattleTowerText14 - .4byte gTVBravoTrainerBattleTowerText15 - - .align 2 -gTVNameRaterTextGroup:: @ 83D1584 - .4byte gTVNameRaterText1 - .4byte gTVNameRaterText2 - .4byte gTVNameRaterText3 - .4byte gTVNameRaterText4 - .4byte gTVNameRaterText5 - .4byte gTVNameRaterText6 - .4byte gTVNameRaterText7 - .4byte gTVNameRaterText8 - .4byte gTVNameRaterText9 - .4byte gTVNameRaterText10 - .4byte gTVNameRaterText11 - .4byte gTVNameRaterText12 - .4byte gTVNameRaterText13 - .4byte gTVNameRaterText14 - .4byte gTVNameRaterText15 - .4byte gTVNameRaterText16 - .4byte gTVNameRaterText17 - .4byte gTVNameRaterText18 - .4byte gTVNameRaterText19 - - .align 2 -gTVPokemonTodayFailedCaptureTextGroup:: @ 83D15D0 - .4byte gTVPokemonTodayFailedCaptureText1 - .4byte gTVPokemonTodayFailedCaptureText2 - .4byte gTVPokemonTodayFailedCaptureText3 - .4byte gTVPokemonTodayFailedCaptureText4 - .4byte gTVPokemonTodayFailedCaptureText5 - .4byte gTVPokemonTodayFailedCaptureText6 - .4byte gTVPokemonTodayFailedCaptureText7 - - .align 2 -gTVFishingGuruAdviceTextGroup:: @ 83D15EC - .4byte gTVFishingGuruAdviceText1 - .4byte gTVFishingGuruAdviceText2 - - .align 2 -gTVWorldOfMastersTextGroup:: @ 83D15F4 - .4byte gTVWorldOfMastersText1 - .4byte gTVWorldOfMastersText2 - .4byte gTVWorldOfMastersText3 - - .align 2 -gTVGabbyAndTyTextGroup:: @ 83D1600 - .4byte gTVGabbyAndTyText1 - .4byte gTVGabbyAndTyText2 - .4byte gTVGabbyAndTyText3 - .4byte gTVGabbyAndTyText4 - .4byte gTVGabbyAndTyText5 - .4byte gTVGabbyAndTyText6 - .4byte gTVGabbyAndTyText7 - .4byte gTVGabbyAndTyText8 - .4byte gTVGabbyAndTyText9 -- cgit v1.2.3 From 4a57fe42e53b0f1e35c224a38a613a1bf9bb97f7 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Mon, 13 Nov 2017 18:03:57 -0500 Subject: migrate main_menu data to src --- data/main_menu.s | 59 -------------------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 data/main_menu.s (limited to 'data') diff --git a/data/main_menu.s b/data/main_menu.s deleted file mode 100644 index 1fae3850b..000000000 --- a/data/main_menu.s +++ /dev/null @@ -1,59 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_081E764C:: @ 81E764C - .incbin "graphics/birch_speech/bg0.gbapal" - .incbin "graphics/birch_speech/bg1.gbapal" - - .align 2 -gBirchIntroShadowGfx:: @ 81E768C - .incbin "graphics/birch_speech/shadow.4bpp.lz" - - .align 2 -gUnknown_081E7834:: @ 81E7834 - .incbin "graphics/birch_speech/map.bin.lz" - - .align 2 -gUnknown_081E795C:: @ 81E795C - .incbin "graphics/birch_speech/bg2.gbapal" - - .align 2 -gUnknown_081E796C:: @ 81E796C - .space 16 - - .align 2 -gMainMenuPalette:: @ 81E797C - .incbin "graphics/misc/main_menu.gbapal" - - .align 2 -gSpriteAffineAnim_81E799C:: @ 81E799C - obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 48 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_81E79AC:: @ 81E79AC - .4byte gSpriteAffineAnim_81E799C - - .align 2 -gUnknown_081E79B0:: @ 81E79B0 - .4byte gBirchText_Boy, 0 - .4byte gBirchText_Girl, 0 - - .align 2 -gMalePresetNames:: @ 81E79C0 - .4byte gBirchText_NewName, 0 - .4byte gDefaultBoyName1, 0 - .4byte gDefaultBoyName2, 0 - .4byte gDefaultBoyName3, 0 - .4byte gDefaultBoyName4, 0 - - .align 2 -gFemalePresetNames:: @ 81E79E8 - .4byte gBirchText_NewName, 0 - .4byte gDefaultGirlName1, 0 - .4byte gDefaultGirlName2, 0 - .4byte gDefaultGirlName3, 0 - .4byte gDefaultGirlName4, 0 -- cgit v1.2.3 From 542e1cac5520175949098cb6311faaba42bc2f37 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 15 Nov 2017 15:35:15 -0500 Subject: migrate field_door data to src --- data/field_door.s | 416 ------------------------------------------------------ 1 file changed, 416 deletions(-) delete mode 100644 data/field_door.s (limited to 'data') diff --git a/data/field_door.s b/data/field_door.s deleted file mode 100644 index d7ccdd2d4..000000000 --- a/data/field_door.s +++ /dev/null @@ -1,416 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -DoorAnimTiles_04: @ 8308F1C - .incbin "graphics/door_anims/04/0.4bpp" - .incbin "graphics/door_anims/04/1.4bpp" - .incbin "graphics/door_anims/04/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_05: @ 830923C - .incbin "graphics/door_anims/05/0.4bpp" - .incbin "graphics/door_anims/05/1.4bpp" - .incbin "graphics/door_anims/05/2.4bpp" - - .align 2 -DoorAnimTiles_08: @ 830953C - .incbin "graphics/door_anims/08/0.4bpp" - .incbin "graphics/door_anims/08/1.4bpp" - .incbin "graphics/door_anims/08/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_15: @ 830985C - .incbin "graphics/door_anims/15/0.4bpp" - .incbin "graphics/door_anims/15/1.4bpp" - .incbin "graphics/door_anims/15/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_16: @ 8309B7C - .incbin "graphics/door_anims/16/0.4bpp" - .incbin "graphics/door_anims/16/1.4bpp" - .incbin "graphics/door_anims/16/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_00: @ 8309E9C - .incbin "graphics/door_anims/00/0.4bpp" - .incbin "graphics/door_anims/00/1.4bpp" - .incbin "graphics/door_anims/00/2.4bpp" - - .align 2 -DoorAnimTiles_01: @ 830A19C - .incbin "graphics/door_anims/01/0.4bpp" - .incbin "graphics/door_anims/01/1.4bpp" - .incbin "graphics/door_anims/01/2.4bpp" - - .align 2 -DoorAnimTiles_02: @ 830A49C - .incbin "graphics/door_anims/02/0.4bpp" - .incbin "graphics/door_anims/02/1.4bpp" - .incbin "graphics/door_anims/02/2.4bpp" - - .align 2 -DoorAnimTiles_03: @ 830A79C - .incbin "graphics/door_anims/03/0.4bpp" - .incbin "graphics/door_anims/03/1.4bpp" - .incbin "graphics/door_anims/03/2.4bpp" - - .align 2 -DoorAnimTiles_06: @ 830AA9C - .incbin "graphics/door_anims/06/0.4bpp" - .incbin "graphics/door_anims/06/1.4bpp" - .incbin "graphics/door_anims/06/2.4bpp" - - .align 2 -DoorAnimTiles_07: @ 830AD9C - .incbin "graphics/door_anims/07/0.4bpp" - .incbin "graphics/door_anims/07/1.4bpp" - .incbin "graphics/door_anims/07/2.4bpp" - - .align 2 -DoorAnimTiles_09: @ 830B09C - .incbin "graphics/door_anims/09/0.4bpp" - .incbin "graphics/door_anims/09/1.4bpp" - .incbin "graphics/door_anims/09/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_10: @ 830B3BC - .incbin "graphics/door_anims/10/0.4bpp" - .incbin "graphics/door_anims/10/1.4bpp" - .incbin "graphics/door_anims/10/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_11: @ 830B6DC - .incbin "graphics/door_anims/11/0.4bpp" - .incbin "graphics/door_anims/11/1.4bpp" - .incbin "graphics/door_anims/11/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_12: @ 830B9FC - .incbin "graphics/door_anims/12/0.4bpp" - .incbin "graphics/door_anims/12/1.4bpp" - .incbin "graphics/door_anims/12/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_13: @ 830BD1C - .incbin "graphics/door_anims/13/0.4bpp" - .incbin "graphics/door_anims/13/1.4bpp" - .incbin "graphics/door_anims/13/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_14: @ 830C03C - .incbin "graphics/door_anims/14/0.4bpp" - .incbin "graphics/door_anims/14/1.4bpp" - .incbin "graphics/door_anims/14/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_17: @ 830C35C - .incbin "graphics/door_anims/17/0.4bpp" - .incbin "graphics/door_anims/17/1.4bpp" - .incbin "graphics/door_anims/17/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_18: @ 830C67C - .incbin "graphics/door_anims/18/0.4bpp" - .incbin "graphics/door_anims/18/1.4bpp" - .incbin "graphics/door_anims/18/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_19: @ 830C99C - .incbin "graphics/door_anims/19/0.4bpp" - .incbin "graphics/door_anims/19/1.4bpp" - .incbin "graphics/door_anims/19/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_20: @ 830CCBC - .incbin "graphics/door_anims/20/0.4bpp" - .incbin "graphics/door_anims/20/1.4bpp" - .incbin "graphics/door_anims/20/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_21: @ 830CFDC - .incbin "graphics/door_anims/21/0.4bpp" - .incbin "graphics/door_anims/21/1.4bpp" - .incbin "graphics/door_anims/21/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_22: @ 830D2FC - .incbin "graphics/door_anims/22/0.4bpp" - .incbin "graphics/door_anims/22/1.4bpp" - .incbin "graphics/door_anims/22/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_23: @ 830D61C - .incbin "graphics/door_anims/23/0.4bpp" - .incbin "graphics/door_anims/23/1.4bpp" - .incbin "graphics/door_anims/23/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_24: @ 830D93C - .incbin "graphics/door_anims/24/0.4bpp" - .incbin "graphics/door_anims/24/1.4bpp" - .incbin "graphics/door_anims/24/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_25: @ 830DC5C - .incbin "graphics/door_anims/25/0.4bpp" - .incbin "graphics/door_anims/25/1.4bpp" - .incbin "graphics/door_anims/25/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_26: @ 830DF7C - .incbin "graphics/door_anims/26/0.4bpp" - .incbin "graphics/door_anims/26/1.4bpp" - .incbin "graphics/door_anims/26/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_27: @ 830E29C - .incbin "graphics/door_anims/27/0.4bpp" - .incbin "graphics/door_anims/27/1.4bpp" - .incbin "graphics/door_anims/27/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_28: @ 830E5BC - .incbin "graphics/door_anims/28/0.4bpp" - .incbin "graphics/door_anims/28/1.4bpp" - .incbin "graphics/door_anims/28/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_29: @ 830E8DC - .incbin "graphics/door_anims/29/0.4bpp" - .incbin "graphics/door_anims/29/1.4bpp" - .incbin "graphics/door_anims/29/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_30: @ 830EBFC - .incbin "graphics/door_anims/30/0.4bpp" - .incbin "graphics/door_anims/30/1.4bpp" - .incbin "graphics/door_anims/30/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_31: @ 830EF1C - .incbin "graphics/door_anims/31/0.4bpp" - .incbin "graphics/door_anims/31/1.4bpp" - .incbin "graphics/door_anims/31/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_32: @ 830F23C - .incbin "graphics/door_anims/32/0.4bpp" - .incbin "graphics/door_anims/32/1.4bpp" - .incbin "graphics/door_anims/32/2.4bpp" - - .space 32 - - .align 2 -DoorAnimTiles_33: @ 830F55C - .incbin "graphics/door_anims/33/0.4bpp" - .incbin "graphics/door_anims/33/1.4bpp" - .incbin "graphics/door_anims/33/2.4bpp" - - .space 32 - -gDoorOpenAnimFrames:: @ 830F87C - door_anim_frame 4, -1 - door_anim_frame 4, 0 - door_anim_frame 4, 0x100 - door_anim_frame 4, 0x200 - door_anim_frame 0, 0 - -gDoorCloseAnimFrames:: @ 830F890 - door_anim_frame 4, 0x200 - door_anim_frame 4, 0x100 - door_anim_frame 4, 0 - door_anim_frame 4, -1 - door_anim_frame 0, 0 - -DoorAnimPalettes_830F8A4: - .byte 1, 1, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F8AC: - .byte 1, 1, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F8B4: - .byte 5, 5, 5, 5, 5, 5, 5, 5 - -DoorAnimPalettes_830F8BC: - .byte 0, 0, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F8C4: - .byte 6, 6, 6, 6, 6, 6, 6, 6 - -DoorAnimPalettes_830F8CC: - .byte 8, 8, 8, 8, 8, 8, 8, 8 - -DoorAnimPalettes_830F8D4: - .byte 11, 11, 11, 11, 11, 11, 11, 11 - -DoorAnimPalettes_830F8DC: - .byte 10, 10, 10, 10, 10, 10, 10, 10 - -DoorAnimPalettes_830F8E4: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F8EC: - .byte 8, 8, 8, 8, 8, 8, 8, 8 - -DoorAnimPalettes_830F8F4: - .byte 9, 9, 9, 9, 9, 9, 9, 9 - -DoorAnimPalettes_830F8FC: - .byte 9, 9, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F904: - .byte 8, 8, 8, 8, 8, 8, 8, 8 - -DoorAnimPalettes_830F90C: - .byte 9, 9, 9, 9, 9, 9, 9, 9 - -DoorAnimPalettes_830F914: - .byte 6, 6, 6, 6, 6, 6, 6, 6 - -DoorAnimPalettes_830F91C: - .byte 6, 6, 6, 6, 6, 6, 6, 6 - -DoorAnimPalettes_830F924: - .byte 0, 0, 5, 5, 5, 5, 5, 5 - -DoorAnimPalettes_830F92C: - .byte 6, 6, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F934: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F93C: - .byte 6, 6, 5, 5, 5, 5, 5, 5 - -DoorAnimPalettes_830F944: - .byte 5, 5, 5, 5, 5, 5, 5, 5 - -DoorAnimPalettes_830F94C: - .byte 1, 1, 1, 1, 1, 1, 1, 1 - -DoorAnimPalettes_830F954: - .byte 6, 6, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F95C: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F964: - .byte 5, 5, 5, 5, 5, 5, 5, 5 - -DoorAnimPalettes_830F96C: - .byte 9, 9, 9, 9, 9, 9, 9, 9 - -DoorAnimPalettes_830F974: - .byte 8, 8, 8, 8, 8, 8, 8, 8 - -DoorAnimPalettes_830F97C: - .byte 6, 6, 6, 6, 6, 6, 6, 6 - -DoorAnimPalettes_830F984: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F98C: - .byte 11, 11, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F994: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F99C: - .byte 6, 6, 7, 7, 7, 7, 7, 7 - -DoorAnimPalettes_830F9A4: - .byte 9, 9, 9, 9, 9, 9, 9, 9 - -DoorAnimPalettes_830F9AC: - .byte 7, 7, 7, 7, 7, 7, 7, 7 - - .align 2 -gDoorAnimGraphicsTable:: @ 830F9B4 - door_anim_gfx 0x021, 0, DoorAnimTiles_00, DoorAnimPalettes_830F8A4 - door_anim_gfx 0x061, 1, DoorAnimTiles_01, DoorAnimPalettes_830F8AC - door_anim_gfx 0x1CD, 1, DoorAnimTiles_02, DoorAnimPalettes_830F8B4 - door_anim_gfx 0x041, 1, DoorAnimTiles_03, DoorAnimPalettes_830F8BC - door_anim_gfx 0x248, 0, DoorAnimTiles_04, DoorAnimPalettes_830F8C4 - door_anim_gfx 0x249, 0, DoorAnimTiles_05, DoorAnimPalettes_830F8CC - door_anim_gfx 0x22F, 0, DoorAnimTiles_06, DoorAnimPalettes_830F8D4 - door_anim_gfx 0x21F, 0, DoorAnimTiles_07, DoorAnimPalettes_830F8DC - door_anim_gfx 0x2A5, 0, DoorAnimTiles_08, DoorAnimPalettes_830F8E4 - door_anim_gfx 0x287, 0, DoorAnimTiles_09, DoorAnimPalettes_830F8F4 - door_anim_gfx 0x2AC, 0, DoorAnimTiles_10, DoorAnimPalettes_830F934 - door_anim_gfx 0x3A1, 0, DoorAnimTiles_11, DoorAnimPalettes_830F93C - door_anim_gfx 0x2DC, 0, DoorAnimTiles_12, DoorAnimPalettes_830F92C - door_anim_gfx 0x225, 0, DoorAnimTiles_13, DoorAnimPalettes_830F924 - door_anim_gfx 0x1DB, 1, DoorAnimTiles_14, DoorAnimPalettes_830F94C - door_anim_gfx 0x246, 0, DoorAnimTiles_15, DoorAnimPalettes_830F8EC - door_anim_gfx 0x28E, 0, DoorAnimTiles_16, DoorAnimPalettes_830F944 - door_anim_gfx 0x2A1, 0, DoorAnimTiles_17, DoorAnimPalettes_830F8FC - door_anim_gfx 0x21C, 0, DoorAnimTiles_18, DoorAnimPalettes_830F914 - door_anim_gfx 0x21E, 0, DoorAnimTiles_19, DoorAnimPalettes_830F91C - door_anim_gfx 0x21D, 1, DoorAnimTiles_20, DoorAnimPalettes_830F904 - door_anim_gfx 0x21A, 0, DoorAnimTiles_21, DoorAnimPalettes_830F90C - door_anim_gfx 0x224, 0, DoorAnimTiles_22, DoorAnimPalettes_830F954 - door_anim_gfx 0x289, 0, DoorAnimTiles_23, DoorAnimPalettes_830F95C - door_anim_gfx 0x30C, 1, DoorAnimTiles_24, DoorAnimPalettes_830F964 - door_anim_gfx 0x32D, 1, DoorAnimTiles_25, DoorAnimPalettes_830F96C - door_anim_gfx 0x2ED, 1, DoorAnimTiles_26, DoorAnimPalettes_830F974 - door_anim_gfx 0x264, 1, DoorAnimTiles_27, DoorAnimPalettes_830F97C - door_anim_gfx 0x22B, 0, DoorAnimTiles_28, DoorAnimPalettes_830F984 - door_anim_gfx 0x2F7, 0, DoorAnimTiles_29, DoorAnimPalettes_830F98C - door_anim_gfx 0x297, 0, DoorAnimTiles_30, DoorAnimPalettes_830F994 - door_anim_gfx 0x285, 1, DoorAnimTiles_31, DoorAnimPalettes_830F99C - door_anim_gfx 0x25D, 1, DoorAnimTiles_32, DoorAnimPalettes_830F9A4 - door_anim_gfx 0x20E, 1, DoorAnimTiles_33, DoorAnimPalettes_830F9AC - door_anim_gfx 0, 0, 0, 0 -- cgit v1.2.3 From f85dbd0779bdee6e191100d8e0bc53d3c601e8f3 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 15 Nov 2017 18:56:27 -0500 Subject: migrate text_window and reset_rtc_screen data to src --- data/reset_rtc_screen.s | 67 ------------------------------------------------- data/text_window.s | 31 ----------------------- 2 files changed, 98 deletions(-) delete mode 100644 data/reset_rtc_screen.s delete mode 100644 data/text_window.s (limited to 'data') diff --git a/data/reset_rtc_screen.s b/data/reset_rtc_screen.s deleted file mode 100644 index a9a3ac847..000000000 --- a/data/reset_rtc_screen.s +++ /dev/null @@ -1,67 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_08376420:: @ 8376420 - .byte 3, 0, 1, 0, 15, 39, 0, 2, 0, 0, 0, 0 - .byte 4, 0, 0, 0, 23, 0, 1, 3, 0, 0, 0, 0 - .byte 5, 0, 0, 0, 59, 0, 2, 4, 0, 0, 0, 0 - .byte 6, 0, 0, 0, 59, 0, 3, 5, 0, 0, 0, 0 - .byte 7, 0, 0, 0, 0, 0, 4, 0, 6, 0, 0, 0 - - .align 2 -gOamData_837645C:: @ 837645C - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteImage_8376464:: @ 8376464 - .incbin "graphics/unknown_sprites/83764AC/0.4bpp" - - .align 2 -gSpriteImage_8376484:: @ 8376484 - .incbin "graphics/unknown_sprites/83764AC/1.4bpp" - - .align 2 -Palette_3764A4: @ 83764A4 - .incbin "graphics/unknown/83764A4.gbapal" - - .align 2 -gSpriteImageTable_83764AC:: @ 83764AC - obj_frame_tiles gSpriteImage_8376464, 0x20 - obj_frame_tiles gSpriteImage_8376484, 0x20 - - .align 2 -gUnknown_083764BC:: @ 83764BC - obj_pal Palette_3764A4, 0x1000 - - .align 2 -gSpriteAnim_83764C4:: @ 83764C4 - obj_image_anim_frame 0, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83764CC:: @ 83764CC - obj_image_anim_frame 0, 30, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83764D4:: @ 83764D4 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83764DC:: @ 83764DC - .4byte gSpriteAnim_83764C4 - .4byte gSpriteAnim_83764CC - .4byte gSpriteAnim_83764D4 - - .align 2 -gSpriteTemplate_83764E8:: @ 83764E8 - spr_template 0xFFFF, 0x1000, gOamData_837645C, gSpriteAnimTable_83764DC, gSpriteImageTable_83764AC, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_08376500:: @ 8376500 - .string " : $" diff --git a/data/text_window.s b/data/text_window.s deleted file mode 100644 index d8a3dbb38..000000000 --- a/data/text_window.s +++ /dev/null @@ -1,31 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083761F0:: @ 83761F0 - .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal - .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal - .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal - .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal - .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal - .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal - .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal - .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal - .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal - .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal - .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal - .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal - .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal - .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal - .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal - .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal - .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal - .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal - .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal - .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal - - .align 1 -gMessageBoxTilemap:: @ 8376290 - .incbin "graphics/text_window/message_box_map.bin" -- cgit v1.2.3 From a465fd339c08791d247f6897230cef94a17d8ca4 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 15 Nov 2017 23:28:16 -0500 Subject: migrate matsuda debug menu and tileset anim data to src --- data/matsuda_debug_menu.s | 201 --------------- data/tileset_anim.s | 637 ---------------------------------------------- 2 files changed, 838 deletions(-) delete mode 100644 data/matsuda_debug_menu.s delete mode 100644 data/tileset_anim.s (limited to 'data') diff --git a/data/matsuda_debug_menu.s b/data/matsuda_debug_menu.s deleted file mode 100644 index c4f7adcb7..000000000 --- a/data/matsuda_debug_menu.s +++ /dev/null @@ -1,201 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 83C9150 - .string "テストです$" @ "test" - -gMatsudaDebugMenu_ActionContestText: - .string "Contest$" - -gMatsudaDebugMenu_ActionContestResultsText: - .string "Contest results$" - .string "パラメータへんこう$" @ "Change parameter" - .string "わざ へんこう$" @ "Change move" - -gMatsudaDebugMenu_ActionContestCommText: - .string "Contest (comm.)$" - -gMatsudaDebugMenu_ActionCommTestText: - .string "Init comm. data$" - -gMatsudaDebugMenu_ActionSetHighScoreText: - .string "Set highest score$" - -gMatsudaDebugMenu_ActionResetHighScoreText: - .string "Reset highest score$" - -gMatsudaDebugMenu_ActionSetAllArtMuseumText: - .string "Set all art museum items$" - - .align 2 -gMatsudaDebugMenuActions:: @ 83C91F0 - .4byte gMatsudaDebugMenu_ActionContestText, MatsudaDebugMenu_Contest - .4byte gMatsudaDebugMenu_ActionContestResultsText, MatsudaDebugMenu_ContestResults - .4byte gMatsudaDebugMenu_ActionContestCommText, MatsudaDebugMenu_ContestComm - .4byte gMatsudaDebugMenu_ActionCommTestText, MatsudaDebugMenu_CommTest - .4byte gMatsudaDebugMenu_ActionSetHighScoreText, MatsudaDebugMenu_SetHighScore - .4byte gMatsudaDebugMenu_ActionResetHighScoreText, MatsudaDebugMenu_ResetHighScore - .4byte gMatsudaDebugMenu_ActionSetAllArtMuseumText, MatsudaDebugMenu_SetArtMuseumItems - -gMatsudaDebugMenu_UnknownByteArray:: @ 83C9228 - .byte 0xFC, 0x02, 0x0F, 0x00, 0xFF - -Unknown_083C922D: - .incbin "graphics/unknown/ball.4bpp" - - .align 1 -Unknown_083C924E: - .incbin "graphics/unknown/ball.gbapal" - -gUnknown_083C926E:: @ 83C926E - .byte 2, 0 - .byte 17, 0 - .byte 2, 2 - .byte 17, 2 - -gMatsudaDebugMenuContestTopLeft:: @ 83C9276 - .byte 0, 6 - .byte 15, 6 - .byte 0, 8 - .byte 15, 8 - .byte 0, 10 - .byte 15, 10 - -gUnknown_083C9282:: @ 83C9282 - .byte 7, 6 - .byte 22, 6 - .byte 7, 8 - .byte 22, 8 - .byte 7, 10 - .byte 22, 10 - -gUnknown_083C928E:: @ 83C928E - .byte 2, 14 - .byte 17, 14 - .byte 2, 16 - .byte 17, 16 - -gUnknown_083C9296:: @ 83C9296 - .byte 0x08, 0x80, 0x08, 0x80, 0x10, 0x10, 0x30, 0xA8, 0x30, 0xA8, 0x30, 0xA8, 0x08, 0x80, 0x08, 0x80, 0x10, 0x88 - -gUnknown_083C92A8:: @ 83C92A8 - .byte 0x08, 0x18, 0x28, 0x38, 0x48, 0x58, 0x78, 0x88, 0x98 - - .align 2 -gUnknown_083C92B4:: @ 83C92B4 - obj_tiles Unknown_083C922D, 32, 0x04b0 - - .align 2 -gUnknown_083C92BC:: @ 83C92BC - obj_pal Unknown_083C924E, 0x04B0 - - .align 2 -gOamData_83C92C4:: @ 83C92C4 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteTemplate_83C92CC:: @ 83C92CC - spr_template 1200, 1200, gOamData_83C92C4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80AA754 - - .align 2 -gUnknown_083C92E4:: @ 83C92E4 - .4byte sub_80AA8C8 - .4byte sub_80AA8D8 - .4byte sub_80AA8E8 - .4byte sub_80AA8F8 - .4byte sub_80AAC5C - .4byte sub_80AAC5C - .4byte sub_80AA930 - .4byte sub_80AA974 - .4byte sub_80AA9B8 - .4byte sub_80AA9FC - .4byte sub_80AAA40 - .4byte sub_80AAA84 - .4byte sub_80AAAF0 - .4byte sub_80AAB30 - .4byte sub_80AAB70 - .4byte sub_80AABB0 - .4byte sub_80AABF0 - .4byte sub_80AAD44 - -gMatsudaDebugMenu_StartText:: @ 83C932C - .string "{COLOR CYAN}{HIGHLIGHT RED}$" - .string "かいし$" @ Start - -gMatsudaDebugMenu_GoBackText:: @ 83C9337 - .string "もどる$" @ Go Back - -gMatsudaDebugMenu_BattlePointsText:: @ 83C933B -.ifdef ENGLISH - .string "{COLOR MAGENTA}BP.$" -.else - .string "{COLOR MAGENTA}BP,$" -.endif - -MatsudaDebugMenuText_Cool: - .string "かっこよさ$" @ coolness -MatsudaDebugMenuText_Cute: - .string "かわいさ$" @ cuteness -MatsudaDebugMenuText_Beauty: - .string "うつくしさ$" @ beauty -MatsudaDebugMenuText_Smart: - .string "かしこさ$" @ smartness -MatsudaDebugMenuText_Tough: - .string "たくましさ$" @ toughness -MatsudaDebugMenuText_Sheen: - .string "けづや$" @ sheen - - .align 2 -gMatsudaDebugMenuTextList1:: @ 83C9364 - .4byte MatsudaDebugMenuText_Cool - .4byte MatsudaDebugMenuText_Cute - .4byte MatsudaDebugMenuText_Beauty - .4byte MatsudaDebugMenuText_Smart - .4byte MatsudaDebugMenuText_Tough - .4byte MatsudaDebugMenuText_Sheen - -MatsudaDebugMenuText_CoolContest: - .string "かっこよさコンテスト$" @ Cool Contest -MatsudaDebugMenuText_BeautyContest: - .string "うつくしさコンテスト$" @ Beauty Contest -MatsudaDebugMenuText_CuteContest: - .string "かわいさコンテスト　$" @ Cute Contest -MatsudaDebugMenuText_SmartContest: - .string "かしこさコンテスト　$" @ Smart Contest -MatsudaDebugMenuText_ToughContest: - .string "たくましさコンテスト$" @ Tough Contest - - .align 2 -gMatsudaDebugMenuTextList2:: @ 83C93B4 - .4byte MatsudaDebugMenuText_CoolContest - .4byte MatsudaDebugMenuText_BeautyContest - .4byte MatsudaDebugMenuText_CuteContest - .4byte MatsudaDebugMenuText_SmartContest - .4byte MatsudaDebugMenuText_ToughContest - -MatsudaDebugMenuText_Fallarbor: - .string "ハジツゲ/ノーマル$" @ Fallarbor / Normal -MatsudaDebugMenuText_Verdanturf: - .string "シダケ/スーパー　$" @ Verdanturf / Super -MatsudaDebugMenuText_Slateport: - .string "カイナ/ハイパー　$" @ Slateport / Hyper -MatsudaDebugMenuText_Lilycove: - .string "ミナモ/マスター　$" @ Lilycove / Master - - .align 2 -gMatsudaDebugMenuTextList3:: @ 83C93F0 - .4byte MatsudaDebugMenuText_Fallarbor @ Normal - .4byte MatsudaDebugMenuText_Verdanturf @ Super - .4byte MatsudaDebugMenuText_Slateport @ Hyper - .4byte MatsudaDebugMenuText_Lilycove @ Master - -@ OamData - .align 2 -gUnknown_083C9400:: @ 83C9400 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0xF3FF diff --git a/data/tileset_anim.s b/data/tileset_anim.s deleted file mode 100644 index e34d50953..000000000 --- a/data/tileset_anim.s +++ /dev/null @@ -1,637 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -TilesetAnimTiles_General_0_1: @ 8376D84 - .incbin "data/tilesets/primary/general/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_General_0_0: @ 8376E04 - .incbin "data/tilesets/primary/general/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_General_0_2: @ 8376E84 - .incbin "data/tilesets/primary/general/anim/0/2.4bpp" - - .space 32 - - .align 2 -gTilesetAnimTable_General_0:: @ 8376F24 - .4byte TilesetAnimTiles_General_0_0 - .4byte TilesetAnimTiles_General_0_1 - .4byte TilesetAnimTiles_General_0_0 - .4byte TilesetAnimTiles_General_0_2 - - .align 2 -TilesetAnimTiles_General_1_0: @ 8376F34 - .incbin "data/tilesets/primary/general/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_General_1_1: @ 83772F4 - .incbin "data/tilesets/primary/general/anim/1/1.4bpp" - - .align 2 -TilesetAnimTiles_General_1_2: @ 83776B4 - .incbin "data/tilesets/primary/general/anim/1/2.4bpp" - - .align 2 -TilesetAnimTiles_General_1_3: @ 8377A74 - .incbin "data/tilesets/primary/general/anim/1/3.4bpp" - - .align 2 -TilesetAnimTiles_General_1_4: @ 8377E34 - .incbin "data/tilesets/primary/general/anim/1/4.4bpp" - - .align 2 -TilesetAnimTiles_General_1_5: @ 83781F4 - .incbin "data/tilesets/primary/general/anim/1/5.4bpp" - - .align 2 -TilesetAnimTiles_General_1_6: @ 83785B4 - .incbin "data/tilesets/primary/general/anim/1/6.4bpp" - - .align 2 -TilesetAnimTiles_General_1_7: @ 8378974 - .incbin "data/tilesets/primary/general/anim/1/7.4bpp" - - .align 2 -gTilesetAnimTable_General_1:: @ 8378D34 - .4byte TilesetAnimTiles_General_1_0 - .4byte TilesetAnimTiles_General_1_1 - .4byte TilesetAnimTiles_General_1_2 - .4byte TilesetAnimTiles_General_1_3 - .4byte TilesetAnimTiles_General_1_4 - .4byte TilesetAnimTiles_General_1_5 - .4byte TilesetAnimTiles_General_1_6 - .4byte TilesetAnimTiles_General_1_7 - - .align 2 -TilesetAnimTiles_General_2_0: @ 8378D54 - .incbin "data/tilesets/primary/general/anim/2/0.4bpp" - - .align 2 -TilesetAnimTiles_General_2_1: @ 8378E94 - .incbin "data/tilesets/primary/general/anim/2/1.4bpp" - - .align 2 -TilesetAnimTiles_General_2_2: @ 8378FD4 - .incbin "data/tilesets/primary/general/anim/2/2.4bpp" - - .align 2 -TilesetAnimTiles_General_2_3: @ 8379114 - .incbin "data/tilesets/primary/general/anim/2/3.4bpp" - - .align 2 -TilesetAnimTiles_General_2_4: @ 8379254 - .incbin "data/tilesets/primary/general/anim/2/4.4bpp" - - .align 2 -TilesetAnimTiles_General_2_5: @ 8379394 - .incbin "data/tilesets/primary/general/anim/2/5.4bpp" - - .align 2 -TilesetAnimTiles_General_2_6: @ 83794D4 - .incbin "data/tilesets/primary/general/anim/2/6.4bpp" - - .align 2 -gTilesetAnimTable_General_2:: @ 8379614 - .4byte TilesetAnimTiles_General_2_0 - .4byte TilesetAnimTiles_General_2_1 - .4byte TilesetAnimTiles_General_2_2 - .4byte TilesetAnimTiles_General_2_3 - .4byte TilesetAnimTiles_General_2_4 - .4byte TilesetAnimTiles_General_2_5 - .4byte TilesetAnimTiles_General_2_6 - .4byte TilesetAnimTiles_General_2_0 - - .align 2 -TilesetAnimTiles_General_3_0: @ 8379634 - .incbin "data/tilesets/primary/general/anim/3/0.4bpp" - - .align 2 -TilesetAnimTiles_General_3_1: @ 83796F4 - .incbin "data/tilesets/primary/general/anim/3/1.4bpp" - - .align 2 -TilesetAnimTiles_General_3_2: @ 83797B4 - .incbin "data/tilesets/primary/general/anim/3/2.4bpp" - - .align 2 -TilesetAnimTiles_General_3_3: @ 8379874 - .incbin "data/tilesets/primary/general/anim/3/3.4bpp" - - .align 2 -gTilesetAnimTable_General_3:: @ 8379934 - .4byte TilesetAnimTiles_General_3_0 - .4byte TilesetAnimTiles_General_3_1 - .4byte TilesetAnimTiles_General_3_2 - .4byte TilesetAnimTiles_General_3_3 - - .align 2 -TilesetAnimTiles_General_4_0: @ 8379944 - .incbin "data/tilesets/primary/general/anim/4/0.4bpp" - - .align 2 -TilesetAnimTiles_General_4_1: @ 8379A84 - .incbin "data/tilesets/primary/general/anim/4/1.4bpp" - - .align 2 -TilesetAnimTiles_General_4_2: @ 8379BC4 - .incbin "data/tilesets/primary/general/anim/4/2.4bpp" - - .align 2 -TilesetAnimTiles_General_4_3: @ 8379D04 - .incbin "data/tilesets/primary/general/anim/4/3.4bpp" - - .align 2 -gTilesetAnimTable_General_4:: @ 8379E44 - .4byte TilesetAnimTiles_General_4_0 - .4byte TilesetAnimTiles_General_4_1 - .4byte TilesetAnimTiles_General_4_2 - .4byte TilesetAnimTiles_General_4_3 - - .align 2 -TilesetAnimTiles_Lavaridge_0: @ 8379E54 - .incbin "data/tilesets/secondary/lavaridge/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_Lavaridge_1: @ 8379ED4 - .incbin "data/tilesets/secondary/lavaridge/anim/1.4bpp" - - .align 2 -TilesetAnimTiles_Lavaridge_2: @ 8379F54 - .incbin "data/tilesets/secondary/lavaridge/anim/2.4bpp" - - .align 2 -TilesetAnimTiles_Lavaridge_3: @ 8379FD4 - .incbin "data/tilesets/secondary/lavaridge/anim/3.4bpp" - - .align 2 -gTilesetAnimTable_Lavaridge:: @ 837A054 - .4byte TilesetAnimTiles_Lavaridge_0 - .4byte TilesetAnimTiles_Lavaridge_1 - .4byte TilesetAnimTiles_Lavaridge_2 - .4byte TilesetAnimTiles_Lavaridge_3 - - .align 2 -TilesetAnimTiles_Pacifidlog_0_0: @ 837A064 - .incbin "data/tilesets/secondary/pacifidlog/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_0_1: @ 837A424 - .incbin "data/tilesets/secondary/pacifidlog/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_0_2: @ 837A7E4 - .incbin "data/tilesets/secondary/pacifidlog/anim/0/2.4bpp" - - .align 2 -gTilesetAnimTable_Pacifidlog_0:: @ 837ABA4 - .4byte TilesetAnimTiles_Pacifidlog_0_0 - .4byte TilesetAnimTiles_Pacifidlog_0_1 - .4byte TilesetAnimTiles_Pacifidlog_0_2 - .4byte TilesetAnimTiles_Pacifidlog_0_1 - - .align 2 -TilesetAnimTiles_Underwater_0: @ 837ABB4 - .incbin "data/tilesets/secondary/underwater/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_Underwater_1: @ 837AC34 - .incbin "data/tilesets/secondary/underwater/anim/1.4bpp" - - .align 2 -TilesetAnimTiles_Underwater_2: @ 837ACB4 - .incbin "data/tilesets/secondary/underwater/anim/2.4bpp" - - .align 2 -TilesetAnimTiles_Underwater_3: @ 837AD34 - .incbin "data/tilesets/secondary/underwater/anim/3.4bpp" - - .align 2 -gTilesetAnimTable_Underwater:: @ 837ADB4 - .4byte TilesetAnimTiles_Underwater_0 - .4byte TilesetAnimTiles_Underwater_1 - .4byte TilesetAnimTiles_Underwater_2 - .4byte TilesetAnimTiles_Underwater_3 - - .align 2 -TilesetAnimTiles_Pacifidlog_1_0: @ 837ADC4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_1: @ 837AEC4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/1.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_2: @ 837AFC4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/2.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_3: @ 837B0C4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/3.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_4: @ 837B1C4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/4.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_5: @ 837B2C4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/5.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_6: @ 837B3C4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/6.4bpp" - - .align 2 -TilesetAnimTiles_Pacifidlog_1_7: @ 837B4C4 - .incbin "data/tilesets/secondary/pacifidlog/anim/1/7.4bpp" - - .align 2 -gTilesetAnimTable_Pacifidlog_1:: @ 837B5C4 - .4byte TilesetAnimTiles_Pacifidlog_1_0 - .4byte TilesetAnimTiles_Pacifidlog_1_1 - .4byte TilesetAnimTiles_Pacifidlog_1_2 - .4byte TilesetAnimTiles_Pacifidlog_1_3 - .4byte TilesetAnimTiles_Pacifidlog_1_4 - .4byte TilesetAnimTiles_Pacifidlog_1_5 - .4byte TilesetAnimTiles_Pacifidlog_1_6 - .4byte TilesetAnimTiles_Pacifidlog_1_7 - - .align 2 -TilesetAnimTiles_Mauville_0_0: @ 837B5E4 - .incbin "data/tilesets/secondary/mauville/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_0_1: @ 837B664 - .incbin "data/tilesets/secondary/mauville/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_0_2: @ 837B6E4 - .incbin "data/tilesets/secondary/mauville/anim/0/2.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_0_3: @ 837B764 - .incbin "data/tilesets/secondary/mauville/anim/0/3.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_0_4: @ 837B7E4 - .incbin "data/tilesets/secondary/mauville/anim/0/4.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_1_0: @ 837B864 - .incbin "data/tilesets/secondary/mauville/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_1_1: @ 837B8E4 - .incbin "data/tilesets/secondary/mauville/anim/1/1.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_1_2: @ 837B964 - .incbin "data/tilesets/secondary/mauville/anim/1/2.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_1_3: @ 837B9E4 - .incbin "data/tilesets/secondary/mauville/anim/1/3.4bpp" - - .align 2 -TilesetAnimTiles_Mauville_1_4: @ 837BA64 - .incbin "data/tilesets/secondary/mauville/anim/1/4.4bpp" - - .align 2 -gUnknown_0837BAE4:: @ 837BAE4 - .4byte 0x06004C00 - .4byte 0x06004C80 - .4byte 0x06004D00 - .4byte 0x06004D80 - .4byte 0x06004E00 - .4byte 0x06004E80 - .4byte 0x06004F00 - .4byte 0x06004F80 - - .align 2 -gUnknown_0837BB04:: @ 837BB04 - .4byte 0x06005000 - .4byte 0x06005080 - .4byte 0x06005100 - .4byte 0x06005180 - .4byte 0x06005200 - .4byte 0x06005280 - .4byte 0x06005300 - .4byte 0x06005380 - - .align 2 -gTilesetAnimTable_Mauville_0A:: @ 837BB24 - .4byte TilesetAnimTiles_Mauville_0_0 - .4byte TilesetAnimTiles_Mauville_0_0 - .4byte TilesetAnimTiles_Mauville_0_1 - .4byte TilesetAnimTiles_Mauville_0_2 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_3 - .4byte TilesetAnimTiles_Mauville_0_2 - .4byte TilesetAnimTiles_Mauville_0_1 - - .align 2 -gTilesetAnimTable_Mauville_1A:: @ 837BB54 - .4byte TilesetAnimTiles_Mauville_1_0 - .4byte TilesetAnimTiles_Mauville_1_0 - .4byte TilesetAnimTiles_Mauville_1_1 - .4byte TilesetAnimTiles_Mauville_1_2 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_3 - .4byte TilesetAnimTiles_Mauville_1_2 - .4byte TilesetAnimTiles_Mauville_1_1 - - .align 2 -gTilesetAnimTable_Mauville_0B:: @ 837BB84 - .4byte TilesetAnimTiles_Mauville_0_0 - .4byte TilesetAnimTiles_Mauville_0_0 - .4byte TilesetAnimTiles_Mauville_0_4 - .4byte TilesetAnimTiles_Mauville_0_4 - - .align 2 -gTilesetAnimTable_Mauville_1B:: @ 837BB94 - .4byte TilesetAnimTiles_Mauville_1_0 - .4byte TilesetAnimTiles_Mauville_1_0 - .4byte TilesetAnimTiles_Mauville_1_4 - .4byte TilesetAnimTiles_Mauville_1_4 - - .align 2 -TilesetAnimTiles_Rustboro_0_0: @ 837BBA4 - .incbin "data/tilesets/secondary/rustboro/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_1: @ 837BC24 - .incbin "data/tilesets/secondary/rustboro/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_2: @ 837BCA4 - .incbin "data/tilesets/secondary/rustboro/anim/0/2.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_3: @ 837BD24 - .incbin "data/tilesets/secondary/rustboro/anim/0/3.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_4: @ 837BDA4 - .incbin "data/tilesets/secondary/rustboro/anim/0/4.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_5: @ 837BE24 - .incbin "data/tilesets/secondary/rustboro/anim/0/5.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_6: @ 837BEA4 - .incbin "data/tilesets/secondary/rustboro/anim/0/6.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_0_7: @ 837BF24 - .incbin "data/tilesets/secondary/rustboro/anim/0/7.4bpp" - - .align 2 -gUnknown_0837BFA4:: @ 837BFA4 - .4byte 0x06005000 - .4byte 0x06005080 - .4byte 0x06005100 - .4byte 0x06005180 - .4byte 0x06005200 - .4byte 0x06005280 - .4byte 0x06005300 - .4byte 0x06005380 - - .align 2 -gTilesetAnimTable_Rustboro_0:: @ 837BFC4 - .4byte TilesetAnimTiles_Rustboro_0_0 - .4byte TilesetAnimTiles_Rustboro_0_1 - .4byte TilesetAnimTiles_Rustboro_0_2 - .4byte TilesetAnimTiles_Rustboro_0_3 - .4byte TilesetAnimTiles_Rustboro_0_4 - .4byte TilesetAnimTiles_Rustboro_0_5 - .4byte TilesetAnimTiles_Rustboro_0_6 - .4byte TilesetAnimTiles_Rustboro_0_7 - - .align 2 -TilesetAnimTiles_Rustboro_1_0: @ 837BFE4 - .incbin "data/tilesets/secondary/rustboro/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_Rustboro_1_1: @ 837C064 - .incbin "data/tilesets/secondary/rustboro/anim/1/1.4bpp" - - .align 2 -gTilesetAnimTable_Rustboro_1:: @ 837C0E4 - .4byte TilesetAnimTiles_Rustboro_1_0 - .4byte TilesetAnimTiles_Rustboro_1_1 - - .align 2 -TilesetAnimTiles_Cave_0: @ 837C0EC - .incbin "data/tilesets/secondary/cave/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_Cave_1: @ 837C16C - .incbin "data/tilesets/secondary/cave/anim/1.4bpp" - - .align 2 -TilesetAnimTiles_Cave_2: @ 837C1EC - .incbin "data/tilesets/secondary/cave/anim/2.4bpp" - - .align 2 -TilesetAnimTiles_Cave_3: @ 837C26C - .incbin "data/tilesets/secondary/cave/anim/3.4bpp" - - .incbin "data/tilesets/secondary/cave/anim/unused/0.4bpp" - .incbin "data/tilesets/secondary/cave/anim/unused/1.4bpp" - .incbin "data/tilesets/secondary/cave/anim/unused/2.4bpp" - .incbin "data/tilesets/secondary/cave/anim/unused/3.4bpp" - - .space 32 - - .align 2 -gTilesetAnimTable_Cave:: @ 837C50C - .4byte TilesetAnimTiles_Cave_0 - .4byte TilesetAnimTiles_Cave_1 - .4byte TilesetAnimTiles_Cave_2 - .4byte TilesetAnimTiles_Cave_3 - - .align 2 -TilesetAnimTiles_EverGrande_0: @ 837C51C - .incbin "data/tilesets/secondary/ever_grande/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_1: @ 837C59C - .incbin "data/tilesets/secondary/ever_grande/anim/1.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_2: @ 837C61C - .incbin "data/tilesets/secondary/ever_grande/anim/2.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_3: @ 837C69C - .incbin "data/tilesets/secondary/ever_grande/anim/3.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_4: @ 837C71C - .incbin "data/tilesets/secondary/ever_grande/anim/4.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_5: @ 837C79C - .incbin "data/tilesets/secondary/ever_grande/anim/5.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_6: @ 837C81C - .incbin "data/tilesets/secondary/ever_grande/anim/6.4bpp" - - .align 2 -TilesetAnimTiles_EverGrande_7: @ 837C89C - .incbin "data/tilesets/secondary/ever_grande/anim/7.4bpp" - - .space 32 - - .align 2 -gUnknown_0837C93C:: @ 837C93C - .4byte 0x06005C00 - .4byte 0x06005C80 - .4byte 0x06005D00 - .4byte 0x06005D80 - .4byte 0x06005E00 - .4byte 0x06005E80 - .4byte 0x06005F00 - .4byte 0x06005F80 - - .align 2 -gTilesetAnimTable_EverGrande:: @ 837C95C - .4byte TilesetAnimTiles_EverGrande_0 - .4byte TilesetAnimTiles_EverGrande_1 - .4byte TilesetAnimTiles_EverGrande_2 - .4byte TilesetAnimTiles_EverGrande_3 - .4byte TilesetAnimTiles_EverGrande_4 - .4byte TilesetAnimTiles_EverGrande_5 - .4byte TilesetAnimTiles_EverGrande_6 - .4byte TilesetAnimTiles_EverGrande_7 - - .align 2 -TilesetAnimTiles_Building_0: @ 837C97C - .incbin "data/tilesets/primary/building/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_Building_1: @ 837C9FC - .incbin "data/tilesets/primary/building/anim/1.4bpp" - - .align 2 -gTilesetAnimTable_Building:: @ 837CA7C - .4byte TilesetAnimTiles_Building_0 - .4byte TilesetAnimTiles_Building_1 - - .align 2 -TilesetAnimTiles_SootopolisGym_0_0: @ 837CA84 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_SootopolisGym_0_1: @ 837CC04 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_SootopolisGym_0_2: @ 837CD84 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp" - - .align 2 -TilesetAnimTiles_SootopolisGym_1_0: @ 837CF04 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_SootopolisGym_1_1: @ 837D184 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp" - - .align 2 -TilesetAnimTiles_SootopolisGym_1_2: @ 837D404 - .incbin "data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp" - - .align 2 -gTilesetAnimTable_SootopolisGym_0:: @ 837D684 - .4byte TilesetAnimTiles_SootopolisGym_0_0 - .4byte TilesetAnimTiles_SootopolisGym_0_1 - .4byte TilesetAnimTiles_SootopolisGym_0_2 - - .align 2 -gTilesetAnimTable_SootopolisGym_1:: @ 837D690 - .4byte TilesetAnimTiles_SootopolisGym_1_0 - .4byte TilesetAnimTiles_SootopolisGym_1_1 - .4byte TilesetAnimTiles_SootopolisGym_1_2 - - .align 2 -TilesetAnimTiles_EliteFour_1_0: @ 837D69C - .incbin "data/tilesets/secondary/elite_four/anim/1/0.4bpp" - - .align 2 -TilesetAnimTiles_EliteFour_1_1: @ 837D71C - .incbin "data/tilesets/secondary/elite_four/anim/1/1.4bpp" - - .align 2 -TilesetAnimTiles_EliteFour_0_0: @ 837D79C - .incbin "data/tilesets/secondary/elite_four/anim/0/0.4bpp" - - .align 2 -TilesetAnimTiles_EliteFour_0_1: @ 837D7BC - .incbin "data/tilesets/secondary/elite_four/anim/0/1.4bpp" - - .align 2 -TilesetAnimTiles_EliteFour_0_2: @ 837D7DC - .incbin "data/tilesets/secondary/elite_four/anim/0/2.4bpp" - - .align 2 -TilesetAnimTiles_EliteFour_0_3: @ 837D7FC - .incbin "data/tilesets/secondary/elite_four/anim/0/3.4bpp" - - .space 32 - - .align 2 -gTilesetAnimTable_EliteFour_0:: @ 837D83C - .4byte TilesetAnimTiles_EliteFour_0_0 - .4byte TilesetAnimTiles_EliteFour_0_1 - .4byte TilesetAnimTiles_EliteFour_0_2 - .4byte TilesetAnimTiles_EliteFour_0_3 - - .align 2 -gTilesetAnimTable_EliteFour_1:: @ 837D84C - .4byte TilesetAnimTiles_EliteFour_1_0 - .4byte TilesetAnimTiles_EliteFour_1_1 - - .align 2 -TilesetAnimTiles_MauvilleGym_0: @ 837D854 - .incbin "data/tilesets/secondary/mauville_gym/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_MauvilleGym_1: @ 837DA54 - .incbin "data/tilesets/secondary/mauville_gym/anim/1.4bpp" - - .space 32 - - .align 2 -gTilesetAnimTable_MauvilleGym:: @ 837DC74 - .4byte TilesetAnimTiles_MauvilleGym_0 - .4byte TilesetAnimTiles_MauvilleGym_1 - - .align 2 -TilesetAnimTiles_BikeShop_0: @ 837DC7C - .incbin "data/tilesets/secondary/bike_shop/anim/0.4bpp" - - .align 2 -TilesetAnimTiles_BikeShop_1: @ 837DD9C - .incbin "data/tilesets/secondary/bike_shop/anim/1.4bpp" - - .space 32 - - .align 2 -gTilesetAnimTable_BikeShop:: @ 837DEDC - .4byte TilesetAnimTiles_BikeShop_0 - .4byte TilesetAnimTiles_BikeShop_1 -- cgit v1.2.3 From 5e97fb83269bbee6b5adf9c7aeb992f45a6dd563 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Wed, 15 Nov 2017 23:40:46 -0500 Subject: fix Route124 concatenation in map_events.s --- data/map_events.s | 13 +------------ data/maps/events/Route124_DivingTreasureHuntersHouse.inc | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100755 data/maps/events/Route124_DivingTreasureHuntersHouse.inc (limited to 'data') diff --git a/data/map_events.s b/data/map_events.s index 68c8e510e..7156e4b6e 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -396,15 +396,4 @@ .include "data/maps/events/Route119_WeatherInstitute_1F.inc" .include "data/maps/events/Route119_WeatherInstitute_2F.inc" .include "data/maps/events/Route119_House.inc" -Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0 - -Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 - warp_def 3, 8, 0, 0, Route124 - warp_def 4, 8, 0, 0, Route124 - -Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 - bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 - -Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 - map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents + .include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc" diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc new file mode 100755 index 000000000..5d60c795e --- /dev/null +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -0,0 +1,12 @@ +Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C + object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0 + +Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 + warp_def 3, 8, 0, 0, Route124 + warp_def 4, 8, 0, 0, Route124 + +Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 + bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 + +Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 + map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents -- cgit v1.2.3 From 9bf23faf9d73d4dbe9ba160e89a0cfd4508a2692 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Thu, 16 Nov 2017 00:22:33 -0500 Subject: migrate fldeff_flash and money data to src --- data/fldeff_flash.s | 71 ----------------------------------------------------- data/money.s | 31 ----------------------- 2 files changed, 102 deletions(-) delete mode 100644 data/fldeff_flash.s delete mode 100644 data/money.s (limited to 'data') diff --git a/data/fldeff_flash.s b/data/fldeff_flash.s deleted file mode 100644 index c8b6185f2..000000000 --- a/data/fldeff_flash.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083F7FC4:: @ 83F7FC4 - .byte 1, 4, 1, 0 - .4byte sub_810CFF8 - .byte 2, 4, 1, 0 - .4byte sub_810CFF8 - .byte 3, 4, 1, 0 - .4byte sub_810CFF8 - .byte 5, 4, 1, 0 - .4byte sub_810CFF8 - .byte 6, 4, 1, 0 - .4byte sub_810CFF8 - .byte 7, 4, 1, 0 - .4byte sub_810CFF8 - .byte 8, 4, 1, 0 - .4byte sub_810CFF8 - .byte 9, 4, 1, 0 - .4byte sub_810CFF8 - - .byte 4, 1, 0, 1 - .4byte sub_810CE48 - .byte 4, 2, 0, 1 - .4byte sub_810CE48 - .byte 4, 3, 0, 1 - .4byte sub_810CE48 - .byte 4, 5, 0, 1 - .4byte sub_810CE48 - .byte 4, 6, 0, 1 - .4byte sub_810CE48 - .byte 4, 7, 0, 1 - .4byte sub_810CE48 - .byte 4, 8, 0, 1 - .4byte sub_810CE48 - .byte 4, 9, 0, 1 - .4byte sub_810CE48 - - .byte 0, 0, 0, 0 - .4byte NULL - - .align 2 -gCaveTransitionPalette_White:: @ 83F804C - .rept 16 - .2byte 0x7FFF - .endr - - .align 2 -gCaveTransitionPalette_Black:: @ 83F806C - .rept 16 - .2byte 0x0000 - .endr - - .align 1 -gUnknown_083F808C:: @ 83F808C - .incbin "graphics/misc/83F808C.gbapal" - - .align 1 -gUnknown_083F809C:: @ 83F809C - .incbin "graphics/misc/83F809C.gbapal" - - .align 2 -gCaveTransitionTilemap:: @ 83F80AC - .incbin "graphics/misc/cave_transition_map.bin.lz" - - .align 2 -gCaveTransitionTiles:: @ 83F828C - .incbin "graphics/misc/cave_transition.4bpp.lz" diff --git a/data/money.s b/data/money.s deleted file mode 100644 index 04e54a836..000000000 --- a/data/money.s +++ /dev/null @@ -1,31 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gOamData_83CF558:: @ 83CF558 - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83CF560:: @ 83CF560 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83CF568:: @ 83CF568 - .4byte gSpriteAnim_83CF560 - - .align 2 -gSpriteTemplate_83CF56C:: @ 83CF56C - spr_template 10018, 10018, gOamData_83CF558, gSpriteAnimTable_83CF568, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_083CF584:: @ 83CF584 - obj_tiles gMenuMoneyGfx, 256, 0x2722 - - .align 2 -gUnknown_083CF58C:: @ 83CF58C - obj_pal gMenuMoneyPal, 0x2722 -- cgit v1.2.3 From 402fbab95183eb4f67533468061bb5ca979c67e7 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 17 Nov 2017 01:01:38 -0500 Subject: split fldeff_80C5CD4.s --- data/fldeff_80C5CD4.s | 320 --------------------------------------------- data/fldeff_decoration.s | 36 +++++ data/fldeff_recordmixing.s | 45 +++++++ data/fldeff_secretpower.s | 208 +++++++++++++++++++++++++++++ data/pss_effect.s | 43 ++++++ 5 files changed, 332 insertions(+), 320 deletions(-) delete mode 100644 data/fldeff_80C5CD4.s create mode 100755 data/fldeff_decoration.s create mode 100755 data/fldeff_recordmixing.s create mode 100755 data/fldeff_secretpower.s create mode 100755 data/pss_effect.s (limited to 'data') diff --git a/data/fldeff_80C5CD4.s b/data/fldeff_80C5CD4.s deleted file mode 100644 index 4f0e83832..000000000 --- a/data/fldeff_80C5CD4.s +++ /dev/null @@ -1,320 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083D1898:: @ 83D1898 - obj_tiles gUnknownGfx_083D190C, 0x80, 0 - - .align 2 -gUnknown_083D18A0:: @ 83D18A0 - obj_pal gUnknownPal_083D18EC, 0x0000 - - .align 2 -gSpriteTemplate_83D18A8:: @ 83D18A8 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C60CC - - .align 2 -gSpriteTemplate_83D18C0:: @ 83D18C0 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C6130 - - .align 2 -gOamData_83D18D8:: @ 83D18D8 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83D18E0:: @ 83D18E0 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D18E8:: @ 83D18E8 - .4byte gSpriteAnim_83D18E0 - - .align 2 -gUnknownPal_083D18EC:: - .incbin "graphics/unknown/unknown_3D18EC.gbapal" - - .align 2 -gUnknownGfx_083D190C:: - .incbin "graphics/unknown/unknown_3D190C.4bpp" - - .align 2 -gSpriteImage_83D198C:: @ 83D198C - .incbin "graphics/unknown_sprites/83D259C/0.4bpp" - - .align 2 -gSpriteImage_83D1A0C:: @ 83D1A0C - .incbin "graphics/unknown_sprites/83D259C/1.4bpp" - - .align 2 -gSpriteImage_83D1A8C:: @ 83D1A8C - .incbin "graphics/unknown_sprites/83D259C/2.4bpp" - - .align 2 -gSpriteImage_83D1B0C:: @ 83D1B0C - .incbin "graphics/unknown_sprites/83D259C/3.4bpp" - - .align 2 -gSpriteImage_83D1B8C:: @ 83D1B8C - .incbin "graphics/unknown_sprites/83D259C/4.4bpp" - - .space 32 - - .align 2 -gFieldEffectObjectPalette7: @ 83D1C2C - .incbin "graphics/field_effect_objects/palettes/07.gbapal" - - .align 2 -gSpriteImage_83D1C4C:: @ 83D1C4C - .incbin "graphics/unknown_sprites/83D25EC/0.4bpp" - - .align 2 -gSpriteImage_83D1CCC:: @ 83D1CCC - .incbin "graphics/unknown_sprites/83D25EC/1.4bpp" - - .align 2 -gSpriteImage_83D1D4C:: @ 83D1D4C - .incbin "graphics/unknown_sprites/83D25EC/2.4bpp" - - .align 2 -gSpriteImage_83D1DCC:: @ 83D1DCC - .incbin "graphics/unknown_sprites/83D25EC/3.4bpp" - - .align 2 -gSpriteImage_83D1E4C:: @ 83D1E4C - .incbin "graphics/unknown_sprites/83D25EC/4.4bpp" - - .align 2 -gSpriteImage_83D1ECC:: @ 83D1ECC - .incbin "graphics/unknown_sprites/83D25C4/0.4bpp" - - .align 2 -gSpriteImage_83D1F4C:: @ 83D1F4C - .incbin "graphics/unknown_sprites/83D25C4/1.4bpp" - - .align 2 -gSpriteImage_83D1FCC:: @ 83D1FCC - .incbin "graphics/unknown_sprites/83D25C4/2.4bpp" - - .align 2 -gSpriteImage_83D204C:: @ 83D204C - .incbin "graphics/unknown_sprites/83D25C4/3.4bpp" - - .align 2 -gSpriteImage_83D20CC:: @ 83D20CC - .incbin "graphics/unknown_sprites/83D25C4/4.4bpp" - - .align 2 - .incbin "graphics/unknown_sprites/83D25C4/5.4bpp" - - .align 2 -gFieldEffectObjectPalette8: @ 83D21CC - .incbin "graphics/field_effect_objects/palettes/08.gbapal" - - .align 2 -gSpriteImage_83D21EC:: @ 83D21EC - .incbin "graphics/unknown_sprites/83D2688/0.4bpp" - - .align 2 -gSpriteImage_83D22EC:: @ 83D22EC - .incbin "graphics/unknown_sprites/83D2688/1.4bpp" - - .align 2 -gSpriteImage_83D23EC:: @ 83D23EC - .incbin "graphics/unknown_sprites/83D2688/2.4bpp" - - .align 2 -gOamData_83D24EC:: @ 83D24EC - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83D24F4:: @ 83D24F4 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_83D250C:: @ 83D250C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_83D2524:: @ 83D2524 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_83D253C:: @ 83D253C - obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_83D2554:: @ 83D2554 - obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_83D256C:: @ 83D256C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D2584:: @ 83D2584 - .4byte gSpriteAnim_83D24F4 - - .align 2 -gSpriteAnimTable_83D2588:: @ 83D2588 - .4byte gSpriteAnim_83D250C - .4byte gSpriteAnim_83D2524 - .4byte gSpriteAnim_83D253C - .4byte gSpriteAnim_83D2554 - - .align 2 -gSpriteAnimTable_83D2598:: @ 83D2598 - .4byte gSpriteAnim_83D256C - - .align 2 -gSpriteImageTable_83D259C:: @ 83D259C - obj_frame_tiles gSpriteImage_83D198C, 0x80 - obj_frame_tiles gSpriteImage_83D1A0C, 0x80 - obj_frame_tiles gSpriteImage_83D1A8C, 0x80 - obj_frame_tiles gSpriteImage_83D1B0C, 0x80 - obj_frame_tiles gSpriteImage_83D1B8C, 0x80 - - .align 2 -gSpriteImageTable_83D25C4:: @ 83D25C4 - obj_frame_tiles gSpriteImage_83D1ECC, 0x80 - obj_frame_tiles gSpriteImage_83D1F4C, 0x80 - obj_frame_tiles gSpriteImage_83D1FCC, 0x80 - obj_frame_tiles gSpriteImage_83D204C, 0x80 - obj_frame_tiles gSpriteImage_83D20CC, 0x80 - - .align 2 -gSpriteImageTable_83D25EC:: @ 83D25EC - obj_frame_tiles gSpriteImage_83D1C4C, 0x80 - obj_frame_tiles gSpriteImage_83D1CCC, 0x80 - obj_frame_tiles gSpriteImage_83D1D4C, 0x80 - obj_frame_tiles gSpriteImage_83D1DCC, 0x80 - obj_frame_tiles gSpriteImage_83D1E4C, 0x80 - - .align 2 -gSpriteTemplate_83D2614:: @ 83D2614 - spr_template 0xFFFF, 4099, gOamData_83D24EC, gSpriteAnimTable_83D2584, gSpriteImageTable_83D259C, gDummySpriteAffineAnimTable, sub_80C644C - - .align 2 -gSpriteTemplate_83D262C:: @ 83D262C - spr_template 0xFFFF, 4104, gOamData_83D24EC, gSpriteAnimTable_83D2588, gSpriteImageTable_83D25C4, gDummySpriteAffineAnimTable, sub_80C6598 - - .align 2 -gSpriteTemplate_83D2644:: @ 83D2644 - spr_template 0xFFFF, 4104, gOamData_83D24EC, gSpriteAnimTable_83D2598, gSpriteImageTable_83D25EC, gDummySpriteAffineAnimTable, sub_80C66BC - - .align 2 -gFieldEffectObjectPaletteInfo7:: @ 83D265C - obj_pal gFieldEffectObjectPalette7, 0x1003 - - .align 2 -gFieldEffectObjectPaletteInfo8:: @ 83D2664 - obj_pal gFieldEffectObjectPalette8, 0x1008 - - .align 2 -gOamData_83D266C:: @ 83D266C - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83D2674:: @ 83D2674 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D2684:: @ 83D2684 - .4byte gSpriteAnim_83D2674 - - .align 2 -gSpriteImageTable_83D2688:: @ 83D2688 - obj_frame_tiles gSpriteImage_83D21EC, 0x100 - obj_frame_tiles gSpriteImage_83D22EC, 0x100 - obj_frame_tiles gSpriteImage_83D23EC, 0x100 - - .align 2 -gSpriteTemplate_83D26A0:: @ 83D26A0 - spr_template 0xFFFF, 4110, gOamData_83D266C, gSpriteAnimTable_83D2684, gSpriteImageTable_83D2688, gDummySpriteAffineAnimTable, SpriteCB_SandPillar_0 - -@ This uses one of the secret base palettes, so there is no "09.pal" file. - .align 2 -gFieldEffectObjectPaletteInfo9:: @ 83D26B8 - obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E - - .align 2 -gSpriteImage_83D26C0:: @ 83D26C0 - .incbin "graphics/unknown_sprites/83D2860/0.4bpp" - - .align 2 -gSpriteImage_83D2740:: @ 83D2740 - .incbin "graphics/unknown_sprites/83D2860/1.4bpp" - - .align 2 -gSpriteImage_83D27C0:: @ 83D27C0 - .incbin "graphics/unknown_sprites/83D2860/2.4bpp" - - .align 2 -Palette_3D2840:: @ 83D2840 - .incbin "graphics/unknown/unknown_3D2840.gbapal" - - .align 2 -gSpriteImageTable_83D2860:: @ 83D2860 - obj_frame_tiles gSpriteImage_83D26C0, 0x80 - obj_frame_tiles gSpriteImage_83D2740, 0x80 - obj_frame_tiles gSpriteImage_83D27C0, 0x80 - - .align 2 -gUnknown_083D2878:: @ 83D2878 - obj_pal Palette_3D2840, 4096 - - .align 2 -gSpriteAnim_83D2880:: @ 83D2880 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_frame 2, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83D2890:: @ 83D2890 - .4byte gSpriteAnim_83D2880 - - .align 2 -gSpriteTemplate_83D2894:: @ 83D2894 - spr_template 0xFFFF, 4096, gFieldOamData_32x8, gSpriteAnimTable_83D2890, gSpriteImageTable_83D2860, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/fldeff_decoration.s b/data/fldeff_decoration.s new file mode 100755 index 000000000..2081679cd --- /dev/null +++ b/data/fldeff_decoration.s @@ -0,0 +1,36 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gOamData_83D266C:: @ 83D266C + .2byte 0x8000 + .2byte 0x8000 + .2byte 0x0800 + + .align 2 +gSpriteAnim_83D2674:: @ 83D2674 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_frame 2, 6 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_83D2684:: @ 83D2684 + .4byte gSpriteAnim_83D2674 + + .align 2 +gSpriteImageTable_83D2688:: @ 83D2688 + obj_frame_tiles gSpriteImage_83D21EC, 0x100 + obj_frame_tiles gSpriteImage_83D22EC, 0x100 + obj_frame_tiles gSpriteImage_83D23EC, 0x100 + + .align 2 +gSpriteTemplate_83D26A0:: @ 83D26A0 + spr_template 0xFFFF, 4110, gOamData_83D266C, gSpriteAnimTable_83D2684, gSpriteImageTable_83D2688, gDummySpriteAffineAnimTable, SpriteCB_SandPillar_0 + +@ This uses one of the secret base palettes, so there is no "09.pal" file. + .align 2 +gFieldEffectObjectPaletteInfo9:: @ 83D26B8 + obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E diff --git a/data/fldeff_recordmixing.s b/data/fldeff_recordmixing.s new file mode 100755 index 000000000..ee9d6b8d6 --- /dev/null +++ b/data/fldeff_recordmixing.s @@ -0,0 +1,45 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gSpriteImage_83D26C0:: @ 83D26C0 + .incbin "graphics/unknown_sprites/83D2860/0.4bpp" + + .align 2 +gSpriteImage_83D2740:: @ 83D2740 + .incbin "graphics/unknown_sprites/83D2860/1.4bpp" + + .align 2 +gSpriteImage_83D27C0:: @ 83D27C0 + .incbin "graphics/unknown_sprites/83D2860/2.4bpp" + + .align 2 +Palette_3D2840:: @ 83D2840 + .incbin "graphics/unknown/unknown_3D2840.gbapal" + + .align 2 +gSpriteImageTable_83D2860:: @ 83D2860 + obj_frame_tiles gSpriteImage_83D26C0, 0x80 + obj_frame_tiles gSpriteImage_83D2740, 0x80 + obj_frame_tiles gSpriteImage_83D27C0, 0x80 + + .align 2 +gUnknown_083D2878:: @ 83D2878 + obj_pal Palette_3D2840, 4096 + + .align 2 +gSpriteAnim_83D2880:: @ 83D2880 + obj_image_anim_frame 0, 30 + obj_image_anim_frame 1, 30 + obj_image_anim_frame 2, 30 + obj_image_anim_jump 0 + + .align 2 +gSpriteAnimTable_83D2890:: @ 83D2890 + .4byte gSpriteAnim_83D2880 + + .align 2 +gSpriteTemplate_83D2894:: @ 83D2894 + spr_template 0xFFFF, 4096, gFieldOamData_32x8, gSpriteAnimTable_83D2890, gSpriteImageTable_83D2860, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/fldeff_secretpower.s b/data/fldeff_secretpower.s new file mode 100755 index 000000000..589ded675 --- /dev/null +++ b/data/fldeff_secretpower.s @@ -0,0 +1,208 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gSpriteImage_83D198C:: @ 83D198C + .incbin "graphics/unknown_sprites/83D259C/0.4bpp" + + .align 2 +gSpriteImage_83D1A0C:: @ 83D1A0C + .incbin "graphics/unknown_sprites/83D259C/1.4bpp" + + .align 2 +gSpriteImage_83D1A8C:: @ 83D1A8C + .incbin "graphics/unknown_sprites/83D259C/2.4bpp" + + .align 2 +gSpriteImage_83D1B0C:: @ 83D1B0C + .incbin "graphics/unknown_sprites/83D259C/3.4bpp" + + .align 2 +gSpriteImage_83D1B8C:: @ 83D1B8C + .incbin "graphics/unknown_sprites/83D259C/4.4bpp" + + .space 32 + + .align 2 +gFieldEffectObjectPalette7: @ 83D1C2C + .incbin "graphics/field_effect_objects/palettes/07.gbapal" + + .align 2 +gSpriteImage_83D1C4C:: @ 83D1C4C + .incbin "graphics/unknown_sprites/83D25EC/0.4bpp" + + .align 2 +gSpriteImage_83D1CCC:: @ 83D1CCC + .incbin "graphics/unknown_sprites/83D25EC/1.4bpp" + + .align 2 +gSpriteImage_83D1D4C:: @ 83D1D4C + .incbin "graphics/unknown_sprites/83D25EC/2.4bpp" + + .align 2 +gSpriteImage_83D1DCC:: @ 83D1DCC + .incbin "graphics/unknown_sprites/83D25EC/3.4bpp" + + .align 2 +gSpriteImage_83D1E4C:: @ 83D1E4C + .incbin "graphics/unknown_sprites/83D25EC/4.4bpp" + + .align 2 +gSpriteImage_83D1ECC:: @ 83D1ECC + .incbin "graphics/unknown_sprites/83D25C4/0.4bpp" + + .align 2 +gSpriteImage_83D1F4C:: @ 83D1F4C + .incbin "graphics/unknown_sprites/83D25C4/1.4bpp" + + .align 2 +gSpriteImage_83D1FCC:: @ 83D1FCC + .incbin "graphics/unknown_sprites/83D25C4/2.4bpp" + + .align 2 +gSpriteImage_83D204C:: @ 83D204C + .incbin "graphics/unknown_sprites/83D25C4/3.4bpp" + + .align 2 +gSpriteImage_83D20CC:: @ 83D20CC + .incbin "graphics/unknown_sprites/83D25C4/4.4bpp" + + .align 2 + .incbin "graphics/unknown_sprites/83D25C4/5.4bpp" + + .align 2 +gFieldEffectObjectPalette8: @ 83D21CC + .incbin "graphics/field_effect_objects/palettes/08.gbapal" + + .align 2 +gSpriteImage_83D21EC:: @ 83D21EC + .incbin "graphics/unknown_sprites/83D2688/0.4bpp" + + .align 2 +gSpriteImage_83D22EC:: @ 83D22EC + .incbin "graphics/unknown_sprites/83D2688/1.4bpp" + + .align 2 +gSpriteImage_83D23EC:: @ 83D23EC + .incbin "graphics/unknown_sprites/83D2688/2.4bpp" + + .align 2 +gOamData_83D24EC:: @ 83D24EC + .2byte 0x0000 + .2byte 0x4000 + .2byte 0x0800 + + .align 2 +gSpriteAnim_83D24F4:: @ 83D24F4 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_frame 4, 8 + obj_image_anim_end + + .align 2 +gSpriteAnim_83D250C:: @ 83D250C + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_frame 4, 8 + obj_image_anim_end + + .align 2 +gSpriteAnim_83D2524:: @ 83D2524 + obj_image_anim_frame 4, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_end + + .align 2 +gSpriteAnim_83D253C:: @ 83D253C + obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_end + + .align 2 +gSpriteAnim_83D2554:: @ 83D2554 + obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP + obj_image_anim_end + + .align 2 +gSpriteAnim_83D256C:: @ 83D256C + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_frame 4, 8 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_83D2584:: @ 83D2584 + .4byte gSpriteAnim_83D24F4 + + .align 2 +gSpriteAnimTable_83D2588:: @ 83D2588 + .4byte gSpriteAnim_83D250C + .4byte gSpriteAnim_83D2524 + .4byte gSpriteAnim_83D253C + .4byte gSpriteAnim_83D2554 + + .align 2 +gSpriteAnimTable_83D2598:: @ 83D2598 + .4byte gSpriteAnim_83D256C + + .align 2 +gSpriteImageTable_83D259C:: @ 83D259C + obj_frame_tiles gSpriteImage_83D198C, 0x80 + obj_frame_tiles gSpriteImage_83D1A0C, 0x80 + obj_frame_tiles gSpriteImage_83D1A8C, 0x80 + obj_frame_tiles gSpriteImage_83D1B0C, 0x80 + obj_frame_tiles gSpriteImage_83D1B8C, 0x80 + + .align 2 +gSpriteImageTable_83D25C4:: @ 83D25C4 + obj_frame_tiles gSpriteImage_83D1ECC, 0x80 + obj_frame_tiles gSpriteImage_83D1F4C, 0x80 + obj_frame_tiles gSpriteImage_83D1FCC, 0x80 + obj_frame_tiles gSpriteImage_83D204C, 0x80 + obj_frame_tiles gSpriteImage_83D20CC, 0x80 + + .align 2 +gSpriteImageTable_83D25EC:: @ 83D25EC + obj_frame_tiles gSpriteImage_83D1C4C, 0x80 + obj_frame_tiles gSpriteImage_83D1CCC, 0x80 + obj_frame_tiles gSpriteImage_83D1D4C, 0x80 + obj_frame_tiles gSpriteImage_83D1DCC, 0x80 + obj_frame_tiles gSpriteImage_83D1E4C, 0x80 + + .align 2 +gSpriteTemplate_83D2614:: @ 83D2614 + spr_template 0xFFFF, 4099, gOamData_83D24EC, gSpriteAnimTable_83D2584, gSpriteImageTable_83D259C, gDummySpriteAffineAnimTable, sub_80C644C + + .align 2 +gSpriteTemplate_83D262C:: @ 83D262C + spr_template 0xFFFF, 4104, gOamData_83D24EC, gSpriteAnimTable_83D2588, gSpriteImageTable_83D25C4, gDummySpriteAffineAnimTable, sub_80C6598 + + .align 2 +gSpriteTemplate_83D2644:: @ 83D2644 + spr_template 0xFFFF, 4104, gOamData_83D24EC, gSpriteAnimTable_83D2598, gSpriteImageTable_83D25EC, gDummySpriteAffineAnimTable, sub_80C66BC + + .align 2 +gFieldEffectObjectPaletteInfo7:: @ 83D265C + obj_pal gFieldEffectObjectPalette7, 0x1003 + + .align 2 +gFieldEffectObjectPaletteInfo8:: @ 83D2664 + obj_pal gFieldEffectObjectPalette8, 0x1008 diff --git a/data/pss_effect.s b/data/pss_effect.s new file mode 100755 index 000000000..4f860213a --- /dev/null +++ b/data/pss_effect.s @@ -0,0 +1,43 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_083D1898:: @ 83D1898 + obj_tiles gUnknownGfx_083D190C, 0x80, 0 + + .align 2 +gUnknown_083D18A0:: @ 83D18A0 + obj_pal gUnknownPal_083D18EC, 0x0000 + + .align 2 +gSpriteTemplate_83D18A8:: @ 83D18A8 + spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C60CC + + .align 2 +gSpriteTemplate_83D18C0:: @ 83D18C0 + spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C6130 + + .align 2 +gOamData_83D18D8:: @ 83D18D8 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0000 + + .align 2 +gSpriteAnim_83D18E0:: @ 83D18E0 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_83D18E8:: @ 83D18E8 + .4byte gSpriteAnim_83D18E0 + + .align 2 +gUnknownPal_083D18EC:: + .incbin "graphics/unknown/unknown_3D18EC.gbapal" + + .align 2 +gUnknownGfx_083D190C:: + .incbin "graphics/unknown/unknown_3D190C.4bpp" -- cgit v1.2.3 From 1aeffc55038149680185811079c4fe661d8c723e Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 17 Nov 2017 01:18:00 -0500 Subject: rename pss_effect --- data/pss_effect.s | 43 ------------------------------------------- data/pss_tveffect.s | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) delete mode 100755 data/pss_effect.s create mode 100755 data/pss_tveffect.s (limited to 'data') diff --git a/data/pss_effect.s b/data/pss_effect.s deleted file mode 100755 index 4f860213a..000000000 --- a/data/pss_effect.s +++ /dev/null @@ -1,43 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083D1898:: @ 83D1898 - obj_tiles gUnknownGfx_083D190C, 0x80, 0 - - .align 2 -gUnknown_083D18A0:: @ 83D18A0 - obj_pal gUnknownPal_083D18EC, 0x0000 - - .align 2 -gSpriteTemplate_83D18A8:: @ 83D18A8 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C60CC - - .align 2 -gSpriteTemplate_83D18C0:: @ 83D18C0 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C6130 - - .align 2 -gOamData_83D18D8:: @ 83D18D8 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83D18E0:: @ 83D18E0 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D18E8:: @ 83D18E8 - .4byte gSpriteAnim_83D18E0 - - .align 2 -gUnknownPal_083D18EC:: - .incbin "graphics/unknown/unknown_3D18EC.gbapal" - - .align 2 -gUnknownGfx_083D190C:: - .incbin "graphics/unknown/unknown_3D190C.4bpp" diff --git a/data/pss_tveffect.s b/data/pss_tveffect.s new file mode 100755 index 000000000..4f860213a --- /dev/null +++ b/data/pss_tveffect.s @@ -0,0 +1,43 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_083D1898:: @ 83D1898 + obj_tiles gUnknownGfx_083D190C, 0x80, 0 + + .align 2 +gUnknown_083D18A0:: @ 83D18A0 + obj_pal gUnknownPal_083D18EC, 0x0000 + + .align 2 +gSpriteTemplate_83D18A8:: @ 83D18A8 + spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C60CC + + .align 2 +gSpriteTemplate_83D18C0:: @ 83D18C0 + spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C6130 + + .align 2 +gOamData_83D18D8:: @ 83D18D8 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0000 + + .align 2 +gSpriteAnim_83D18E0:: @ 83D18E0 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_83D18E8:: @ 83D18E8 + .4byte gSpriteAnim_83D18E0 + + .align 2 +gUnknownPal_083D18EC:: + .incbin "graphics/unknown/unknown_3D18EC.gbapal" + + .align 2 +gUnknownGfx_083D190C:: + .incbin "graphics/unknown/unknown_3D190C.4bpp" -- cgit v1.2.3 From 016b2d16bcc735053267b3b5e8cd597807db4055 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 18 Nov 2017 03:12:12 -0500 Subject: rename pss_tveffect --- data/pc_screen_effect.s | 43 +++++++++++++++++++++++++++++++++++++++++++ data/pss_tveffect.s | 43 ------------------------------------------- 2 files changed, 43 insertions(+), 43 deletions(-) create mode 100755 data/pc_screen_effect.s delete mode 100755 data/pss_tveffect.s (limited to 'data') diff --git a/data/pc_screen_effect.s b/data/pc_screen_effect.s new file mode 100755 index 000000000..4f860213a --- /dev/null +++ b/data/pc_screen_effect.s @@ -0,0 +1,43 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_083D1898:: @ 83D1898 + obj_tiles gUnknownGfx_083D190C, 0x80, 0 + + .align 2 +gUnknown_083D18A0:: @ 83D18A0 + obj_pal gUnknownPal_083D18EC, 0x0000 + + .align 2 +gSpriteTemplate_83D18A8:: @ 83D18A8 + spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C60CC + + .align 2 +gSpriteTemplate_83D18C0:: @ 83D18C0 + spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C6130 + + .align 2 +gOamData_83D18D8:: @ 83D18D8 + .2byte 0x4000 + .2byte 0x4000 + .2byte 0x0000 + + .align 2 +gSpriteAnim_83D18E0:: @ 83D18E0 + obj_image_anim_frame 0, 5 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_83D18E8:: @ 83D18E8 + .4byte gSpriteAnim_83D18E0 + + .align 2 +gUnknownPal_083D18EC:: + .incbin "graphics/unknown/unknown_3D18EC.gbapal" + + .align 2 +gUnknownGfx_083D190C:: + .incbin "graphics/unknown/unknown_3D190C.4bpp" diff --git a/data/pss_tveffect.s b/data/pss_tveffect.s deleted file mode 100755 index 4f860213a..000000000 --- a/data/pss_tveffect.s +++ /dev/null @@ -1,43 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083D1898:: @ 83D1898 - obj_tiles gUnknownGfx_083D190C, 0x80, 0 - - .align 2 -gUnknown_083D18A0:: @ 83D18A0 - obj_pal gUnknownPal_083D18EC, 0x0000 - - .align 2 -gSpriteTemplate_83D18A8:: @ 83D18A8 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C60CC - - .align 2 -gSpriteTemplate_83D18C0:: @ 83D18C0 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C6130 - - .align 2 -gOamData_83D18D8:: @ 83D18D8 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83D18E0:: @ 83D18E0 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D18E8:: @ 83D18E8 - .4byte gSpriteAnim_83D18E0 - - .align 2 -gUnknownPal_083D18EC:: - .incbin "graphics/unknown/unknown_3D18EC.gbapal" - - .align 2 -gUnknownGfx_083D190C:: - .incbin "graphics/unknown/unknown_3D190C.4bpp" -- cgit v1.2.3 From 9baa39f7082acfb1eb8b75603e440773504ad206 Mon Sep 17 00:00:00 2001 From: sceptillion <33798691+sceptillion@users.noreply.github.com> Date: Sat, 18 Nov 2017 23:35:08 -0800 Subject: decompile fldeff_recordmixing --- data/fldeff_recordmixing.s | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100755 data/fldeff_recordmixing.s (limited to 'data') diff --git a/data/fldeff_recordmixing.s b/data/fldeff_recordmixing.s deleted file mode 100755 index ee9d6b8d6..000000000 --- a/data/fldeff_recordmixing.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSpriteImage_83D26C0:: @ 83D26C0 - .incbin "graphics/unknown_sprites/83D2860/0.4bpp" - - .align 2 -gSpriteImage_83D2740:: @ 83D2740 - .incbin "graphics/unknown_sprites/83D2860/1.4bpp" - - .align 2 -gSpriteImage_83D27C0:: @ 83D27C0 - .incbin "graphics/unknown_sprites/83D2860/2.4bpp" - - .align 2 -Palette_3D2840:: @ 83D2840 - .incbin "graphics/unknown/unknown_3D2840.gbapal" - - .align 2 -gSpriteImageTable_83D2860:: @ 83D2860 - obj_frame_tiles gSpriteImage_83D26C0, 0x80 - obj_frame_tiles gSpriteImage_83D2740, 0x80 - obj_frame_tiles gSpriteImage_83D27C0, 0x80 - - .align 2 -gUnknown_083D2878:: @ 83D2878 - obj_pal Palette_3D2840, 4096 - - .align 2 -gSpriteAnim_83D2880:: @ 83D2880 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_frame 2, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83D2890:: @ 83D2890 - .4byte gSpriteAnim_83D2880 - - .align 2 -gSpriteTemplate_83D2894:: @ 83D2894 - spr_template 0xFFFF, 4096, gFieldOamData_32x8, gSpriteAnimTable_83D2890, gSpriteImageTable_83D2860, gDummySpriteAffineAnimTable, SpriteCallbackDummy -- cgit v1.2.3 From e0e5d070fa7a19235c6e8ba9b57b618ff86b8895 Mon Sep 17 00:00:00 2001 From: sceptillion <33798691+sceptillion@users.noreply.github.com> Date: Sun, 19 Nov 2017 01:31:09 -0800 Subject: decompile fldeff_secret_base_pc --- data/event_scripts.s | 8 ++++---- data/field_effect_scripts.s | 2 +- data/specials.inc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 854b52c9e..6d2a3693c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -486,7 +486,7 @@ EventScript_15F4A1: goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A22, 3 special sub_80BC5BC - special sub_80C683C + special DoSecretBasePCTurnOffEffect releaseall end @@ -496,13 +496,13 @@ EventScript_15F4E0: goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 special sub_80BC5BC - special sub_80C683C + special DoSecretBasePCTurnOffEffect releaseall end EventScript_15F503: msgbox UnknownString_81A39C0, 3 - special sub_80C683C + special DoSecretBasePCTurnOffEffect closemessage releaseall end @@ -514,7 +514,7 @@ EventScript_15F511: end EventScript_15F51D: - special sub_80C683C + special DoSecretBasePCTurnOffEffect closemessage releaseall end diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index aabb1252d..8e6a6d877 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -318,7 +318,7 @@ gFieldEffectScript_UseFlyAncientTomb: @ 81D9E26 end gFieldEffectScript_PCTurnOn: @ 81D9E2C - callnative FldEff_PCTurnOn + callnative FldEff_SecretBasePCTurnOn end gFieldEffectScript_HallOfFameRecord: @ 81D9E32 diff --git a/data/specials.inc b/data/specials.inc index efa8da174..2924f2173 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -33,7 +33,7 @@ gSpecials:: def_special sub_8100A7C def_special sub_80BBC78 def_special sub_80BCE4C - def_special sub_80C683C + def_special DoSecretBasePCTurnOffEffect def_special sub_80B929C def_special sub_808347C def_special sub_80834E4 -- cgit v1.2.3 From 98c1ea205b7d700ae466acbed9910fa1d55eb94c Mon Sep 17 00:00:00 2001 From: sceptillion <33798691+sceptillion@users.noreply.github.com> Date: Sun, 19 Nov 2017 01:33:24 -0800 Subject: update field effect script label --- data/field_effect_scripts.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 8e6a6d877..900cc7009 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -67,7 +67,7 @@ gFieldEffectScriptPointers:: @ 81D9B34 .4byte gFieldEffectScript_CutGrass .4byte gFieldEffectScript_FieldMoveShowMonInit .4byte gFieldEffectScript_UseFlyAncientTomb - .4byte gFieldEffectScript_PCTurnOn + .4byte gFieldEffectScript_SecretBasePCTurnOn .4byte gFieldEffectScript_HallOfFameRecord .4byte gFieldEffectScript_UseTeleport @@ -317,7 +317,7 @@ gFieldEffectScript_UseFlyAncientTomb: @ 81D9E26 callnative FldEff_UseFlyAncientTomb end -gFieldEffectScript_PCTurnOn: @ 81D9E2C +gFieldEffectScript_SecretBasePCTurnOn: @ 81D9E2C callnative FldEff_SecretBasePCTurnOn end -- cgit v1.2.3 From 3e77fcdd38e9dfab732e8ce72ac1496cec652c0e Mon Sep 17 00:00:00 2001 From: sceptillion <33798691+sceptillion@users.noreply.github.com> Date: Sun, 19 Nov 2017 18:04:08 -0800 Subject: label battle anims --- data/battle_anim_80CA710.s | 2 +- data/battle_anim_scripts.s | 153 +++++++++++++++++++++++---------------------- data/battle_scripts_1.s | 84 ++++++++++++------------- data/battle_scripts_2.s | 8 +-- 4 files changed, 124 insertions(+), 123 deletions(-) (limited to 'data') diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index 72ed3cffa..24881ab7c 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -1000,7 +1000,7 @@ gSpriteAnimTable_83D6E94:: @ 83D6E94 .4byte gSpriteAnim_83D6E80 .align 2 -gBattleAnimSpriteTemplate_83D6E98:: @ 83D6E98 +gBattleAnimSpriteTemplate_EndureFlame:: @ 83D6E98 spr_template 10184, 10184, gOamData_837DF74, gSpriteAnimTable_83D6E94, NULL, gDummySpriteAffineAnimTable, sub_80CDF0C .align 2 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 74205e66c..d38bfaf60 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -382,40 +382,40 @@ gBattleAnims_StatusConditions:: @ 81C76F8 .4byte StatusCondition_Nightmare .align 2 -gBattleAnims_Unknown1:: @ 81C771C - .4byte Unknown_81D63B4 - .4byte Unknown_81D63EA - .4byte Unknown_81D63F3 - .4byte Unknown_81D6430 - .4byte Unknown_81D6438 - .4byte Unknown_81D647E - .4byte Unknown_81D6489 - .4byte Unknown_81D661C - .4byte Unknown_81D6690 - .4byte Unknown_81D676E - .4byte Unknown_Weather_Rain - .4byte Unknown_Weather_HarshSunlight - .4byte Unknown_Weather_Sandstorm - .4byte Unknown_Weather_Hail - .4byte Unknown_81D6813 - .4byte Unknown_81D6821 - .4byte Unknown_81D6852 - .4byte Unknown_81D6877 - .4byte Unknown_81D68D5 - .4byte Unknown_81D6934 - .4byte Unknown_81D69F9 - .4byte Unknown_81D6A39 - .4byte Unknown_81D6A7C +gBattleAnims_General:: @ 81C771C + .4byte General_CastformChange + .4byte General_StatsChange + .4byte General_SubstituteFade + .4byte General_SubstituteAppear + .4byte General_PokeblockThrow + .4byte General_ItemKnockoff + .4byte General_TurnTrap + .4byte General_ItemEffect + .4byte General_SmokeballEscape + .4byte General_HangedOn + .4byte General_Rain + .4byte General_Sun + .4byte General_Sandstorm + .4byte General_Hail + .4byte General_LeechSeedDrain + .4byte General_MonHit + .4byte General_ItemSteal + .4byte General_SnatchMove + .4byte General_FutureSightHit + .4byte General_DoomDesireHit + .4byte General_FocusPunchSetUp + .4byte General_IngrainHeal + .4byte General_WishHeal .align 2 gBattleAnims_Unknown2:: @ 81C7778 - .4byte Unknown_81D6AF6 - .4byte Unknown_81D6B17 - .4byte Unknown_81D6B28 - .4byte Unknown_81D6B39 - .4byte Unknown_81D6B8D - .4byte Unknown_81D6BA6 - .4byte Unknown_81D6BB0 + .4byte Special_LevelUp + .4byte Special_SwitchOutPlayerMon + .4byte Special_SwitchOutOpponentMon + .4byte Special_BallThrow + .4byte Special_SafariBallThrow + .4byte Special_SubstituteToMon + .4byte Special_MonToSubstitute Move_POUND: @ 81C7794 loadsprite 10135 @@ -3182,25 +3182,26 @@ Move_DESTINY_BOND: @ 81CBA2C Move_ENDURE: @ 81CBA87 loadsprite 10184 panse_19 SE_W082, 192 - call _81CBAC7 + call EndureFlamesAnim pause 8 createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 - call _81CBAC7 + call EndureFlamesAnim pause 8 - call _81CBAC7 + call EndureFlamesAnim wait end -_81CBAC7: - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -24, 26, 2 + +EndureFlamesAnim: + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, -24, 26, 2 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, 14, 28, 1 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, 14, 28, 1 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -5, 10, 2 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, -5, 10, 2 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, 28, 26, 3 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, 28, 26, 3 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -12, 0, 1 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, -12, 0, 1 ret Move_CHARM: @ 81CBB1B @@ -7348,13 +7349,13 @@ Move_LICK: @ 81D1B32 Move_FOCUS_ENERGY: @ 81D1B59 loadsprite 10184 panse_19 SE_W082, 192 - call _81CBAC7 + call EndureFlamesAnim pause 8 createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 32767 createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 - call _81CBAC7 + call EndureFlamesAnim pause 8 - call _81CBAC7 + call EndureFlamesAnim wait end @@ -10287,7 +10288,7 @@ StatusCondition_Nightmare: @ 81D638F clearmonbg 3 end -Unknown_81D63B4: @ 81D63B4 +General_CastformChange: @ 81D63B4 createtask c3_80DFBE4, 2 jumpvareq 7, 1, _81D63E0 jump _81D63C8 @@ -10303,12 +10304,12 @@ _81D63E0: createtask sub_812DB58, 2, 1 end -Unknown_81D63EA: @ 81D63EA +General_StatsChange: @ 81D63EA createtask sub_807BB88, 5 wait end -Unknown_81D63F3: @ 81D63F3 +General_SubstituteFade: @ 81D63F3 monbg 0 createtask sub_81416C4, 5 createtask sub_80E2A38, 10, 2, 0, 0, 16, 32767 @@ -10321,11 +10322,11 @@ Unknown_81D63F3: @ 81D63F3 createtask sub_814151C, 2, 1 end -Unknown_81D6430: @ 81D6430 +General_SubstituteAppear: @ 81D6430 createtask sub_81312E4, 2 end -Unknown_81D6438: @ 81D6438 +General_PokeblockThrow: @ 81D6438 createtask sub_8141D7C, 2 createtask sub_8141BD4, 2 pause 0 @@ -10338,12 +10339,12 @@ Unknown_81D6438: @ 81D6438 createtask sub_8141C08, 2 end -Unknown_81D647E: @ 81D647E +General_ItemKnockoff: @ 81D647E loadsprite 10224 sprite gBattleAnimSpriteTemplate_83D6734, 130 end -Unknown_81D6489: @ 81D6489 +General_TurnTrap: @ 81D6489 createtask sub_8141DAC, 5 jumpvareq 0, 1, _81D64FD jumpvareq 0, 2, _81D6522 @@ -10418,7 +10419,7 @@ _81D65D3: stopsound end -Unknown_81D661C: @ 81D661C +General_ItemEffect: @ 81D661C loadsprite 10203 loadsprite 10049 pause 0 @@ -10440,7 +10441,7 @@ Unknown_81D661C: @ 81D661C wait end -Unknown_81D6690: @ 81D6690 +General_SmokeballEscape: @ 81D6690 loadsprite 10242 monbg 0 setalpha 12, 4 @@ -10479,7 +10480,7 @@ Unknown_81D6690: @ 81D6690 blendoff end -Unknown_81D676E: @ 81D676E +General_HangedOn: @ 81D676E sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 2, 7, 0, 9, 31 panse_19 SE_W082, 192 createtask sub_812FC68, 5, 30, 128, 0, 1, 2, 0, 1 @@ -10490,7 +10491,7 @@ Unknown_81D676E: @ 81D676E sprite gBattleAnimSpriteTemplate_83C1FE0, 0, 0, 0, 15 end -Unknown_Weather_Rain: @ 81D67BB +General_Rain: @ 81D67BB loadsprite 10115 panse_19 SE_W240, 192 createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 @@ -10503,21 +10504,21 @@ Unknown_Weather_Rain: @ 81D67BB wait end -Unknown_Weather_HarshSunlight: @ 81D6804 +General_Sun: @ 81D6804 jump Move_SUNNY_DAY -Unknown_Weather_Sandstorm: @ 81D6809 +General_Sandstorm: @ 81D6809 jump Move_SANDSTORM -Unknown_Weather_Hail: @ 81D680E +General_Hail: @ 81D680E jump Move_HAIL -Unknown_81D6813: @ 81D6813 +General_LeechSeedDrain: @ 81D6813 createtask sub_8141E10, 5 pause 0 jump Move_ABSORB -Unknown_81D6821: @ 81D6821 +General_MonHit: @ 81D6821 loadsprite 10135 monbg 1 setalpha 12, 8 @@ -10529,7 +10530,7 @@ Unknown_81D6821: @ 81D6821 blendoff end -Unknown_81D6852: @ 81D6852 +General_ItemSteal: @ 81D6852 loadsprite 10224 createtask sub_80E42D0, 2 createtask sub_8141808, 2 @@ -10537,7 +10538,7 @@ Unknown_81D6852: @ 81D6852 sprite gBattleAnimSpriteTemplate_83D677C, 2, 0, -5, 10, 2, -1 end -Unknown_81D6877: @ 81D6877 +General_SnatchMove: @ 81D6877 loadsprite 10224 createtask sub_80E4234, 2 call Unknown_81D6AB6 @@ -10560,7 +10561,7 @@ _81D68C5: createtask sub_8131FFC, 2 jump _81D68AE -Unknown_81D68D5: @ 81D68D5 +General_FutureSightHit: @ 81D68D5 createtask sub_80E42B0, 2 monbg 3 panse_19 SE_W060, 192 @@ -10580,7 +10581,7 @@ Unknown_81D68D5: @ 81D68D5 call Unknown_81D61F3 end -Unknown_81D6934: @ 81D6934 +General_DoomDesireHit: @ 81D6934 createtask sub_80E42B0, 2 loadsprite 10198 sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 16, 32767 @@ -10614,20 +10615,20 @@ Unknown_81D6934: @ 81D6934 wait end -Unknown_81D69F9: @ 81D69F9 +General_FocusPunchSetUp: @ 81D69F9 loadsprite 10184 panse_19 SE_W082, 192 - call _81CBAC7 + call EndureFlamesAnim pause 8 createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 - call _81CBAC7 + call EndureFlamesAnim pause 8 - call _81CBAC7 + call EndureFlamesAnim wait end -Unknown_81D6A39: @ 81D6A39 +General_IngrainHeal: @ 81D6A39 loadsprite 10147 loadsprite 10031 monbg 3 @@ -10646,7 +10647,7 @@ Unknown_81D6A39: @ 81D6A39 blendoff end -Unknown_81D6A7C: @ 81D6A7C +General_WishHeal: @ 81D6A7C loadsprite 10031 loadsprite 10049 sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 10, 0 @@ -10681,7 +10682,7 @@ _81D6AE7: wait jump _81D6AE5 -Unknown_81D6AF6: @ 81D6AF6 +Special_LevelUp: @ 81D6AF6 panse_19 SE_EXPMAX, 0 createtask sub_813F4EC, 2 pause 0 @@ -10690,19 +10691,19 @@ Unknown_81D6AF6: @ 81D6AF6 createtask sub_813F5E8, 2 end -Unknown_81D6B17: @ 81D6B17 +Special_SwitchOutPlayerMon: @ 81D6B17 createtask sub_813F844, 2 pause 10 createtask sub_813F798, 2 end -Unknown_81D6B28: @ 81D6B28 +Special_SwitchOutOpponentMon: @ 81D6B28 createtask sub_813F844, 2 pause 10 createtask sub_813F798, 2 end -Unknown_81D6B39: @ 81D6B39 +Special_BallThrow: @ 81D6B39 createtask sub_813F990, 2 pause 0 panse_19 SE_NAGERU, 0 @@ -10726,7 +10727,7 @@ _81D6B65: blendoff jump _81D6B5C -Unknown_81D6B8D: @ 81D6B8D +Special_SafariBallThrow: @ 81D6B8D createtask sub_813F990, 2 pause 0 createtask sub_813FBB8, 2 @@ -10734,10 +10735,10 @@ Unknown_81D6B8D: @ 81D6B8D createtask sub_813F9B8, 2 end -Unknown_81D6BA6: @ 81D6BA6 +Special_SubstituteToMon: @ 81D6BA6 createtask sub_814151C, 2, 1 end -Unknown_81D6BB0: @ 81D6BB0 +Special_MonToSubstitute: @ 81D6BB0 createtask sub_814151C, 2, 0 end diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 83bacd844..45bf5cc95 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -535,7 +535,7 @@ BattleScript_1D71CE: @ 81D71CE BattleScript_1D71D0: @ 81D71D0 atk47 - playanimation USER, 1, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 BattleScript_1D71D8: @ 81D71D8 printfromtable BattleTextList_401570 @@ -545,7 +545,7 @@ BattleScript_1D71E0: @ 81D71E0 jump BattleScript_EndTurn BattleScript_StatUp:: @ 81D71E5 - playanimation 2, 1, gSharedMem + 0x160A4 + playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 return @@ -585,7 +585,7 @@ BattleScript_1D725F: @ 81D725F attackanimation waitanimation atk47 - playanimation TARGET, 1, gSharedMem + 0x160A4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 BattleScript_1D7269: @ 81D7269 printfromtable BattleTextList_40157C @@ -595,7 +595,7 @@ BattleScript_1D7271: @ 81D7271 jump BattleScript_EndTurn BattleScript_StatDown:: @ 81D7276 - playanimation 2, 1, gSharedMem + 0x160A4 + playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_40157C waitmessage 64 return @@ -1694,7 +1694,7 @@ MoveEffect_Swagger: @ 81D7EA2 statbuffchange 1, BattleScript_1D7EE5 jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7EE5 atk47 - playanimation TARGET, 1, gSharedMem + 0x160A4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 @@ -1898,7 +1898,7 @@ MoveEffect_SkullBash: @ 81D8085 statbuffchange 65, BattleScript_1D80CF jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D80CF atk47 - playanimation USER, 1, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 @@ -2264,7 +2264,7 @@ MoveEffect_Flatter: @ 81D84B1 statbuffchange 1, BattleScript_1D84F4 jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D84F4 atk47 - playanimation TARGET, 1, gSharedMem + 0x160A4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 @@ -3081,7 +3081,7 @@ gUnknown_081D8E0D:: @ 81D8E0D end2 gUnknown_081D8E14:: @ 81D8E14 - playanimation USER, 8, 0x0 + playanimation USER, B_ANIM_SMOKEBALL_ESCAPE, 0x0 printstring BATTLE_TEXT_FledUsingItem waitmessage 64 end2 @@ -3238,7 +3238,7 @@ gUnknown_081D8F62:: @ 81D8F62 printfromtable BattleTextList_401534 waitmessage 64 jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8F7C - playanimation USER, 10, 0x0 + playanimation USER, B_ANIM_RAIN_CONTINUES, 0x0 BattleScript_1D8F7C: @ 81D8F7C end2 @@ -3280,7 +3280,7 @@ gUnknown_081D8FFF:: @ 81D8FFF gUnknown_081D9008:: @ 81D9008 printstring BATTLE_TEXT_SunStrong waitmessage 64 - playanimation USER, 11, 0x0 + playanimation USER, B_ANIM_SUN_CONTINUES, 0x0 end2 gUnknown_081D9016:: @ 81D9016 @@ -3312,7 +3312,7 @@ gUnknown_081D9041:: @ 81D9041 end2 BattleScript_LeechSeedTurnDrain:: @ 81D904B - playanimation USER, 14, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_LEECH_SEED_DRAIN, gSharedMem + 0x160A4 orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER @@ -3559,11 +3559,11 @@ BattleScript_1D92F4: @ 81D92F4 BattleScript_1D92FB: @ 81D92FB atk8 jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D9313 - playanimation USER, 18, 0x0 + playanimation USER, B_ANIM_FUTURE_SIGHT_HIT, 0x0 jump BattleScript_1D931A BattleScript_1D9313: @ 81D9313 - playanimation USER, 19, 0x0 + playanimation USER, B_ANIM_DOOM_DESIRE_HIT, 0x0 BattleScript_1D931A: @ 81D931A missmessage @@ -3626,7 +3626,7 @@ BattleScript_MoveUsedIsTaunted:: @ 81D938F BattleScript_WishComesTrue:: @ 81D939A atkd4 1, BattleScript_1D93C1 - playanimation TARGET, 22, 0x0 + playanimation TARGET, B_ANIM_WISH_HEAL, 0x0 printstring BATTLE_TEXT_WishTrue waitmessage 64 orword gHitMarker, 0x100 @@ -3645,7 +3645,7 @@ BattleScript_1D93C1: @ 81D93C1 end2 BattleScript_IngrainTurnHeal:: @ 81D93D1 - playanimation USER, 21, 0x0 + playanimation USER, B_ANIM_INGRAIN_HEAL, 0x0 printstring BATTLE_TEXT_AbsorbNutrients waitmessage 64 orword gHitMarker, 0x100 @@ -3681,7 +3681,7 @@ BattleScript_1D944A: @ 81D944A return BattleScript_KnockedOff:: @ 81D944B - playanimation TARGET, 5, 0x0 + playanimation TARGET, B_ANIM_ITEM_KNOCKOFF, 0x0 printstring BATTLE_TEXT_KnockedOffItem waitmessage 64 return @@ -3714,7 +3714,7 @@ BattleScript_SnatchedMove:: @ 81D9487 attackstring ppreduce snatchmove - playanimation TARGET, 17, 0x0 + playanimation TARGET, B_ANIM_SNATCH_MOVE, 0x0 printstring BATTLE_TEXT_SnatchedMove waitmessage 64 orword gHitMarker, 0x800c00 @@ -3743,10 +3743,10 @@ BattleScript_SAtkDown2:: @ 81D94B0 BattleScript_1D94D9: @ 81D94D9 return -gUnknown_081D94DA:: @ 81D94DA +BattleScript_FocusPunchSetUp:: @ 81D94DA printstring BATTLE_TEXT_Terminator2 waitmessage 1 - playanimation USER, 20, 0x0 + playanimation USER, B_ANIM_FOCUS_PUNCH_SET_UP, 0x0 printstring BATTLE_TEXT_TightenFocus waitmessage 64 end2 @@ -3866,7 +3866,7 @@ gUnknown_081D95DB:: @ 81D95DB return BattleScript_WrapTurnDmg:: @ 81D95E2 - playanimation USER, 6, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_TURN_TRAP, gSharedMem + 0x160A4 printstring BATTLE_TEXT_HurtBy waitmessage 64 jump BattleScript_1D9520 @@ -3991,7 +3991,7 @@ BattleScript_1D96F5: @ 81D96F5 return BattleScript_ItemSteal:: @ 81D96F6 - playanimation TARGET, 16, 0x0 + playanimation TARGET, B_ANIM_ITEM_STEAL, 0x0 printstring BATTLE_TEXT_StoleSomething waitmessage 64 return @@ -4000,12 +4000,12 @@ BattleScript_DrizzleActivates:: @ 81D9704 pause 32 printstring BATTLE_TEXT_RainMade waitstateatk - playanimation 7, 10, 0x0 + playanimation 7, B_ANIM_RAIN_CONTINUES, 0x0 callatk BattleScript_1D9761 end3 BattleScript_SpeedBoostActivates:: @ 81D9718 - playanimation USER, 1, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printstring BATTLE_TEXT_SpeedRisen waitmessage 64 end3 @@ -4028,7 +4028,7 @@ BattleScript_SandstreamActivates:: @ 81D9744 pause 32 printstring BATTLE_TEXT_WhipSandstorm waitstateatk - playanimation 7, 12, 0x0 + playanimation 7, B_ANIM_SANDSTORM_CONTINUES, 0x0 callatk BattleScript_1D9761 end3 @@ -4078,7 +4078,7 @@ BattleScript_1D97A1: @ 81D97A1 statbuffchange 33, BattleScript_1D97E4 jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D97E4 atk47 - playanimation TARGET, 1, gSharedMem + 0x160A4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printstring BATTLE_TEXT_CutsAttack waitmessage 64 @@ -4099,7 +4099,7 @@ BattleScript_DroughtActivates:: @ 81D97FE pause 32 printstring BATTLE_TEXT_SunIntensified waitstateatk - playanimation 7, 11, 0x0 + playanimation 7, B_ANIM_SUN_CONTINUES, 0x0 callatk BattleScript_1D9761 end3 @@ -4297,7 +4297,7 @@ gUnknown_081D99A0:: @ 81D99A0 jump BattleScript_1D95AC BattleScript_SubstituteFade:: @ 81D99AB - playanimation TARGET, 2, 0x0 + playanimation TARGET, B_ANIM_SUBSTITUTE_FADE, 0x0 printstring BATTLE_TEXT_SubFaded return @@ -4306,7 +4306,7 @@ BattleScript_BerryCurePrlzEnd2:: @ 81D99B6 end2 BattleScript_BerryCureParRet:: @ 81D99BC - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredParalysis waitmessage 64 atk98 10 @@ -4318,7 +4318,7 @@ BattleScript_BerryCurePsnEnd2:: @ 81D99CE end2 BattleScript_BerryCurePsnRet:: @ 81D99D4 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredPoison waitmessage 64 atk98 10 @@ -4330,7 +4330,7 @@ BattleScript_BerryCureBrnEnd2:: @ 81D99E6 end2 BattleScript_BerryCureBrnRet:: @ 81D99EC - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredBurn waitmessage 64 atk98 10 @@ -4342,7 +4342,7 @@ BattleScript_BerryCureFrzEnd2:: @ 81D99FE end2 BattleScript_BerryCureFrzRet:: @ 81D9A04 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredFreeze waitmessage 64 atk98 10 @@ -4354,7 +4354,7 @@ BattleScript_BerryCureSlpEnd2:: @ 81D9A16 end2 BattleScript_BerryCureSlpRet:: @ 81D9A1C - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredSleep waitmessage 64 atk98 10 @@ -4366,7 +4366,7 @@ BattleScript_BerryCureConfusionEnd2:: @ 81D9A2E end2 BattleScript_BerryCureConfusionRet:: @ 81D9A34 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredConfusion waitmessage 64 removeitem 10 @@ -4377,7 +4377,7 @@ gUnknown_081D9A44:: @ 81D9A44 end2 gUnknown_081D9A4A:: @ 81D9A4A - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printfromtable BattleTextList_40162C waitmessage 64 atk98 10 @@ -4389,14 +4389,14 @@ BattleScript_WhiteHerbEnd2:: @ 81D9A5E end2 BattleScript_WhiteHerbRet:: @ 81D9A64 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredStatus waitmessage 64 removeitem 10 return BattleScript_ItemHealHP_RemoveItem:: @ 81D9A74 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 orword gHitMarker, 0x100 @@ -4406,7 +4406,7 @@ BattleScript_ItemHealHP_RemoveItem:: @ 81D9A74 end2 BattleScript_BerryPPHealEnd2:: @ 81D9A91 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredPP waitmessage 64 removeitem USER @@ -4417,7 +4417,7 @@ BattleScript_ItemHealHP_End2:: @ 81D9AA1 end2 BattleScript_ItemHealHP_Ret:: @ 81D9AA7 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredHPLittle waitmessage 64 orword gHitMarker, 0x100 @@ -4430,13 +4430,13 @@ BattleScript_MoveSelectionChoiceBanded:: @ 81D9AC2 atk44 BattleScript_HangedOnMsg:: @ 81D9AC6 - playanimation TARGET, 9, 0x0 + playanimation TARGET, B_ANIM_HANGED_ON, 0x0 printstring BATTLE_TEXT_FocusSash waitmessage 64 return BattleScript_BerryConfuseHealEnd2:: @ 81D9AD4 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 orword gHitMarker, 0x100 @@ -4450,7 +4450,7 @@ BattleScript_BerryConfuseHealEnd2:: @ 81D9AD4 end2 BattleScript_BerryStatRaiseEnd2:: @ 81D9AFE - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 statbuffchange 65, BattleScript_1D9B0B BattleScript_1D9B0B: @ 81D9B0B @@ -4460,7 +4460,7 @@ BattleScript_1D9B0B: @ 81D9B0B end2 BattleScript_BerryFocusEnergyEnd2:: @ 81D9B19 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_HustleUse waitmessage 64 removeitem USER diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 0833b7bf2..22ecc7769 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -5,7 +5,7 @@ .section script_data, "aw", %progbits .align 2 -gUnknown_081D9E48:: @ 81D9E48 +gBattlescriptsForBallThrow:: @ 81D9E48 .4byte BattleScript_1D9EA8 .4byte BattleScript_1D9EA8 .4byte BattleScript_1D9EA8 @@ -28,10 +28,10 @@ gUnknown_081D9E7C:: @ 81D9E7C .4byte BattleScript_1D9F9C .4byte BattleScript_1D9FBB -gUnknown_081D9E94:: @ 81D9E94 +gBattlescriptsForRunningByItem:: @ 81D9E94 .4byte BattleScript_1D9FDA -gUnknown_081D9E98:: @ 81D9E98 +gBattlescriptsForSafariActions:: @ 81D9E98 .4byte BattleScript_1D9FE4 .4byte BattleScript_1D9FEB .4byte BattleScript_1D9FF4 @@ -177,7 +177,7 @@ BattleScript_1D9FEB: @ 81D9FEB BattleScript_1D9FF4: @ 81D9FF4 printstring BATTLE_TEXT_ThrewBlock waitmessage 64 - playanimation USER, 4, 0x0 + playanimation USER, B_ANIM_POKEBLOCK_THROW, 0x0 printfromtable BattleTextList_40161A waitmessage 64 end2 -- cgit v1.2.3 From 9d36bf245b25376b678e7f1d9a2c82a7b47464c9 Mon Sep 17 00:00:00 2001 From: sceptillion <33798691+sceptillion@users.noreply.github.com> Date: Sun, 19 Nov 2017 20:11:02 -0800 Subject: gBattleAnims_Unknown2 to gBattleAnims_Special --- data/battle_anim_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index d38bfaf60..08ef8be32 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -408,7 +408,7 @@ gBattleAnims_General:: @ 81C771C .4byte General_WishHeal .align 2 -gBattleAnims_Unknown2:: @ 81C7778 +gBattleAnims_Special:: @ 81C7778 .4byte Special_LevelUp .4byte Special_SwitchOutPlayerMon .4byte Special_SwitchOutOpponentMon -- cgit v1.2.3 From e404d27e64305859e058d95946547143656b9a50 Mon Sep 17 00:00:00 2001 From: sceptillion <33798691+sceptillion@users.noreply.github.com> Date: Mon, 20 Nov 2017 21:41:42 -0800 Subject: partially decompile pc_screen_effect --- data/pc_screen_effect.s | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'data') diff --git a/data/pc_screen_effect.s b/data/pc_screen_effect.s index 4f860213a..c33957945 100755 --- a/data/pc_screen_effect.s +++ b/data/pc_screen_effect.s @@ -3,22 +3,6 @@ .section .rodata - .align 2 -gUnknown_083D1898:: @ 83D1898 - obj_tiles gUnknownGfx_083D190C, 0x80, 0 - - .align 2 -gUnknown_083D18A0:: @ 83D18A0 - obj_pal gUnknownPal_083D18EC, 0x0000 - - .align 2 -gSpriteTemplate_83D18A8:: @ 83D18A8 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C60CC - - .align 2 -gSpriteTemplate_83D18C0:: @ 83D18C0 - spr_template 0, 0, gOamData_83D18D8, gSpriteAnimTable_83D18E8, NULL, gDummySpriteAffineAnimTable, sub_80C6130 - .align 2 gOamData_83D18D8:: @ 83D18D8 .2byte 0x4000 -- cgit v1.2.3 From c9a21f43bd074e532c745560b1d7d412f6ea8456 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 25 Nov 2017 13:11:38 -0600 Subject: split field_weather.c and convert more data --- data/field_weather.s | 395 +-------------------------------------------------- 1 file changed, 1 insertion(+), 394 deletions(-) (limited to 'data') diff --git a/data/field_weather.s b/data/field_weather.s index 1b0076451..9ca3eef3a 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -3,399 +3,6 @@ .section .rodata - .align 2 -gUnknown_08396FC4:: @ 8396FC4 - .4byte gUnknown_0202F7E8 - - .align 2 -gUnknown_08396FC8:: @ 8396FC8 - .4byte sub_807CAE8, nullsub_38, sub_807CAE8, sub_807CB0C - .4byte sub_807DE78, sub_807DEF4, sub_807DEC4, sub_807DF54 - .4byte sub_807DF9C, nullsub_55, sub_807DFC0, sub_807DFD0 - .4byte sub_807E364, sub_807E400, sub_807E3D0, sub_807E460 - .4byte sub_807E9C8, snowflakes_progress2, sub_807EA18, sub_807EAC0 - .4byte sub_807EE80, sub_807EFC0, sub_807EEF4, sub_807F34C - .4byte sub_807F49C, sub_807F52C, sub_807F4FC, sub_807F5EC - .4byte sub_807F7F8, sub_807F888, sub_807F858, sub_807F934 - .4byte sub_807FE9C, sub_807FF4C, sub_807FF1C, sub_807FFC8 - .4byte sub_807FB24, sub_807FBD8, sub_807FBA8, sub_807FC3C - .4byte sub_807F49C, sub_807F52C, sub_807F4FC, sub_807F5EC - .4byte sub_8080430, nullsub_56, sub_8080460, sub_8080470 - .4byte sub_807E110, sub_807E174, sub_807E144, sub_807E258 - .4byte sub_807EF24, sub_807EFC0, sub_807EF90, sub_807F34C - .4byte sub_8080474, sub_80804F8, sub_80804C8, sub_808056C - - .align 2 -gUnknown_083970B8:: @ 83970B8 - .4byte sub_807CC24 - .4byte sub_807CCAC - .4byte nullsub_39 - .4byte nullsub_39 - -gUnknown_083970C8:: @ 83970C8 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 0 - .byte 0 - .byte 2 - .byte 1 - .byte 2 - .byte 2 - .byte 2 - .byte 2 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 2 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - - .align 2 -gUnknown_083970E8:: @ 83970E8 - .incbin "graphics/weather/0.gbapal" - - .align 2 -gUnknown_08397108:: @ 8397108 - .incbin "graphics/weather/1.gbapal" - - .align 2 -gUnknown_08397128:: @ 8397128 - .incbin "graphics/weather/2.gbapal" - - .align 2 -WeatherFog0Tiles: @ 8397148 - .incbin "graphics/weather/fog0.4bpp" - - .align 2 -gWeatherFog1Tiles:: @ 8397948 - .incbin "graphics/weather/fog1.4bpp" - - .align 2 -WeatherCloudTiles: @ 8398148 - .incbin "graphics/weather/cloud.4bpp" - - .align 2 -gSpriteImage_8398948:: @ 8398948 - .incbin "graphics/weather/snow0.4bpp" - - .align 2 -gSpriteImage_8398968:: @ 8398968 - .incbin "graphics/weather/snow1.4bpp" - - .align 2 -WeatherBubbleTiles: @ 8398988 - .incbin "graphics/weather/bubble.4bpp" - - .align 2 -WeatherAshTiles: @ 83989C8 - .incbin "graphics/weather/ash.4bpp" - - .align 2 -WeatherRainTiles: @ 83999C8 - .incbin "graphics/weather/rain.4bpp" - - .align 2 -WeatherSandstormTiles: @ 8399FC8 - .incbin "graphics/weather/sandstorm.4bpp" - - .align 1 -gUnknown_0839A9C8:: @ 839A9C8 - .2byte 0, 66 - .2byte 5, 73 - .2byte 10, 78 - - .align 2 -gUnknown_0839A9D4:: @ 839A9D4 - obj_tiles WeatherCloudTiles, 0x800, 0x1200 - - .align 2 -gOamData_839A9DC:: @ 839A9DC - .2byte 0x0400 - .2byte 0xC000 - .2byte 0x0C00 - - .align 2 -gSpriteAnim_839A9E4:: @ 839A9E4 - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839A9EC:: @ 839A9EC - .4byte gSpriteAnim_839A9E4 - - .align 2 -gSpriteTemplate_839A9F0:: @ 839A9F0 - spr_template 4608, 4609, gOamData_839A9DC, gSpriteAnimTable_839A9EC, NULL, gDummySpriteAffineAnimTable, sub_807E0F4 - - .align 1 -gUnknown_0839AA08:: @ 839AA08 - .2byte 0, 0 - .2byte 0, 160 - .2byte 0, 64 - .2byte 144, 224 - .2byte 144, 128 - .2byte 32, 32 - .2byte 32, 192 - .2byte 32, 96 - .2byte 72, 128 - .2byte 72, 32 - .2byte 72, 192 - .2byte 216, 96 - .2byte 216, 0 - .2byte 104, 160 - .2byte 104, 64 - .2byte 104, 224 - .2byte 144, 0 - .2byte 144, 160 - .2byte 144, 64 - .2byte 32, 224 - .2byte 32, 128 - .2byte 72, 32 - .2byte 72, 192 - .2byte 48, 96 - - .align 2 -gOamData_839AA68:: @ 839AA68 - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x2400 - - .align 2 -gSpriteAnim_839AA70:: @ 839AA70 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_839AA78:: @ 839AA78 - obj_image_anim_frame 8, 3 - obj_image_anim_frame 32, 2 - obj_image_anim_frame 40, 2 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AA88:: @ 839AA88 - obj_image_anim_frame 8, 3 - obj_image_anim_frame 16, 3 - obj_image_anim_frame 24, 4 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839AA98:: @ 839AA98 - .4byte gSpriteAnim_839AA70 - .4byte gSpriteAnim_839AA78 - .4byte gSpriteAnim_839AA88 - - .align 2 -gSpriteTemplate_839AAA4:: @ 839AAA4 - spr_template 4614, 4608, gOamData_839AA68, gSpriteAnimTable_839AA98, NULL, gDummySpriteAffineAnimTable, sub_807E5C0 - - .align 1 -gUnknown_0839AABC:: @ 839AABC - .2byte -104, 208 - .2byte -160, 320 - - .align 1 -gUnknown_0839AAC4:: @ 839AAC4 - .2byte 18, 7, 12, 10 - - .align 2 -gUnknown_0839AACC:: @ 839AACC - obj_tiles WeatherRainTiles, 0x600, 0x1206 - - .align 2 -gOamData_839AAD4:: @ 839AAD4 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0400 - - .align 2 -gSpriteImageTable_839AADC:: @ 839AADC - obj_frame_tiles gSpriteImage_8398948, 0x20 - obj_frame_tiles gSpriteImage_8398968, 0x20 - - .align 2 -gSpriteAnim_839AAEC:: @ 839AAEC - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AAF4:: @ 839AAF4 - obj_image_anim_frame 1, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839AAFC:: @ 839AAFC - .4byte gSpriteAnim_839AAEC - .4byte gSpriteAnim_839AAF4 - - .align 2 -gSpriteTemplate_839AB04:: @ 839AB04 - spr_template 0xFFFF, 4608, gOamData_839AAD4, gSpriteAnimTable_839AAFC, gSpriteImageTable_839AADC, gDummySpriteAffineAnimTable, sub_807ED48 - -@ unused data - .2byte 0 - .2byte 6 - .2byte 6 - .2byte 12 - .2byte 18 - .2byte 42 - .2byte 300 - .2byte 300 - - .align 2 -gOamData_839AB2C:: @ 839AB2C - .2byte 0x0400 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_839AB34:: @ 839AB34 - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AB3C:: @ 839AB3C - obj_image_anim_frame 32, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AB44:: @ 839AB44 - obj_image_anim_frame 64, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AB4C:: @ 839AB4C - obj_image_anim_frame 96, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AB54:: @ 839AB54 - obj_image_anim_frame 128, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AB5C:: @ 839AB5C - obj_image_anim_frame 160, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839AB64:: @ 839AB64 - .4byte gSpriteAnim_839AB34 - .4byte gSpriteAnim_839AB3C - .4byte gSpriteAnim_839AB44 - .4byte gSpriteAnim_839AB4C - .4byte gSpriteAnim_839AB54 - .4byte gSpriteAnim_839AB5C - - .align 2 -gSpriteAffineAnim_839AB7C:: @ 839AB7C - obj_rot_scal_anim_frame 0x200, 0x200, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_839AB8C:: @ 839AB8C - .4byte gSpriteAffineAnim_839AB7C - - .align 2 -gSpriteTemplate_839AB90:: @ 839AB90 - spr_template 4609, 4608, gOamData_839AB2C, gSpriteAnimTable_839AB64, NULL, gSpriteAffineAnimTable_839AB8C, sub_807F688 - - .align 2 -gUnknown_0839ABA8:: @ 839ABA8 - obj_tiles gWeatherFog1Tiles, 0x800, 0x1201 - - .align 2 -gUnknown_0839ABB0:: @ 839ABB0 - obj_tiles WeatherAshTiles, 0x1000, 0x1202 - - .align 2 -gOamData_839ABB8:: @ 839ABB8 - .2byte 0x0400 - .2byte 0xC000 - .2byte 0xF400 - - .align 2 -gSpriteAnim_839ABC0:: @ 839ABC0 - obj_image_anim_frame 0, 60 - obj_image_anim_frame 64, 60 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_839ABCC:: @ 839ABCC - .4byte gSpriteAnim_839ABC0 - - .align 2 -gSpriteTemplate_839ABD0:: @ 839ABD0 - spr_template 4610, 4608, gOamData_839ABB8, gSpriteAnimTable_839ABCC, NULL, gDummySpriteAffineAnimTable, sub_807FAA8 - - .align 2 -gUnknown_0839ABE8:: @ 839ABE8 - obj_tiles WeatherFog0Tiles, 0x800, 0x1203 - - .align 2 -gOamData_839ABF0:: @ 839ABF0 - .2byte 0x0400 - .2byte 0xC000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_839ABF8:: @ 839ABF8 - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839AC00:: @ 839AC00 - .4byte gSpriteAnim_839ABF8 - - .align 2 -gSpriteTemplate_839AC04:: @ 839AC04 - spr_template 4611, 4608, gOamData_839ABF0, gSpriteAnimTable_839AC00, NULL, gDummySpriteAffineAnimTable, sub_807FE3C - - .align 2 -gOamData_839AC1C:: @ 839AC1C - .2byte 0x0400 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_839AC24:: @ 839AC24 - obj_image_anim_frame 0, 3 - obj_image_anim_end - - .align 2 -gSpriteAnim_839AC2C:: @ 839AC2C - obj_image_anim_frame 64, 3 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839AC34:: @ 839AC34 - .4byte gSpriteAnim_839AC24 - .4byte gSpriteAnim_839AC2C - - .align 2 -gSpriteTemplate_839AC3C:: @ 839AC3C - spr_template 4612, 4609, gOamData_839AC1C, gSpriteAnimTable_839AC34, NULL, gDummySpriteAffineAnimTable, sub_8080338 - - .align 2 -gUnknown_0839AC54:: @ 839AC54 - obj_tiles WeatherSandstormTiles, 0xA00, 0x1204 - .align 1 gUnknown_0839AC5C:: @ 839AC5C .2byte 0 @@ -416,7 +23,7 @@ gUnknown_0839AC68:: @ 839AC68 .byte 30 .align 2 -gUnknown_0839AC70:: @ 839AC70 +gWeatherBubbleSpriteSheet:: @ 839AC70 obj_tiles WeatherBubbleTiles, 0x40, 0x1205 .align 1 -- cgit v1.2.3 From 37418d05c404aec70745e238796c11b464da33ef Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 25 Nov 2017 18:07:24 -0600 Subject: label and decompile more of field_weather_2 --- data/field_weather.s | 2 +- data/graphics.s | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/field_weather.s b/data/field_weather.s index 9ca3eef3a..f6f794092 100644 --- a/data/field_weather.s +++ b/data/field_weather.s @@ -24,7 +24,7 @@ gUnknown_0839AC68:: @ 839AC68 .align 2 gWeatherBubbleSpriteSheet:: @ 839AC70 - obj_tiles WeatherBubbleTiles, 0x40, 0x1205 + obj_tiles gWeatherBubbleTiles, 0x40, 0x1205 .align 1 gUnknown_0839AC78:: @ 839AC78 diff --git a/data/graphics.s b/data/graphics.s index d24039de6..f1c7c37a3 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2997,8 +2997,8 @@ gBattleAnimSpriteSheet_277:: @ 8E6DA54 .incbin "graphics/battle_anims/sprites/277.4bpp.lz" .align 2 -gWeatherFog1Tilemap:: @ 8E6DE48 - .incbin "graphics/weather/fog1.bin.lz" +gBattleAnimFogTilemap:: @ 8E6DE48 + .incbin "graphics/battle_anims/backgrounds/fog.bin.lz" .align 2 gBattleAnimSpritePalette_283:: @ 8E6DFC0 -- cgit v1.2.3 From a8c22a9f1de634d75d8ddc117bcd2fda59aac522 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 25 Nov 2017 23:33:16 -0600 Subject: finish decompiling field_weather_2 --- data/field_weather.s | 63 ---------------------------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 data/field_weather.s (limited to 'data') diff --git a/data/field_weather.s b/data/field_weather.s deleted file mode 100644 index f6f794092..000000000 --- a/data/field_weather.s +++ /dev/null @@ -1,63 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 -gUnknown_0839AC5C:: @ 839AC5C - .2byte 0 - .2byte 120 - .2byte 80 - .2byte 160 - .2byte 40 - .2byte 0 - -gUnknown_0839AC68:: @ 839AC68 - .byte 40 - .byte 90 - .byte 60 - .byte 90 - .byte 2 - .byte 60 - .byte 40 - .byte 30 - - .align 2 -gWeatherBubbleSpriteSheet:: @ 839AC70 - obj_tiles gWeatherBubbleTiles, 0x40, 0x1205 - - .align 1 -gUnknown_0839AC78:: @ 839AC78 - .2byte 120, 160 - .2byte 376, 160 - .2byte 40, 140 - .2byte 296, 140 - .2byte 180, 130 - .2byte 436, 130 - .2byte 60, 160 - .2byte 436, 160 - .2byte 220, 180 - .2byte 476, 180 - .2byte 10, 90 - .2byte 266, 90 - .2byte 256, 160 - - .align 2 -gSpriteAnim_839ACAC:: @ 839ACAC - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839ACB8:: @ 839ACB8 - .4byte gSpriteAnim_839ACAC - - .align 2 -gSpriteTemplate_839ACBC:: @ 839ACBC - spr_template 4613, 4608, gOamData_837DF24, gSpriteAnimTable_839ACB8, NULL, gDummySpriteAffineAnimTable, unc_0807DAB4 - -gUnknown_0839ACD4:: @ 839ACD4 - .byte 2, 3, 5, 3 - -gUnknown_0839ACD8:: @ 839ACD8 - .byte 2, 2, 3, 2 -- cgit v1.2.3 From 5f242ae6cee377d219defa8290ef1c164b003f52 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 26 Nov 2017 13:00:26 -0600 Subject: abilities, songs, species constants --- data/battle_ai_scripts.s | 1 + data/battle_anim_scripts.s | 1 + data/battle_scripts_1.s | 1 + data/easy_chat.s | 1 + data/event_scripts.s | 1 + data/maps.s | 1 + 6 files changed, 6 insertions(+) (limited to 'data') diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 855221507..f049ee8e2 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -1,3 +1,4 @@ +#include "constants/abilities.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "asm/macros/battle_ai_script.inc" diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 08ef8be32..de3d354ce 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,3 +1,4 @@ +#include "constants/songs.h" .include "asm/macros.inc" .include "asm/macros/battle_anim.inc" .include "constants/constants.inc" diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 45bf5cc95..4e41bcc20 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1,3 +1,4 @@ +#include "constants/abilities.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "asm/macros/battle_script.inc" diff --git a/data/easy_chat.s b/data/easy_chat.s index e0844b902..a1331c34b 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -1,3 +1,4 @@ +#include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/event_scripts.s b/data/event_scripts.s index 6d2a3693c..e735250c5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,3 +1,4 @@ +#include "constants/songs.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" diff --git a/data/maps.s b/data/maps.s index a8074c02a..8848ac242 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,3 +1,4 @@ +#include "constants/songs.h" .include "asm/macros.inc" .include "constants/constants.inc" -- cgit v1.2.3 From 43349392dc4c79494af0e0727065c57ff78e1e92 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 26 Nov 2017 14:04:00 -0600 Subject: easy_chat constants --- data/battle_ai_scripts.s | 1 + data/contest.s | 2 + data/data2a.s | 2 + data/easy_chat.s | 78 +- data/event_scripts.s | 2 + data/text/easy_chat/words_by_letter.inc | 3716 +++++++++++++++---------------- data/wild_encounter.s | 1 + 7 files changed, 1907 insertions(+), 1895 deletions(-) (limited to 'data') diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index f049ee8e2..db5d16c48 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -1,4 +1,5 @@ #include "constants/abilities.h" +#include "constants/moves.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "asm/macros/battle_ai_script.inc" diff --git a/data/contest.s b/data/contest.s index 181d5ed13..0ffcfc636 100644 --- a/data/contest.s +++ b/data/contest.s @@ -1,3 +1,5 @@ +#include "constants/moves.h" +#include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/data2a.s b/data/data2a.s index 30803120d..dcc59c8e4 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -1,5 +1,7 @@ @ the second big chunk of data +#include "constants/moves.h" +#include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/easy_chat.s b/data/easy_chat.s index a1331c34b..99a03f8f5 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -1,47 +1,51 @@ +#include "constants/easy_chat.h" +#include "constants/moves.h" #include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" +#define EC_DUPLICATES(count) (0xFF00 + (count)) + .section .rodata .align 1 gMysteryEventPhrase:: @ 83DB678 - ec_word MYSTERY - ec_word EVENT - ec_word IS - ec_word EXCITING + .2byte EC_WORD_MYSTERY + .2byte EC_WORD_EVENT + .2byte EC_WORD_IS + .2byte EC_WORD_EXCITING .align 1 gBerryMasterWifePhrases:: @ 83DB680 .ifdef ENGLISH - ec_word GREAT - ec_word BATTLE + .2byte EC_WORD_GREAT + .2byte EC_WORD_BATTLE - ec_word CHALLENGE - ec_word CONTEST + .2byte EC_WORD_CHALLENGE + .2byte EC_WORD_CONTEST - ec_word OVERWHELMING - ec_pokemon1 LATIAS + .2byte EC_WORD_OVERWHELMING + .2byte EC_POKEMON(LATIAS) - ec_word COOL - ec_pokemon1 LATIOS + .2byte EC_WORD_COOL + .2byte EC_POKEMON(LATIOS) - ec_word SUPER - ec_word HUSTLE + .2byte EC_WORD_SUPER + .2byte EC_WORD_HUSTLE .else - ec_word GREAT - ec_word FIGHT + .2byte EC_WORD_GREAT + .2byte EC_WORD_FIGHT - ec_word CONTEST - ec_word CHALLENGE + .2byte EC_WORD_CONTEST + .2byte EC_WORD_CHALLENGE - ec_pokemon1 LATIAS - ec_word OVERWHELMING + .2byte EC_POKEMON(LATIAS) + .2byte EC_WORD_OVERWHELMING - ec_pokemon1 LATIOS - ec_word COOL + .2byte EC_POKEMON(LATIOS) + .2byte EC_WORD_COOL - ec_word SUPER + .2byte EC_WORD_SUPER .2byte 0xFFFF .endif @@ -129,25 +133,25 @@ gUnknown_083DB7DC:: @ 83DB7DC .align 1 gUnknown_083DB7EC:: @ 83DB7EC .ifdef ENGLISH - ec_word I_AM - ec_word A - ec_word POKEMON - ec_word GREAT + .2byte EC_WORD_I_AM + .2byte EC_WORD_A + .2byte EC_WORD_POKEMON + .2byte EC_WORD_GREAT .else - ec_word I_AM - ec_word BIG - ec_word IN - ec_word POKEMON + .2byte EC_WORD_I_AM + .2byte EC_WORD_BIG + .2byte EC_WORD_IN + .2byte EC_WORD_POKEMON .endif .align 1 gUnknown_083DB7F4:: @ 83DB7F4 - ec_word ARE - ec_word YOU - ec_word READY - ec_word QUES - ec_word HERE_I_COME - ec_word EXCL + .2byte EC_WORD_ARE + .2byte EC_WORD_YOU + .2byte EC_WORD_READY + .2byte EC_WORD_QUES + .2byte EC_WORD_HERE_I_COME + .2byte EC_WORD_EXCL .align 2 InterviewPalette_0:: @ 83DB800 diff --git a/data/event_scripts.s b/data/event_scripts.s index e735250c5..4ef10652b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,4 +1,6 @@ +#include "constants/moves.h" #include "constants/songs.h" +#include "constants/species.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" diff --git a/data/text/easy_chat/words_by_letter.inc b/data/text/easy_chat/words_by_letter.inc index 86fba988e..3c7f5bafc 100644 --- a/data/text/easy_chat/words_by_letter.inc +++ b/data/text/easy_chat/words_by_letter.inc @@ -1,1893 +1,1893 @@ .align 1 gEasyChatWordsAlphabetized:: @ 83DE138 gEasyChatWordsByLetter_Others: - ec_word EXCL - ec_word EXCL_EXCL - ec_word DASH - ec_word DASH_DASH_DASH - ec_word ELLIPSIS - ec_word ELLIPSIS_EXCL - ec_word ELLIPSIS_ELLIPSIS_ELLIPSIS - ec_word 1_HIT_KO_EXCL - ec_word QUES - ec_word QUES_EXCL + .2byte EC_WORD_EXCL + .2byte EC_WORD_EXCL_EXCL + .2byte EC_WORD_DASH + .2byte EC_WORD_DASH_DASH_DASH + .2byte EC_WORD_ELLIPSIS + .2byte EC_WORD_ELLIPSIS_EXCL + .2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS + .2byte EC_WORD_1_HIT_KO_EXCL + .2byte EC_WORD_QUES + .2byte EC_WORD_QUES_EXCL gEasyChatWordsByLetter_A: - ec_word A - ec_word A_LITTLE - ec_word A_LOT - ec_word A_TINY_BIT - ec_word ABOUT - ec_word ABOVE - ec_duplicates 2 - ec_pokemon1 ABRA - ec_pokemon2 ABRA - ec_word ABSENT - ec_pokemon1 ABSOL - ec_word ABSOLUTELY - ec_move1 ABSORB - ec_word ACCEPT - ec_move2 ACID - ec_move2 ACID_ARMOR - ec_word ADORE - ec_word ADULT - ec_word ADVENTURE - ec_move2 AERIAL_ACE - ec_move1 AEROBLAST - ec_pokemon2 AERODACTYL - ec_word AFTER - ec_word AGE - ec_pokemon1 AGGRON - ec_move1 AGILITY - ec_word AGREE - ec_word AHAHA - ec_word AIM - ec_pokemon2 AIPOM - ec_move1 AIR_CUTTER - ec_word AIR_LOCK - ec_word AIYEEH - ec_duplicates 2 - ec_pokemon1 ALAKAZAM - ec_pokemon2 ALAKAZAM - ec_word ALL - ec_word ALL_RIGHT - ec_word ALLOW - ec_word ALLOWANCE - ec_word ALLY - ec_word ALMOST - ec_word ALONE - ec_word ALSO - ec_word ALT_COLOR - ec_pokemon1 ALTARIA - ec_word ALTHOUGH - ec_word ALWAYS - ec_word AM - ec_move2 AMNESIA - ec_pokemon2 AMPHAROS - ec_word AMUSING - ec_word AN - ec_move1 ANCIENT_POWER - ec_word AND - ec_word ANGER - ec_word ANGERS - ec_word ANGRY - ec_word ANIME - ec_pokemon1 ANORITH - ec_word ANOTHER - ec_word ANTICIPATION - ec_word ANY - ec_word ANYWHERE - ec_word APOLOGIZE - ec_word APPEAL - ec_word APPEAR - ec_word APPEARS - ec_word APPRECIATE - ec_word APPROVED - ec_pokemon2 ARBOK - ec_pokemon2 ARCANINE - ec_word ARE - ec_word AREN_T - ec_word ARENA_TRAP - ec_pokemon2 ARIADOS - ec_move2 ARM_THRUST - ec_pokemon1 ARMALDO - ec_move1 AROMATHERAPY - ec_pokemon1 ARON - ec_word AROUND - ec_word ARRGH - ec_pokemon2 ARTICUNO - ec_word AS - ec_word AS_IF - ec_word AS_MUCH_AS - ec_move2 ASSIST - ec_move1 ASTONISH - ec_word AT - ec_word ATTACK - ec_move2 ATTRACT - ec_word AUNT - ec_move1 AURORA_BEAM - ec_word AVANT_GARDE - ec_word AWAY - ec_word AWESOME - ec_word AWFUL - ec_word AWFULLY - ec_word AWW - ec_duplicates 2 - ec_pokemon1 AZUMARILL - ec_pokemon2 AZUMARILL - ec_pokemon1 AZURILL + .2byte EC_WORD_A + .2byte EC_WORD_A_LITTLE + .2byte EC_WORD_A_LOT + .2byte EC_WORD_A_TINY_BIT + .2byte EC_WORD_ABOUT + .2byte EC_WORD_ABOVE + ec_duplicates 2 + .2byte EC_POKEMON(ABRA) + .2byte EC_POKEMON2(ABRA) + .2byte EC_WORD_ABSENT + .2byte EC_POKEMON(ABSOL) + .2byte EC_WORD_ABSOLUTELY + .2byte EC_MOVE(ABSORB) + .2byte EC_WORD_ACCEPT + .2byte EC_MOVE2(ACID) + .2byte EC_MOVE2(ACID_ARMOR) + .2byte EC_WORD_ADORE + .2byte EC_WORD_ADULT + .2byte EC_WORD_ADVENTURE + .2byte EC_MOVE2(AERIAL_ACE) + .2byte EC_MOVE(AEROBLAST) + .2byte EC_POKEMON2(AERODACTYL) + .2byte EC_WORD_AFTER + .2byte EC_WORD_AGE + .2byte EC_POKEMON(AGGRON) + .2byte EC_MOVE(AGILITY) + .2byte EC_WORD_AGREE + .2byte EC_WORD_AHAHA + .2byte EC_WORD_AIM + .2byte EC_POKEMON2(AIPOM) + .2byte EC_MOVE(AIR_CUTTER) + .2byte EC_WORD_AIR_LOCK + .2byte EC_WORD_AIYEEH + ec_duplicates 2 + .2byte EC_POKEMON(ALAKAZAM) + .2byte EC_POKEMON2(ALAKAZAM) + .2byte EC_WORD_ALL + .2byte EC_WORD_ALL_RIGHT + .2byte EC_WORD_ALLOW + .2byte EC_WORD_ALLOWANCE + .2byte EC_WORD_ALLY + .2byte EC_WORD_ALMOST + .2byte EC_WORD_ALONE + .2byte EC_WORD_ALSO + .2byte EC_WORD_ALT_COLOR + .2byte EC_POKEMON(ALTARIA) + .2byte EC_WORD_ALTHOUGH + .2byte EC_WORD_ALWAYS + .2byte EC_WORD_AM + .2byte EC_MOVE2(AMNESIA) + .2byte EC_POKEMON2(AMPHAROS) + .2byte EC_WORD_AMUSING + .2byte EC_WORD_AN + .2byte EC_MOVE(ANCIENT_POWER) + .2byte EC_WORD_AND + .2byte EC_WORD_ANGER + .2byte EC_WORD_ANGERS + .2byte EC_WORD_ANGRY + .2byte EC_WORD_ANIME + .2byte EC_POKEMON(ANORITH) + .2byte EC_WORD_ANOTHER + .2byte EC_WORD_ANTICIPATION + .2byte EC_WORD_ANY + .2byte EC_WORD_ANYWHERE + .2byte EC_WORD_APOLOGIZE + .2byte EC_WORD_APPEAL + .2byte EC_WORD_APPEAR + .2byte EC_WORD_APPEARS + .2byte EC_WORD_APPRECIATE + .2byte EC_WORD_APPROVED + .2byte EC_POKEMON2(ARBOK) + .2byte EC_POKEMON2(ARCANINE) + .2byte EC_WORD_ARE + .2byte EC_WORD_AREN_T + .2byte EC_WORD_ARENA_TRAP + .2byte EC_POKEMON2(ARIADOS) + .2byte EC_MOVE2(ARM_THRUST) + .2byte EC_POKEMON(ARMALDO) + .2byte EC_MOVE(AROMATHERAPY) + .2byte EC_POKEMON(ARON) + .2byte EC_WORD_AROUND + .2byte EC_WORD_ARRGH + .2byte EC_POKEMON2(ARTICUNO) + .2byte EC_WORD_AS + .2byte EC_WORD_AS_IF + .2byte EC_WORD_AS_MUCH_AS + .2byte EC_MOVE2(ASSIST) + .2byte EC_MOVE(ASTONISH) + .2byte EC_WORD_AT + .2byte EC_WORD_ATTACK + .2byte EC_MOVE2(ATTRACT) + .2byte EC_WORD_AUNT + .2byte EC_MOVE(AURORA_BEAM) + .2byte EC_WORD_AVANT_GARDE + .2byte EC_WORD_AWAY + .2byte EC_WORD_AWESOME + .2byte EC_WORD_AWFUL + .2byte EC_WORD_AWFULLY + .2byte EC_WORD_AWW + ec_duplicates 2 + .2byte EC_POKEMON(AZUMARILL) + .2byte EC_POKEMON2(AZUMARILL) + .2byte EC_POKEMON(AZURILL) gEasyChatWordsByLetter_B: - ec_word BABE - ec_word BABY - ec_word BACK - ec_word BAD - ec_word BADLY - ec_pokemon1 BAGON - ec_word BALL - ec_pokemon1 BALTOY - ec_pokemon1 BANETTE - ec_word BANG - ec_pokemon1 BARBOACH - ec_move2 BARRAGE - ec_move2 BARRIER - ec_word BATH - ec_move2 BATON_PASS - ec_word BATTLE - ec_word BATTLE_ARMOR - ec_word BATTLE_ROOM - ec_word BATTLE_TOWER - ec_pokemon2 BAYLEEF - ec_word BE - ec_word BEAT - ec_move2 BEAT_UP - ec_pokemon1 BEAUTIFLY - ec_word BEAUTIFUL - ec_word BEAUTY - ec_word BECOMES - ec_pokemon2 BEEDRILL - ec_word BEEN - ec_word BEFORE - ec_word BEGINNING - ec_word BEING - ec_pokemon1 BELDUM - ec_word BELIEVE - ec_duplicates 2 - ec_pokemon1 BELLOSSOM - ec_pokemon2 BELLOSSOM - ec_pokemon2 BELLSPROUT - ec_move2 BELLY_DRUM - ec_word BELONGS_TO - ec_word BELOW - ec_word BERRY - ec_word BESIDE - ec_word BEST - ec_word BETTER - ec_move1 BIDE - ec_word BIG - ec_word BIKE - ec_move1 BIND - ec_move1 BITE - ec_pokemon2 BLASTOISE - ec_word BLAZE - ec_move2 BLAZE_KICK - ec_pokemon1 BLAZIKEN - ec_word BLEND - ec_pokemon2 BLISSEY - ec_move2 BLIZZARD - ec_move2 BLOCK - ec_word BOARD - ec_move2 BODY_SLAM - ec_move2 BONE_CLUB - ec_move2 BONE_RUSH - ec_move2 BONEMERANG - ec_word BOOK - ec_word BORED - ec_word BORING - ec_move2 BOUNCE - ec_word BOY - ec_word BRAG - ec_word BREAK - ec_pokemon1 BRELOOM - ec_move1 BRICK_BREAK - ec_word BROTHER - ec_move1 BUBBLE - ec_move2 BUBBLE_BEAM - ec_word BUG - ec_pokemon2 BULBASAUR - ec_move2 BULK_UP - ec_move2 BULLET_SEED - ec_word BUSY - ec_word BUT - ec_pokemon2 BUTTERFREE - ec_word BYE_BYE + .2byte EC_WORD_BABE + .2byte EC_WORD_BABY + .2byte EC_WORD_BACK + .2byte EC_WORD_BAD + .2byte EC_WORD_BADLY + .2byte EC_POKEMON(BAGON) + .2byte EC_WORD_BALL + .2byte EC_POKEMON(BALTOY) + .2byte EC_POKEMON(BANETTE) + .2byte EC_WORD_BANG + .2byte EC_POKEMON(BARBOACH) + .2byte EC_MOVE2(BARRAGE) + .2byte EC_MOVE2(BARRIER) + .2byte EC_WORD_BATH + .2byte EC_MOVE2(BATON_PASS) + .2byte EC_WORD_BATTLE + .2byte EC_WORD_BATTLE_ARMOR + .2byte EC_WORD_BATTLE_ROOM + .2byte EC_WORD_BATTLE_TOWER + .2byte EC_POKEMON2(BAYLEEF) + .2byte EC_WORD_BE + .2byte EC_WORD_BEAT + .2byte EC_MOVE2(BEAT_UP) + .2byte EC_POKEMON(BEAUTIFLY) + .2byte EC_WORD_BEAUTIFUL + .2byte EC_WORD_BEAUTY + .2byte EC_WORD_BECOMES + .2byte EC_POKEMON2(BEEDRILL) + .2byte EC_WORD_BEEN + .2byte EC_WORD_BEFORE + .2byte EC_WORD_BEGINNING + .2byte EC_WORD_BEING + .2byte EC_POKEMON(BELDUM) + .2byte EC_WORD_BELIEVE + ec_duplicates 2 + .2byte EC_POKEMON(BELLOSSOM) + .2byte EC_POKEMON2(BELLOSSOM) + .2byte EC_POKEMON2(BELLSPROUT) + .2byte EC_MOVE2(BELLY_DRUM) + .2byte EC_WORD_BELONGS_TO + .2byte EC_WORD_BELOW + .2byte EC_WORD_BERRY + .2byte EC_WORD_BESIDE + .2byte EC_WORD_BEST + .2byte EC_WORD_BETTER + .2byte EC_MOVE(BIDE) + .2byte EC_WORD_BIG + .2byte EC_WORD_BIKE + .2byte EC_MOVE(BIND) + .2byte EC_MOVE(BITE) + .2byte EC_POKEMON2(BLASTOISE) + .2byte EC_WORD_BLAZE + .2byte EC_MOVE2(BLAZE_KICK) + .2byte EC_POKEMON(BLAZIKEN) + .2byte EC_WORD_BLEND + .2byte EC_POKEMON2(BLISSEY) + .2byte EC_MOVE2(BLIZZARD) + .2byte EC_MOVE2(BLOCK) + .2byte EC_WORD_BOARD + .2byte EC_MOVE2(BODY_SLAM) + .2byte EC_MOVE2(BONE_CLUB) + .2byte EC_MOVE2(BONE_RUSH) + .2byte EC_MOVE2(BONEMERANG) + .2byte EC_WORD_BOOK + .2byte EC_WORD_BORED + .2byte EC_WORD_BORING + .2byte EC_MOVE2(BOUNCE) + .2byte EC_WORD_BOY + .2byte EC_WORD_BRAG + .2byte EC_WORD_BREAK + .2byte EC_POKEMON(BRELOOM) + .2byte EC_MOVE(BRICK_BREAK) + .2byte EC_WORD_BROTHER + .2byte EC_MOVE(BUBBLE) + .2byte EC_MOVE2(BUBBLE_BEAM) + .2byte EC_WORD_BUG + .2byte EC_POKEMON2(BULBASAUR) + .2byte EC_MOVE2(BULK_UP) + .2byte EC_MOVE2(BULLET_SEED) + .2byte EC_WORD_BUSY + .2byte EC_WORD_BUT + .2byte EC_POKEMON2(BUTTERFREE) + .2byte EC_WORD_BYE_BYE gEasyChatWordsByLetter_C: - ec_pokemon1 CACNEA - ec_pokemon1 CACTURNE - ec_move2 CALM_MIND - ec_word CAME - ec_word CAMERA - ec_pokemon1 CAMERUPT - ec_move2 CAMOUFLAGE - ec_word CAN - ec_word CAN_WIN - ec_word CAN_T - ec_word CAN_T_WIN - ec_word CANCEL - ec_word CAPABLE - ec_word CARDS - ec_word CARE - ec_word CARES - ec_pokemon1 CARVANHA - ec_pokemon1 CASCOON - ec_word CASE - ec_pokemon1 CASTFORM - ec_pokemon2 CATERPIE - ec_word CAUSE - ec_pokemon2 CELEBI - ec_word CENTER - ec_word CHALLENGE - ec_word CHANGE - ec_word CHANNEL - ec_pokemon2 CHANSEY - ec_move1 CHARGE - ec_pokemon2 CHARIZARD - ec_move1 CHARM - ec_pokemon2 CHARMANDER - ec_pokemon2 CHARMELEON - ec_word CHAT - ec_pokemon2 CHIKORITA - ec_word CHILD_S_PLAY - ec_word CHILDREN - ec_pokemon1 CHIMECHO - ec_duplicates 2 - ec_pokemon1 CHINCHOU - ec_pokemon2 CHINCHOU - ec_word CHLOROPHYLL - ec_word CHOICE - ec_word CHOOSE - ec_word CHORES - ec_move1 CLAMP - ec_pokemon1 CLAMPERL - ec_word CLASS - ec_pokemon1 CLAYDOL - ec_word CLEAR_BODY - ec_pokemon2 CLEFABLE - ec_pokemon2 CLEFAIRY - ec_pokemon2 CLEFFA - ec_word CLOSE - ec_word CLOUD_NINE - ec_pokemon2 CLOYSTER - ec_word COLD - ec_word COLLECT - ec_word COLLECTION - ec_word COLOR - ec_word COLOR_CHANGE - ec_pokemon1 COMBUSKEN - ec_word COME - ec_word COME_ON - ec_word COME_OVER - ec_move2 COMET_PUNCH - ec_word COMICS - ec_word COMMEMORATE - ec_word COMPLETE - ec_word COMPOUNDEYES - ec_word CONCEDE - ec_move1 CONFUSE_RAY - ec_word CONFUSED - ec_move2 CONFUSION - ec_word CONGRATS - ec_move1 CONSTRICT - ec_word CONTEST - ec_word CONVERSATION - ec_move2 CONVERSION - ec_move2 CONVERSION_2 - ec_word COOL - ec_word COOLNESS - ec_pokemon1 CORPHISH - ec_word CORRECT - ec_duplicates 2 - ec_pokemon1 CORSOLA - ec_pokemon2 CORSOLA - ec_move1 COSMIC_POWER - ec_move2 COTTON_SPORE - ec_word COULD - ec_word COULDN_T - ec_word COUNT_ON - ec_move1 COUNTER - ec_word COUPLE - ec_move2 COVET - ec_move1 CRABHAMMER - ec_pokemon1 CRADILY - ec_pokemon1 CRAWDAUNT - ec_word CRIES - ec_duplicates 2 - ec_pokemon1 CROBAT - ec_pokemon2 CROBAT - ec_pokemon2 CROCONAW - ec_move1 CROSS_CHOP - ec_move1 CRUNCH - ec_move2 CRUSH_CLAW - ec_word CRY - ec_pokemon2 CUBONE - ec_word CURRENT - ec_move2 CURSE - ec_move1 CUT - ec_word CUTE - ec_word CUTE_CHARM - ec_word CUTENESS - ec_pokemon2 CYNDAQUIL + .2byte EC_POKEMON(CACNEA) + .2byte EC_POKEMON(CACTURNE) + .2byte EC_MOVE2(CALM_MIND) + .2byte EC_WORD_CAME + .2byte EC_WORD_CAMERA + .2byte EC_POKEMON(CAMERUPT) + .2byte EC_MOVE2(CAMOUFLAGE) + .2byte EC_WORD_CAN + .2byte EC_WORD_CAN_WIN + .2byte EC_WORD_CAN_T + .2byte EC_WORD_CAN_T_WIN + .2byte EC_WORD_CANCEL + .2byte EC_WORD_CAPABLE + .2byte EC_WORD_CARDS + .2byte EC_WORD_CARE + .2byte EC_WORD_CARES + .2byte EC_POKEMON(CARVANHA) + .2byte EC_POKEMON(CASCOON) + .2byte EC_WORD_CASE + .2byte EC_POKEMON(CASTFORM) + .2byte EC_POKEMON2(CATERPIE) + .2byte EC_WORD_CAUSE + .2byte EC_POKEMON2(CELEBI) + .2byte EC_WORD_CENTER + .2byte EC_WORD_CHALLENGE + .2byte EC_WORD_CHANGE + .2byte EC_WORD_CHANNEL + .2byte EC_POKEMON2(CHANSEY) + .2byte EC_MOVE(CHARGE) + .2byte EC_POKEMON2(CHARIZARD) + .2byte EC_MOVE(CHARM) + .2byte EC_POKEMON2(CHARMANDER) + .2byte EC_POKEMON2(CHARMELEON) + .2byte EC_WORD_CHAT + .2byte EC_POKEMON2(CHIKORITA) + .2byte EC_WORD_CHILD_S_PLAY + .2byte EC_WORD_CHILDREN + .2byte EC_POKEMON(CHIMECHO) + ec_duplicates 2 + .2byte EC_POKEMON(CHINCHOU) + .2byte EC_POKEMON2(CHINCHOU) + .2byte EC_WORD_CHLOROPHYLL + .2byte EC_WORD_CHOICE + .2byte EC_WORD_CHOOSE + .2byte EC_WORD_CHORES + .2byte EC_MOVE(CLAMP) + .2byte EC_POKEMON(CLAMPERL) + .2byte EC_WORD_CLASS + .2byte EC_POKEMON(CLAYDOL) + .2byte EC_WORD_CLEAR_BODY + .2byte EC_POKEMON2(CLEFABLE) + .2byte EC_POKEMON2(CLEFAIRY) + .2byte EC_POKEMON2(CLEFFA) + .2byte EC_WORD_CLOSE + .2byte EC_WORD_CLOUD_NINE + .2byte EC_POKEMON2(CLOYSTER) + .2byte EC_WORD_COLD + .2byte EC_WORD_COLLECT + .2byte EC_WORD_COLLECTION + .2byte EC_WORD_COLOR + .2byte EC_WORD_COLOR_CHANGE + .2byte EC_POKEMON(COMBUSKEN) + .2byte EC_WORD_COME + .2byte EC_WORD_COME_ON + .2byte EC_WORD_COME_OVER + .2byte EC_MOVE2(COMET_PUNCH) + .2byte EC_WORD_COMICS + .2byte EC_WORD_COMMEMORATE + .2byte EC_WORD_COMPLETE + .2byte EC_WORD_COMPOUNDEYES + .2byte EC_WORD_CONCEDE + .2byte EC_MOVE(CONFUSE_RAY) + .2byte EC_WORD_CONFUSED + .2byte EC_MOVE2(CONFUSION) + .2byte EC_WORD_CONGRATS + .2byte EC_MOVE(CONSTRICT) + .2byte EC_WORD_CONTEST + .2byte EC_WORD_CONVERSATION + .2byte EC_MOVE2(CONVERSION) + .2byte EC_MOVE2(CONVERSION_2) + .2byte EC_WORD_COOL + .2byte EC_WORD_COOLNESS + .2byte EC_POKEMON(CORPHISH) + .2byte EC_WORD_CORRECT + ec_duplicates 2 + .2byte EC_POKEMON(CORSOLA) + .2byte EC_POKEMON2(CORSOLA) + .2byte EC_MOVE(COSMIC_POWER) + .2byte EC_MOVE2(COTTON_SPORE) + .2byte EC_WORD_COULD + .2byte EC_WORD_COULDN_T + .2byte EC_WORD_COUNT_ON + .2byte EC_MOVE(COUNTER) + .2byte EC_WORD_COUPLE + .2byte EC_MOVE2(COVET) + .2byte EC_MOVE(CRABHAMMER) + .2byte EC_POKEMON(CRADILY) + .2byte EC_POKEMON(CRAWDAUNT) + .2byte EC_WORD_CRIES + ec_duplicates 2 + .2byte EC_POKEMON(CROBAT) + .2byte EC_POKEMON2(CROBAT) + .2byte EC_POKEMON2(CROCONAW) + .2byte EC_MOVE(CROSS_CHOP) + .2byte EC_MOVE(CRUNCH) + .2byte EC_MOVE2(CRUSH_CLAW) + .2byte EC_WORD_CRY + .2byte EC_POKEMON2(CUBONE) + .2byte EC_WORD_CURRENT + .2byte EC_MOVE2(CURSE) + .2byte EC_MOVE(CUT) + .2byte EC_WORD_CUTE + .2byte EC_WORD_CUTE_CHARM + .2byte EC_WORD_CUTENESS + .2byte EC_POKEMON2(CYNDAQUIL) gEasyChatWordsByLetter_D: - ec_word DAILY - ec_word DAMP - ec_word DANCE - ec_word DANGER - ec_word DARK - ec_word DARN - ec_word DATE - ec_word DAUGHTER - ec_word DAY - ec_word DAYS - ec_word DAYTIME - ec_word DECIDE - ec_word DECIDED - ec_word DEEP - ec_word DEFEATED - ec_move2 DEFENSE_CURL - ec_pokemon1 DELCATTY - ec_pokemon2 DELIBIRD - ec_pokemon1 DEOXYS - ec_word DEPT_STORE - ec_word DESIGN - ec_word DESTINY - ec_move2 DESTINY_BOND - ec_word DESTROYED - ec_move2 DETECT - ec_pokemon2 DEWGONG - ec_word DID - ec_word DIDN_T - ec_word DIET - ec_word DIFFERENT - ec_move1 DIG - ec_word DIGITAL - ec_pokemon2 DIGLETT - ec_move1 DISABLE - ec_word DISAPPEAR - ec_word DISAPPOINT - ec_word DISAPPOINTED - ec_word DISAPPOINTS - ec_word DISASTER - ec_word DISLIKE - ec_word DISLIKES - ec_pokemon2 DITTO - ec_move2 DIVE - ec_move2 DIZZY_PUNCH - ec_word DO - ec_word DOCILE - ec_duplicates 2 - ec_pokemon1 DODRIO - ec_pokemon2 DODRIO - ec_duplicates 2 - ec_pokemon1 DODUO - ec_pokemon2 DODUO - ec_word DOES - ec_word DOESN_T - ec_word DON_T - ec_word DONE - ec_duplicates 2 - ec_pokemon1 DONPHAN - ec_pokemon2 DONPHAN - ec_move2 DOUBLE_KICK - ec_move1 DOUBLE_TEAM - ec_move1 DOUBLE_EDGE - ec_move1 DOUBLE_SLAP - ec_word DOWN - ec_word DOWNCAST - ec_word DRAGON - ec_move2 DRAGON_CLAW - ec_move2 DRAGON_DANCE - ec_move2 DRAGON_RAGE - ec_pokemon2 DRAGONAIR - ec_move2 DRAGON_BREATH - ec_pokemon2 DRAGONITE - ec_pokemon2 DRATINI - ec_word DREAM - ec_move2 DREAM_EATER - ec_move2 DRILL_PECK - ec_word DRINK - ec_word DRINKS - ec_word DRIZZLE - ec_word DROOLING - ec_word DROUGHT - ec_pokemon2 DROWZEE - ec_word DUDE - ec_pokemon2 DUGTRIO - ec_pokemon2 DUNSPARCE - ec_pokemon1 DUSCLOPS - ec_pokemon1 DUSKULL - ec_pokemon1 DUSTOX - ec_move2 DYNAMIC_PUNCH + .2byte EC_WORD_DAILY + .2byte EC_WORD_DAMP + .2byte EC_WORD_DANCE + .2byte EC_WORD_DANGER + .2byte EC_WORD_DARK + .2byte EC_WORD_DARN + .2byte EC_WORD_DATE + .2byte EC_WORD_DAUGHTER + .2byte EC_WORD_DAY + .2byte EC_WORD_DAYS + .2byte EC_WORD_DAYTIME + .2byte EC_WORD_DECIDE + .2byte EC_WORD_DECIDED + .2byte EC_WORD_DEEP + .2byte EC_WORD_DEFEATED + .2byte EC_MOVE2(DEFENSE_CURL) + .2byte EC_POKEMON(DELCATTY) + .2byte EC_POKEMON2(DELIBIRD) + .2byte EC_POKEMON(DEOXYS) + .2byte EC_WORD_DEPT_STORE + .2byte EC_WORD_DESIGN + .2byte EC_WORD_DESTINY + .2byte EC_MOVE2(DESTINY_BOND) + .2byte EC_WORD_DESTROYED + .2byte EC_MOVE2(DETECT) + .2byte EC_POKEMON2(DEWGONG) + .2byte EC_WORD_DID + .2byte EC_WORD_DIDN_T + .2byte EC_WORD_DIET + .2byte EC_WORD_DIFFERENT + .2byte EC_MOVE(DIG) + .2byte EC_WORD_DIGITAL + .2byte EC_POKEMON2(DIGLETT) + .2byte EC_MOVE(DISABLE) + .2byte EC_WORD_DISAPPEAR + .2byte EC_WORD_DISAPPOINT + .2byte EC_WORD_DISAPPOINTED + .2byte EC_WORD_DISAPPOINTS + .2byte EC_WORD_DISASTER + .2byte EC_WORD_DISLIKE + .2byte EC_WORD_DISLIKES + .2byte EC_POKEMON2(DITTO) + .2byte EC_MOVE2(DIVE) + .2byte EC_MOVE2(DIZZY_PUNCH) + .2byte EC_WORD_DO + .2byte EC_WORD_DOCILE + ec_duplicates 2 + .2byte EC_POKEMON(DODRIO) + .2byte EC_POKEMON2(DODRIO) + ec_duplicates 2 + .2byte EC_POKEMON(DODUO) + .2byte EC_POKEMON2(DODUO) + .2byte EC_WORD_DOES + .2byte EC_WORD_DOESN_T + .2byte EC_WORD_DON_T + .2byte EC_WORD_DONE + ec_duplicates 2 + .2byte EC_POKEMON(DONPHAN) + .2byte EC_POKEMON2(DONPHAN) + .2byte EC_MOVE2(DOUBLE_KICK) + .2byte EC_MOVE(DOUBLE_TEAM) + .2byte EC_MOVE(DOUBLE_EDGE) + .2byte EC_MOVE(DOUBLE_SLAP) + .2byte EC_WORD_DOWN + .2byte EC_WORD_DOWNCAST + .2byte EC_WORD_DRAGON + .2byte EC_MOVE2(DRAGON_CLAW) + .2byte EC_MOVE2(DRAGON_DANCE) + .2byte EC_MOVE2(DRAGON_RAGE) + .2byte EC_POKEMON2(DRAGONAIR) + .2byte EC_MOVE2(DRAGON_BREATH) + .2byte EC_POKEMON2(DRAGONITE) + .2byte EC_POKEMON2(DRATINI) + .2byte EC_WORD_DREAM + .2byte EC_MOVE2(DREAM_EATER) + .2byte EC_MOVE2(DRILL_PECK) + .2byte EC_WORD_DRINK + .2byte EC_WORD_DRINKS + .2byte EC_WORD_DRIZZLE + .2byte EC_WORD_DROOLING + .2byte EC_WORD_DROUGHT + .2byte EC_POKEMON2(DROWZEE) + .2byte EC_WORD_DUDE + .2byte EC_POKEMON2(DUGTRIO) + .2byte EC_POKEMON2(DUNSPARCE) + .2byte EC_POKEMON(DUSCLOPS) + .2byte EC_POKEMON(DUSKULL) + .2byte EC_POKEMON(DUSTOX) + .2byte EC_MOVE2(DYNAMIC_PUNCH) gEasyChatWordsByLetter_E: - ec_word EARLIER - ec_word EARLY_BIRD - ec_move1 EARTHQUAKE - ec_word EASY - ec_word EAT - ec_word EATS - ec_word EEK - ec_pokemon2 EEVEE - ec_word EFFECT_SPORE - ec_word EGG - ec_move2 EGG_BOMB - ec_word EH_QUES - ec_word EHEHE - ec_pokemon2 EKANS - ec_pokemon2 ELECTABUZZ - ec_word ELECTRIC - ec_pokemon1 ELECTRIKE - ec_duplicates 2 - ec_pokemon1 ELECTRODE - ec_pokemon2 ELECTRODE - ec_pokemon2 ELEKID - ec_word ELSE - ec_move2 EMBER - ec_move1 ENCORE - ec_word ENCYCLOPEDIA - ec_word END - ec_move1 ENDEAVOR - ec_move1 ENDURE - ec_word ENJOY - ec_word ENJOYS - ec_word ENOUGH - ec_pokemon2 ENTEI - ec_word ENTERTAINING - ec_move2 ERUPTION - ec_word ESCAPE - ec_pokemon2 ESPEON - ec_word EVEN_SO - ec_word EVENT - ec_word EVENTS - ec_word EVER - ec_word EVERY - ec_word EVOLUTION - ec_word EVOLVE - ec_word EXCELLENT - ec_word EXCESS - ec_word EXCITE - ec_word EXCITING - ec_word EXCUSE - ec_word EXCUSE_ME - ec_pokemon2 EXEGGCUTE - ec_pokemon2 EXEGGUTOR - ec_word EXISTS - ec_word EXPENSIVE - ec_move2 EXPLOSION - ec_pokemon1 EXPLOUD - ec_move1 EXTRASENSORY - ec_move1 EXTREME_SPEED + .2byte EC_WORD_EARLIER + .2byte EC_WORD_EARLY_BIRD + .2byte EC_MOVE(EARTHQUAKE) + .2byte EC_WORD_EASY + .2byte EC_WORD_EAT + .2byte EC_WORD_EATS + .2byte EC_WORD_EEK + .2byte EC_POKEMON2(EEVEE) + .2byte EC_WORD_EFFECT_SPORE + .2byte EC_WORD_EGG + .2byte EC_MOVE2(EGG_BOMB) + .2byte EC_WORD_EH_QUES + .2byte EC_WORD_EHEHE + .2byte EC_POKEMON2(EKANS) + .2byte EC_POKEMON2(ELECTABUZZ) + .2byte EC_WORD_ELECTRIC + .2byte EC_POKEMON(ELECTRIKE) + ec_duplicates 2 + .2byte EC_POKEMON(ELECTRODE) + .2byte EC_POKEMON2(ELECTRODE) + .2byte EC_POKEMON2(ELEKID) + .2byte EC_WORD_ELSE + .2byte EC_MOVE2(EMBER) + .2byte EC_MOVE(ENCORE) + .2byte EC_WORD_ENCYCLOPEDIA + .2byte EC_WORD_END + .2byte EC_MOVE(ENDEAVOR) + .2byte EC_MOVE(ENDURE) + .2byte EC_WORD_ENJOY + .2byte EC_WORD_ENJOYS + .2byte EC_WORD_ENOUGH + .2byte EC_POKEMON2(ENTEI) + .2byte EC_WORD_ENTERTAINING + .2byte EC_MOVE2(ERUPTION) + .2byte EC_WORD_ESCAPE + .2byte EC_POKEMON2(ESPEON) + .2byte EC_WORD_EVEN_SO + .2byte EC_WORD_EVENT + .2byte EC_WORD_EVENTS + .2byte EC_WORD_EVER + .2byte EC_WORD_EVERY + .2byte EC_WORD_EVOLUTION + .2byte EC_WORD_EVOLVE + .2byte EC_WORD_EXCELLENT + .2byte EC_WORD_EXCESS + .2byte EC_WORD_EXCITE + .2byte EC_WORD_EXCITING + .2byte EC_WORD_EXCUSE + .2byte EC_WORD_EXCUSE_ME + .2byte EC_POKEMON2(EXEGGCUTE) + .2byte EC_POKEMON2(EXEGGUTOR) + .2byte EC_WORD_EXISTS + .2byte EC_WORD_EXPENSIVE + .2byte EC_MOVE2(EXPLOSION) + .2byte EC_POKEMON(EXPLOUD) + .2byte EC_MOVE(EXTRASENSORY) + .2byte EC_MOVE(EXTREME_SPEED) gEasyChatWordsByLetter_F: - ec_word FABULOUS - ec_move1 FACADE - ec_word FAINT - ec_move2 FAINT_ATTACK - ec_word FAINTED - ec_move2 FAKE_OUT - ec_move1 FAKE_TEARS - ec_word FALL - ec_move2 FALSE_SWIPE - ec_word FAMILY - ec_word FANTASTIC - ec_word FAR - ec_pokemon2 FARFETCHD - ec_word FASHION - ec_word FAST - ec_word FATHER - ec_word FEAR - ec_pokemon2 FEAROW - ec_move2 FEATHER_DANCE - ec_pokemon1 FEEBAS - ec_word FEELING - ec_pokemon2 FERALIGATR - ec_word FESTIVAL - ec_word FEVER - ec_word FIERY - ec_word FIGHT - ec_word FIGHTING - ec_word FIGHTS - ec_word FINAL - ec_word FINALLY - ec_word FINISH - ec_word FIRE - ec_move2 FIRE_BLAST - ec_move2 FIRE_PUNCH - ec_move2 FIRE_SPIN - ec_word FISHING - ec_move1 FISSURE - ec_pokemon2 FLAAFFY - ec_move1 FLAIL - ec_word FLAME_BODY - ec_move1 FLAME_WHEEL - ec_move1 FLAMETHROWER - ec_pokemon2 FLAREON - ec_move2 FLASH - ec_word FLASH_FIRE - ec_word FLATTEN - ec_move1 FLATTER - ec_word FLOWERS - ec_move1 FLY - ec_pokemon1 FLYGON - ec_word FLYING - ec_move1 FOCUS_ENERGY - ec_move1 FOCUS_PUNCH - ec_word FOE - ec_move1 FOLLOW_ME - ec_word FOR - ec_word FOR_NOW - ec_word FORECAST - ec_move2 FORESIGHT - ec_word FOREVER - ec_word FORGET - ec_word FORGETS - ec_word FORGIVE - ec_pokemon2 FORRETRESS - ec_word FRIDAY - ec_word FRIEND - ec_word FROM - ec_word FRONT - ec_move2 FRUSTRATION - ec_word FUFUFU - ec_word FULL - ec_word FUNNY - ec_pokemon2 FURRET - ec_move2 FURY_ATTACK - ec_move2 FURY_CUTTER - ec_move2 FURY_SWIPES - ec_move2 FUTURE_SIGHT + .2byte EC_WORD_FABULOUS + .2byte EC_MOVE(FACADE) + .2byte EC_WORD_FAINT + .2byte EC_MOVE2(FAINT_ATTACK) + .2byte EC_WORD_FAINTED + .2byte EC_MOVE2(FAKE_OUT) + .2byte EC_MOVE(FAKE_TEARS) + .2byte EC_WORD_FALL + .2byte EC_MOVE2(FALSE_SWIPE) + .2byte EC_WORD_FAMILY + .2byte EC_WORD_FANTASTIC + .2byte EC_WORD_FAR + .2byte EC_POKEMON2(FARFETCHD) + .2byte EC_WORD_FASHION + .2byte EC_WORD_FAST + .2byte EC_WORD_FATHER + .2byte EC_WORD_FEAR + .2byte EC_POKEMON2(FEAROW) + .2byte EC_MOVE2(FEATHER_DANCE) + .2byte EC_POKEMON(FEEBAS) + .2byte EC_WORD_FEELING + .2byte EC_POKEMON2(FERALIGATR) + .2byte EC_WORD_FESTIVAL + .2byte EC_WORD_FEVER + .2byte EC_WORD_FIERY + .2byte EC_WORD_FIGHT + .2byte EC_WORD_FIGHTING + .2byte EC_WORD_FIGHTS + .2byte EC_WORD_FINAL + .2byte EC_WORD_FINALLY + .2byte EC_WORD_FINISH + .2byte EC_WORD_FIRE + .2byte EC_MOVE2(FIRE_BLAST) + .2byte EC_MOVE2(FIRE_PUNCH) + .2byte EC_MOVE2(FIRE_SPIN) + .2byte EC_WORD_FISHING + .2byte EC_MOVE(FISSURE) + .2byte EC_POKEMON2(FLAAFFY) + .2byte EC_MOVE(FLAIL) + .2byte EC_WORD_FLAME_BODY + .2byte EC_MOVE(FLAME_WHEEL) + .2byte EC_MOVE(FLAMETHROWER) + .2byte EC_POKEMON2(FLAREON) + .2byte EC_MOVE2(FLASH) + .2byte EC_WORD_FLASH_FIRE + .2byte EC_WORD_FLATTEN + .2byte EC_MOVE(FLATTER) + .2byte EC_WORD_FLOWERS + .2byte EC_MOVE(FLY) + .2byte EC_POKEMON(FLYGON) + .2byte EC_WORD_FLYING + .2byte EC_MOVE(FOCUS_ENERGY) + .2byte EC_MOVE(FOCUS_PUNCH) + .2byte EC_WORD_FOE + .2byte EC_MOVE(FOLLOW_ME) + .2byte EC_WORD_FOR + .2byte EC_WORD_FOR_NOW + .2byte EC_WORD_FORECAST + .2byte EC_MOVE2(FORESIGHT) + .2byte EC_WORD_FOREVER + .2byte EC_WORD_FORGET + .2byte EC_WORD_FORGETS + .2byte EC_WORD_FORGIVE + .2byte EC_POKEMON2(FORRETRESS) + .2byte EC_WORD_FRIDAY + .2byte EC_WORD_FRIEND + .2byte EC_WORD_FROM + .2byte EC_WORD_FRONT + .2byte EC_MOVE2(FRUSTRATION) + .2byte EC_WORD_FUFUFU + .2byte EC_WORD_FULL + .2byte EC_WORD_FUNNY + .2byte EC_POKEMON2(FURRET) + .2byte EC_MOVE2(FURY_ATTACK) + .2byte EC_MOVE2(FURY_CUTTER) + .2byte EC_MOVE2(FURY_SWIPES) + .2byte EC_MOVE2(FUTURE_SIGHT) gEasyChatWordsByLetter_G: - ec_word GAME - ec_pokemon1 GARDEVOIR - ec_pokemon2 GASTLY - ec_pokemon2 GENGAR - ec_word GENIUS - ec_duplicates 2 - ec_pokemon1 GEODUDE - ec_pokemon2 GEODUDE - ec_word GET - ec_word GETS - ec_word GHOST - ec_word GIDDY - ec_move1 GIGA_DRAIN - ec_word GIGGLE - ec_word GIMME - ec_duplicates 2 - ec_pokemon1 GIRAFARIG - ec_pokemon2 GIRAFARIG - ec_word GIRL - ec_word GIVE - ec_word GIVE_ME - ec_word GIVE_UP - ec_word GIVES - ec_pokemon1 GLALIE - ec_move2 GLARE - ec_pokemon2 GLIGAR - ec_duplicates 2 - ec_pokemon1 GLOOM - ec_pokemon2 GLOOM - ec_word GO - ec_word GO_AHEAD - ec_word GO_EASY - ec_word GO_HOME - ec_word GOES - ec_word GOING - ec_duplicates 2 - ec_pokemon1 GOLBAT - ec_pokemon2 GOLBAT - ec_duplicates 2 - ec_pokemon1 GOLDEEN - ec_pokemon2 GOLDEEN - ec_duplicates 2 - ec_pokemon1 GOLDUCK - ec_pokemon2 GOLDUCK - ec_duplicates 2 - ec_pokemon1 GOLEM - ec_pokemon2 GOLEM - ec_word GOOD - ec_word GOOD_BYE - ec_pokemon1 GOREBYSS - ec_word GOT - ec_word GOTCHA - ec_word GOURMET - ec_word GRAAAH - ec_pokemon2 GRANBULL - ec_word GRANDFATHER - ec_word GRANDMOTHER - ec_word GRASS - ec_move1 GRASS_WHISTLE - ec_duplicates 2 - ec_pokemon1 GRAVELER - ec_pokemon2 GRAVELER - ec_word GREAT - ec_duplicates 2 - ec_pokemon1 GRIMER - ec_pokemon2 GRIMER - ec_pokemon1 GROUDON - ec_word GROUND - ec_word GROUP - ec_pokemon1 GROVYLE - ec_move2 GROWL - ec_pokemon2 GROWLITHE - ec_move1 GROWTH - ec_move1 GRUDGE - ec_pokemon1 GRUMPIG - ec_word GUARD - ec_move2 GUILLOTINE - ec_pokemon1 GULPIN - ec_move1 GUST - ec_word GUTS - ec_word GUTSY - ec_word GWAH - ec_word GWAHAHAHA - ec_duplicates 2 - ec_pokemon1 GYARADOS - ec_pokemon2 GYARADOS + .2byte EC_WORD_GAME + .2byte EC_POKEMON(GARDEVOIR) + .2byte EC_POKEMON2(GASTLY) + .2byte EC_POKEMON2(GENGAR) + .2byte EC_WORD_GENIUS + ec_duplicates 2 + .2byte EC_POKEMON(GEODUDE) + .2byte EC_POKEMON2(GEODUDE) + .2byte EC_WORD_GET + .2byte EC_WORD_GETS + .2byte EC_WORD_GHOST + .2byte EC_WORD_GIDDY + .2byte EC_MOVE(GIGA_DRAIN) + .2byte EC_WORD_GIGGLE + .2byte EC_WORD_GIMME + ec_duplicates 2 + .2byte EC_POKEMON(GIRAFARIG) + .2byte EC_POKEMON2(GIRAFARIG) + .2byte EC_WORD_GIRL + .2byte EC_WORD_GIVE + .2byte EC_WORD_GIVE_ME + .2byte EC_WORD_GIVE_UP + .2byte EC_WORD_GIVES + .2byte EC_POKEMON(GLALIE) + .2byte EC_MOVE2(GLARE) + .2byte EC_POKEMON2(GLIGAR) + ec_duplicates 2 + .2byte EC_POKEMON(GLOOM) + .2byte EC_POKEMON2(GLOOM) + .2byte EC_WORD_GO + .2byte EC_WORD_GO_AHEAD + .2byte EC_WORD_GO_EASY + .2byte EC_WORD_GO_HOME + .2byte EC_WORD_GOES + .2byte EC_WORD_GOING + ec_duplicates 2 + .2byte EC_POKEMON(GOLBAT) + .2byte EC_POKEMON2(GOLBAT) + ec_duplicates 2 + .2byte EC_POKEMON(GOLDEEN) + .2byte EC_POKEMON2(GOLDEEN) + ec_duplicates 2 + .2byte EC_POKEMON(GOLDUCK) + .2byte EC_POKEMON2(GOLDUCK) + ec_duplicates 2 + .2byte EC_POKEMON(GOLEM) + .2byte EC_POKEMON2(GOLEM) + .2byte EC_WORD_GOOD + .2byte EC_WORD_GOOD_BYE + .2byte EC_POKEMON(GOREBYSS) + .2byte EC_WORD_GOT + .2byte EC_WORD_GOTCHA + .2byte EC_WORD_GOURMET + .2byte EC_WORD_GRAAAH + .2byte EC_POKEMON2(GRANBULL) + .2byte EC_WORD_GRANDFATHER + .2byte EC_WORD_GRANDMOTHER + .2byte EC_WORD_GRASS + .2byte EC_MOVE(GRASS_WHISTLE) + ec_duplicates 2 + .2byte EC_POKEMON(GRAVELER) + .2byte EC_POKEMON2(GRAVELER) + .2byte EC_WORD_GREAT + ec_duplicates 2 + .2byte EC_POKEMON(GRIMER) + .2byte EC_POKEMON2(GRIMER) + .2byte EC_POKEMON(GROUDON) + .2byte EC_WORD_GROUND + .2byte EC_WORD_GROUP + .2byte EC_POKEMON(GROVYLE) + .2byte EC_MOVE2(GROWL) + .2byte EC_POKEMON2(GROWLITHE) + .2byte EC_MOVE(GROWTH) + .2byte EC_MOVE(GRUDGE) + .2byte EC_POKEMON(GRUMPIG) + .2byte EC_WORD_GUARD + .2byte EC_MOVE2(GUILLOTINE) + .2byte EC_POKEMON(GULPIN) + .2byte EC_MOVE(GUST) + .2byte EC_WORD_GUTS + .2byte EC_WORD_GUTSY + .2byte EC_WORD_GWAH + .2byte EC_WORD_GWAHAHAHA + ec_duplicates 2 + .2byte EC_POKEMON(GYARADOS) + .2byte EC_POKEMON2(GYARADOS) gEasyChatWordsByLetter_H: - ec_word HABIT - ec_word HAH - ec_word HAHAHA - ec_move1 HAIL - ec_word HALL_OF_FAME - ec_word HAPPENING - ec_word HAPPILY - ec_word HAPPINESS - ec_word HAPPY - ec_word HARD - ec_move1 HARDEN - ec_pokemon1 HARIYAMA - ec_word HAS - ec_word HASSLE - ec_pokemon2 HAUNTER - ec_word HAVE - ec_word HAVEN_T - ec_move1 HAZE - ec_word HE - ec_word HE_S - ec_move1 HEADBUTT - ec_move1 HEAL_BELL - ec_word HEALTHY - ec_word HEAR - ec_word HEARING - ec_word HEARS - ec_word HEART - ec_move2 HEAT_WAVE - ec_word HEH - ec_word HEHE - ec_word HEHEHE - ec_word HELLO - ec_move2 HELPING_HAND - ec_word HER - ec_word HERS - ec_duplicates 2 - ec_pokemon1 HERACROSS - ec_pokemon2 HERACROSS - ec_word HERE - ec_word HERE_GOES - ec_word HERE_I_COME - ec_word HERE_IT_IS - ec_word HERO - ec_word HEROINE - ec_word HEY - ec_word HEY_THERE - ec_word HEY_QUES - ec_word HI - ec_move2 HI_JUMP_KICK - ec_word HIDDEN - ec_move2 HIDDEN_POWER - ec_word HIGH - ec_word HIGHS - ec_word HIM - ec_word HIP_AND - ec_word HIS - ec_word HIT - ec_pokemon2 HITMONCHAN - ec_pokemon2 HITMONLEE - ec_pokemon2 HITMONTOP - ec_word HIYAH - ec_word HMM - ec_pokemon2 HO_OH - ec_word HOBBY - ec_word HOHOHO - ec_word HOLIDAY - ec_word HOME - ec_word HOO_HAH - ec_pokemon2 HOOTHOOT - ec_word HOPELESS - ec_pokemon2 HOPPIP - ec_move2 HORN_ATTACK - ec_move2 HORN_DRILL - ec_duplicates 2 - ec_pokemon1 HORSEA - ec_pokemon2 HORSEA - ec_word HOT - ec_pokemon2 HOUNDOOM - ec_pokemon2 HOUNDOUR - ec_word HOW - ec_word HOW_DO - ec_word HOWEVER - ec_move2 HOWL - ec_word HUGE_POWER - ec_word HUH_QUES - ec_word HUMPH - ec_word HUNGRY - ec_pokemon1 HUNTAIL - ec_word HURRIED - ec_word HUSTLE - ec_move2 HYDRO_PUMP - ec_word HYPER - ec_move2 HYPER_BEAM - ec_word HYPER_CUTTER - ec_move2 HYPER_FANG - ec_move2 HYPER_VOICE - ec_pokemon2 HYPNO - ec_move1 HYPNOSIS + .2byte EC_WORD_HABIT + .2byte EC_WORD_HAH + .2byte EC_WORD_HAHAHA + .2byte EC_MOVE(HAIL) + .2byte EC_WORD_HALL_OF_FAME + .2byte EC_WORD_HAPPENING + .2byte EC_WORD_HAPPILY + .2byte EC_WORD_HAPPINESS + .2byte EC_WORD_HAPPY + .2byte EC_WORD_HARD + .2byte EC_MOVE(HARDEN) + .2byte EC_POKEMON(HARIYAMA) + .2byte EC_WORD_HAS + .2byte EC_WORD_HASSLE + .2byte EC_POKEMON2(HAUNTER) + .2byte EC_WORD_HAVE + .2byte EC_WORD_HAVEN_T + .2byte EC_MOVE(HAZE) + .2byte EC_WORD_HE + .2byte EC_WORD_HE_S + .2byte EC_MOVE(HEADBUTT) + .2byte EC_MOVE(HEAL_BELL) + .2byte EC_WORD_HEALTHY + .2byte EC_WORD_HEAR + .2byte EC_WORD_HEARING + .2byte EC_WORD_HEARS + .2byte EC_WORD_HEART + .2byte EC_MOVE2(HEAT_WAVE) + .2byte EC_WORD_HEH + .2byte EC_WORD_HEHE + .2byte EC_WORD_HEHEHE + .2byte EC_WORD_HELLO + .2byte EC_MOVE2(HELPING_HAND) + .2byte EC_WORD_HER + .2byte EC_WORD_HERS + ec_duplicates 2 + .2byte EC_POKEMON(HERACROSS) + .2byte EC_POKEMON2(HERACROSS) + .2byte EC_WORD_HERE + .2byte EC_WORD_HERE_GOES + .2byte EC_WORD_HERE_I_COME + .2byte EC_WORD_HERE_IT_IS + .2byte EC_WORD_HERO + .2byte EC_WORD_HEROINE + .2byte EC_WORD_HEY + .2byte EC_WORD_HEY_THERE + .2byte EC_WORD_HEY_QUES + .2byte EC_WORD_HI + .2byte EC_MOVE2(HI_JUMP_KICK) + .2byte EC_WORD_HIDDEN + .2byte EC_MOVE2(HIDDEN_POWER) + .2byte EC_WORD_HIGH + .2byte EC_WORD_HIGHS + .2byte EC_WORD_HIM + .2byte EC_WORD_HIP_AND + .2byte EC_WORD_HIS + .2byte EC_WORD_HIT + .2byte EC_POKEMON2(HITMONCHAN) + .2byte EC_POKEMON2(HITMONLEE) + .2byte EC_POKEMON2(HITMONTOP) + .2byte EC_WORD_HIYAH + .2byte EC_WORD_HMM + .2byte EC_POKEMON2(HO_OH) + .2byte EC_WORD_HOBBY + .2byte EC_WORD_HOHOHO + .2byte EC_WORD_HOLIDAY + .2byte EC_WORD_HOME + .2byte EC_WORD_HOO_HAH + .2byte EC_POKEMON2(HOOTHOOT) + .2byte EC_WORD_HOPELESS + .2byte EC_POKEMON2(HOPPIP) + .2byte EC_MOVE2(HORN_ATTACK) + .2byte EC_MOVE2(HORN_DRILL) + ec_duplicates 2 + .2byte EC_POKEMON(HORSEA) + .2byte EC_POKEMON2(HORSEA) + .2byte EC_WORD_HOT + .2byte EC_POKEMON2(HOUNDOOM) + .2byte EC_POKEMON2(HOUNDOUR) + .2byte EC_WORD_HOW + .2byte EC_WORD_HOW_DO + .2byte EC_WORD_HOWEVER + .2byte EC_MOVE2(HOWL) + .2byte EC_WORD_HUGE_POWER + .2byte EC_WORD_HUH_QUES + .2byte EC_WORD_HUMPH + .2byte EC_WORD_HUNGRY + .2byte EC_POKEMON(HUNTAIL) + .2byte EC_WORD_HURRIED + .2byte EC_WORD_HUSTLE + .2byte EC_MOVE2(HYDRO_PUMP) + .2byte EC_WORD_HYPER + .2byte EC_MOVE2(HYPER_BEAM) + .2byte EC_WORD_HYPER_CUTTER + .2byte EC_MOVE2(HYPER_FANG) + .2byte EC_MOVE2(HYPER_VOICE) + .2byte EC_POKEMON2(HYPNO) + .2byte EC_MOVE(HYPNOSIS) gEasyChatWordsByLetter_I: - ec_word I - ec_word I_AM - ec_word I_CHOOSE_YOU - ec_word I_WAS - ec_word I_VE - ec_word I_VE_ARRIVED - ec_word ICE - ec_move1 ICE_BALL - ec_move2 ICE_BEAM - ec_move2 ICE_PUNCH - ec_move1 ICY_WIND - ec_word IDOL - ec_word IF - ec_word IF_I_LOSE - ec_word IF_I_WIN - ec_duplicates 2 - ec_pokemon1 IGGLYBUFF - ec_pokemon2 IGGLYBUFF - ec_word IGNORANT - ec_word ILLUMINATE - ec_pokemon1 ILLUMISE - ec_word IMMUNITY - ec_word IMPORTANT - ec_word IMPOSSIBLE - ec_move2 IMPRISON - ec_word IN - ec_word INCREASING - ec_word INCREDIBLE - ec_word INFORMATION - ec_move2 INGRAIN - ec_word INNER_FOCUS - ec_word INSIDE - ec_word INSOMNIA - ec_word INSTEAD - ec_word INTIMIDATE - ec_word INVINCIBLE - ec_move2 IRON_DEFENSE - ec_move1 IRON_TAIL - ec_word IS - ec_word IS_IT_QUES - ec_word ISN_T - ec_word ISN_T_IT_QUES - ec_word IT - ec_word IT_S - ec_word ITEM - ec_pokemon2 IVYSAUR + .2byte EC_WORD_I + .2byte EC_WORD_I_AM + .2byte EC_WORD_I_CHOOSE_YOU + .2byte EC_WORD_I_WAS + .2byte EC_WORD_I_VE + .2byte EC_WORD_I_VE_ARRIVED + .2byte EC_WORD_ICE + .2byte EC_MOVE(ICE_BALL) + .2byte EC_MOVE2(ICE_BEAM) + .2byte EC_MOVE2(ICE_PUNCH) + .2byte EC_MOVE(ICY_WIND) + .2byte EC_WORD_IDOL + .2byte EC_WORD_IF + .2byte EC_WORD_IF_I_LOSE + .2byte EC_WORD_IF_I_WIN + ec_duplicates 2 + .2byte EC_POKEMON(IGGLYBUFF) + .2byte EC_POKEMON2(IGGLYBUFF) + .2byte EC_WORD_IGNORANT + .2byte EC_WORD_ILLUMINATE + .2byte EC_POKEMON(ILLUMISE) + .2byte EC_WORD_IMMUNITY + .2byte EC_WORD_IMPORTANT + .2byte EC_WORD_IMPOSSIBLE + .2byte EC_MOVE2(IMPRISON) + .2byte EC_WORD_IN + .2byte EC_WORD_INCREASING + .2byte EC_WORD_INCREDIBLE + .2byte EC_WORD_INFORMATION + .2byte EC_MOVE2(INGRAIN) + .2byte EC_WORD_INNER_FOCUS + .2byte EC_WORD_INSIDE + .2byte EC_WORD_INSOMNIA + .2byte EC_WORD_INSTEAD + .2byte EC_WORD_INTIMIDATE + .2byte EC_WORD_INVINCIBLE + .2byte EC_MOVE2(IRON_DEFENSE) + .2byte EC_MOVE(IRON_TAIL) + .2byte EC_WORD_IS + .2byte EC_WORD_IS_IT_QUES + .2byte EC_WORD_ISN_T + .2byte EC_WORD_ISN_T_IT_QUES + .2byte EC_WORD_IT + .2byte EC_WORD_IT_S + .2byte EC_WORD_ITEM + .2byte EC_POKEMON2(IVYSAUR) gEasyChatWordsByLetter_J: ec_duplicates 2 - ec_pokemon1 JIGGLYPUFF - ec_pokemon2 JIGGLYPUFF - ec_pokemon1 JIRACHI - ec_word JOKING - ec_pokemon2 JOLTEON - ec_word JOY - ec_word JUDGE - ec_move2 JUMP_KICK - ec_pokemon2 JUMPLUFF - ec_word JUST - ec_pokemon2 JYNX + .2byte EC_POKEMON(JIGGLYPUFF) + .2byte EC_POKEMON2(JIGGLYPUFF) + .2byte EC_POKEMON(JIRACHI) + .2byte EC_WORD_JOKING + .2byte EC_POKEMON2(JOLTEON) + .2byte EC_WORD_JOY + .2byte EC_WORD_JUDGE + .2byte EC_MOVE2(JUMP_KICK) + .2byte EC_POKEMON2(JUMPLUFF) + .2byte EC_WORD_JUST + .2byte EC_POKEMON2(JYNX) gEasyChatWordsByLetter_K: - ec_pokemon2 KABUTO - ec_pokemon2 KABUTOPS - ec_duplicates 2 - ec_pokemon1 KADABRA - ec_pokemon2 KADABRA - ec_pokemon2 KAKUNA - ec_pokemon2 KANGASKHAN - ec_move1 KARATE_CHOP - ec_pokemon1 KECLEON - ec_word KEEN_EYE - ec_word KID - ec_word KIDDING - ec_word KIND - ec_word KINDERGARTEN - ec_move1 KINESIS - ec_duplicates 2 - ec_pokemon1 KINGDRA - ec_pokemon2 KINGDRA - ec_pokemon2 KINGLER - ec_pokemon1 KIRLIA - ec_move2 KNOCK_OFF - ec_word KNOCKOUT - ec_word KNOW - ec_word KNOWS - ec_duplicates 2 - ec_pokemon1 KOFFING - ec_pokemon2 KOFFING - ec_pokemon2 KRABBY - ec_word KTHX_BYE - ec_pokemon1 KYOGRE + .2byte EC_POKEMON2(KABUTO) + .2byte EC_POKEMON2(KABUTOPS) + ec_duplicates 2 + .2byte EC_POKEMON(KADABRA) + .2byte EC_POKEMON2(KADABRA) + .2byte EC_POKEMON2(KAKUNA) + .2byte EC_POKEMON2(KANGASKHAN) + .2byte EC_MOVE(KARATE_CHOP) + .2byte EC_POKEMON(KECLEON) + .2byte EC_WORD_KEEN_EYE + .2byte EC_WORD_KID + .2byte EC_WORD_KIDDING + .2byte EC_WORD_KIND + .2byte EC_WORD_KINDERGARTEN + .2byte EC_MOVE(KINESIS) + ec_duplicates 2 + .2byte EC_POKEMON(KINGDRA) + .2byte EC_POKEMON2(KINGDRA) + .2byte EC_POKEMON2(KINGLER) + .2byte EC_POKEMON(KIRLIA) + .2byte EC_MOVE2(KNOCK_OFF) + .2byte EC_WORD_KNOCKOUT + .2byte EC_WORD_KNOW + .2byte EC_WORD_KNOWS + ec_duplicates 2 + .2byte EC_POKEMON(KOFFING) + .2byte EC_POKEMON2(KOFFING) + .2byte EC_POKEMON2(KRABBY) + .2byte EC_WORD_KTHX_BYE + .2byte EC_POKEMON(KYOGRE) gEasyChatWordsByLetter_L: - ec_word LACKING - ec_word LACKS - ec_word LADY - ec_pokemon1 LAIRON - ec_word LALALA - ec_duplicates 2 - ec_pokemon1 LANTURN - ec_pokemon2 LANTURN - ec_pokemon2 LAPRAS - ec_pokemon2 LARVITAR - ec_word LAST - ec_word LATE - ec_word LATER - ec_pokemon1 LATIAS - ec_pokemon1 LATIOS - ec_word LAVISH - ec_word LAY - ec_word LEADER - ec_word LEADERS - ec_move2 LEAF_BLADE - ec_word LEARN - ec_pokemon2 LEDIAN - ec_pokemon2 LEDYBA - ec_move1 LEECH_LIFE - ec_move2 LEECH_SEED - ec_move2 LEER - ec_word LEFT - ec_word LEGEND - ec_word LESS - ec_word LESSONS - ec_word LET_ME_WIN - ec_word LET_S - ec_word LETTER - ec_word LEVEL - ec_word LEVITATE - ec_move1 LICK - ec_pokemon2 LICKITUNG - ec_word LIE - ec_word LIFE - ec_move2 LIGHT_SCREEN - ec_word LIGHTNINGROD - ec_word LIKE - ec_word LIKELY_TO - ec_word LIKES - ec_pokemon1 LILEEP - ec_word LIMBER - ec_word LINK - ec_pokemon1 LINOONE - ec_word LIQUID_OOZE - ec_word LISTEN - ec_word LISTENING - ec_word LISTENS - ec_word LIVING - ec_move2 LOCK_ON - ec_word LOCOMOTIVE - ec_word LOL - ec_word LOLLING - ec_pokemon1 LOMBRE - ec_word LONESOME - ec_word LOOK - ec_word LOOKS - ec_word LOSE - ec_word LOSER - ec_word LOSING - ec_word LOSS - ec_word LOST - ec_pokemon1 LOTAD - ec_pokemon1 LOUDRED - ec_word LOUSY - ec_move1 LOVELY_KISS - ec_word LOVEY_DOVEY - ec_word LOW - ec_move1 LOW_KICK - ec_word LOWS - ec_pokemon1 LUDICOLO - ec_pokemon2 LUGIA - ec_word LUKEWARM - ec_pokemon1 LUNATONE - ec_move2 LUSTER_PURGE - ec_pokemon1 LUVDISC + .2byte EC_WORD_LACKING + .2byte EC_WORD_LACKS + .2byte EC_WORD_LADY + .2byte EC_POKEMON(LAIRON) + .2byte EC_WORD_LALALA + ec_duplicates 2 + .2byte EC_POKEMON(LANTURN) + .2byte EC_POKEMON2(LANTURN) + .2byte EC_POKEMON2(LAPRAS) + .2byte EC_POKEMON2(LARVITAR) + .2byte EC_WORD_LAST + .2byte EC_WORD_LATE + .2byte EC_WORD_LATER + .2byte EC_POKEMON(LATIAS) + .2byte EC_POKEMON(LATIOS) + .2byte EC_WORD_LAVISH + .2byte EC_WORD_LAY + .2byte EC_WORD_LEADER + .2byte EC_WORD_LEADERS + .2byte EC_MOVE2(LEAF_BLADE) + .2byte EC_WORD_LEARN + .2byte EC_POKEMON2(LEDIAN) + .2byte EC_POKEMON2(LEDYBA) + .2byte EC_MOVE(LEECH_LIFE) + .2byte EC_MOVE2(LEECH_SEED) + .2byte EC_MOVE2(LEER) + .2byte EC_WORD_LEFT + .2byte EC_WORD_LEGEND + .2byte EC_WORD_LESS + .2byte EC_WORD_LESSONS + .2byte EC_WORD_LET_ME_WIN + .2byte EC_WORD_LET_S + .2byte EC_WORD_LETTER + .2byte EC_WORD_LEVEL + .2byte EC_WORD_LEVITATE + .2byte EC_MOVE(LICK) + .2byte EC_POKEMON2(LICKITUNG) + .2byte EC_WORD_LIE + .2byte EC_WORD_LIFE + .2byte EC_MOVE2(LIGHT_SCREEN) + .2byte EC_WORD_LIGHTNINGROD + .2byte EC_WORD_LIKE + .2byte EC_WORD_LIKELY_TO + .2byte EC_WORD_LIKES + .2byte EC_POKEMON(LILEEP) + .2byte EC_WORD_LIMBER + .2byte EC_WORD_LINK + .2byte EC_POKEMON(LINOONE) + .2byte EC_WORD_LIQUID_OOZE + .2byte EC_WORD_LISTEN + .2byte EC_WORD_LISTENING + .2byte EC_WORD_LISTENS + .2byte EC_WORD_LIVING + .2byte EC_MOVE2(LOCK_ON) + .2byte EC_WORD_LOCOMOTIVE + .2byte EC_WORD_LOL + .2byte EC_WORD_LOLLING + .2byte EC_POKEMON(LOMBRE) + .2byte EC_WORD_LONESOME + .2byte EC_WORD_LOOK + .2byte EC_WORD_LOOKS + .2byte EC_WORD_LOSE + .2byte EC_WORD_LOSER + .2byte EC_WORD_LOSING + .2byte EC_WORD_LOSS + .2byte EC_WORD_LOST + .2byte EC_POKEMON(LOTAD) + .2byte EC_POKEMON(LOUDRED) + .2byte EC_WORD_LOUSY + .2byte EC_MOVE(LOVELY_KISS) + .2byte EC_WORD_LOVEY_DOVEY + .2byte EC_WORD_LOW + .2byte EC_MOVE(LOW_KICK) + .2byte EC_WORD_LOWS + .2byte EC_POKEMON(LUDICOLO) + .2byte EC_POKEMON2(LUGIA) + .2byte EC_WORD_LUKEWARM + .2byte EC_POKEMON(LUNATONE) + .2byte EC_MOVE2(LUSTER_PURGE) + .2byte EC_POKEMON(LUVDISC) gEasyChatWordsByLetter_M: - ec_move2 MACH_PUNCH - ec_duplicates 2 - ec_pokemon1 MACHAMP - ec_pokemon2 MACHAMP - ec_word MACHINE - ec_duplicates 2 - ec_pokemon1 MACHOKE - ec_pokemon2 MACHOKE - ec_duplicates 2 - ec_pokemon1 MACHOP - ec_pokemon2 MACHOP - ec_word MAGAZINE - ec_pokemon2 MAGBY - ec_duplicates 2 - ec_pokemon1 MAGCARGO - ec_pokemon2 MAGCARGO - ec_move2 MAGIC_COAT - ec_move2 MAGICAL_LEAF - ec_duplicates 2 - ec_pokemon1 MAGIKARP - ec_pokemon2 MAGIKARP - ec_word MAGMA_ARMOR - ec_pokemon2 MAGMAR - ec_duplicates 2 - ec_pokemon1 MAGNEMITE - ec_pokemon2 MAGNEMITE - ec_word MAGNET_PULL - ec_duplicates 2 - ec_pokemon1 MAGNETON - ec_pokemon2 MAGNETON - ec_move2 MAGNITUDE - ec_word MAIL - ec_word MAKE - ec_word MAKING - ec_pokemon1 MAKUHITA - ec_word MAN - ec_pokemon1 MANECTRIC - ec_pokemon2 MANKEY - ec_pokemon2 MANTINE - ec_pokemon2 MAREEP - ec_duplicates 2 - ec_pokemon1 MARILL - ec_pokemon2 MARILL - ec_pokemon2 MAROWAK - ec_pokemon1 MARSHTOMP - ec_word MARVEL_SCALE - ec_pokemon1 MASQUERAIN - ec_word MASTER - ec_word MATCH - ec_word MATCH_UP - ec_pokemon1 MAWILE - ec_word MAYBE - ec_word MC - ec_word ME - ec_word MEAN - ec_move1 MEAN_LOOK - ec_pokemon1 MEDICHAM - ec_move2 MEDITATE - ec_pokemon1 MEDITITE - ec_word MEET - ec_word MEET_YOU - ec_word MEETS - ec_word MEGA - ec_move2 MEGA_DRAIN - ec_move2 MEGA_KICK - ec_move2 MEGA_PUNCH - ec_move2 MEGAHORN - ec_pokemon2 MEGANIUM - ec_move1 MEMENTO - ec_pokemon2 MEOWTH - ec_word MESSAGE - ec_pokemon1 METAGROSS - ec_move2 METAL_CLAW - ec_move1 METAL_SOUND - ec_pokemon1 METANG - ec_pokemon2 METAPOD - ec_move1 METEOR_MASH - ec_move2 METRONOME - ec_pokemon2 MEW - ec_pokemon2 MEWTWO - ec_pokemon1 MIGHTYENA - ec_move2 MILK_DRINK - ec_pokemon1 MILOTIC - ec_pokemon2 MILTANK - ec_move2 MIMIC - ec_move1 MIND_READER - ec_move2 MINIMIZE - ec_pokemon1 MINUN - ec_word MINUS - ec_move2 MIRROR_COAT - ec_move1 MIRROR_MOVE - ec_pokemon2 MISDREAVUS - ec_word MISHEARD - ec_word MISS - ec_move1 MIST - ec_move2 MIST_BALL - ec_word MISTAKE - ec_word MMM - ec_word MODE - ec_word MODERN - ec_pokemon2 MOLTRES - ec_word MOMENTUM - ec_word MONDAY - ec_word MONEY - ec_word MONTH - ec_word MOOD - ec_move2 MOONLIGHT - ec_word MORE - ec_word MORNING - ec_move1 MORNING_SUN - ec_word MOTHER - ec_word MOVE - ec_word MOVIE - ec_word MR - ec_pokemon2 MR_MIME - ec_word MRS - ec_word MUCH - ec_word MUCH_OBLIGED - ec_move2 MUD_SHOT - ec_move2 MUD_SPORT - ec_move2 MUD_SLAP - ec_move2 MUDDY_WATER - ec_pokemon1 MUDKIP - ec_word MUFUFU - ec_duplicates 2 - ec_pokemon1 MUK - ec_pokemon2 MUK - ec_pokemon2 MURKROW - ec_word MUSIC - ec_word MUST_BE - ec_word MY - ec_word MYSELF - ec_word MYSTERY + .2byte EC_MOVE2(MACH_PUNCH) + ec_duplicates 2 + .2byte EC_POKEMON(MACHAMP) + .2byte EC_POKEMON2(MACHAMP) + .2byte EC_WORD_MACHINE + ec_duplicates 2 + .2byte EC_POKEMON(MACHOKE) + .2byte EC_POKEMON2(MACHOKE) + ec_duplicates 2 + .2byte EC_POKEMON(MACHOP) + .2byte EC_POKEMON2(MACHOP) + .2byte EC_WORD_MAGAZINE + .2byte EC_POKEMON2(MAGBY) + ec_duplicates 2 + .2byte EC_POKEMON(MAGCARGO) + .2byte EC_POKEMON2(MAGCARGO) + .2byte EC_MOVE2(MAGIC_COAT) + .2byte EC_MOVE2(MAGICAL_LEAF) + ec_duplicates 2 + .2byte EC_POKEMON(MAGIKARP) + .2byte EC_POKEMON2(MAGIKARP) + .2byte EC_WORD_MAGMA_ARMOR + .2byte EC_POKEMON2(MAGMAR) + ec_duplicates 2 + .2byte EC_POKEMON(MAGNEMITE) + .2byte EC_POKEMON2(MAGNEMITE) + .2byte EC_WORD_MAGNET_PULL + ec_duplicates 2 + .2byte EC_POKEMON(MAGNETON) + .2byte EC_POKEMON2(MAGNETON) + .2byte EC_MOVE2(MAGNITUDE) + .2byte EC_WORD_MAIL + .2byte EC_WORD_MAKE + .2byte EC_WORD_MAKING + .2byte EC_POKEMON(MAKUHITA) + .2byte EC_WORD_MAN + .2byte EC_POKEMON(MANECTRIC) + .2byte EC_POKEMON2(MANKEY) + .2byte EC_POKEMON2(MANTINE) + .2byte EC_POKEMON2(MAREEP) + ec_duplicates 2 + .2byte EC_POKEMON(MARILL) + .2byte EC_POKEMON2(MARILL) + .2byte EC_POKEMON2(MAROWAK) + .2byte EC_POKEMON(MARSHTOMP) + .2byte EC_WORD_MARVEL_SCALE + .2byte EC_POKEMON(MASQUERAIN) + .2byte EC_WORD_MASTER + .2byte EC_WORD_MATCH + .2byte EC_WORD_MATCH_UP + .2byte EC_POKEMON(MAWILE) + .2byte EC_WORD_MAYBE + .2byte EC_WORD_MC + .2byte EC_WORD_ME + .2byte EC_WORD_MEAN + .2byte EC_MOVE(MEAN_LOOK) + .2byte EC_POKEMON(MEDICHAM) + .2byte EC_MOVE2(MEDITATE) + .2byte EC_POKEMON(MEDITITE) + .2byte EC_WORD_MEET + .2byte EC_WORD_MEET_YOU + .2byte EC_WORD_MEETS + .2byte EC_WORD_MEGA + .2byte EC_MOVE2(MEGA_DRAIN) + .2byte EC_MOVE2(MEGA_KICK) + .2byte EC_MOVE2(MEGA_PUNCH) + .2byte EC_MOVE2(MEGAHORN) + .2byte EC_POKEMON2(MEGANIUM) + .2byte EC_MOVE(MEMENTO) + .2byte EC_POKEMON2(MEOWTH) + .2byte EC_WORD_MESSAGE + .2byte EC_POKEMON(METAGROSS) + .2byte EC_MOVE2(METAL_CLAW) + .2byte EC_MOVE(METAL_SOUND) + .2byte EC_POKEMON(METANG) + .2byte EC_POKEMON2(METAPOD) + .2byte EC_MOVE(METEOR_MASH) + .2byte EC_MOVE2(METRONOME) + .2byte EC_POKEMON2(MEW) + .2byte EC_POKEMON2(MEWTWO) + .2byte EC_POKEMON(MIGHTYENA) + .2byte EC_MOVE2(MILK_DRINK) + .2byte EC_POKEMON(MILOTIC) + .2byte EC_POKEMON2(MILTANK) + .2byte EC_MOVE2(MIMIC) + .2byte EC_MOVE(MIND_READER) + .2byte EC_MOVE2(MINIMIZE) + .2byte EC_POKEMON(MINUN) + .2byte EC_WORD_MINUS + .2byte EC_MOVE2(MIRROR_COAT) + .2byte EC_MOVE(MIRROR_MOVE) + .2byte EC_POKEMON2(MISDREAVUS) + .2byte EC_WORD_MISHEARD + .2byte EC_WORD_MISS + .2byte EC_MOVE(MIST) + .2byte EC_MOVE2(MIST_BALL) + .2byte EC_WORD_MISTAKE + .2byte EC_WORD_MMM + .2byte EC_WORD_MODE + .2byte EC_WORD_MODERN + .2byte EC_POKEMON2(MOLTRES) + .2byte EC_WORD_MOMENTUM + .2byte EC_WORD_MONDAY + .2byte EC_WORD_MONEY + .2byte EC_WORD_MONTH + .2byte EC_WORD_MOOD + .2byte EC_MOVE2(MOONLIGHT) + .2byte EC_WORD_MORE + .2byte EC_WORD_MORNING + .2byte EC_MOVE(MORNING_SUN) + .2byte EC_WORD_MOTHER + .2byte EC_WORD_MOVE + .2byte EC_WORD_MOVIE + .2byte EC_WORD_MR + .2byte EC_POKEMON2(MR_MIME) + .2byte EC_WORD_MRS + .2byte EC_WORD_MUCH + .2byte EC_WORD_MUCH_OBLIGED + .2byte EC_MOVE2(MUD_SHOT) + .2byte EC_MOVE2(MUD_SPORT) + .2byte EC_MOVE2(MUD_SLAP) + .2byte EC_MOVE2(MUDDY_WATER) + .2byte EC_POKEMON(MUDKIP) + .2byte EC_WORD_MUFUFU + ec_duplicates 2 + .2byte EC_POKEMON(MUK) + .2byte EC_POKEMON2(MUK) + .2byte EC_POKEMON2(MURKROW) + .2byte EC_WORD_MUSIC + .2byte EC_WORD_MUST_BE + .2byte EC_WORD_MY + .2byte EC_WORD_MYSELF + .2byte EC_WORD_MYSTERY gEasyChatWordsByLetter_N: - ec_word NAME - ec_word NAP - ec_duplicates 2 - ec_pokemon1 NATU - ec_pokemon2 NATU - ec_word NATURAL - ec_word NATURAL_CURE - ec_word NATURALLY - ec_word NATURE - ec_move1 NATURE_POWER - ec_word NEAR - ec_word NEARLY - ec_word NEED - ec_move2 NEEDLE_ARM - ec_word NEGATIVE - ec_word NEVER - ec_word NEW - ec_word NEWS - ec_word NEXT - ec_word NICE - ec_pokemon2 NIDOKING - ec_pokemon2 NIDOQUEEN - ec_pokemon2 NIDORAN_F - ec_pokemon2 NIDORAN_M - ec_pokemon2 NIDORINA - ec_pokemon2 NIDORINO - ec_word NIGHT - ec_move2 NIGHT_SHADE - ec_move1 NIGHTMARE - ec_word NIGHTTIME - ec_pokemon1 NINCADA - ec_duplicates 2 - ec_pokemon1 NINETALES - ec_pokemon2 NINETALES - ec_pokemon1 NINJASK - ec_word NITWIT - ec_word NO - ec_word NO_MATCH - ec_word NO_1 - ec_pokemon2 NOCTOWL - ec_word NOISY - ec_word NON_STOP - ec_word NONE - ec_word NOPE - ec_word NORMAL - ec_pokemon1 NOSEPASS - ec_word NOT - ec_word NOT_VERY - ec_word NOTHING - ec_word NOW - ec_pokemon1 NUMEL - ec_pokemon1 NUZLEAF + .2byte EC_WORD_NAME + .2byte EC_WORD_NAP + ec_duplicates 2 + .2byte EC_POKEMON(NATU) + .2byte EC_POKEMON2(NATU) + .2byte EC_WORD_NATURAL + .2byte EC_WORD_NATURAL_CURE + .2byte EC_WORD_NATURALLY + .2byte EC_WORD_NATURE + .2byte EC_MOVE(NATURE_POWER) + .2byte EC_WORD_NEAR + .2byte EC_WORD_NEARLY + .2byte EC_WORD_NEED + .2byte EC_MOVE2(NEEDLE_ARM) + .2byte EC_WORD_NEGATIVE + .2byte EC_WORD_NEVER + .2byte EC_WORD_NEW + .2byte EC_WORD_NEWS + .2byte EC_WORD_NEXT + .2byte EC_WORD_NICE + .2byte EC_POKEMON2(NIDOKING) + .2byte EC_POKEMON2(NIDOQUEEN) + .2byte EC_POKEMON2(NIDORAN_F) + .2byte EC_POKEMON2(NIDORAN_M) + .2byte EC_POKEMON2(NIDORINA) + .2byte EC_POKEMON2(NIDORINO) + .2byte EC_WORD_NIGHT + .2byte EC_MOVE2(NIGHT_SHADE) + .2byte EC_MOVE(NIGHTMARE) + .2byte EC_WORD_NIGHTTIME + .2byte EC_POKEMON(NINCADA) + ec_duplicates 2 + .2byte EC_POKEMON(NINETALES) + .2byte EC_POKEMON2(NINETALES) + .2byte EC_POKEMON(NINJASK) + .2byte EC_WORD_NITWIT + .2byte EC_WORD_NO + .2byte EC_WORD_NO_MATCH + .2byte EC_WORD_NO_1 + .2byte EC_POKEMON2(NOCTOWL) + .2byte EC_WORD_NOISY + .2byte EC_WORD_NON_STOP + .2byte EC_WORD_NONE + .2byte EC_WORD_NOPE + .2byte EC_WORD_NORMAL + .2byte EC_POKEMON(NOSEPASS) + .2byte EC_WORD_NOT + .2byte EC_WORD_NOT_VERY + .2byte EC_WORD_NOTHING + .2byte EC_WORD_NOW + .2byte EC_POKEMON(NUMEL) + .2byte EC_POKEMON(NUZLEAF) gEasyChatWordsByLetter_O: - ec_word OBLIVIOUS - ec_move1 OCTAZOOKA - ec_pokemon2 OCTILLERY - ec_duplicates 2 - ec_pokemon1 ODDISH - ec_pokemon2 ODDISH - ec_move1 ODOR_SLEUTH - ec_word OF - ec_word OFF - ec_word OFFENSIVE - ec_word OH - ec_word OH_DEAR - ec_word OH_YEAH - ec_word OH_KAY - ec_word OH_QUES - ec_word OI - ec_word OI_OI_OI - ec_word OK_QUES - ec_word OKAY - ec_word OLD - ec_word OLDEN - ec_pokemon2 OMANYTE - ec_pokemon2 OMASTAR - ec_word ON - ec_word ONCE - ec_pokemon2 ONIX - ec_word ONLY - ec_word OOPS - ec_word OPPONENT - ec_word OPPOSITE - ec_word OR - ec_word OTHER - ec_word OUR - ec_word OUT - ec_move1 OUTRAGE - ec_word OUTSIDE - ec_word OVER - ec_word OVERDO - ec_word OVERGROW - ec_move1 OVERHEAT - ec_word OVERWHELMING - ec_word OWN - ec_word OWN_TEMPO + .2byte EC_WORD_OBLIVIOUS + .2byte EC_MOVE(OCTAZOOKA) + .2byte EC_POKEMON2(OCTILLERY) + ec_duplicates 2 + .2byte EC_POKEMON(ODDISH) + .2byte EC_POKEMON2(ODDISH) + .2byte EC_MOVE(ODOR_SLEUTH) + .2byte EC_WORD_OF + .2byte EC_WORD_OFF + .2byte EC_WORD_OFFENSIVE + .2byte EC_WORD_OH + .2byte EC_WORD_OH_DEAR + .2byte EC_WORD_OH_YEAH + .2byte EC_WORD_OH_KAY + .2byte EC_WORD_OH_QUES + .2byte EC_WORD_OI + .2byte EC_WORD_OI_OI_OI + .2byte EC_WORD_OK_QUES + .2byte EC_WORD_OKAY + .2byte EC_WORD_OLD + .2byte EC_WORD_OLDEN + .2byte EC_POKEMON2(OMANYTE) + .2byte EC_POKEMON2(OMASTAR) + .2byte EC_WORD_ON + .2byte EC_WORD_ONCE + .2byte EC_POKEMON2(ONIX) + .2byte EC_WORD_ONLY + .2byte EC_WORD_OOPS + .2byte EC_WORD_OPPONENT + .2byte EC_WORD_OPPOSITE + .2byte EC_WORD_OR + .2byte EC_WORD_OTHER + .2byte EC_WORD_OUR + .2byte EC_WORD_OUT + .2byte EC_MOVE(OUTRAGE) + .2byte EC_WORD_OUTSIDE + .2byte EC_WORD_OVER + .2byte EC_WORD_OVERDO + .2byte EC_WORD_OVERGROW + .2byte EC_MOVE(OVERHEAT) + .2byte EC_WORD_OVERWHELMING + .2byte EC_WORD_OWN + .2byte EC_WORD_OWN_TEMPO gEasyChatWordsByLetter_P: - ec_move1 PAIN_SPLIT - ec_pokemon2 PARAS - ec_pokemon2 PARASECT - ec_word PARDON - ec_word PARENT - ec_word PARTNER - ec_word PARTY - ec_word PATTERN - ec_move2 PAY_DAY - ec_word PC - ec_move2 PECK - ec_pokemon1 PELIPPER - ec_word PERFECT - ec_word PERFECTION - ec_move2 PERISH_SONG - ec_pokemon2 PERSIAN - ec_word PERSON - ec_move2 PETAL_DANCE - ec_duplicates 2 - ec_pokemon1 PHANPY - ec_pokemon2 PHANPY - ec_word PHONE - ec_duplicates 2 - ec_pokemon1 PICHU - ec_pokemon2 PICHU - ec_word PICKUP - ec_pokemon2 PIDGEOT - ec_pokemon2 PIDGEOTTO - ec_pokemon2 PIDGEY - ec_duplicates 2 - ec_pokemon1 PIKACHU - ec_pokemon2 PIKACHU - ec_pokemon2 PILOSWINE - ec_move2 PIN_MISSILE - ec_pokemon2 PINECO - ec_duplicates 2 - ec_pokemon1 PINSIR - ec_pokemon2 PINSIR - ec_word PKRS - ec_word PLACE - ec_word PLANS - ec_word PLAY - ec_word PLAYED - ec_word PLAYS - ec_word PLEASE - ec_word PLUS - ec_word PLUSH_DOLL - ec_pokemon1 PLUSLE - ec_word POINTS - ec_word POISON - ec_move2 POISON_FANG - ec_move2 POISON_GAS - ec_word POISON_POINT - ec_move2 POISON_STING - ec_move2 POISON_TAIL - ec_move2 POISON_POWDER - ec_word POKEBLOCK - ec_word POKEDEX - ec_word POKEMON - ec_word POKENAV - ec_pokemon2 POLITOED - ec_pokemon2 POLIWAG - ec_pokemon2 POLIWHIRL - ec_pokemon2 POLIWRATH - ec_pokemon2 PONYTA - ec_pokemon1 POOCHYENA - ec_word POPULAR - ec_pokemon2 PORYGON - ec_pokemon2 PORYGON2 - ec_move2 POUND - ec_move1 POWDER_SNOW - ec_word POWER - ec_word PRAISE - ec_word PREPOSTEROUS - ec_move2 PRESENT - ec_word PRESSURE - ec_word PRETEND - ec_word PRETTY - ec_pokemon2 PRIMEAPE - ec_word PROBABLY - ec_word PROMISE - ec_move2 PROTECT - ec_move1 PSYBEAM - ec_move1 PSYCH_UP - ec_duplicates 2 - ec_word PSYCHIC - ec_move1 PSYCHIC - ec_duplicates 2 - ec_pokemon1 PSYDUCK - ec_pokemon2 PSYDUCK - ec_move1 PSYWAVE - ec_pokemon2 PUPITAR - ec_word PURE_POWER - ec_move1 PURSUIT - ec_word PUSHOVER + .2byte EC_MOVE(PAIN_SPLIT) + .2byte EC_POKEMON2(PARAS) + .2byte EC_POKEMON2(PARASECT) + .2byte EC_WORD_PARDON + .2byte EC_WORD_PARENT + .2byte EC_WORD_PARTNER + .2byte EC_WORD_PARTY + .2byte EC_WORD_PATTERN + .2byte EC_MOVE2(PAY_DAY) + .2byte EC_WORD_PC + .2byte EC_MOVE2(PECK) + .2byte EC_POKEMON(PELIPPER) + .2byte EC_WORD_PERFECT + .2byte EC_WORD_PERFECTION + .2byte EC_MOVE2(PERISH_SONG) + .2byte EC_POKEMON2(PERSIAN) + .2byte EC_WORD_PERSON + .2byte EC_MOVE2(PETAL_DANCE) + ec_duplicates 2 + .2byte EC_POKEMON(PHANPY) + .2byte EC_POKEMON2(PHANPY) + .2byte EC_WORD_PHONE + ec_duplicates 2 + .2byte EC_POKEMON(PICHU) + .2byte EC_POKEMON2(PICHU) + .2byte EC_WORD_PICKUP + .2byte EC_POKEMON2(PIDGEOT) + .2byte EC_POKEMON2(PIDGEOTTO) + .2byte EC_POKEMON2(PIDGEY) + ec_duplicates 2 + .2byte EC_POKEMON(PIKACHU) + .2byte EC_POKEMON2(PIKACHU) + .2byte EC_POKEMON2(PILOSWINE) + .2byte EC_MOVE2(PIN_MISSILE) + .2byte EC_POKEMON2(PINECO) + ec_duplicates 2 + .2byte EC_POKEMON(PINSIR) + .2byte EC_POKEMON2(PINSIR) + .2byte EC_WORD_PKRS + .2byte EC_WORD_PLACE + .2byte EC_WORD_PLANS + .2byte EC_WORD_PLAY + .2byte EC_WORD_PLAYED + .2byte EC_WORD_PLAYS + .2byte EC_WORD_PLEASE + .2byte EC_WORD_PLUS + .2byte EC_WORD_PLUSH_DOLL + .2byte EC_POKEMON(PLUSLE) + .2byte EC_WORD_POINTS + .2byte EC_WORD_POISON + .2byte EC_MOVE2(POISON_FANG) + .2byte EC_MOVE2(POISON_GAS) + .2byte EC_WORD_POISON_POINT + .2byte EC_MOVE2(POISON_STING) + .2byte EC_MOVE2(POISON_TAIL) + .2byte EC_MOVE2(POISON_POWDER) + .2byte EC_WORD_POKEBLOCK + .2byte EC_WORD_POKEDEX + .2byte EC_WORD_POKEMON + .2byte EC_WORD_POKENAV + .2byte EC_POKEMON2(POLITOED) + .2byte EC_POKEMON2(POLIWAG) + .2byte EC_POKEMON2(POLIWHIRL) + .2byte EC_POKEMON2(POLIWRATH) + .2byte EC_POKEMON2(PONYTA) + .2byte EC_POKEMON(POOCHYENA) + .2byte EC_WORD_POPULAR + .2byte EC_POKEMON2(PORYGON) + .2byte EC_POKEMON2(PORYGON2) + .2byte EC_MOVE2(POUND) + .2byte EC_MOVE(POWDER_SNOW) + .2byte EC_WORD_POWER + .2byte EC_WORD_PRAISE + .2byte EC_WORD_PREPOSTEROUS + .2byte EC_MOVE2(PRESENT) + .2byte EC_WORD_PRESSURE + .2byte EC_WORD_PRETEND + .2byte EC_WORD_PRETTY + .2byte EC_POKEMON2(PRIMEAPE) + .2byte EC_WORD_PROBABLY + .2byte EC_WORD_PROMISE + .2byte EC_MOVE2(PROTECT) + .2byte EC_MOVE(PSYBEAM) + .2byte EC_MOVE(PSYCH_UP) + ec_duplicates 2 + .2byte EC_WORD_PSYCHIC + .2byte EC_MOVE(PSYCHIC) + ec_duplicates 2 + .2byte EC_POKEMON(PSYDUCK) + .2byte EC_POKEMON2(PSYDUCK) + .2byte EC_MOVE(PSYWAVE) + .2byte EC_POKEMON2(PUPITAR) + .2byte EC_WORD_PURE_POWER + .2byte EC_MOVE(PURSUIT) + .2byte EC_WORD_PUSHOVER gEasyChatWordsByLetter_Q: - ec_pokemon2 QUAGSIRE - ec_word QUESTION - ec_move2 QUICK_ATTACK - ec_pokemon2 QUILAVA - ec_word QUITE - ec_pokemon2 QWILFISH + .2byte EC_POKEMON2(QUAGSIRE) + .2byte EC_WORD_QUESTION + .2byte EC_MOVE2(QUICK_ATTACK) + .2byte EC_POKEMON2(QUILAVA) + .2byte EC_WORD_QUITE + .2byte EC_POKEMON2(QWILFISH) gEasyChatWordsByLetter_R: - ec_word RADIO - ec_move1 RAGE - ec_duplicates 2 - ec_pokemon1 RAICHU - ec_pokemon2 RAICHU - ec_pokemon2 RAIKOU - ec_move1 RAIN_DANCE - ec_word RAIN_DISH - ec_pokemon1 RALTS - ec_word RANK - ec_move1 RAPID_SPIN - ec_pokemon2 RAPIDASH - ec_word RARE - ec_word RATHER - ec_pokemon2 RATICATE - ec_pokemon2 RATTATA - ec_pokemon1 RAYQUAZA - ec_move2 RAZOR_LEAF - ec_move1 RAZOR_WIND - ec_word READY - ec_word REALLY - ec_word REAR - ec_word RECEIVED - ec_word RECOMMEND - ec_move1 RECOVER - ec_move2 RECYCLE - ec_move2 REFLECT - ec_move2 REFRESH - ec_word REFRESHING - ec_word REFUSE - ec_pokemon1 REGICE - ec_pokemon1 REGIROCK - ec_pokemon1 REGISTEEL - ec_word REJECT - ec_word RELEASE - ec_pokemon1 RELICANTH - ec_pokemon2 REMORAID - ec_word RENTAL - ec_move2 REST - ec_word RESUSCITATE - ec_move1 RETURN - ec_move2 REVENGE - ec_move1 REVERSAL - ec_duplicates 2 - ec_pokemon1 RHYDON - ec_pokemon2 RHYDON - ec_duplicates 2 - ec_pokemon1 RHYHORN - ec_pokemon2 RHYHORN - ec_word RIBBON - ec_word RICKETY - ec_word RIGHT - ec_word RIPPED - ec_word RIVAL - ec_move2 ROAR - ec_word ROCK - ec_move2 ROCK_BLAST - ec_word ROCK_HEAD - ec_move1 ROCK_SLIDE - ec_move1 ROCK_SMASH - ec_move1 ROCK_THROW - ec_move1 ROCK_TOMB - ec_word ROCK_SOLID - ec_move2 ROLE_PLAY - ec_move2 ROLLING_KICK - ec_move1 ROLLOUT - ec_word ROMANTIC - ec_pokemon1 ROSELIA - ec_word ROUGH_SKIN - ec_word RPG - ec_word RUBY - ec_word RULE - ec_word RUN - ec_word RUN_AWAY - ec_word RUNS + .2byte EC_WORD_RADIO + .2byte EC_MOVE(RAGE) + ec_duplicates 2 + .2byte EC_POKEMON(RAICHU) + .2byte EC_POKEMON2(RAICHU) + .2byte EC_POKEMON2(RAIKOU) + .2byte EC_MOVE(RAIN_DANCE) + .2byte EC_WORD_RAIN_DISH + .2byte EC_POKEMON(RALTS) + .2byte EC_WORD_RANK + .2byte EC_MOVE(RAPID_SPIN) + .2byte EC_POKEMON2(RAPIDASH) + .2byte EC_WORD_RARE + .2byte EC_WORD_RATHER + .2byte EC_POKEMON2(RATICATE) + .2byte EC_POKEMON2(RATTATA) + .2byte EC_POKEMON(RAYQUAZA) + .2byte EC_MOVE2(RAZOR_LEAF) + .2byte EC_MOVE(RAZOR_WIND) + .2byte EC_WORD_READY + .2byte EC_WORD_REALLY + .2byte EC_WORD_REAR + .2byte EC_WORD_RECEIVED + .2byte EC_WORD_RECOMMEND + .2byte EC_MOVE(RECOVER) + .2byte EC_MOVE2(RECYCLE) + .2byte EC_MOVE2(REFLECT) + .2byte EC_MOVE2(REFRESH) + .2byte EC_WORD_REFRESHING + .2byte EC_WORD_REFUSE + .2byte EC_POKEMON(REGICE) + .2byte EC_POKEMON(REGIROCK) + .2byte EC_POKEMON(REGISTEEL) + .2byte EC_WORD_REJECT + .2byte EC_WORD_RELEASE + .2byte EC_POKEMON(RELICANTH) + .2byte EC_POKEMON2(REMORAID) + .2byte EC_WORD_RENTAL + .2byte EC_MOVE2(REST) + .2byte EC_WORD_RESUSCITATE + .2byte EC_MOVE(RETURN) + .2byte EC_MOVE2(REVENGE) + .2byte EC_MOVE(REVERSAL) + ec_duplicates 2 + .2byte EC_POKEMON(RHYDON) + .2byte EC_POKEMON2(RHYDON) + ec_duplicates 2 + .2byte EC_POKEMON(RHYHORN) + .2byte EC_POKEMON2(RHYHORN) + .2byte EC_WORD_RIBBON + .2byte EC_WORD_RICKETY + .2byte EC_WORD_RIGHT + .2byte EC_WORD_RIPPED + .2byte EC_WORD_RIVAL + .2byte EC_MOVE2(ROAR) + .2byte EC_WORD_ROCK + .2byte EC_MOVE2(ROCK_BLAST) + .2byte EC_WORD_ROCK_HEAD + .2byte EC_MOVE(ROCK_SLIDE) + .2byte EC_MOVE(ROCK_SMASH) + .2byte EC_MOVE(ROCK_THROW) + .2byte EC_MOVE(ROCK_TOMB) + .2byte EC_WORD_ROCK_SOLID + .2byte EC_MOVE2(ROLE_PLAY) + .2byte EC_MOVE2(ROLLING_KICK) + .2byte EC_MOVE(ROLLOUT) + .2byte EC_WORD_ROMANTIC + .2byte EC_POKEMON(ROSELIA) + .2byte EC_WORD_ROUGH_SKIN + .2byte EC_WORD_RPG + .2byte EC_WORD_RUBY + .2byte EC_WORD_RULE + .2byte EC_WORD_RUN + .2byte EC_WORD_RUN_AWAY + .2byte EC_WORD_RUNS gEasyChatWordsByLetter_S: - ec_pokemon1 SABLEYE - ec_move1 SACRED_FIRE - ec_word SAD - ec_word SADLY - ec_move1 SAFEGUARD - ec_word SAID - ec_pokemon1 SALAMENCE - ec_word SAND_STREAM - ec_move1 SAND_TOMB - ec_word SAND_VEIL - ec_move1 SAND_ATTACK - ec_duplicates 2 - ec_pokemon1 SANDSHREW - ec_pokemon2 SANDSHREW - ec_duplicates 2 - ec_pokemon1 SANDSLASH - ec_pokemon2 SANDSLASH - ec_move1 SANDSTORM - ec_word SAPPHIRE - ec_word SATISFIED - ec_word SATURDAY - ec_word SAYS - ec_word SCARY - ec_move1 SCARY_FACE - ec_word SCATTER - ec_pokemon1 SCEPTILE - ec_word SCHOOL - ec_pokemon2 SCIZOR - ec_move2 SCRATCH - ec_move1 SCREECH - ec_pokemon2 SCYTHER - ec_duplicates 2 - ec_pokemon1 SEADRA - ec_pokemon2 SEADRA - ec_duplicates 2 - ec_pokemon1 SEAKING - ec_pokemon2 SEAKING - ec_pokemon1 SEALEO - ec_word SEARCH - ec_word SECRET - ec_word SECRET_BASE - ec_move2 SECRET_POWER - ec_word SEE - ec_word SEE_YA - ec_pokemon1 SEEDOT - ec_word SEEK - ec_pokemon2 SEEL - ec_word SEEMS - ec_word SEES - ec_move2 SEISMIC_TOSS - ec_move1 SELF_DESTRUCT - ec_word SENSE - ec_pokemon2 SENTRET - ec_word SERENE_GRACE - ec_word SERIOUS - ec_word SERIOUSLY - ec_word SERVICE - ec_pokemon1 SEVIPER - ec_move1 SHADOW_BALL - ec_move1 SHADOW_PUNCH - ec_word SHADOW_TAG - ec_word SHADY - ec_word SHAKE - ec_word SHAKY - ec_word SHALLOW - ec_pokemon1 SHARPEDO - ec_move1 SHARPEN - ec_word SHE - ec_word SHE_IS - ec_word SHE_WAS - ec_word SHED_SKIN - ec_pokemon1 SHEDINJA - ec_move1 SHEER_COLD - ec_pokemon1 SHELGON - ec_word SHELL_ARMOR - ec_pokemon2 SHELLDER - ec_word SHIELD_DUST - ec_pokemon1 SHIFTRY - ec_word SHINE - ec_move2 SHOCK_WAVE - ec_word SHOCKED - ec_word SHOPPING - ec_word SHOULD - ec_word SHOW - ec_word SHREDDED - ec_pokemon1 SHROOMISH - ec_pokemon2 SHUCKLE - ec_pokemon1 SHUPPET - ec_word SIBLINGS - ec_word SIGH - ec_move1 SIGNAL_BEAM - ec_pokemon1 SILCOON - ec_word SILKY - ec_move1 SILVER_WIND - ec_word SIMPLE - ec_word SINCE - ec_move1 SING - ec_word SINK - ec_word SISTER - ec_duplicates 2 - ec_pokemon1 SKARMORY - ec_pokemon2 SKARMORY - ec_move1 SKETCH - ec_word SKILL - ec_move1 SKILL_SWAP - ec_word SKILLED - ec_pokemon2 SKIPLOOM - ec_pokemon1 SKITTY - ec_move2 SKULL_BASH - ec_move1 SKY_ATTACK - ec_move1 SKY_UPPERCUT - ec_move2 SLACK_OFF - ec_pokemon1 SLAKING - ec_pokemon1 SLAKOTH - ec_move2 SLAM - ec_move1 SLASH - ec_word SLEEP - ec_move2 SLEEP_POWDER - ec_move2 SLEEP_TALK - ec_word SLEPT - ec_word SLIDE - ec_word SLIMY - ec_pokemon2 SLOWBRO - ec_pokemon2 SLOWKING - ec_pokemon2 SLOWPOKE - ec_move2 SLUDGE - ec_move2 SLUDGE_BOMB - ec_duplicates 2 - ec_pokemon1 SLUGMA - ec_pokemon2 SLUGMA - ec_word SMACK - ec_word SMALL - ec_word SMART - ec_word SMARTNESS - ec_pokemon2 SMEARGLE - ec_word SMELL - ec_word SMELL_YA - ec_move1 SMELLING_SALT - ec_word SMITE - ec_move1 SMOG - ec_move1 SMOKESCREEN - ec_pokemon2 SMOOCHUM - ec_word SMOOTH - ec_move2 SNATCH - ec_pokemon2 SNEASEL - ec_move1 SNORE - ec_pokemon2 SNORLAX - ec_word SNORT - ec_pokemon1 SNORUNT - ec_pokemon2 SNUBBULL - ec_word SO - ec_move2 SOFT_BOILED - ec_word SOFTWARE - ec_move1 SOLAR_BEAM - ec_pokemon1 SOLROCK - ec_word SOME - ec_word SOMEHOW - ec_word SOMEONE - ec_word SOMETHING - ec_word SOMETIME - ec_word SON - ec_word SONG - ec_word SONGS - ec_move1 SONIC_BOOM - ec_word SOON - ec_word SORRY - ec_word SOUNDPROOF - ec_word SP_ABILITY - ec_move1 SPARK - ec_pokemon2 SPEAROW - ec_word SPECTATOR - ec_word SPEED_BOOST - ec_pokemon1 SPHEAL - ec_move1 SPIDER_WEB - ec_move2 SPIKE_CANNON - ec_move2 SPIKES - ec_pokemon2 SPINARAK - ec_pokemon1 SPINDA - ec_word SPIRALING - ec_word SPIRIT - ec_move2 SPIT_UP - ec_move1 SPITE - ec_move2 SPLASH - ec_pokemon1 SPOINK - ec_move1 SPORE - ec_word SPORTS - ec_word SPRING - ec_pokemon2 SQUIRTLE - ec_word STAGE - ec_pokemon2 STANTLER - ec_duplicates 2 - ec_pokemon1 STARMIE - ec_pokemon2 STARMIE - ec_word START - ec_duplicates 2 - ec_pokemon1 STARYU - ec_pokemon2 STARYU - ec_word STATIC - ec_word STAY_AT_HOME - ec_word STEEL - ec_move2 STEEL_WING - ec_pokemon2 STEELIX - ec_word STENCH - ec_word STICKY_HOLD - ec_move2 STOCKPILE - ec_move2 STOMP - ec_word STOP - ec_word STORE - ec_word STORES - ec_word STORY - ec_word STRATEGY - ec_move1 STRENGTH - ec_move1 STRING_SHOT - ec_word STRONG - ec_move2 STRUGGLE - ec_word STUDY - ec_move1 STUN_SPORE - ec_word STURDY - ec_move1 SUBMISSION - ec_move2 SUBSTITUTE - ec_word SUCTION_CUPS - ec_pokemon2 SUDOWOODO - ec_pokemon2 SUICUNE - ec_word SUMMER - ec_word SUNDAY - ec_pokemon2 SUNFLORA - ec_pokemon2 SUNKERN - ec_move2 SUNNY_DAY - ec_word SUPER - ec_move1 SUPER_FANG - ec_move2 SUPERPOWER - ec_move2 SUPERSONIC - ec_move2 SURF - ec_word SURPRISE - ec_word SURRENDER - ec_pokemon1 SURSKIT - ec_pokemon1 SWABLU - ec_move1 SWAGGER - ec_move2 SWALLOW - ec_pokemon1 SWALOT - ec_pokemon1 SWAMPERT - ec_word SWARM - ec_move2 SWEET_KISS - ec_move1 SWEET_SCENT - ec_word SWEETS - ec_pokemon1 SWELLOW - ec_move1 SWIFT - ec_word SWIFT_SWIM - ec_pokemon2 SWINUB - ec_move2 SWORDS_DANCE - ec_word SYNCHRONIZE - ec_move1 SYNTHESIS - ec_word SYSTEM + .2byte EC_POKEMON(SABLEYE) + .2byte EC_MOVE(SACRED_FIRE) + .2byte EC_WORD_SAD + .2byte EC_WORD_SADLY + .2byte EC_MOVE(SAFEGUARD) + .2byte EC_WORD_SAID + .2byte EC_POKEMON(SALAMENCE) + .2byte EC_WORD_SAND_STREAM + .2byte EC_MOVE(SAND_TOMB) + .2byte EC_WORD_SAND_VEIL + .2byte EC_MOVE(SAND_ATTACK) + ec_duplicates 2 + .2byte EC_POKEMON(SANDSHREW) + .2byte EC_POKEMON2(SANDSHREW) + ec_duplicates 2 + .2byte EC_POKEMON(SANDSLASH) + .2byte EC_POKEMON2(SANDSLASH) + .2byte EC_MOVE(SANDSTORM) + .2byte EC_WORD_SAPPHIRE + .2byte EC_WORD_SATISFIED + .2byte EC_WORD_SATURDAY + .2byte EC_WORD_SAYS + .2byte EC_WORD_SCARY + .2byte EC_MOVE(SCARY_FACE) + .2byte EC_WORD_SCATTER + .2byte EC_POKEMON(SCEPTILE) + .2byte EC_WORD_SCHOOL + .2byte EC_POKEMON2(SCIZOR) + .2byte EC_MOVE2(SCRATCH) + .2byte EC_MOVE(SCREECH) + .2byte EC_POKEMON2(SCYTHER) + ec_duplicates 2 + .2byte EC_POKEMON(SEADRA) + .2byte EC_POKEMON2(SEADRA) + ec_duplicates 2 + .2byte EC_POKEMON(SEAKING) + .2byte EC_POKEMON2(SEAKING) + .2byte EC_POKEMON(SEALEO) + .2byte EC_WORD_SEARCH + .2byte EC_WORD_SECRET + .2byte EC_WORD_SECRET_BASE + .2byte EC_MOVE2(SECRET_POWER) + .2byte EC_WORD_SEE + .2byte EC_WORD_SEE_YA + .2byte EC_POKEMON(SEEDOT) + .2byte EC_WORD_SEEK + .2byte EC_POKEMON2(SEEL) + .2byte EC_WORD_SEEMS + .2byte EC_WORD_SEES + .2byte EC_MOVE2(SEISMIC_TOSS) + .2byte EC_MOVE(SELF_DESTRUCT) + .2byte EC_WORD_SENSE + .2byte EC_POKEMON2(SENTRET) + .2byte EC_WORD_SERENE_GRACE + .2byte EC_WORD_SERIOUS + .2byte EC_WORD_SERIOUSLY + .2byte EC_WORD_SERVICE + .2byte EC_POKEMON(SEVIPER) + .2byte EC_MOVE(SHADOW_BALL) + .2byte EC_MOVE(SHADOW_PUNCH) + .2byte EC_WORD_SHADOW_TAG + .2byte EC_WORD_SHADY + .2byte EC_WORD_SHAKE + .2byte EC_WORD_SHAKY + .2byte EC_WORD_SHALLOW + .2byte EC_POKEMON(SHARPEDO) + .2byte EC_MOVE(SHARPEN) + .2byte EC_WORD_SHE + .2byte EC_WORD_SHE_IS + .2byte EC_WORD_SHE_WAS + .2byte EC_WORD_SHED_SKIN + .2byte EC_POKEMON(SHEDINJA) + .2byte EC_MOVE(SHEER_COLD) + .2byte EC_POKEMON(SHELGON) + .2byte EC_WORD_SHELL_ARMOR + .2byte EC_POKEMON2(SHELLDER) + .2byte EC_WORD_SHIELD_DUST + .2byte EC_POKEMON(SHIFTRY) + .2byte EC_WORD_SHINE + .2byte EC_MOVE2(SHOCK_WAVE) + .2byte EC_WORD_SHOCKED + .2byte EC_WORD_SHOPPING + .2byte EC_WORD_SHOULD + .2byte EC_WORD_SHOW + .2byte EC_WORD_SHREDDED + .2byte EC_POKEMON(SHROOMISH) + .2byte EC_POKEMON2(SHUCKLE) + .2byte EC_POKEMON(SHUPPET) + .2byte EC_WORD_SIBLINGS + .2byte EC_WORD_SIGH + .2byte EC_MOVE(SIGNAL_BEAM) + .2byte EC_POKEMON(SILCOON) + .2byte EC_WORD_SILKY + .2byte EC_MOVE(SILVER_WIND) + .2byte EC_WORD_SIMPLE + .2byte EC_WORD_SINCE + .2byte EC_MOVE(SING) + .2byte EC_WORD_SINK + .2byte EC_WORD_SISTER + ec_duplicates 2 + .2byte EC_POKEMON(SKARMORY) + .2byte EC_POKEMON2(SKARMORY) + .2byte EC_MOVE(SKETCH) + .2byte EC_WORD_SKILL + .2byte EC_MOVE(SKILL_SWAP) + .2byte EC_WORD_SKILLED + .2byte EC_POKEMON2(SKIPLOOM) + .2byte EC_POKEMON(SKITTY) + .2byte EC_MOVE2(SKULL_BASH) + .2byte EC_MOVE(SKY_ATTACK) + .2byte EC_MOVE(SKY_UPPERCUT) + .2byte EC_MOVE2(SLACK_OFF) + .2byte EC_POKEMON(SLAKING) + .2byte EC_POKEMON(SLAKOTH) + .2byte EC_MOVE2(SLAM) + .2byte EC_MOVE(SLASH) + .2byte EC_WORD_SLEEP + .2byte EC_MOVE2(SLEEP_POWDER) + .2byte EC_MOVE2(SLEEP_TALK) + .2byte EC_WORD_SLEPT + .2byte EC_WORD_SLIDE + .2byte EC_WORD_SLIMY + .2byte EC_POKEMON2(SLOWBRO) + .2byte EC_POKEMON2(SLOWKING) + .2byte EC_POKEMON2(SLOWPOKE) + .2byte EC_MOVE2(SLUDGE) + .2byte EC_MOVE2(SLUDGE_BOMB) + ec_duplicates 2 + .2byte EC_POKEMON(SLUGMA) + .2byte EC_POKEMON2(SLUGMA) + .2byte EC_WORD_SMACK + .2byte EC_WORD_SMALL + .2byte EC_WORD_SMART + .2byte EC_WORD_SMARTNESS + .2byte EC_POKEMON2(SMEARGLE) + .2byte EC_WORD_SMELL + .2byte EC_WORD_SMELL_YA + .2byte EC_MOVE(SMELLING_SALT) + .2byte EC_WORD_SMITE + .2byte EC_MOVE(SMOG) + .2byte EC_MOVE(SMOKESCREEN) + .2byte EC_POKEMON2(SMOOCHUM) + .2byte EC_WORD_SMOOTH + .2byte EC_MOVE2(SNATCH) + .2byte EC_POKEMON2(SNEASEL) + .2byte EC_MOVE(SNORE) + .2byte EC_POKEMON2(SNORLAX) + .2byte EC_WORD_SNORT + .2byte EC_POKEMON(SNORUNT) + .2byte EC_POKEMON2(SNUBBULL) + .2byte EC_WORD_SO + .2byte EC_MOVE2(SOFT_BOILED) + .2byte EC_WORD_SOFTWARE + .2byte EC_MOVE(SOLAR_BEAM) + .2byte EC_POKEMON(SOLROCK) + .2byte EC_WORD_SOME + .2byte EC_WORD_SOMEHOW + .2byte EC_WORD_SOMEONE + .2byte EC_WORD_SOMETHING + .2byte EC_WORD_SOMETIME + .2byte EC_WORD_SON + .2byte EC_WORD_SONG + .2byte EC_WORD_SONGS + .2byte EC_MOVE(SONIC_BOOM) + .2byte EC_WORD_SOON + .2byte EC_WORD_SORRY + .2byte EC_WORD_SOUNDPROOF + .2byte EC_WORD_SP_ABILITY + .2byte EC_MOVE(SPARK) + .2byte EC_POKEMON2(SPEAROW) + .2byte EC_WORD_SPECTATOR + .2byte EC_WORD_SPEED_BOOST + .2byte EC_POKEMON(SPHEAL) + .2byte EC_MOVE(SPIDER_WEB) + .2byte EC_MOVE2(SPIKE_CANNON) + .2byte EC_MOVE2(SPIKES) + .2byte EC_POKEMON2(SPINARAK) + .2byte EC_POKEMON(SPINDA) + .2byte EC_WORD_SPIRALING + .2byte EC_WORD_SPIRIT + .2byte EC_MOVE2(SPIT_UP) + .2byte EC_MOVE(SPITE) + .2byte EC_MOVE2(SPLASH) + .2byte EC_POKEMON(SPOINK) + .2byte EC_MOVE(SPORE) + .2byte EC_WORD_SPORTS + .2byte EC_WORD_SPRING + .2byte EC_POKEMON2(SQUIRTLE) + .2byte EC_WORD_STAGE + .2byte EC_POKEMON2(STANTLER) + ec_duplicates 2 + .2byte EC_POKEMON(STARMIE) + .2byte EC_POKEMON2(STARMIE) + .2byte EC_WORD_START + ec_duplicates 2 + .2byte EC_POKEMON(STARYU) + .2byte EC_POKEMON2(STARYU) + .2byte EC_WORD_STATIC + .2byte EC_WORD_STAY_AT_HOME + .2byte EC_WORD_STEEL + .2byte EC_MOVE2(STEEL_WING) + .2byte EC_POKEMON2(STEELIX) + .2byte EC_WORD_STENCH + .2byte EC_WORD_STICKY_HOLD + .2byte EC_MOVE2(STOCKPILE) + .2byte EC_MOVE2(STOMP) + .2byte EC_WORD_STOP + .2byte EC_WORD_STORE + .2byte EC_WORD_STORES + .2byte EC_WORD_STORY + .2byte EC_WORD_STRATEGY + .2byte EC_MOVE(STRENGTH) + .2byte EC_MOVE(STRING_SHOT) + .2byte EC_WORD_STRONG + .2byte EC_MOVE2(STRUGGLE) + .2byte EC_WORD_STUDY + .2byte EC_MOVE(STUN_SPORE) + .2byte EC_WORD_STURDY + .2byte EC_MOVE(SUBMISSION) + .2byte EC_MOVE2(SUBSTITUTE) + .2byte EC_WORD_SUCTION_CUPS + .2byte EC_POKEMON2(SUDOWOODO) + .2byte EC_POKEMON2(SUICUNE) + .2byte EC_WORD_SUMMER + .2byte EC_WORD_SUNDAY + .2byte EC_POKEMON2(SUNFLORA) + .2byte EC_POKEMON2(SUNKERN) + .2byte EC_MOVE2(SUNNY_DAY) + .2byte EC_WORD_SUPER + .2byte EC_MOVE(SUPER_FANG) + .2byte EC_MOVE2(SUPERPOWER) + .2byte EC_MOVE2(SUPERSONIC) + .2byte EC_MOVE2(SURF) + .2byte EC_WORD_SURPRISE + .2byte EC_WORD_SURRENDER + .2byte EC_POKEMON(SURSKIT) + .2byte EC_POKEMON(SWABLU) + .2byte EC_MOVE(SWAGGER) + .2byte EC_MOVE2(SWALLOW) + .2byte EC_POKEMON(SWALOT) + .2byte EC_POKEMON(SWAMPERT) + .2byte EC_WORD_SWARM + .2byte EC_MOVE2(SWEET_KISS) + .2byte EC_MOVE(SWEET_SCENT) + .2byte EC_WORD_SWEETS + .2byte EC_POKEMON(SWELLOW) + .2byte EC_MOVE(SWIFT) + .2byte EC_WORD_SWIFT_SWIM + .2byte EC_POKEMON2(SWINUB) + .2byte EC_MOVE2(SWORDS_DANCE) + .2byte EC_WORD_SYNCHRONIZE + .2byte EC_MOVE(SYNTHESIS) + .2byte EC_WORD_SYSTEM gEasyChatWordsByLetter_T: - ec_move2 TACKLE - ec_move2 TAIL_GLOW - ec_move1 TAIL_WHIP - ec_pokemon1 TAILLOW - ec_word TAKE - ec_move2 TAKE_DOWN - ec_word TAKE_THAT - ec_word TALENT - ec_word TALK - ec_word TALKING - ec_pokemon2 TANGELA - ec_word TASTY - ec_move2 TAUNT - ec_pokemon2 TAUROS - ec_word TCH - ec_word TEACH - ec_word TEACHER - ec_word TEACHES - ec_pokemon2 TEDDIURSA - ec_move2 TEETER_DANCE - ec_move2 TELEPORT - ec_word TELEVISION - ec_duplicates 2 - ec_pokemon1 TENTACOOL - ec_pokemon2 TENTACOOL - ec_duplicates 2 - ec_pokemon1 TENTACRUEL - ec_pokemon2 TENTACRUEL - ec_word TERRIBLE - ec_word TEST - ec_word THAN - ec_word THANK_YOU - ec_word THANKS - ec_word THAT - ec_word THAT_WAS - ec_word THAT_S - ec_word THAT_S_IT_EXCL - ec_word THE - ec_word THEIR - ec_word THERE - ec_word THESE - ec_word THESE_WERE - ec_word THEY - ec_word THEY_WERE - ec_word THEY_RE - ec_word THEY_VE - ec_word THICK - ec_word THICK_FAT - ec_move2 THIEF - ec_word THIN - ec_word THING - ec_word THINGS - ec_word THINK - ec_word THINKS - ec_word THIRSTY - ec_word THIS - ec_word THIS_IS_IT_EXCL - ec_word THOSE - ec_word THOSE_ARE - ec_word THOSE_WERE - ec_move1 THRASH - ec_word THROW - ec_move1 THUNDER - ec_move2 THUNDER_WAVE - ec_move1 THUNDERBOLT - ec_move1 THUNDER_PUNCH - ec_move2 THUNDER_SHOCK - ec_word THURSDAY - ec_move1 TICKLE - ec_word TICKLISH - ec_word TIGHT - ec_word TIME - ec_word TIMES - ec_word TIRED - ec_word TO - ec_word TO_HER - ec_word TO_ME - ec_word TO_THEM - ec_word TO_US - ec_word TO_WHOM - ec_word TODAY - ec_pokemon2 TOGEPI - ec_word TOGETHER - ec_pokemon2 TOGETIC - ec_word TOMORROW - ec_word TOO - ec_word TOO_LATE - ec_word TOO_STRONG - ec_word TOO_WEAK - ec_word TOP - ec_pokemon1 TORCHIC - ec_pokemon1 TORKOAL - ec_move1 TORMENT - ec_word TORRENT - ec_word TOTALLY - ec_pokemon2 TOTODILE - ec_word TOUGH - ec_word TOUGHNESS - ec_word TOURNAMENT - ec_move2 TOXIC - ec_word TOYS - ec_word TRACE - ec_word TRADE - ec_word TRAIN - ec_word TRAINER - ec_word TRAINS - ec_move2 TRANSFORM - ec_pokemon1 TRAPINCH - ec_word TRAVEL - ec_word TREASURE - ec_pokemon1 TREECKO - ec_word TRENDY - ec_move2 TRI_ATTACK - ec_move2 TRICK - ec_word TRIES - ec_move2 TRIPLE_KICK - ec_pokemon1 TROPIUS - ec_word TRUANT - ec_word TRULY - ec_word TRUMP_CARD - ec_word TRUST - ec_word TRY - ec_word TUESDAY - ec_move2 TWINEEDLE - ec_word TWIRLING - ec_move2 TWISTER - ec_word TYPE - ec_pokemon2 TYPHLOSION - ec_pokemon2 TYRANITAR - ec_pokemon2 TYROGUE + .2byte EC_MOVE2(TACKLE) + .2byte EC_MOVE2(TAIL_GLOW) + .2byte EC_MOVE(TAIL_WHIP) + .2byte EC_POKEMON(TAILLOW) + .2byte EC_WORD_TAKE + .2byte EC_MOVE2(TAKE_DOWN) + .2byte EC_WORD_TAKE_THAT + .2byte EC_WORD_TALENT + .2byte EC_WORD_TALK + .2byte EC_WORD_TALKING + .2byte EC_POKEMON2(TANGELA) + .2byte EC_WORD_TASTY + .2byte EC_MOVE2(TAUNT) + .2byte EC_POKEMON2(TAUROS) + .2byte EC_WORD_TCH + .2byte EC_WORD_TEACH + .2byte EC_WORD_TEACHER + .2byte EC_WORD_TEACHES + .2byte EC_POKEMON2(TEDDIURSA) + .2byte EC_MOVE2(TEETER_DANCE) + .2byte EC_MOVE2(TELEPORT) + .2byte EC_WORD_TELEVISION + ec_duplicates 2 + .2byte EC_POKEMON(TENTACOOL) + .2byte EC_POKEMON2(TENTACOOL) + ec_duplicates 2 + .2byte EC_POKEMON(TENTACRUEL) + .2byte EC_POKEMON2(TENTACRUEL) + .2byte EC_WORD_TERRIBLE + .2byte EC_WORD_TEST + .2byte EC_WORD_THAN + .2byte EC_WORD_THANK_YOU + .2byte EC_WORD_THANKS + .2byte EC_WORD_THAT + .2byte EC_WORD_THAT_WAS + .2byte EC_WORD_THAT_S + .2byte EC_WORD_THAT_S_IT_EXCL + .2byte EC_WORD_THE + .2byte EC_WORD_THEIR + .2byte EC_WORD_THERE + .2byte EC_WORD_THESE + .2byte EC_WORD_THESE_WERE + .2byte EC_WORD_THEY + .2byte EC_WORD_THEY_WERE + .2byte EC_WORD_THEY_RE + .2byte EC_WORD_THEY_VE + .2byte EC_WORD_THICK + .2byte EC_WORD_THICK_FAT + .2byte EC_MOVE2(THIEF) + .2byte EC_WORD_THIN + .2byte EC_WORD_THING + .2byte EC_WORD_THINGS + .2byte EC_WORD_THINK + .2byte EC_WORD_THINKS + .2byte EC_WORD_THIRSTY + .2byte EC_WORD_THIS + .2byte EC_WORD_THIS_IS_IT_EXCL + .2byte EC_WORD_THOSE + .2byte EC_WORD_THOSE_ARE + .2byte EC_WORD_THOSE_WERE + .2byte EC_MOVE(THRASH) + .2byte EC_WORD_THROW + .2byte EC_MOVE(THUNDER) + .2byte EC_MOVE2(THUNDER_WAVE) + .2byte EC_MOVE(THUNDERBOLT) + .2byte EC_MOVE(THUNDER_PUNCH) + .2byte EC_MOVE2(THUNDER_SHOCK) + .2byte EC_WORD_THURSDAY + .2byte EC_MOVE(TICKLE) + .2byte EC_WORD_TICKLISH + .2byte EC_WORD_TIGHT + .2byte EC_WORD_TIME + .2byte EC_WORD_TIMES + .2byte EC_WORD_TIRED + .2byte EC_WORD_TO + .2byte EC_WORD_TO_HER + .2byte EC_WORD_TO_ME + .2byte EC_WORD_TO_THEM + .2byte EC_WORD_TO_US + .2byte EC_WORD_TO_WHOM + .2byte EC_WORD_TODAY + .2byte EC_POKEMON2(TOGEPI) + .2byte EC_WORD_TOGETHER + .2byte EC_POKEMON2(TOGETIC) + .2byte EC_WORD_TOMORROW + .2byte EC_WORD_TOO + .2byte EC_WORD_TOO_LATE + .2byte EC_WORD_TOO_STRONG + .2byte EC_WORD_TOO_WEAK + .2byte EC_WORD_TOP + .2byte EC_POKEMON(TORCHIC) + .2byte EC_POKEMON(TORKOAL) + .2byte EC_MOVE(TORMENT) + .2byte EC_WORD_TORRENT + .2byte EC_WORD_TOTALLY + .2byte EC_POKEMON2(TOTODILE) + .2byte EC_WORD_TOUGH + .2byte EC_WORD_TOUGHNESS + .2byte EC_WORD_TOURNAMENT + .2byte EC_MOVE2(TOXIC) + .2byte EC_WORD_TOYS + .2byte EC_WORD_TRACE + .2byte EC_WORD_TRADE + .2byte EC_WORD_TRAIN + .2byte EC_WORD_TRAINER + .2byte EC_WORD_TRAINS + .2byte EC_MOVE2(TRANSFORM) + .2byte EC_POKEMON(TRAPINCH) + .2byte EC_WORD_TRAVEL + .2byte EC_WORD_TREASURE + .2byte EC_POKEMON(TREECKO) + .2byte EC_WORD_TRENDY + .2byte EC_MOVE2(TRI_ATTACK) + .2byte EC_MOVE2(TRICK) + .2byte EC_WORD_TRIES + .2byte EC_MOVE2(TRIPLE_KICK) + .2byte EC_POKEMON(TROPIUS) + .2byte EC_WORD_TRUANT + .2byte EC_WORD_TRULY + .2byte EC_WORD_TRUMP_CARD + .2byte EC_WORD_TRUST + .2byte EC_WORD_TRY + .2byte EC_WORD_TUESDAY + .2byte EC_MOVE2(TWINEEDLE) + .2byte EC_WORD_TWIRLING + .2byte EC_MOVE2(TWISTER) + .2byte EC_WORD_TYPE + .2byte EC_POKEMON2(TYPHLOSION) + .2byte EC_POKEMON2(TYRANITAR) + .2byte EC_POKEMON2(TYROGUE) gEasyChatWordsByLetter_U: - ec_word UGLY - ec_word UH_HUH - ec_word UH_OH - ec_word UM - ec_pokemon2 UMBREON - ec_word UNAVOIDABLE - ec_word UNBELIEVABLE - ec_word UNCLE - ec_word UNDERSTAND - ec_word UNDERSTANDS - ec_word UNDERSTOOD - ec_pokemon2 UNOWN - ec_word UNTIL - ec_word UP - ec_word UPBEAT - ec_move1 UPROAR - ec_word UPSIDE_DOWN - ec_word URGH - ec_pokemon2 URSARING - ec_word USE - ec_word USELESS - ec_word USES - ec_word USING + .2byte EC_WORD_UGLY + .2byte EC_WORD_UH_HUH + .2byte EC_WORD_UH_OH + .2byte EC_WORD_UM + .2byte EC_POKEMON2(UMBREON) + .2byte EC_WORD_UNAVOIDABLE + .2byte EC_WORD_UNBELIEVABLE + .2byte EC_WORD_UNCLE + .2byte EC_WORD_UNDERSTAND + .2byte EC_WORD_UNDERSTANDS + .2byte EC_WORD_UNDERSTOOD + .2byte EC_POKEMON2(UNOWN) + .2byte EC_WORD_UNTIL + .2byte EC_WORD_UP + .2byte EC_WORD_UPBEAT + .2byte EC_MOVE(UPROAR) + .2byte EC_WORD_UPSIDE_DOWN + .2byte EC_WORD_URGH + .2byte EC_POKEMON2(URSARING) + .2byte EC_WORD_USE + .2byte EC_WORD_USELESS + .2byte EC_WORD_USES + .2byte EC_WORD_USING gEasyChatWordsByLetter_V: - ec_word VACATION - ec_pokemon2 VAPOREON - ec_pokemon2 VENOMOTH - ec_pokemon2 VENONAT - ec_pokemon2 VENUSAUR - ec_word VERSION - ec_word VERSUS - ec_word VERY - ec_pokemon1 VIBRAVA - ec_move2 VICE_GRIP - ec_word VICTORY - ec_pokemon2 VICTREEBEL - ec_word VIEWING - ec_pokemon1 VIGOROTH - ec_duplicates 2 - ec_pokemon1 VILEPLUME - ec_pokemon2 VILEPLUME - ec_move2 VINE_WHIP - ec_word VITAL_SPIRIT - ec_move1 VITAL_THROW - ec_pokemon1 VOLBEAT - ec_word VOLT_ABSORB - ec_duplicates 2 - ec_pokemon1 VOLTORB - ec_pokemon2 VOLTORB - ec_word VORACIOUS - ec_duplicates 2 - ec_pokemon1 VULPIX - ec_pokemon2 VULPIX + .2byte EC_WORD_VACATION + .2byte EC_POKEMON2(VAPOREON) + .2byte EC_POKEMON2(VENOMOTH) + .2byte EC_POKEMON2(VENONAT) + .2byte EC_POKEMON2(VENUSAUR) + .2byte EC_WORD_VERSION + .2byte EC_WORD_VERSUS + .2byte EC_WORD_VERY + .2byte EC_POKEMON(VIBRAVA) + .2byte EC_MOVE2(VICE_GRIP) + .2byte EC_WORD_VICTORY + .2byte EC_POKEMON2(VICTREEBEL) + .2byte EC_WORD_VIEWING + .2byte EC_POKEMON(VIGOROTH) + ec_duplicates 2 + .2byte EC_POKEMON(VILEPLUME) + .2byte EC_POKEMON2(VILEPLUME) + .2byte EC_MOVE2(VINE_WHIP) + .2byte EC_WORD_VITAL_SPIRIT + .2byte EC_MOVE(VITAL_THROW) + .2byte EC_POKEMON(VOLBEAT) + .2byte EC_WORD_VOLT_ABSORB + ec_duplicates 2 + .2byte EC_POKEMON(VOLTORB) + .2byte EC_POKEMON2(VOLTORB) + .2byte EC_WORD_VORACIOUS + ec_duplicates 2 + .2byte EC_POKEMON(VULPIX) + .2byte EC_POKEMON2(VULPIX) gEasyChatWordsByLetter_W: - ec_word WAAAH - ec_word WAHAHAHA - ec_pokemon1 WAILMER - ec_pokemon1 WAILORD - ec_word WAIT - ec_word WAKE_UP - ec_word WAKES_UP - ec_word WALK - ec_word WALKING - ec_word WALKS - ec_pokemon1 WALREIN - ec_word WANDERING - ec_word WANNABE - ec_word WANT - ec_word WANTS - ec_pokemon2 WARTORTLE - ec_word WAS - ec_word WASN_T - ec_word WATER - ec_word WATER_ABSORB - ec_move2 WATER_GUN - ec_move2 WATER_PULSE - ec_move2 WATER_SPORT - ec_move1 WATER_SPOUT - ec_word WATER_VEIL - ec_move2 WATERFALL - ec_word WAY - ec_word WE - ec_word WE_RE - ec_word WE_VE - ec_word WEAK - ec_word WEAKENED - ec_move1 WEATHER_BALL - ec_word WEDNESDAY - ec_pokemon2 WEEDLE - ec_word WEEK - ec_pokemon2 WEEPINBELL - ec_duplicates 2 - ec_pokemon1 WEEZING - ec_pokemon2 WEEZING - ec_word WEIRD - ec_word WELCOME - ec_word WELL - ec_word WELL_THEN - ec_word WENT - ec_word WERE - ec_word WEREN_T - ec_word WHAT - ec_word WHAT_S_UP_QUES - ec_word WHEN - ec_word WHEN_I_WIN - ec_word WHERE - ec_word WHICH - ec_word WHILE - ec_move1 WHIRLPOOL - ec_move2 WHIRLWIND - ec_pokemon1 WHISCASH - ec_pokemon1 WHISMUR - ec_word WHITE_SMOKE - ec_word WHO - ec_word WHO_IS - ec_word WHO_WAS - ec_word WHOAH - ec_word WHOM - ec_word WHOSE - ec_word WHY - ec_duplicates 2 - ec_pokemon1 WIGGLYTUFF - ec_pokemon2 WIGGLYTUFF - ec_word WILD - ec_word WILL - ec_word WILL_BE_HERE - ec_move1 WILL_O_WISP - ec_word WIMPY - ec_word WIN - ec_move2 WING_ATTACK - ec_pokemon1 WINGULL - ec_word WINNER - ec_word WINS - ec_word WINTER - ec_move2 WISH - ec_word WITH - ec_move1 WITHDRAW - ec_word WITHOUT - ec_word WOBBLY - ec_duplicates 2 - ec_pokemon1 WOBBUFFET - ec_pokemon2 WOBBUFFET - ec_word WOMAN - ec_word WON - ec_word WON_T - ec_word WONDER - ec_word WONDER_GUARD - ec_pokemon2 WOOPER - ec_word WORD - ec_word WORK - ec_word WORKING - ec_word WORKS - ec_word WORLD - ec_word WORRY - ec_word WOULD - ec_word WOW - ec_word WOWEE - ec_move2 WRAP - ec_word WROOOAAR_EXCL - ec_pokemon1 WURMPLE - ec_pokemon1 WYNAUT + .2byte EC_WORD_WAAAH + .2byte EC_WORD_WAHAHAHA + .2byte EC_POKEMON(WAILMER) + .2byte EC_POKEMON(WAILORD) + .2byte EC_WORD_WAIT + .2byte EC_WORD_WAKE_UP + .2byte EC_WORD_WAKES_UP + .2byte EC_WORD_WALK + .2byte EC_WORD_WALKING + .2byte EC_WORD_WALKS + .2byte EC_POKEMON(WALREIN) + .2byte EC_WORD_WANDERING + .2byte EC_WORD_WANNABE + .2byte EC_WORD_WANT + .2byte EC_WORD_WANTS + .2byte EC_POKEMON2(WARTORTLE) + .2byte EC_WORD_WAS + .2byte EC_WORD_WASN_T + .2byte EC_WORD_WATER + .2byte EC_WORD_WATER_ABSORB + .2byte EC_MOVE2(WATER_GUN) + .2byte EC_MOVE2(WATER_PULSE) + .2byte EC_MOVE2(WATER_SPORT) + .2byte EC_MOVE(WATER_SPOUT) + .2byte EC_WORD_WATER_VEIL + .2byte EC_MOVE2(WATERFALL) + .2byte EC_WORD_WAY + .2byte EC_WORD_WE + .2byte EC_WORD_WE_RE + .2byte EC_WORD_WE_VE + .2byte EC_WORD_WEAK + .2byte EC_WORD_WEAKENED + .2byte EC_MOVE(WEATHER_BALL) + .2byte EC_WORD_WEDNESDAY + .2byte EC_POKEMON2(WEEDLE) + .2byte EC_WORD_WEEK + .2byte EC_POKEMON2(WEEPINBELL) + ec_duplicates 2 + .2byte EC_POKEMON(WEEZING) + .2byte EC_POKEMON2(WEEZING) + .2byte EC_WORD_WEIRD + .2byte EC_WORD_WELCOME + .2byte EC_WORD_WELL + .2byte EC_WORD_WELL_THEN + .2byte EC_WORD_WENT + .2byte EC_WORD_WERE + .2byte EC_WORD_WEREN_T + .2byte EC_WORD_WHAT + .2byte EC_WORD_WHAT_S_UP_QUES + .2byte EC_WORD_WHEN + .2byte EC_WORD_WHEN_I_WIN + .2byte EC_WORD_WHERE + .2byte EC_WORD_WHICH + .2byte EC_WORD_WHILE + .2byte EC_MOVE(WHIRLPOOL) + .2byte EC_MOVE2(WHIRLWIND) + .2byte EC_POKEMON(WHISCASH) + .2byte EC_POKEMON(WHISMUR) + .2byte EC_WORD_WHITE_SMOKE + .2byte EC_WORD_WHO + .2byte EC_WORD_WHO_IS + .2byte EC_WORD_WHO_WAS + .2byte EC_WORD_WHOAH + .2byte EC_WORD_WHOM + .2byte EC_WORD_WHOSE + .2byte EC_WORD_WHY + ec_duplicates 2 + .2byte EC_POKEMON(WIGGLYTUFF) + .2byte EC_POKEMON2(WIGGLYTUFF) + .2byte EC_WORD_WILD + .2byte EC_WORD_WILL + .2byte EC_WORD_WILL_BE_HERE + .2byte EC_MOVE(WILL_O_WISP) + .2byte EC_WORD_WIMPY + .2byte EC_WORD_WIN + .2byte EC_MOVE2(WING_ATTACK) + .2byte EC_POKEMON(WINGULL) + .2byte EC_WORD_WINNER + .2byte EC_WORD_WINS + .2byte EC_WORD_WINTER + .2byte EC_MOVE2(WISH) + .2byte EC_WORD_WITH + .2byte EC_MOVE(WITHDRAW) + .2byte EC_WORD_WITHOUT + .2byte EC_WORD_WOBBLY + ec_duplicates 2 + .2byte EC_POKEMON(WOBBUFFET) + .2byte EC_POKEMON2(WOBBUFFET) + .2byte EC_WORD_WOMAN + .2byte EC_WORD_WON + .2byte EC_WORD_WON_T + .2byte EC_WORD_WONDER + .2byte EC_WORD_WONDER_GUARD + .2byte EC_POKEMON2(WOOPER) + .2byte EC_WORD_WORD + .2byte EC_WORD_WORK + .2byte EC_WORD_WORKING + .2byte EC_WORD_WORKS + .2byte EC_WORD_WORLD + .2byte EC_WORD_WORRY + .2byte EC_WORD_WOULD + .2byte EC_WORD_WOW + .2byte EC_WORD_WOWEE + .2byte EC_MOVE2(WRAP) + .2byte EC_WORD_WROOOAAR_EXCL + .2byte EC_POKEMON(WURMPLE) + .2byte EC_POKEMON(WYNAUT) gEasyChatWordsByLetter_X: ec_duplicates 2 - ec_pokemon1 XATU - ec_pokemon2 XATU + .2byte EC_POKEMON(XATU) + .2byte EC_POKEMON2(XATU) gEasyChatWordsByLetter_Y: - ec_word YAHOO - ec_pokemon2 YANMA - ec_move1 YAWN - ec_word YAY - ec_word YEAH - ec_word YEAH_YEAH - ec_word YEEHAW_EXCL - ec_word YES - ec_word YES_SIR_EXCL - ec_word YESTERDAY - ec_word YET - ec_word YO - ec_word YOU - ec_word YOU_RE - ec_word YOU_VE - ec_word YOUNG - ec_word YOUR - ec_word YOURS - ec_word YUP + .2byte EC_WORD_YAHOO + .2byte EC_POKEMON2(YANMA) + .2byte EC_MOVE(YAWN) + .2byte EC_WORD_YAY + .2byte EC_WORD_YEAH + .2byte EC_WORD_YEAH_YEAH + .2byte EC_WORD_YEEHAW_EXCL + .2byte EC_WORD_YES + .2byte EC_WORD_YES_SIR_EXCL + .2byte EC_WORD_YESTERDAY + .2byte EC_WORD_YET + .2byte EC_WORD_YO + .2byte EC_WORD_YOU + .2byte EC_WORD_YOU_RE + .2byte EC_WORD_YOU_VE + .2byte EC_WORD_YOUNG + .2byte EC_WORD_YOUR + .2byte EC_WORD_YOURS + .2byte EC_WORD_YUP gEasyChatWordsByLetter_Z: - ec_pokemon1 ZANGOOSE - ec_move2 ZAP_CANNON - ec_pokemon2 ZAPDOS - ec_pokemon1 ZIGZAGOON + .2byte EC_POKEMON(ZANGOOSE) + .2byte EC_MOVE2(ZAP_CANNON) + .2byte EC_POKEMON2(ZAPDOS) + .2byte EC_POKEMON(ZIGZAGOON) ec_duplicates 2 - ec_pokemon1 ZUBAT - ec_pokemon2 ZUBAT + .2byte EC_POKEMON(ZUBAT) + .2byte EC_POKEMON2(ZUBAT) gEasyChatWordsByLetter_End: .align 1 diff --git a/data/wild_encounter.s b/data/wild_encounter.s index 317502aa9..f6fb67eee 100644 --- a/data/wild_encounter.s +++ b/data/wild_encounter.s @@ -1,3 +1,4 @@ +#include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" -- cgit v1.2.3 From 34a49a726c6c42803950fc993394be8b96492c71 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 14 Nov 2017 22:00:53 -0800 Subject: More pokemon_summary_screen decompilation --- data/graphics.s | 3 +++ 1 file changed, 3 insertions(+) (limited to 'data') diff --git a/data/graphics.s b/data/graphics.s index f1c7c37a3..7792e8a9e 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3960,6 +3960,9 @@ gUnknown_08E94510:: @ 8E94510 gUnknown_08E94550:: @ 8E94550 .incbin "graphics/unknown/unknown_E94550.bin" +gUnknown_08E94590:: @ 8E94590 + .incbin "graphics/unknown/unknown_E94590.bin" + gUnknown_08E945D0:: @ 8E945D0 .incbin "graphics/interface/wordgroup_layout.bin" -- cgit v1.2.3 From 5a8cd94046983f15eaf6d414d5f431cb296abdc3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 23 Nov 2017 13:47:44 -0800 Subject: Lots more pokemon_summary_screen decompilation --- data/text/contest_strings.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 4c4f37fc4..94366cc41 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -96,7 +96,7 @@ ContestString_DescStopExcitement: .string "Temporarily stops the\ncrowd from growing excited.$" .align 2 -gUnknown_083CADD4:: @ 83CADD4 +gContestEffectStrings:: @ 83CADD4 .4byte ContestString_DescHighlyAppealing .4byte ContestString_DescStartled1 .4byte ContestString_DescGreatLock -- cgit v1.2.3 From 85ab103fa6940af7355117f2197d67eb1ce10dc4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 25 Nov 2017 19:33:32 -0800 Subject: Fix some non-matchings and organize header --- data/pokemon_summary_screen.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index 5d577ca84..902850337 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -372,7 +372,7 @@ gUnknown_083C1598:: @ 83C1598 .4byte sub_80A015C .4byte sub_80A015C -gUnknown_083C15A8:: @ 83C15A8 +gDoubleBattlePartyOrder:: @ 83C15A8 .byte 0, 2, 3, 1, 4, 5 gUnknown_083C15AE:: @ 83C15AE -- cgit v1.2.3 From 90dcfa4f1c53d6bab795fd1514868dc25e7f5f76 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 25 Nov 2017 20:58:46 -0800 Subject: Migrate move_descriptions to src/data/text --- data/pokemon_summary_screen.s | 3 - data/text/move_descriptions.inc | 1772 --------------------------------------- 2 files changed, 1775 deletions(-) delete mode 100644 data/text/move_descriptions.inc (limited to 'data') diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index 902850337..c938de935 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -3,9 +3,6 @@ .section .rodata -@ 83BC680 - .include "data/text/move_descriptions.inc" - @ 83C0F60 .include "data/text/nature_names.inc" diff --git a/data/text/move_descriptions.inc b/data/text/move_descriptions.inc deleted file mode 100644 index 29e325ad7..000000000 --- a/data/text/move_descriptions.inc +++ /dev/null @@ -1,1772 +0,0 @@ -gMoveDescription_Pound: @ 83BC680 - .string "Pounds the foe with\n" - .string "forelegs or tail.$" - -gMoveDescription_KarateChop: @ 83BC6A6 - .string "A chopping attack with a\n" - .string "high critical-hit ratio.$" - -gMoveDescription_DoubleSlap: @ 83BC6D8 - .string "Repeatedly slaps the foe\n" - .string "2 to 5 times.$" - -gMoveDescription_CometPunch: @ 83BC6FF - .string "Repeatedly punches the foe\n" - .string "2 to 5 times.$" - -gMoveDescription_MegaPunch: @ 83BC728 - .string "A strong punch thrown with\n" - .string "incredible power.$" - -gMoveDescription_PayDay: @ 83BC755 - .string "Throws coins at the foe.\n" - .string "Money is recovered after.$" - -gMoveDescription_FirePunch: @ 83BC788 - .string "A fiery punch that may burn\n" - .string "the foe.$" - -gMoveDescription_IcePunch: @ 83BC7AD - .string "An icy punch that may\n" - .string "freeze the foe.$" - -gMoveDescription_ThunderPunch: @ 83BC7D3 - .string "An electrified punch that\n" - .string "may paralyze the foe.$" - -gMoveDescription_Scratch: @ 83BC803 - .string "Scratches the foe with\n" - .string "sharp claws.$" - -gMoveDescription_ViceGrip: @ 83BC827 - .string "Grips the foe with large and\n" - .string "powerful pincers.$" - -gMoveDescription_Guillotine: @ 83BC856 - .string "A powerful pincer attack\n" - .string "that may cause fainting.$" - -gMoveDescription_RazorWind: @ 83BC888 - .string "A 2-turn move that strikes\n" - .string "the foe on the 2nd turn.$" - -gMoveDescription_SwordsDance: @ 83BC8BC - .string "A fighting dance that\n" - .string "sharply raises ATTACK.$" - -gMoveDescription_Cut: @ 83BC8E9 - .string "Cuts the foe with sharp\n" - .string "scythes, claws, etc.$" - -gMoveDescription_Gust: @ 83BC916 - .string "Strikes the foe with a gust\n" - .string "of wind whipped up by wings.$" - -gMoveDescription_WingAttack: @ 83BC94F - .string "Strikes the foe with wings\n" - .string "spread wide.$" - -gMoveDescription_Whirlwind: @ 83BC977 - .string "Blows away the foe with\n" - .string "wind and ends the battle.$" - -gMoveDescription_Fly: @ 83BC9A9 - .string "Flies up on the first turn,\n" - .string "then strikes the next turn.$" - -gMoveDescription_Bind: @ 83BC9E1 - .string "Binds and squeezes the foe\n" - .string "for 2 to 5 turns.$" - -gMoveDescription_Slam: @ 83BCA0E - .string "Slams the foe with a long\n" - .string "tail, vine, etc.$" - -gMoveDescription_VineWhip: @ 83BCA39 - .string "Strikes the foe with\n" - .string "slender, whiplike vines.$" - -gMoveDescription_Stomp: @ 83BCA67 - .string "Stomps the enemy with a big\n" - .string "foot. May cause flinching.$" - -gMoveDescription_DoubleKick: @ 83BCA9E - .string "A double-kicking attack\n" - .string "that strikes the foe twice.$" - -gMoveDescription_MegaKick: @ 83BCAD2 - .string "An extremely powerful kick\n" - .string "with intense force.$" - -gMoveDescription_JumpKick: @ 83BCB01 - .string "A strong jumping kick. May\n" - .string "miss and hurt the kicker.$" - -gMoveDescription_RollingKick: @ 83BCB36 - .string "A fast kick delivered from\n" - .string "a rapid spin.$" - -gMoveDescription_SandAttack: @ 83BCB5F - .string "Reduces the foe’s accuracy\n" - .string "by hurling sand in its face.$" - -gMoveDescription_Headbutt: @ 83BCB97 - .string "A ramming attack that may\n" - .string "cause flinching.$" - -gMoveDescription_HornAttack: @ 83BCBC2 - .string "Jabs the foe with sharp\n" - .string "horns.$" - -gMoveDescription_FuryAttack: @ 83BCBE1 - .string "Jabs the foe 2 to 5 times\n" - .string "with sharp horns, etc.$" - -gMoveDescription_HornDrill: @ 83BCC12 - .string "A one-hit KO attack that\n" - .string "uses a horn like a drill.$" - -gMoveDescription_Tackle: @ 83BCC45 - .string "Charges the foe with a full-\n" - .string "body tackle.$" - -gMoveDescription_BodySlam: @ 83BCC6F - .string "A full-body slam that may\n" - .string "cause paralysis.$" - -gMoveDescription_Wrap: @ 83BCC9A - .string "Wraps and squeezes the foe\n" - .string "2 to 5 times with vines, etc.$" - -gMoveDescription_TakeDown: @ 83BCCD3 - .string "A reckless charge attack\n" - .string "that also hurts the user.$" - -gMoveDescription_Thrash: @ 83BCD06 - .string "A rampage of 2 to 3 turns\n" - .string "that confuses the user.$" - -gMoveDescription_DoubleEdge: @ 83BCD38 - .string "A life-risking tackle that\n" - .string "also hurts the user.$" - -gMoveDescription_TailWhip: @ 83BCD68 - .string "Wags the tail to lower the\n" - .string "foe’s DEFENSE.$" - -gMoveDescription_PoisonSting: @ 83BCD92 - .string "A toxic attack with barbs,\n" - .string "etc., that may poison.$" - -gMoveDescription_Twineedle: @ 83BCDC4 - .string "Stingers on the forelegs\n" - .string "jab the foe twice.$" - -gMoveDescription_PinMissile: @ 83BCDF0 - .string "Sharp pins are fired to\n" - .string "strike 2 to 5 times.$" - -gMoveDescription_Leer: @ 83BCE1D - .string "Frightens the foe with a\n" - .string "leer to lower DEFENSE.$" - -gMoveDescription_Bite: @ 83BCE4D - .string "Bites with vicious fangs.\n" - .string "May cause flinching.$" - -gMoveDescription_Growl: @ 83BCE7C - .string "Growls cutely to reduce the\n" - .string "foe’s ATTACK.$" - -gMoveDescription_Roar: @ 83BCEA6 - .string "Makes the foe flee to end\n" - .string "the battle.$" - -gMoveDescription_Sing: @ 83BCECC - .string "A soothing song lulls the\n" - .string "foe into a deep slumber.$" - -gMoveDescription_Supersonic: @ 83BCEFF - .string "Emits bizarre sound waves\n" - .string "that may confuse the foe.$" - -gMoveDescription_SonicBoom: @ 83BCF33 - .string "Launches shock waves that\n" - .string "always inflict 20 HP damage.$" - -gMoveDescription_Disable: @ 83BCF6A - .string "Psychically disables one of\n" - .string "the foe’s moves.$" - -gMoveDescription_Acid: @ 83BCF97 - .string "Sprays a hide-melting acid.\n" - .string "May lower DEFENSE.$" - -gMoveDescription_Ember: @ 83BCFC6 - .string "A weak fire attack that may\n" - .string "inflict a burn.$" - -gMoveDescription_Flamethrower: @ 83BCFF2 - .string "A powerful fire attack that\n" - .string "may inflict a burn.$" - -gMoveDescription_Mist: @ 83BD022 - .string "Creates a mist that stops\n" - .string "reduction of abilities.$" - -gMoveDescription_WaterGun: @ 83BD054 - .string "Squirts water to attack\n" - .string "the foe.$" - -gMoveDescription_HydroPump: @ 83BD075 - .string "Blasts water at high power\n" - .string "to strike the foe.$" - -gMoveDescription_Surf: @ 83BD0A3 - .string "Creates a huge wave, then\n" - .string "crashes it down on the foe.$" - -gMoveDescription_IceBeam: @ 83BD0D9 - .string "Blasts the foe with an icy\n" - .string "beam that may freeze it.$" - -gMoveDescription_Blizzard: @ 83BD10D - .string "Hits the foe with an icy\n" - .string "storm that may freeze it.$" - -gMoveDescription_Psybeam: @ 83BD140 - .string "Fires a peculiar ray that\n" - .string "may confuse the foe.$" - -gMoveDescription_BubbleBeam: @ 83BD16F - .string "Forcefully sprays bubbles\n" - .string "that may lower SPEED.$" - -gMoveDescription_AuroraBeam: @ 83BD19F - .string "Fires a rainbow-colored\n" - .string "beam that may lower ATTACK.$" - -gMoveDescription_HyperBeam: @ 83BD1D3 - .string "Powerful, but leaves the\n" - .string "user immobile the next turn.$" - -gMoveDescription_Peck: @ 83BD209 - .string "Attacks the foe with a\n" - .string "jabbing beak, etc.$" - -gMoveDescription_DrillPeck: @ 83BD233 - .string "A corkscrewing attack with\n" - .string "the beak acting as a drill.$" - -gMoveDescription_Submission: @ 83BD26A - .string "A reckless body slam that\n" - .string "also hurts the user.$" - -gMoveDescription_LowKick: @ 83BD299 - .string "A kick that inflicts more\n" - .string "damage on heavier foes.$" - -gMoveDescription_Counter: @ 83BD2CB - .string "Retaliates any physical hit\n" - .string "with double the power.$" - -gMoveDescription_SeismicToss: @ 83BD2FE - .string "Inflicts damage identical\n" - .string "to the user’s level.$" - -gMoveDescription_Strength: @ 83BD32D - .string "Builds enormous power,\n" - .string "then slams the foe.$" - -gMoveDescription_Absorb: @ 83BD358 - .string "An attack that absorbs\n" - .string "half the damage inflicted.$" - -gMoveDescription_MegaDrain: @ 83BD38A - .string "An attack that absorbs\n" - .string "half the damage inflicted.$" - -gMoveDescription_LeechSeed: @ 83BD3BC - .string "Plants a seed on the foe to\n" - .string "steal HP on every turn.$" - -gMoveDescription_Growth: @ 83BD3F0 - .string "Forces the body to grow\n" - .string "and heightens SP. ATK.$" - -gMoveDescription_RazorLeaf: @ 83BD41F - .string "Cuts the enemy with leaves.\n" - .string "High critical-hit ratio.$" - -gMoveDescription_SolarBeam: @ 83BD454 - .string "Absorbs light in one turn,\n" - .string "then attacks next turn.$" - -gMoveDescription_PoisonPowder: @ 83BD487 - .string "Scatters a toxic powder\n" - .string "that may poison the foe.$" - -gMoveDescription_StunSpore: @ 83BD4B8 - .string "Scatters a powder that may\n" - .string "paralyze the foe.$" - -gMoveDescription_SleepPowder: @ 83BD4E5 - .string "Scatters a powder that may\n" - .string "cause the foe to sleep.$" - -gMoveDescription_PetalDance: @ 83BD518 - .string "A rampage of 2 to 3 turns\n" - .string "that confuses the user.$" - -gMoveDescription_StringShot: @ 83BD54A - .string "Binds the foe with string\n" - .string "to reduce its SPEED.$" - -gMoveDescription_DragonRage: @ 83BD579 - .string "Launches shock waves that\n" - .string "always inflict 40 HP damage.$" - -gMoveDescription_FireSpin: @ 83BD5B0 - .string "Traps the foe in a ring of\n" - .string "fire for 2 to 5 turns.$" - -gMoveDescription_ThunderShock: @ 83BD5E2 - .string "An electrical attack that\n" - .string "may paralyze the foe.$" - -gMoveDescription_Thunderbolt: @ 83BD612 - .string "A strong electrical attack\n" - .string "that may paralyze the foe.$" - -gMoveDescription_ThunderWave: @ 83BD648 - .string "A weak jolt of electricity\n" - .string "that paralyzes the foe.$" - -gMoveDescription_Thunder: @ 83BD67B - .string "A lightning attack that may\n" - .string "cause paralysis.$" - -gMoveDescription_RockThrow: @ 83BD6A8 - .string "Throws small rocks to\n" - .string "strike the foe.$" - -gMoveDescription_Earthquake: @ 83BD6CE - .string "A powerful quake, but has\n" - .string "no effect on flying foes.$" - -gMoveDescription_Fissure: @ 83BD702 - .string "A one-hit KO move that\n" - .string "drops the foe in a fissure.$" - -gMoveDescription_Dig: @ 83BD735 - .string "Digs underground the first\n" - .string "turn and strikes next turn.$" - -gMoveDescription_Toxic: @ 83BD76C - .string "Poisons the foe with an\n" - .string "intensifying toxin.$" - -gMoveDescription_Confusion: @ 83BD798 - .string "A psychic attack that may\n" - .string "cause confusion.$" - -gMoveDescription_Psychic: @ 83BD7C3 - .string "A powerful psychic attack\n" - .string "that may lower SP. DEF.$" - -gMoveDescription_Hypnosis: @ 83BD7F5 - .string "A hypnotizing move that\n" - .string "may induce sleep.$" - -gMoveDescription_Meditate: @ 83BD81F - .string "Meditates in a peaceful\n" - .string "fashion to raise ATTACK.$" - -gMoveDescription_Agility: @ 83BD850 - .string "Relaxes the body to sharply\n" - .string "boost SPEED.$" - -gMoveDescription_QuickAttack: @ 83BD879 - .string "An extremely fast attack\n" - .string "that always strikes first.$" - -gMoveDescription_Rage: @ 83BD8AD - .string "Raises the user’s ATTACK\n" - .string "every time it is hit.$" - -gMoveDescription_Teleport: @ 83BD8DC - .string "A psychic move for fleeing\n" - .string "from battle instantly.$" - -gMoveDescription_NightShade: @ 83BD90E - .string "Inflicts damage identical\n" - .string "to the user’s level.$" - -gMoveDescription_Mimic: @ 83BD93D - .string "Copies a move used by the\n" - .string "foe during one battle.$" - -gMoveDescription_Screech: @ 83BD96E - .string "Emits a screech to sharply\n" - .string "reduce the foe’s DEFENSE.$" - -gMoveDescription_DoubleTeam: @ 83BD9A3 - .string "Creates illusory copies to\n" - .string "raise evasiveness.$" - -gMoveDescription_Recover: @ 83BD9D1 - .string "Recovers up to half the\n" - .string "user’s maximum HP.$" - -gMoveDescription_Harden: @ 83BD9FC - .string "Stiffens the body’s \n" - .string "muscles to raise DEFENSE.$" - -gMoveDescription_Minimize: @ 83BDA2B - .string "Minimizes the user’s size\n" - .string "to raise evasiveness.$" - -gMoveDescription_Smokescreen: @ 83BDA5B - .string "Lowers the foe’s accuracy\n" - .string "using smoke, ink, etc.$" - -gMoveDescription_ConfuseRay: @ 83BDA8C - .string "A sinister ray that\n" - .string "confuses the foe.$" - -gMoveDescription_Withdraw: @ 83BDAB2 - .string "Withdraws the body into its\n" - .string "hard shell to raise DEFENSE.$" - -gMoveDescription_DefenseCurl: @ 83BDAEB - .string "Curls up to conceal weak\n" - .string "spots and raise DEFENSE.$" - -gMoveDescription_Barrier: @ 83BDB1D - .string "Creates a barrier that\n" - .string "sharply raises DEFENSE.$" - -gMoveDescription_LightScreen: @ 83BDB4C - .string "Creates a wall of light that\n" - .string "lowers SP. ATK damage.$" - -gMoveDescription_Haze: @ 83BDB80 - .string "Creates a black haze that\n" - .string "eliminates all stat changes.$" - -gMoveDescription_Reflect: @ 83BDBB7 - .string "Creates a wall of light that\n" - .string "weakens physical attacks.$" - -gMoveDescription_FocusEnergy: @ 83BDBEE - .string "Focuses power to raise the\n" - .string "critical-hit ratio.$" - -gMoveDescription_Bide: @ 83BDC1D - .string "Endures attack for 2\n" - .string "turns to retaliate double.$" - -gMoveDescription_Metronome: @ 83BDC4D - .string "Waggles a finger to use any\n" - .string "POKéMON move at random.$" - -gMoveDescription_MirrorMove: @ 83BDC81 - .string "Counters the foe’s attack\n" - .string "with the same move.$" - -gMoveDescription_SelfDestruct: @ 83BDCAF - .string "Inflicts severe damage but\n" - .string "makes the user faint.$" - -gMoveDescription_EggBomb: @ 83BDCE0 - .string "An egg is forcibly hurled at\n" - .string "the foe.$" - -gMoveDescription_Lick: @ 83BDD06 - .string "Licks with a long tongue to\n" - .string "injure. May also paralyze.$" - -gMoveDescription_Smog: @ 83BDD3D - .string "An exhaust-gas attack\n" - .string "that may also poison.$" - -gMoveDescription_Sludge: @ 83BDD69 - .string "Sludge is hurled to inflict\n" - .string "damage. May also poison.$" - -gMoveDescription_BoneClub: @ 83BDD9E - .string "Clubs the foe with a bone.\n" - .string "May cause flinching.$" - -gMoveDescription_FireBlast: @ 83BDDCE - .string "A fiery blast that scorches\n" - .string "all. May cause a burn.$" - -gMoveDescription_Waterfall: @ 83BDE01 - .string "Charges the foe with speed\n" - .string "to climb waterfalls.$" - -gMoveDescription_Clamp: @ 83BDE31 - .string "Traps and squeezes the\n" - .string "foe for 2 to 5 turns.$" - -gMoveDescription_Swift: @ 83BDE5E - .string "Sprays star-shaped rays\n" - .string "that never miss.$" - -gMoveDescription_SkullBash: @ 83BDE87 - .string "Tucks in the head, then\n" - .string "attacks on the next turn.$" - -gMoveDescription_SpikeCannon: @ 83BDEB9 - .string "Launches sharp spikes that\n" - .string "strike 2 to 5 times.$" - -gMoveDescription_Constrict: @ 83BDEE9 - .string "Constricts to inflict pain.\n" - .string "May lower SPEED.$" - -gMoveDescription_Amnesia: @ 83BDF16 - .string "Forgets about something\n" - .string "and sharply raises SP. DEF.$" - -gMoveDescription_Kinesis: @ 83BDF4A - .string "Distracts the foe.\n" - .string "May lower accuracy.$" - -gMoveDescription_SoftBoiled: @ 83BDF71 - .string "Recovers up to half the\n" - .string "user’s maximum HP.$" - -gMoveDescription_HiJumpKick: @ 83BDF9C - .string "A jumping knee kick. If it\n" - .string "misses, the user is hurt.$" - -gMoveDescription_Glare: @ 83BDFD1 - .string "Intimidates and frightens\n" - .string "the foe into paralysis.$" - -gMoveDescription_DreamEater: @ 83BE003 - .string "Takes one half the damage\n" - .string "inflicted on a sleeping foe.$" - -gMoveDescription_PoisonGas: @ 83BE03A - .string "Envelops the foe in a toxic\n" - .string "gas that may poison.$" - -gMoveDescription_Barrage: @ 83BE06B - .string "Hurls round objects at the\n" - .string "foe 2 to 5 times.$" - -gMoveDescription_LeechLife: @ 83BE098 - .string "An attack that steals half\n" - .string "the damage inflicted.$" - -gMoveDescription_LovelyKiss: @ 83BE0C9 - .string "Demands a kiss with a scary\n" - .string "face that induces sleep.$" - -gMoveDescription_SkyAttack: @ 83BE0FE - .string "Searches out weak spots,\n" - .string "then strikes the next turn.$" - -gMoveDescription_Transform: @ 83BE133 - .string "Alters the user’s cells to\n" - .string "become a copy of the foe.$" - -gMoveDescription_Bubble: @ 83BE168 - .string "An attack using bubbles.\n" - .string "May lower the foe’s SPEED.$" - -gMoveDescription_DizzyPunch: @ 83BE19C - .string "A rhythmic punch that may\n" - .string "confuse the foe.$" - -gMoveDescription_Spore: @ 83BE1C7 - .string "Scatters a cloud of spores\n" - .string "that always induce sleep.$" - -gMoveDescription_Flash: @ 83BE1FC - .string "Looses a powerful blast of\n" - .string "light that cuts accuracy.$" - -gMoveDescription_Psywave: @ 83BE231 - .string "Attacks with a psychic\n" - .string "wave of varying intensity.$" - -gMoveDescription_Splash: @ 83BE263 - .string "It’s just a splash...\n" - .string "Has no effect whatsoever.$" - -gMoveDescription_AcidArmor: @ 83BE293 - .string "Liquifies the user’s body\n" - .string "to sharply raise DEFENSE.$" - -gMoveDescription_Crabhammer: @ 83BE2C7 - .string "Hammers with a pincer. Has a\n" - .string "high critical-hit ratio.$" - -gMoveDescription_Explosion: @ 83BE2FD - .string "Inflicts severe damage but\n" - .string "makes the user faint.$" - -gMoveDescription_FurySwipes: @ 83BE32E - .string "Rakes the foe with sharp\n" - .string "claws, etc., 2 to 5 times.$" - -gMoveDescription_Bonemerang: @ 83BE362 - .string "Throws a bone boomerang\n" - .string "that strikes twice.$" - -gMoveDescription_Rest: @ 83BE38E - .string "The user sleeps for 2 turns,\n" - .string "restoring HP and status.$" - -gMoveDescription_RockSlide: @ 83BE3C4 - .string "Large boulders are hurled.\n" - .string "May cause flinching.$" - -gMoveDescription_HyperFang: @ 83BE3F4 - .string "Attacks with sharp fangs.\n" - .string "May cause flinching.$" - -gMoveDescription_Sharpen: @ 83BE423 - .string "Reduces the polygon count\n" - .string "and raises ATTACK.$" - -gMoveDescription_Conversion: @ 83BE450 - .string "Changes the user’s type\n" - .string "into an own move’s type.$" - -gMoveDescription_TriAttack: @ 83BE481 - .string "Fires three types of beams\n" - .string "at the same time.$" - -gMoveDescription_SuperFang: @ 83BE4AE - .string "Attacks with sharp fangs\n" - .string "and cuts half the foe’s HP.$" - -gMoveDescription_Slash: @ 83BE4E3 - .string "Slashes with claws, etc. Has\n" - .string "a high critical-hit ratio.$" - -gMoveDescription_Substitute: @ 83BE51B - .string "Creates a decoy using 1/4\n" - .string "of the user’s maximum HP.$" - -gMoveDescription_Struggle: @ 83BE54F - .string "Used only if all PP are gone.\n" - .string "Also hurts the user a little.$" - -gMoveDescription_Sketch: @ 83BE58B - .string "Copies the foe’s last move\n" - .string "permanently.$" - -gMoveDescription_TripleKick: @ 83BE5B3 - .string "Kicks the foe 3 times in a\n" - .string "row with rising intensity.$" - -gMoveDescription_Thief: @ 83BE5E9 - .string "While attacking, it may\n" - .string "steal the foe’s held item.$" - -gMoveDescription_SpiderWeb: @ 83BE61C - .string "Ensnares the foe to stop it\n" - .string "from fleeing or switching.$" - -gMoveDescription_MindReader: @ 83BE653 - .string "Senses the foe’s action to\n" - .string "ensure the next move’s hit.$" - -gMoveDescription_Nightmare: @ 83BE68A - .string "Inflicts 1/4 damage on a\n" - .string "sleeping foe every turn.$" - -gMoveDescription_FlameWheel: @ 83BE6BC - .string "A fiery charge attack that\n" - .string "may inflict a burn.$" - -gMoveDescription_Snore: @ 83BE6EB - .string "A loud attack that can be\n" - .string "used only while asleep.$" - -gMoveDescription_Curse: @ 83BE71D - .string "A move that functions\n" - .string "differently for GHOSTS.$" - -gMoveDescription_Flail: @ 83BE74B - .string "Inflicts more damage when\n" - .string "the user’s HP is down.$" - -gMoveDescription_Conversion2: @ 83BE77C - .string "Makes the user resistant\n" - .string "to the last attack’s type.$" - -gMoveDescription_Aeroblast: @ 83BE7B0 - .string "Launches a vacuumed blast.\n" - .string "High critical-hit ratio.$" - -gMoveDescription_CottonSpore: @ 83BE7E4 - .string "Spores cling to the foe,\n" - .string "sharply reducing SPEED.$" - -gMoveDescription_Reversal: @ 83BE815 - .string "Inflicts more damage when\n" - .string "the user’s HP is down.$" - -gMoveDescription_Spite: @ 83BE846 - .string "Spitefully cuts the PP\n" - .string "of the foe’s last move.$" - -gMoveDescription_PowderSnow: @ 83BE875 - .string "Blasts the foe with a snowy\n" - .string "gust. May cause freezing.$" - -gMoveDescription_Protect: @ 83BE8AB - .string "Evades attack, but may fail\n" - .string "if used in succession.$" - -gMoveDescription_MachPunch: @ 83BE8DE - .string "A punch is thrown at wicked\n" - .string "speed to strike first.$" - -gMoveDescription_ScaryFace: @ 83BE911 - .string "Frightens with a scary face\n" - .string "to sharply reduce SPEED.$" - -gMoveDescription_FaintAttack: @ 83BE946 - .string "Draws the foe close, then\n" - .string "strikes without fail.$" - -gMoveDescription_SweetKiss: @ 83BE976 - .string "Demands a kiss with a cute\n" - .string "look. May cause confusion.$" - -gMoveDescription_BellyDrum: @ 83BE9AC - .string "Maximizes ATTACK while\n" - .string "sacrificing HP.$" - -gMoveDescription_SludgeBomb: @ 83BE9D3 - .string "Sludge is hurled to inflict\n" - .string "damage. May also poison.$" - -gMoveDescription_MudSlap: @ 83BEA08 - .string "Hurls mud in the foe’s face\n" - .string "to reduce its accuracy.$" - -gMoveDescription_Octazooka: @ 83BEA3C - .string "Fires a lump of ink to\n" - .string "damage and cut accuracy.$" - -gMoveDescription_Spikes: @ 83BEA6C - .string "Sets spikes that hurt a \n" - .string "foe switching out.$" - -gMoveDescription_ZapCannon: @ 83BEA98 - .string "Powerful and sure to cause\n" - .string "paralysis, but inaccurate.$" - -gMoveDescription_Foresight: @ 83BEACE - .string "Negates the foe’s efforts\n" - .string "to heighten evasiveness.$" - -gMoveDescription_DestinyBond: @ 83BEB01 - .string "If the user faints, the foe\n" - .string "is also made to faint.$" - -gMoveDescription_PerishSong: @ 83BEB34 - .string "Any POKéMON hearing this\n" - .string "song faints in 3 turns.$" - -gMoveDescription_IcyWind: @ 83BEB65 - .string "A chilling attack that\n" - .string "lowers the foe’s SPEED.$" - -gMoveDescription_Detect: @ 83BEB94 - .string "Evades attack, but may fail\n" - .string "if used in succession.$" - -gMoveDescription_BoneRush: @ 83BEBC7 - .string "Strikes the foe with a bone\n" - .string "in hand 2 to 5 times.$" - -gMoveDescription_LockOn: @ 83BEBF9 - .string "Locks on to the foe to\n" - .string "ensure the next move hits.$" - -gMoveDescription_Outrage: @ 83BEC2B - .string "A rampage of 2 to 3 turns\n" - .string "that confuses the user.$" - -gMoveDescription_Sandstorm: @ 83BEC5D - .string "Causes a sandstorm that\n" - .string "rages for several turns.$" - -gMoveDescription_GigaDrain: @ 83BEC8E - .string "An attack that steals half\n" - .string "the damage inflicted.$" - -gMoveDescription_Endure: @ 83BECBF - .string "Endures any attack for\n" - .string "1 turn, leaving at least 1HP.$" - -gMoveDescription_Charm: @ 83BECF4 - .string "Charms the foe and sharply\n" - .string "reduces its ATTACK.$" - -gMoveDescription_Rollout: @ 83BED23 - .string "An attack lasting 5 turns\n" - .string "with rising intensity.$" - -gMoveDescription_FalseSwipe: @ 83BED54 - .string "An attack that leaves the\n" - .string "foe with at least 1 HP.$" - -gMoveDescription_Swagger: @ 83BED86 - .string "Confuses the foe, but also\n" - .string "sharply raises ATTACK.$" - -gMoveDescription_MilkDrink: @ 83BEDB8 - .string "Recovers up to half the\n" - .string "user’s maximum HP.$" - -gMoveDescription_Spark: @ 83BEDE3 - .string "An electrified tackle that\n" - .string "may paralyze the foe.$" - -gMoveDescription_FuryCutter: @ 83BEE14 - .string "An attack that intensifies\n" - .string "on each successive hit.$" - -gMoveDescription_SteelWing: @ 83BEE47 - .string "Strikes the foe with hard\n" - .string "wings spread wide.$" - -gMoveDescription_MeanLook: @ 83BEE74 - .string "Fixes the foe with a mean\n" - .string "look that prevents escape.$" - -gMoveDescription_Attract: @ 83BEEA9 - .string "Makes the opposite gender\n" - .string "less likely to attack.$" - -gMoveDescription_SleepTalk: @ 83BEEDA - .string "Uses an own move randomly\n" - .string "while asleep.$" - -gMoveDescription_HealBell: @ 83BEF02 - .string "Chimes soothingly to heal\n" - .string "all status abnormalities.$" - -gMoveDescription_Return: @ 83BEF36 - .string "An attack that increases\n" - .string "in power with friendship.$" - -gMoveDescription_Present: @ 83BEF69 - .string "A gift in the form of a\n" - .string "bomb. May restore HP.$" - -gMoveDescription_Frustration: @ 83BEF97 - .string "An attack that is stronger\n" - .string "if the TRAINER is disliked.$" - -gMoveDescription_Safeguard: @ 83BEFCE - .string "A mystical force prevents\n" - .string "all status problems.$" - -gMoveDescription_PainSplit: @ 83BEFFD - .string "Adds the user and foe’s HP,\n" - .string "then shares them equally.$" - -gMoveDescription_SacredFire: @ 83BF033 - .string "A mystical fire attack that\n" - .string "may inflict a burn.$" - -gMoveDescription_Magnitude: @ 83BF063 - .string "A ground-shaking attack\n" - .string "of random intensity.$" - -gMoveDescription_DynamicPunch: @ 83BF090 - .string "Powerful and sure to cause\n" - .string "confusion, but inaccurate.$" - -gMoveDescription_Megahorn: @ 83BF0C6 - .string "A brutal ramming attack\n" - .string "using out-thrust horns.$" - -gMoveDescription_DragonBreath: @ 83BF0F6 - .string "Strikes the foe with an\n" - .string "incredible blast of breath.$" - -gMoveDescription_BatonPass: @ 83BF12A - .string "Switches out the user while\n" - .string "keeping effects in play.$" - -gMoveDescription_Encore: @ 83BF15F - .string "Makes the foe repeat its\n" - .string "last move over 2 to 6 turns.$" - -gMoveDescription_Pursuit: @ 83BF195 - .string "Inflicts bad damage if used\n" - .string "on a foe switching out.$" - -gMoveDescription_RapidSpin: @ 83BF1C9 - .string "Spins the body at high\n" - .string "speed to strike the foe.$" - -gMoveDescription_SweetScent: @ 83BF1F9 - .string "Allures the foe to reduce\n" - .string "evasiveness.$" - -gMoveDescription_IronTail: @ 83BF220 - .string "Attacks with a rock-hard\n" - .string "tail. May lower DEFENSE.$" - -gMoveDescription_MetalClaw: @ 83BF252 - .string "A claw attack that may\n" - .string "raise the user’s ATTACK.$" - -gMoveDescription_VitalThrow: @ 83BF282 - .string "Makes the user’s move last,\n" - .string "but it never misses.$" - -gMoveDescription_MorningSun: @ 83BF2B3 - .string "Restores HP. The amount\n" - .string "varies with the weather.$" - -gMoveDescription_Synthesis: @ 83BF2E4 - .string "Restores HP. The amount\n" - .string "varies with the weather.$" - -gMoveDescription_Moonlight: @ 83BF315 - .string "Restores HP. The amount\n" - .string "varies with the weather.$" - -gMoveDescription_HiddenPower: @ 83BF346 - .string "The effectiveness varies\n" - .string "with the user.$" - -gMoveDescription_CrossChop: @ 83BF36E - .string "A double-chopping attack.\n" - .string "High critical-hit ratio.$" - -gMoveDescription_Twister: @ 83BF3A1 - .string "Whips up a vicious twister\n" - .string "to tear at the foe.$" - -gMoveDescription_RainDance: @ 83BF3D0 - .string "Boosts the power of WATER-\n" - .string "type moves for 5 turns.$" - -gMoveDescription_SunnyDay: @ 83BF403 - .string "Boosts the power of FIRE-\n" - .string "type moves for 5 turns.$" - -gMoveDescription_Crunch: @ 83BF435 - .string "Crunches with sharp fangs.\n" - .string "May lower SP. DEF.$" - -gMoveDescription_MirrorCoat: @ 83BF463 - .string "Counters the foe’s special\n" - .string "attack at double the power.$" - -gMoveDescription_PsychUp: @ 83BF49A - .string "Copies the foe’s effect(s)\n" - .string "and gives to the user.$" - -gMoveDescription_ExtremeSpeed: @ 83BF4CC - .string "An extremely fast and\n" - .string "powerful attack.$" - -gMoveDescription_AncientPower: @ 83BF4F3 - .string "An attack that may raise\n" - .string "all stats.$" - -gMoveDescription_ShadowBall: @ 83BF517 - .string "Hurls a black blob that may\n" - .string "lower the foe’s SP. DEF.$" - -gMoveDescription_FutureSight: @ 83BF54C - .string "Heightens inner power to\n" - .string "strike 2 turns later.$" - -gMoveDescription_RockSmash: @ 83BF57B - .string "A rock-crushing attack\n" - .string "that may lower DEFENSE.$" - -gMoveDescription_Whirlpool: @ 83BF5AA - .string "Traps and hurts the foe in\n" - .string "a whirlpool for 2 to 5 turns.$" - -gMoveDescription_BeatUp: @ 83BF5E3 - .string "Summons party POKéMON to\n" - .string "join in the attack.$" - -gMoveDescription_FakeOut: @ 83BF610 - .string "A 1st-turn, 1st-strike move\n" - .string "that causes flinching.$" - -gMoveDescription_Uproar: @ 83BF643 - .string "Causes an uproar for 2 to 5\n" - .string "turns and prevents sleep.$" - -gMoveDescription_Stockpile: @ 83BF679 - .string "Charges up power for up to\n" - .string "3 turns.$" - -gMoveDescription_SpitUp: @ 83BF69D - .string "Releases stockpiled power\n" - .string "(the more the better).$" - -gMoveDescription_Swallow: @ 83BF6CE - .string "Absorbs stockpiled power\n" - .string "and restores HP.$" - -gMoveDescription_HeatWave: @ 83BF6F8 - .string "Exhales a hot breath on the\n" - .string "foe. May inflict a burn.$" - -gMoveDescription_Hail: @ 83BF72D - .string "Summons a hailstorm that\n" - .string "strikes every turn.$" - -gMoveDescription_Torment: @ 83BF75A - .string "Torments the foe and stops\n" - .string "successive use of a move.$" - -gMoveDescription_Flatter: @ 83BF78F - .string "Confuses the foe, but\n" - .string "raises its SP. ATK.$" - -gMoveDescription_WillOWisp: @ 83BF7B9 - .string "Inflicts a burn on the foe\n" - .string "with intense fire.$" - -gMoveDescription_Memento: @ 83BF7E7 - .string "The user faints and lowers\n" - .string "the foe’s abilities.$" - -gMoveDescription_Facade: @ 83BF817 - .string "Boosts ATTACK when burned,\n" - .string "paralyzed, or poisoned.$" - -gMoveDescription_FocusPunch: @ 83BF84A - .string "A powerful loyalty attack.\n" - .string "The user flinches if hit.$" - -gMoveDescription_SmellingSalt: @ 83BF87F - .string "Powerful against paralyzed\n" - .string "foes, but also heals them.$" - -gMoveDescription_FollowMe: @ 83BF8B5 - .string "Draws attention to make\n" - .string "foes attack only the user.$" - -gMoveDescription_NaturePower: @ 83BF8E8 - .string "The type of attack varies\n" - .string "depending on the location.$" - -gMoveDescription_Charge: @ 83BF91D - .string "Charges power to boost the\n" - .string "electric move used next.$" - -gMoveDescription_Taunt: @ 83BF951 - .string "Taunts the foe into only\n" - .string "using attack moves.$" - -gMoveDescription_HelpingHand: @ 83BF97E - .string "Boosts the power of the\n" - .string "recipient’s moves.$" - -gMoveDescription_Trick: @ 83BF9A9 - .string "Tricks the foe into trading\n" - .string "held items.$" - -gMoveDescription_RolePlay: @ 83BF9D1 - .string "Mimics the target and\n" - .string "copies its special ability.$" - -gMoveDescription_Wish: @ 83BFA03 - .string "A wish that restores HP.\n" - .string "It takes time to work.$" - -gMoveDescription_Assist: @ 83BFA33 - .string "Attacks randomly with one\n" - .string "of the partner’s moves.$" - -gMoveDescription_Ingrain: @ 83BFA65 - .string "Lays roots that restore HP.\n" - .string "The user can’t switch out.$" - -gMoveDescription_Superpower: @ 83BFA9C - .string "Boosts strength sharply,\n" - .string "but lowers abilities.$" - -gMoveDescription_MagicCoat: @ 83BFACB - .string "Reflects special effects\n" - .string "back to the attacker.$" - -gMoveDescription_Recycle: @ 83BFAFA - .string "Recycles a used item for\n" - .string "one more use.$" - -gMoveDescription_Revenge: @ 83BFB21 - .string "An attack that gains power\n" - .string "if injured by the foe.$" - -gMoveDescription_BrickBreak: @ 83BFB53 - .string "Destroys barriers such as\n" - .string "REFLECT and causes damage.$" - -gMoveDescription_Yawn: @ 83BFB88 - .string "Lulls the foe into yawning,\n" - .string "then sleeping next turn.$" - -gMoveDescription_KnockOff: @ 83BFBBD - .string "Knocks down the foe’s held\n" - .string "item to prevent its use.$" - -gMoveDescription_Endeavor: @ 83BFBF1 - .string "Gains power if the user’s HP\n" - .string "is lower than the foe’s HP.$" - -gMoveDescription_Eruption: @ 83BFC2A - .string "The higher the user’s HP,\n" - .string "the more damage caused.$" - -gMoveDescription_SkillSwap: @ 83BFC5C - .string "The user swaps special\n" - .string "abilities with the target.$" - -gMoveDescription_Imprison: @ 83BFC8E - .string "Prevents foes from using\n" - .string "moves known by the user.$" - -gMoveDescription_Refresh: @ 83BFCC0 - .string "Heals poisoning, paralysis,\n" - .string "or a burn.$" - -gMoveDescription_Grudge: @ 83BFCE7 - .string "If the user faints, deletes\n" - .string "the PP of the final move.$" - -gMoveDescription_Snatch: @ 83BFD1D - .string "Steals the effects of the\n" - .string "move the foe uses next.$" - -gMoveDescription_SecretPower: @ 83BFD4F - .string "An attack with effects\n" - .string "that vary by location.$" - -gMoveDescription_Dive: @ 83BFD7D - .string "Dives underwater the first\n" - .string "turn and strikes next turn.$" - -gMoveDescription_ArmThrust: @ 83BFDB4 - .string "Straight-arm punches that\n" - .string "strike the foe 2 to 5 times.$" - -gMoveDescription_Camouflage: @ 83BFDEB - .string "Alters the POKéMON’s type\n" - .string "depending on the location.$" - -gMoveDescription_TailGlow: @ 83BFE20 - .string "Flashes a light that sharply\n" - .string "raises SP. ATK.$" - -gMoveDescription_LusterPurge: @ 83BFE4D - .string "Attacks with a burst of\n" - .string "light. May lower SP. DEF.$" - -gMoveDescription_MistBall: @ 83BFE7F - .string "Attacks with a flurry of\n" - .string "down. May lower SP. ATK.$" - -gMoveDescription_FeatherDance: @ 83BFEB1 - .string "Envelops the foe with down\n" - .string "to sharply reduce ATTACK.$" - -gMoveDescription_TeeterDance: @ 83BFEE6 - .string "Confuses all POKéMON on\n" - .string "the scene.$" - -gMoveDescription_BlazeKick: @ 83BFF09 - .string "A kick with a high critical-\n" - .string "hit ratio. May cause a burn.$" - -gMoveDescription_MudSport: @ 83BFF43 - .string "Covers the user in mud to\n" - .string "raise electrical resistance.$" - -gMoveDescription_IceBall: @ 83BFF7A - .string "A 5-turn attack that gains\n" - .string "power on successive hits.$" - -gMoveDescription_NeedleArm: @ 83BFFAF - .string "Attacks with thorny arms.\n" - .string "May cause flinching.$" - -gMoveDescription_SlackOff: @ 83BFFDE - .string "Slacks off and restores\n" - .string "half the maximum HP.$" - -gMoveDescription_HyperVoice: @ 83C000B - .string "A loud attack that uses\n" - .string "sound waves to injure.$" - -gMoveDescription_PoisonFang: @ 83C003A - .string "A sharp-fanged attack.\n" - .string "May badly poison the foe.$" - -gMoveDescription_CrushClaw: @ 83C006B - .string "Tears at the foe with sharp\n" - .string "claws. May lower DEFENSE.$" - -gMoveDescription_BlastBurn: @ 83C00A1 - .string "Powerful, but leaves the\n" - .string "user immobile the next turn.$" - -gMoveDescription_HydroCannon: @ 83C00D7 - .string "Powerful, but leaves the\n" - .string "user immobile the next turn.$" - -gMoveDescription_MeteorMash: @ 83C010D - .string "Fires a meteor-like punch.\n" - .string "May raise ATTACK.$" - -gMoveDescription_Astonish: @ 83C013A - .string "An attack that may shock\n" - .string "the foe into flinching.$" - -gMoveDescription_WeatherBall: @ 83C016B - .string "The move’s type and power\n" - .string "change with the weather.$" - -gMoveDescription_Aromatherapy: @ 83C019E - .string "Heals all status problems\n" - .string "with a soothing scent.$" - -gMoveDescription_FakeTears: @ 83C01CF - .string "Feigns crying to sharply\n" - .string "lower the foe’s SP. DEF.$" - -gMoveDescription_AirCutter: @ 83C0201 - .string "Hacks with razorlike wind.\n" - .string "High critical-hit ratio.$" - -gMoveDescription_Overheat: @ 83C0235 - .string "Allows a full-power attack,\n" - .string "but sharply lowers SP. ATK.$" - -gMoveDescription_OdorSleuth: @ 83C026D - .string "Negates the foe’s efforts\n" - .string "to heighten evasiveness.$" - -gMoveDescription_RockTomb: @ 83C02A0 - .string "Stops the foe from moving\n" - .string "with rocks and cuts SPEED.$" - -gMoveDescription_SilverWind: @ 83C02D5 - .string "A powdery attack that may\n" - .string "raise abilities.$" - -gMoveDescription_MetalSound: @ 83C0300 - .string "Emits a horrible screech\n" - .string "that sharply lowers SP. DEF.$" - -gMoveDescription_GrassWhistle: @ 83C0336 - .string "Lulls the foe into sleep\n" - .string "with a pleasant melody.$" - -gMoveDescription_Tickle: @ 83C0367 - .string "Makes the foe laugh to\n" - .string "lower ATTACK and DEFENSE.$" - -gMoveDescription_CosmicPower: @ 83C0398 - .string "Raises DEFENSE and SP. DEF\n" - .string "with a mystic power.$" - -gMoveDescription_WaterSpout: @ 83C03C8 - .string "Inflicts more damage if the\n" - .string "user’s HP is high.$" - -gMoveDescription_SignalBeam: @ 83C03F7 - .string "A strange beam attack that\n" - .string "may confuse the foe.$" - -gMoveDescription_ShadowPunch: @ 83C0427 - .string "An unavoidable punch that\n" - .string "is thrown from shadows.$" - -gMoveDescription_Extrasensory: @ 83C0459 - .string "Attacks with a peculiar\n" - .string "power. May cause flinching.$" - -gMoveDescription_SkyUppercut: @ 83C048D - .string "An uppercut thrown as if\n" - .string "leaping into the sky.$" - -gMoveDescription_SandTomb: @ 83C04BC - .string "Traps and hurts the foe in\n" - .string "quicksand for 2 to 5 turns.$" - -gMoveDescription_SheerCold: @ 83C04F3 - .string "A chilling attack that\n" - .string "causes fainting if it hits.$" - -gMoveDescription_MuddyWater: @ 83C0526 - .string "Attacks with muddy water.\n" - .string "May lower accuracy.$" - -gMoveDescription_BulletSeed: @ 83C0554 - .string "Shoots 2 to 5 seeds in a row\n" - .string "to strike the foe.$" - -gMoveDescription_AerialAce: @ 83C0584 - .string "An extremely speedy and\n" - .string "unavoidable attack.$" - -gMoveDescription_IcicleSpear: @ 83C05B0 - .string "Attacks the foe by firing\n" - .string "2 to 5 icicles in a row.$" - -gMoveDescription_IronDefense: @ 83C05E3 - .string "Hardens the body’s surface\n" - .string "to sharply raise DEFENSE.$" - -gMoveDescription_Block: @ 83C0618 - .string "Blocks the foe’s way to\n" - .string "prevent escape.$" - -gMoveDescription_Howl: @ 83C0640 - .string "Howls to raise the spirit\n" - .string "and boosts ATTACK.$" - -gMoveDescription_DragonClaw: @ 83C066D - .string "Slashes the foe with sharp\n" - .string "claws.$" - -gMoveDescription_FrenzyPlant: @ 83C068F - .string "Powerful, but leaves the\n" - .string "user immobile the next turn.$" - -gMoveDescription_BulkUp: @ 83C06C5 - .string "Bulks up the body to boost\n" - .string "both ATTACK and DEFENSE.$" - -gMoveDescription_Bounce: @ 83C06F9 - .string "Bounces up, then down the\n" - .string "next turn. May paralyze.$" - -gMoveDescription_MudShot: @ 83C072C - .string "Hurls mud at the foe and\n" - .string "reduces SPEED.$" - -gMoveDescription_PoisonTail: @ 83C0754 - .string "Has a high critical-hit\n" - .string "ratio. May also poison.$" - -gMoveDescription_Covet: @ 83C0784 - .string "Cutely begs to obtain an\n" - .string "item held by the foe.$" - -gMoveDescription_VoltTackle: @ 83C07B3 - .string "A life-risking tackle that\n" - .string "slightly hurts the user.$" - -gMoveDescription_MagicalLeaf: @ 83C07E7 - .string "Attacks with a strange leaf\n" - .string "that cannot be evaded.$" - -gMoveDescription_WaterSport: @ 83C081A - .string "The user becomes soaked to\n" - .string "raise resistance to fire.$" - -gMoveDescription_CalmMind: @ 83C084F - .string "Raises SP. ATK and SP. DEF\n" - .string "by focusing the mind.$" - -gMoveDescription_LeafBlade: @ 83C0880 - .string "Slashes with a sharp leaf.\n" - .string "High critical-hit ratio.$" - -gMoveDescription_DragonDance: @ 83C08B4 - .string "A mystical dance that ups\n" - .string "ATTACK and SPEED.$" - -gMoveDescription_RockBlast: @ 83C08E0 - .string "Hurls boulders at the foe\n" - .string "2 to 5 times in a row.$" - -gMoveDescription_ShockWave: @ 83C0911 - .string "A fast and unavoidable\n" - .string "electric attack.$" - -gMoveDescription_WaterPulse: @ 83C0939 - .string "Attacks with ultrasonic\n" - .string "waves. May confuse the foe$" - -gMoveDescription_DoomDesire: @ 83C096C - .string "Summons strong sunlight to\n" - .string "attack 2 turns later.$" - -gMoveDescription_PsychoBoost: @ 83C099D - .string "Allows a full-power attack,\n" - .string "but sharply lowers SP. ATK.$" - - .align 2 -gMoveDescriptions:: @ 83C09D8 - .4byte gMoveDescription_Pound - .4byte gMoveDescription_KarateChop - .4byte gMoveDescription_DoubleSlap - .4byte gMoveDescription_CometPunch - .4byte gMoveDescription_MegaPunch - .4byte gMoveDescription_PayDay - .4byte gMoveDescription_FirePunch - .4byte gMoveDescription_IcePunch - .4byte gMoveDescription_ThunderPunch - .4byte gMoveDescription_Scratch - .4byte gMoveDescription_ViceGrip - .4byte gMoveDescription_Guillotine - .4byte gMoveDescription_RazorWind - .4byte gMoveDescription_SwordsDance - .4byte gMoveDescription_Cut - .4byte gMoveDescription_Gust - .4byte gMoveDescription_WingAttack - .4byte gMoveDescription_Whirlwind - .4byte gMoveDescription_Fly - .4byte gMoveDescription_Bind - .4byte gMoveDescription_Slam - .4byte gMoveDescription_VineWhip - .4byte gMoveDescription_Stomp - .4byte gMoveDescription_DoubleKick - .4byte gMoveDescription_MegaKick - .4byte gMoveDescription_JumpKick - .4byte gMoveDescription_RollingKick - .4byte gMoveDescription_SandAttack - .4byte gMoveDescription_Headbutt - .4byte gMoveDescription_HornAttack - .4byte gMoveDescription_FuryAttack - .4byte gMoveDescription_HornDrill - .4byte gMoveDescription_Tackle - .4byte gMoveDescription_BodySlam - .4byte gMoveDescription_Wrap - .4byte gMoveDescription_TakeDown - .4byte gMoveDescription_Thrash - .4byte gMoveDescription_DoubleEdge - .4byte gMoveDescription_TailWhip - .4byte gMoveDescription_PoisonSting - .4byte gMoveDescription_Twineedle - .4byte gMoveDescription_PinMissile - .4byte gMoveDescription_Leer - .4byte gMoveDescription_Bite - .4byte gMoveDescription_Growl - .4byte gMoveDescription_Roar - .4byte gMoveDescription_Sing - .4byte gMoveDescription_Supersonic - .4byte gMoveDescription_SonicBoom - .4byte gMoveDescription_Disable - .4byte gMoveDescription_Acid - .4byte gMoveDescription_Ember - .4byte gMoveDescription_Flamethrower - .4byte gMoveDescription_Mist - .4byte gMoveDescription_WaterGun - .4byte gMoveDescription_HydroPump - .4byte gMoveDescription_Surf - .4byte gMoveDescription_IceBeam - .4byte gMoveDescription_Blizzard - .4byte gMoveDescription_Psybeam - .4byte gMoveDescription_BubbleBeam - .4byte gMoveDescription_AuroraBeam - .4byte gMoveDescription_HyperBeam - .4byte gMoveDescription_Peck - .4byte gMoveDescription_DrillPeck - .4byte gMoveDescription_Submission - .4byte gMoveDescription_LowKick - .4byte gMoveDescription_Counter - .4byte gMoveDescription_SeismicToss - .4byte gMoveDescription_Strength - .4byte gMoveDescription_Absorb - .4byte gMoveDescription_MegaDrain - .4byte gMoveDescription_LeechSeed - .4byte gMoveDescription_Growth - .4byte gMoveDescription_RazorLeaf - .4byte gMoveDescription_SolarBeam - .4byte gMoveDescription_PoisonPowder - .4byte gMoveDescription_StunSpore - .4byte gMoveDescription_SleepPowder - .4byte gMoveDescription_PetalDance - .4byte gMoveDescription_StringShot - .4byte gMoveDescription_DragonRage - .4byte gMoveDescription_FireSpin - .4byte gMoveDescription_ThunderShock - .4byte gMoveDescription_Thunderbolt - .4byte gMoveDescription_ThunderWave - .4byte gMoveDescription_Thunder - .4byte gMoveDescription_RockThrow - .4byte gMoveDescription_Earthquake - .4byte gMoveDescription_Fissure - .4byte gMoveDescription_Dig - .4byte gMoveDescription_Toxic - .4byte gMoveDescription_Confusion - .4byte gMoveDescription_Psychic - .4byte gMoveDescription_Hypnosis - .4byte gMoveDescription_Meditate - .4byte gMoveDescription_Agility - .4byte gMoveDescription_QuickAttack - .4byte gMoveDescription_Rage - .4byte gMoveDescription_Teleport - .4byte gMoveDescription_NightShade - .4byte gMoveDescription_Mimic - .4byte gMoveDescription_Screech - .4byte gMoveDescription_DoubleTeam - .4byte gMoveDescription_Recover - .4byte gMoveDescription_Harden - .4byte gMoveDescription_Minimize - .4byte gMoveDescription_Smokescreen - .4byte gMoveDescription_ConfuseRay - .4byte gMoveDescription_Withdraw - .4byte gMoveDescription_DefenseCurl - .4byte gMoveDescription_Barrier - .4byte gMoveDescription_LightScreen - .4byte gMoveDescription_Haze - .4byte gMoveDescription_Reflect - .4byte gMoveDescription_FocusEnergy - .4byte gMoveDescription_Bide - .4byte gMoveDescription_Metronome - .4byte gMoveDescription_MirrorMove - .4byte gMoveDescription_SelfDestruct - .4byte gMoveDescription_EggBomb - .4byte gMoveDescription_Lick - .4byte gMoveDescription_Smog - .4byte gMoveDescription_Sludge - .4byte gMoveDescription_BoneClub - .4byte gMoveDescription_FireBlast - .4byte gMoveDescription_Waterfall - .4byte gMoveDescription_Clamp - .4byte gMoveDescription_Swift - .4byte gMoveDescription_SkullBash - .4byte gMoveDescription_SpikeCannon - .4byte gMoveDescription_Constrict - .4byte gMoveDescription_Amnesia - .4byte gMoveDescription_Kinesis - .4byte gMoveDescription_SoftBoiled - .4byte gMoveDescription_HiJumpKick - .4byte gMoveDescription_Glare - .4byte gMoveDescription_DreamEater - .4byte gMoveDescription_PoisonGas - .4byte gMoveDescription_Barrage - .4byte gMoveDescription_LeechLife - .4byte gMoveDescription_LovelyKiss - .4byte gMoveDescription_SkyAttack - .4byte gMoveDescription_Transform - .4byte gMoveDescription_Bubble - .4byte gMoveDescription_DizzyPunch - .4byte gMoveDescription_Spore - .4byte gMoveDescription_Flash - .4byte gMoveDescription_Psywave - .4byte gMoveDescription_Splash - .4byte gMoveDescription_AcidArmor - .4byte gMoveDescription_Crabhammer - .4byte gMoveDescription_Explosion - .4byte gMoveDescription_FurySwipes - .4byte gMoveDescription_Bonemerang - .4byte gMoveDescription_Rest - .4byte gMoveDescription_RockSlide - .4byte gMoveDescription_HyperFang - .4byte gMoveDescription_Sharpen - .4byte gMoveDescription_Conversion - .4byte gMoveDescription_TriAttack - .4byte gMoveDescription_SuperFang - .4byte gMoveDescription_Slash - .4byte gMoveDescription_Substitute - .4byte gMoveDescription_Struggle - .4byte gMoveDescription_Sketch - .4byte gMoveDescription_TripleKick - .4byte gMoveDescription_Thief - .4byte gMoveDescription_SpiderWeb - .4byte gMoveDescription_MindReader - .4byte gMoveDescription_Nightmare - .4byte gMoveDescription_FlameWheel - .4byte gMoveDescription_Snore - .4byte gMoveDescription_Curse - .4byte gMoveDescription_Flail - .4byte gMoveDescription_Conversion2 - .4byte gMoveDescription_Aeroblast - .4byte gMoveDescription_CottonSpore - .4byte gMoveDescription_Reversal - .4byte gMoveDescription_Spite - .4byte gMoveDescription_PowderSnow - .4byte gMoveDescription_Protect - .4byte gMoveDescription_MachPunch - .4byte gMoveDescription_ScaryFace - .4byte gMoveDescription_FaintAttack - .4byte gMoveDescription_SweetKiss - .4byte gMoveDescription_BellyDrum - .4byte gMoveDescription_SludgeBomb - .4byte gMoveDescription_MudSlap - .4byte gMoveDescription_Octazooka - .4byte gMoveDescription_Spikes - .4byte gMoveDescription_ZapCannon - .4byte gMoveDescription_Foresight - .4byte gMoveDescription_DestinyBond - .4byte gMoveDescription_PerishSong - .4byte gMoveDescription_IcyWind - .4byte gMoveDescription_Detect - .4byte gMoveDescription_BoneRush - .4byte gMoveDescription_LockOn - .4byte gMoveDescription_Outrage - .4byte gMoveDescription_Sandstorm - .4byte gMoveDescription_GigaDrain - .4byte gMoveDescription_Endure - .4byte gMoveDescription_Charm - .4byte gMoveDescription_Rollout - .4byte gMoveDescription_FalseSwipe - .4byte gMoveDescription_Swagger - .4byte gMoveDescription_MilkDrink - .4byte gMoveDescription_Spark - .4byte gMoveDescription_FuryCutter - .4byte gMoveDescription_SteelWing - .4byte gMoveDescription_MeanLook - .4byte gMoveDescription_Attract - .4byte gMoveDescription_SleepTalk - .4byte gMoveDescription_HealBell - .4byte gMoveDescription_Return - .4byte gMoveDescription_Present - .4byte gMoveDescription_Frustration - .4byte gMoveDescription_Safeguard - .4byte gMoveDescription_PainSplit - .4byte gMoveDescription_SacredFire - .4byte gMoveDescription_Magnitude - .4byte gMoveDescription_DynamicPunch - .4byte gMoveDescription_Megahorn - .4byte gMoveDescription_DragonBreath - .4byte gMoveDescription_BatonPass - .4byte gMoveDescription_Encore - .4byte gMoveDescription_Pursuit - .4byte gMoveDescription_RapidSpin - .4byte gMoveDescription_SweetScent - .4byte gMoveDescription_IronTail - .4byte gMoveDescription_MetalClaw - .4byte gMoveDescription_VitalThrow - .4byte gMoveDescription_MorningSun - .4byte gMoveDescription_Synthesis - .4byte gMoveDescription_Moonlight - .4byte gMoveDescription_HiddenPower - .4byte gMoveDescription_CrossChop - .4byte gMoveDescription_Twister - .4byte gMoveDescription_RainDance - .4byte gMoveDescription_SunnyDay - .4byte gMoveDescription_Crunch - .4byte gMoveDescription_MirrorCoat - .4byte gMoveDescription_PsychUp - .4byte gMoveDescription_ExtremeSpeed - .4byte gMoveDescription_AncientPower - .4byte gMoveDescription_ShadowBall - .4byte gMoveDescription_FutureSight - .4byte gMoveDescription_RockSmash - .4byte gMoveDescription_Whirlpool - .4byte gMoveDescription_BeatUp - .4byte gMoveDescription_FakeOut - .4byte gMoveDescription_Uproar - .4byte gMoveDescription_Stockpile - .4byte gMoveDescription_SpitUp - .4byte gMoveDescription_Swallow - .4byte gMoveDescription_HeatWave - .4byte gMoveDescription_Hail - .4byte gMoveDescription_Torment - .4byte gMoveDescription_Flatter - .4byte gMoveDescription_WillOWisp - .4byte gMoveDescription_Memento - .4byte gMoveDescription_Facade - .4byte gMoveDescription_FocusPunch - .4byte gMoveDescription_SmellingSalt - .4byte gMoveDescription_FollowMe - .4byte gMoveDescription_NaturePower - .4byte gMoveDescription_Charge - .4byte gMoveDescription_Taunt - .4byte gMoveDescription_HelpingHand - .4byte gMoveDescription_Trick - .4byte gMoveDescription_RolePlay - .4byte gMoveDescription_Wish - .4byte gMoveDescription_Assist - .4byte gMoveDescription_Ingrain - .4byte gMoveDescription_Superpower - .4byte gMoveDescription_MagicCoat - .4byte gMoveDescription_Recycle - .4byte gMoveDescription_Revenge - .4byte gMoveDescription_BrickBreak - .4byte gMoveDescription_Yawn - .4byte gMoveDescription_KnockOff - .4byte gMoveDescription_Endeavor - .4byte gMoveDescription_Eruption - .4byte gMoveDescription_SkillSwap - .4byte gMoveDescription_Imprison - .4byte gMoveDescription_Refresh - .4byte gMoveDescription_Grudge - .4byte gMoveDescription_Snatch - .4byte gMoveDescription_SecretPower - .4byte gMoveDescription_Dive - .4byte gMoveDescription_ArmThrust - .4byte gMoveDescription_Camouflage - .4byte gMoveDescription_TailGlow - .4byte gMoveDescription_LusterPurge - .4byte gMoveDescription_MistBall - .4byte gMoveDescription_FeatherDance - .4byte gMoveDescription_TeeterDance - .4byte gMoveDescription_BlazeKick - .4byte gMoveDescription_MudSport - .4byte gMoveDescription_IceBall - .4byte gMoveDescription_NeedleArm - .4byte gMoveDescription_SlackOff - .4byte gMoveDescription_HyperVoice - .4byte gMoveDescription_PoisonFang - .4byte gMoveDescription_CrushClaw - .4byte gMoveDescription_BlastBurn - .4byte gMoveDescription_HydroCannon - .4byte gMoveDescription_MeteorMash - .4byte gMoveDescription_Astonish - .4byte gMoveDescription_WeatherBall - .4byte gMoveDescription_Aromatherapy - .4byte gMoveDescription_FakeTears - .4byte gMoveDescription_AirCutter - .4byte gMoveDescription_Overheat - .4byte gMoveDescription_OdorSleuth - .4byte gMoveDescription_RockTomb - .4byte gMoveDescription_SilverWind - .4byte gMoveDescription_MetalSound - .4byte gMoveDescription_GrassWhistle - .4byte gMoveDescription_Tickle - .4byte gMoveDescription_CosmicPower - .4byte gMoveDescription_WaterSpout - .4byte gMoveDescription_SignalBeam - .4byte gMoveDescription_ShadowPunch - .4byte gMoveDescription_Extrasensory - .4byte gMoveDescription_SkyUppercut - .4byte gMoveDescription_SandTomb - .4byte gMoveDescription_SheerCold - .4byte gMoveDescription_MuddyWater - .4byte gMoveDescription_BulletSeed - .4byte gMoveDescription_AerialAce - .4byte gMoveDescription_IcicleSpear - .4byte gMoveDescription_IronDefense - .4byte gMoveDescription_Block - .4byte gMoveDescription_Howl - .4byte gMoveDescription_DragonClaw - .4byte gMoveDescription_FrenzyPlant - .4byte gMoveDescription_BulkUp - .4byte gMoveDescription_Bounce - .4byte gMoveDescription_MudShot - .4byte gMoveDescription_PoisonTail - .4byte gMoveDescription_Covet - .4byte gMoveDescription_VoltTackle - .4byte gMoveDescription_MagicalLeaf - .4byte gMoveDescription_WaterSport - .4byte gMoveDescription_CalmMind - .4byte gMoveDescription_LeafBlade - .4byte gMoveDescription_DragonDance - .4byte gMoveDescription_RockBlast - .4byte gMoveDescription_ShockWave - .4byte gMoveDescription_WaterPulse - .4byte gMoveDescription_DoomDesire - .4byte gMoveDescription_PsychoBoost -- cgit v1.2.3 From fee28d4e554d229ddf2585bd103a52953f7cc566 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 25 Nov 2017 21:17:39 -0800 Subject: Migrate nature_names to src/data/text --- data/pokemon_summary_screen.s | 3 -- data/text/nature_names.inc | 102 ------------------------------------------ 2 files changed, 105 deletions(-) delete mode 100644 data/text/nature_names.inc (limited to 'data') diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s index c938de935..5f7f9a414 100644 --- a/data/pokemon_summary_screen.s +++ b/data/pokemon_summary_screen.s @@ -3,9 +3,6 @@ .section .rodata -@ 83C0F60 - .include "data/text/nature_names.inc" - .align 2 gUnknown_083C1068:: @ 83C1068 .4byte gEmptyString_81E72B0 diff --git a/data/text/nature_names.inc b/data/text/nature_names.inc deleted file mode 100644 index f191f80ba..000000000 --- a/data/text/nature_names.inc +++ /dev/null @@ -1,102 +0,0 @@ -gNatureName_Hardy: @ 83C0F60 - .string "HARDY$" - -gNatureName_Lonely: @ 83C0F66 - .string "LONELY$" - -gNatureName_Brave: @ 83C0F6D - .string "BRAVE$" - -gNatureName_Adamant: @ 83C0F73 - .string "ADAMANT$" - -gNatureName_Naughty: @ 83C0F7B - .string "NAUGHTY$" - -gNatureName_Bold: @ 83C0F83 - .string "BOLD$" - -gNatureName_Docile: @ 83C0F88 - .string "DOCILE$" - -gNatureName_Relaxed: @ 83C0F8F - .string "RELAXED$" - -gNatureName_Impish: @ 83C0F97 - .string "IMPISH$" - -gNatureName_Lax: @ 83C0F9E - .string "LAX$" - -gNatureName_Timid: @ 83C0FA2 - .string "TIMID$" - -gNatureName_Hasty: @ 83C0FA8 - .string "HASTY$" - -gNatureName_Serious: @ 83C0FAE - .string "SERIOUS$" - -gNatureName_Jolly: @ 83C0FB6 - .string "JOLLY$" - -gNatureName_Naive: @ 83C0FBC - .string "NAIVE$" - -gNatureName_Modest: @ 83C0FC2 - .string "MODEST$" - -gNatureName_Mild: @ 83C0FC9 - .string "MILD$" - -gNatureName_Quiet: @ 83C0FCE - .string "QUIET$" - -gNatureName_Bashful: @ 83C0FD4 - .string "BASHFUL$" - -gNatureName_Rash: @ 83C0FDC - .string "RASH$" - -gNatureName_Calm: @ 83C0FE1 - .string "CALM$" - -gNatureName_Gentle: @ 83C0FE6 - .string "GENTLE$" - -gNatureName_Sassy: @ 83C0FED - .string "SASSY$" - -gNatureName_Careful: @ 83C0FF3 - .string "CAREFUL$" - -gNatureName_Quirky: @ 83C0FFB - .string "QUIRKY$" - - .align 2 -gNatureNames:: @ 83C1004 - .4byte gNatureName_Hardy - .4byte gNatureName_Lonely - .4byte gNatureName_Brave - .4byte gNatureName_Adamant - .4byte gNatureName_Naughty - .4byte gNatureName_Bold - .4byte gNatureName_Docile - .4byte gNatureName_Relaxed - .4byte gNatureName_Impish - .4byte gNatureName_Lax - .4byte gNatureName_Timid - .4byte gNatureName_Hasty - .4byte gNatureName_Serious - .4byte gNatureName_Jolly - .4byte gNatureName_Naive - .4byte gNatureName_Modest - .4byte gNatureName_Mild - .4byte gNatureName_Quiet - .4byte gNatureName_Bashful - .4byte gNatureName_Rash - .4byte gNatureName_Calm - .4byte gNatureName_Gentle - .4byte gNatureName_Sassy - .4byte gNatureName_Careful - .4byte gNatureName_Quirky -- cgit v1.2.3 From 8ad0f966993f4b87fcf30ddc217400164550f193 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 26 Nov 2017 12:51:11 -0800 Subject: Move summary_screen data into src --- data/pokemon_summary_screen.s | 387 ------------------------------------------ 1 file changed, 387 deletions(-) delete mode 100644 data/pokemon_summary_screen.s (limited to 'data') diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s deleted file mode 100644 index 5f7f9a414..000000000 --- a/data/pokemon_summary_screen.s +++ /dev/null @@ -1,387 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083C1068:: @ 83C1068 - .4byte gEmptyString_81E72B0 - .4byte OtherText_PokeInfo - .4byte OtherText_PokeSkills - .4byte OtherText_BattleMoves - .4byte OtherText_ContestMoves - .4byte OtherText_Switch - .4byte OtherText_Info - .4byte gOtherText_CancelNoTerminator - - .align 2 -gSpriteAffineAnim_83C1088:: @ 83C1088 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83C1098:: @ 83C1098 - .4byte gSpriteAffineAnim_83C1088 - - .align 2 -gOamData_83C109C:: @ 83C109C - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83C10A4:: @ 83C10A4 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10AC:: @ 83C10AC - obj_image_anim_frame 8, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10B4:: @ 83C10B4 - obj_image_anim_frame 16, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10BC:: @ 83C10BC - obj_image_anim_frame 24, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10C4:: @ 83C10C4 - obj_image_anim_frame 32, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10CC:: @ 83C10CC - obj_image_anim_frame 40, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10D4:: @ 83C10D4 - obj_image_anim_frame 48, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10DC:: @ 83C10DC - obj_image_anim_frame 56, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10E4:: @ 83C10E4 - obj_image_anim_frame 64, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10EC:: @ 83C10EC - obj_image_anim_frame 72, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10F4:: @ 83C10F4 - obj_image_anim_frame 80, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C10FC:: @ 83C10FC - obj_image_anim_frame 88, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1104:: @ 83C1104 - obj_image_anim_frame 96, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C110C:: @ 83C110C - obj_image_anim_frame 104, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1114:: @ 83C1114 - obj_image_anim_frame 112, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C111C:: @ 83C111C - obj_image_anim_frame 120, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1124:: @ 83C1124 - obj_image_anim_frame 128, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C112C:: @ 83C112C - obj_image_anim_frame 136, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1134:: @ 83C1134 - obj_image_anim_frame 144, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C113C:: @ 83C113C - obj_image_anim_frame 152, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1144:: @ 83C1144 - obj_image_anim_frame 160, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C114C:: @ 83C114C - obj_image_anim_frame 168, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1154:: @ 83C1154 - obj_image_anim_frame 176, 0 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83C115C:: @ 83C115C - .4byte gSpriteAnim_83C10A4 - .4byte gSpriteAnim_83C10AC - .4byte gSpriteAnim_83C10B4 - .4byte gSpriteAnim_83C10BC - .4byte gSpriteAnim_83C10C4 - .4byte gSpriteAnim_83C10CC - .4byte gSpriteAnim_83C10D4 - .4byte gSpriteAnim_83C10DC - .4byte gSpriteAnim_83C10E4 - .4byte gSpriteAnim_83C10EC - .4byte gSpriteAnim_83C10F4 - .4byte gSpriteAnim_83C10FC - .4byte gSpriteAnim_83C1104 - .4byte gSpriteAnim_83C110C - .4byte gSpriteAnim_83C1114 - .4byte gSpriteAnim_83C111C - .4byte gSpriteAnim_83C1124 - .4byte gSpriteAnim_83C112C - .4byte gSpriteAnim_83C1134 - .4byte gSpriteAnim_83C113C - .4byte gSpriteAnim_83C1144 - .4byte gSpriteAnim_83C114C - .4byte gSpriteAnim_83C1154 - - .align 2 -gUnknown_083C11B8:: @ 83C11B8 - obj_tiles gMoveTypes_Gfx, 5888, 0x7532 - - .align 2 -gSpriteTemplate_83C11C0:: @ 83C11C0 - spr_template 30002, 30002, gOamData_83C109C, gSpriteAnimTable_83C115C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_083C11D8:: @ 83C11D8 - .byte 0xD,0xD,0xE,0xE,0xD,0xD,0xF,0xE,0xD,0xF,0xD,0xE,0xF,0xD,0xE,0xE,0xF,0xD,0xD,0xE,0xE,0xF,0xD - - .align 2 -gOamData_83C11F0:: @ 83C11F0 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83C11F8:: @ 83C11F8 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1200:: @ 83C1200 - obj_image_anim_frame 4, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1208:: @ 83C1208 - obj_image_anim_frame 8, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1210:: @ 83C1210 - obj_image_anim_frame 12, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1218:: @ 83C1218 - obj_image_anim_frame 16, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1220:: @ 83C1220 - obj_image_anim_frame 16, 0, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1228:: @ 83C1228 - obj_image_anim_frame 20, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1230:: @ 83C1230 - obj_image_anim_frame 24, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1238:: @ 83C1238 - obj_image_anim_frame 24, 0, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_83C1240:: @ 83C1240 - obj_image_anim_frame 28, 0 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83C1248:: @ 83C1248 - .4byte gSpriteAnim_83C11F8 - .4byte gSpriteAnim_83C1200 - .4byte gSpriteAnim_83C1208 - .4byte gSpriteAnim_83C1210 - .4byte gSpriteAnim_83C1218 - .4byte gSpriteAnim_83C1220 - .4byte gSpriteAnim_83C1228 - .4byte gSpriteAnim_83C1230 - .4byte gSpriteAnim_83C1238 - .4byte gSpriteAnim_83C1240 - - .align 2 -gUnknown_083C1270:: @ 83C1270 - obj_tiles gMenuSummaryGfx, 1024, 0x7530 - - .align 2 -gUnknown_083C1278:: @ 83C1278 - obj_pal gMenuSummaryPal, 0x7530 - - .align 2 -gSpriteTemplate_83C1280:: @ 83C1280 - spr_template 30000, 30000, gOamData_83C11F0, gSpriteAnimTable_83C1248, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gOamData_83C1298:: @ 83C1298 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0C00 - - .align 2 -gSpriteAnim_83C12A0:: @ 83C12A0 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12A8:: @ 83C12A8 - obj_image_anim_frame 4, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12B0:: @ 83C12B0 - obj_image_anim_frame 8, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12B8:: @ 83C12B8 - obj_image_anim_frame 12, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12C0:: @ 83C12C0 - obj_image_anim_frame 16, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12C8:: @ 83C12C8 - obj_image_anim_frame 20, 0 - obj_image_anim_end - - .align 2 -gSpriteAnim_83C12D0:: @ 83C12D0 - obj_image_anim_frame 24, 0 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83C12D8:: @ 83C12D8 - .4byte gSpriteAnim_83C12A0 - .4byte gSpriteAnim_83C12A8 - .4byte gSpriteAnim_83C12B0 - .4byte gSpriteAnim_83C12B8 - .4byte gSpriteAnim_83C12C0 - .4byte gSpriteAnim_83C12C8 - .4byte gSpriteAnim_83C12D0 - - .align 2 -gUnknown_083C12F4:: @ 83C12F4 - obj_tiles gStatusGfx_Icons, 896, 0x7531 - - .align 2 -gUnknown_083C12FC:: @ 83C12FC - obj_pal gStatusPal_Icons, 0x7531 - - .align 2 -gSpriteTemplate_83C1304:: @ 83C1304 - spr_template 30001, 30001, gOamData_83C1298, gSpriteAnimTable_83C12D8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSummaryScreenMonMarkingsPalette:: @ 83C131C - .incbin "graphics/summary_screen/mon_markings.gbapal" - -.ifdef ENGLISH - .align 2 -gSummaryScreenTextTiles:: @ 83C133C - .incbin "graphics/summary_screen/text.4bpp" -.endif - - .align 2 -gSummaryScreenButtonTiles:: @ 83C147C - .incbin "graphics/summary_screen/buttons.4bpp" - - .align 1 -gUnknown_083C157C:: @ 83C157C - .2byte 0x5F5A @ palette color - - .align 1 -gUnknown_083C157E:: @ 83C157E - .2byte 0x6FDE @ palette color - - .align 2 -gUnknown_083C1580:: @ 83C1580 - .4byte sub_809FC0C - .4byte sub_809FEB8 - - .align 2 -gUnknown_083C1588:: @ 83C1588 - .4byte sub_809F63C - .4byte sub_809F650 - .4byte sub_809F664 - .4byte sub_809F664 - - .align 2 -gUnknown_083C1598:: @ 83C1598 - .4byte sub_809FE6C - .4byte sub_80A0090 - .4byte sub_80A015C - .4byte sub_80A015C - -gDoubleBattlePartyOrder:: @ 83C15A8 - .byte 0, 2, 3, 1, 4, 5 - -gUnknown_083C15AE:: @ 83C15AE - .string "{STR_VAR_1}{CLEAR_TO 64}$" - -gUnknown_083C15B4:: @ 83C15B4 - .string "{STR_VAR_1}{CLEAR_TO 72}$" - - .align 2 -gUnknown_083C15BC:: @ 83C15BC - .byte 9, 1, 0, 2 - .byte 10, 3, 0, 4 - .byte 8, 5, 0, 6 - .byte 11, 7, 0, 8 - .byte 14, 9, 0, 10 - .byte 12, 11, 0, 12 - .byte 13, 13, 0, 14 - .byte -1, 15, 0, 10 -- cgit v1.2.3 From 026e017a16df44806b95435403a8e3b8dbe78084 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 26 Nov 2017 15:10:56 -0600 Subject: flag, vars, items constants --- data/battle_ai_scripts.s | 1 + data/data2a.s | 1 + data/event_scripts.s | 1 + data/map_events.s | 1 + 4 files changed, 4 insertions(+) (limited to 'data') diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index db5d16c48..713846cb9 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -1,4 +1,5 @@ #include "constants/abilities.h" +#include "constants/items.h" #include "constants/moves.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/data2a.s b/data/data2a.s index dcc59c8e4..103b723e8 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -1,5 +1,6 @@ @ the second big chunk of data +#include "constants/items.h" #include "constants/moves.h" #include "constants/species.h" .include "asm/macros.inc" diff --git a/data/event_scripts.s b/data/event_scripts.s index 4ef10652b..270a5d787 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,3 +1,4 @@ +#include "constants/items.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" diff --git a/data/map_events.s b/data/map_events.s index 7156e4b6e..43b839944 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,3 +1,4 @@ +#include "constants/items.h" .include "asm/macros.inc" .include "constants/constants.inc" -- cgit v1.2.3 From b80d40fb6977e58d5b001e063314c4e4faac5a02 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 26 Nov 2017 16:00:01 -0600 Subject: map constants --- data/wild_encounter.s | 1 + 1 file changed, 1 insertion(+) (limited to 'data') diff --git a/data/wild_encounter.s b/data/wild_encounter.s index f6fb67eee..b906a21f1 100644 --- a/data/wild_encounter.s +++ b/data/wild_encounter.s @@ -1,3 +1,4 @@ +#include "constants/maps.h" #include "constants/species.h" .include "asm/macros.inc" .include "constants/constants.inc" -- cgit v1.2.3 From 611984671904aa19cf678c59ff2a8682cba09224 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 26 Nov 2017 17:01:50 -0600 Subject: opponents, map_objects, hold_effects, game_stat, decorations, battle_move_effects constants --- data/battle_ai_scripts.s | 2 ++ data/battle_moves.s | 1 + data/cable_car.s | 1 + data/event_scripts.s | 4 ++++ data/map_events.s | 1 + 5 files changed, 9 insertions(+) (limited to 'data') diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 713846cb9..7c58160f6 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -1,4 +1,6 @@ #include "constants/abilities.h" +#include "constants/battle_move_effects.h" +#include "constants/hold_effects.h" #include "constants/items.h" #include "constants/moves.h" .include "asm/macros.inc" diff --git a/data/battle_moves.s b/data/battle_moves.s index ea32446d2..9a7398999 100644 --- a/data/battle_moves.s +++ b/data/battle_moves.s @@ -1,3 +1,4 @@ +#include "constants/battle_move_effects.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/cable_car.s b/data/cable_car.s index 3075f7651..775e53b6a 100644 --- a/data/cable_car.s +++ b/data/cable_car.s @@ -1,3 +1,4 @@ +#include "constants/map_objects.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/event_scripts.s b/data/event_scripts.s index 270a5d787..faa9b8406 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,5 +1,9 @@ +#include "constants/decorations.h" +#include "constants/game_stat.h" #include "constants/items.h" +#include "constants/map_objects.h" #include "constants/moves.h" +#include "constants/opponents.h" #include "constants/songs.h" #include "constants/species.h" .include "asm/macros.inc" diff --git a/data/map_events.s b/data/map_events.s index 43b839944..57b3adab5 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,4 +1,5 @@ #include "constants/items.h" +#include "constants/map_objects.h" .include "asm/macros.inc" .include "constants/constants.inc" -- cgit v1.2.3 From 4fd33b10353c25b2af233a6679b038bdcea8eb2e Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 26 Nov 2017 17:19:05 -0600 Subject: mauville_man constants --- data/scripts/mauville_man.inc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 402afae23..465c61d1a 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -1,11 +1,4 @@ -@ From mauville_old_man.h -@ TODO: Put these in a header - -MAUVILLE_MAN_BARD = 0 -MAUVILLE_MAN_HIPSTER = 1 -MAUVILLE_MAN_TRADER = 2 -MAUVILLE_MAN_STORYTELLER = 3 -MAUVILLE_MAN_GIDDY = 4 +#include "constants/mauville_man.h" MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 special ScrSpecial_GetCurrentMauvilleMan -- cgit v1.2.3 From 8fd1e16862f119cf9cb25b7411cda0c8f7c4e354 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 27 Nov 2017 17:17:00 -0600 Subject: convert landmark data to C --- data/landmark.s | 561 -------------------------------------------------------- 1 file changed, 561 deletions(-) delete mode 100644 data/landmark.s (limited to 'data') diff --git a/data/landmark.s b/data/landmark.s deleted file mode 100644 index 3583365cb..000000000 --- a/data/landmark.s +++ /dev/null @@ -1,561 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -Landmark_FlowerShop: - .4byte gLandmarkName_FlowerShop - .2byte 2108 @ flag num. - - .align 2 -Landmark_PetalburgWoods: - .4byte gLandmarkName_PetalburgWoods - .2byte -1 @ flag num. - - .align 2 -Landmark_MrBrineysCottage: - .4byte gLandmarkName_MrBrineysCottage - .2byte 2109 @ flag num. - - .align 2 -Landmark_AbandonedShip: - .4byte gLandmarkName_AbandonedShip - .2byte 2110 @ flag num. - - .align 2 -Landmark_SeashoreHouse: - .4byte gLandmarkName_SeashoreHouse - .2byte 2111 @ flag num. - - .align 2 -Landmark_SlateportBeach: - .4byte gLandmarkName_SlateportBeach - .2byte -1 @ flag num. - - .align 2 -Landmark_CyclingRoad: - .4byte gLandmarkName_CyclingRoad - .2byte -1 @ flag num. - - .align 2 -Landmark_NewMauville: - .4byte gLandmarkName_NewMauville - .2byte 2112 @ flag num. - - .align 2 -Landmark_TrickHouse: - .4byte gLandmarkName_TrickHouse - .2byte 2114 @ flag num. - - .align 2 -Landmark_OldLadysRestShop: - .4byte gLandmarkName_OldLadysRestShop - .2byte 2113 @ flag num. - - .align 2 -Landmark_Desert: - .4byte gLandmarkName_Desert - .2byte -1 @ flag num. - - .align 2 -Landmark_WinstrateFamily: - .4byte gLandmarkName_WinstrateFamily - .2byte 2115 @ flag num. - - .align 2 -Landmark_CableCar: - .4byte gLandmarkName_CableCar - .2byte -1 @ flag num. - - .align 2 -Landmark_GlassWorkshop: - .4byte gLandmarkName_GlassWorkshop - .2byte 2116 @ flag num. - - .align 2 -Landmark_WeatherInstitute: - .4byte gLandmarkName_WeatherInstitute - .2byte -1 @ flag num. - - .align 2 -Landmark_MeteorFalls: - .4byte gLandmarkName_MeteorFalls - .2byte -1 @ flag num. - - .align 2 -Landmark_TunnelersRestHouse: - .4byte gLandmarkName_TunnelersRestHouse - .2byte 2138 @ flag num. - - .align 2 -Landmark_RusturfTunnel: - .4byte gLandmarkName_RusturfTunnel - .2byte -1 @ flag num. - - .align 2 -Landmark_PokemonDayCare: - .4byte gLandmarkName_PokemonDayCare - .2byte 2118 @ flag num. - - .align 2 -Landmark_SafariZoneEntrance: - .4byte gLandmarkName_SafariZoneEntrance - .2byte -1 @ flag num. - - .align 2 -Landmark_MtPyre: - .4byte gLandmarkName_MtPyre - .2byte -1 @ flag num. - - .align 2 -Landmark_ShoalCave: - .4byte gLandmarkName_ShoalCave - .2byte -1 @ flag num. - - .align 2 -Landmark_SeafloorCavern: - .4byte gLandmarkName_SeafloorCavern - .2byte 2119 @ flag num. - - .align 2 -Landmark_GraniteCave: - .4byte gLandmarkName_GraniteCave - .2byte -1 @ flag num. - - .align 2 -Landmark_OceanCurrent: - .4byte gLandmarkName_OceanCurrent - .2byte -1 @ flag num. - - .align 2 -Landmark_LanettesHouse: - .4byte gLandmarkName_LanettesHouse - .2byte 2117 @ flag num. - - .align 2 -Landmark_FieryPath: - .4byte gLandmarkName_FieryPath - .2byte 2122 @ flag num. - - .align 2 -Landmark_JaggedPass: - .4byte gLandmarkName_JaggedPass - .2byte -1 @ flag num. - - .align 2 -Landmark_BerryMastersHouse: - .4byte gLandmarkName_BerryMastersHouse - .2byte 2147 @ flag num. - - .align 2 -Landmark_IslandCave: - .4byte gLandmarkName_IslandCave - .2byte 2133 @ flag num. - - .align 2 -Landmark_DesertRuins: - .4byte gLandmarkName_DesertRuins - .2byte 2134 @ flag num. - - .align 2 -Landmark_ScorchedSlab: - .4byte gLandmarkName_ScorchedSlab - .2byte 2136 @ flag num. - - .align 2 -Landmark_AncientTomb: - .4byte gLandmarkName_AncientTomb - .2byte 2137 @ flag num. - - .align 2 -Landmark_SealedChamber: - .4byte gLandmarkName_SealedChamber - .2byte 2140 @ flag num. - - .align 2 -Landmark_FossilManiacsHouse: - .4byte gLandmarkName_FossilManiacsHouse - .2byte 2135 @ flag num. - - .align 2 -Landmark_HuntersHouse: - .4byte gLandmarkName_HuntersHouse - .2byte 2139 @ flag num. - - .align 2 -Landmark_SkyPillar: - .4byte gLandmarkName_SkyPillar - .2byte 2142 @ flag num. - - .align 2 -Landmarks_Route104_0: - .4byte Landmark_FlowerShop - .4byte NULL - - .align 2 -Landmarks_Route104_1: - .4byte Landmark_PetalburgWoods - .4byte Landmark_MrBrineysCottage - .4byte NULL - - .align 2 -Landmarks_Route105_0: - .4byte Landmark_IslandCave - .4byte NULL - - .align 2 -Landmarks_Route106_1: - .4byte Landmark_GraniteCave - .4byte NULL - - .align 2 -Landmarks_Route108_0: - .4byte Landmark_AbandonedShip - .4byte NULL - - .align 2 -Landmarks_Route109_0: - .4byte Landmark_SeashoreHouse - .4byte Landmark_SlateportBeach - .4byte NULL - - .align 2 -Landmarks_Route110_0: - .4byte Landmark_CyclingRoad - .4byte Landmark_NewMauville - .4byte NULL - - .align 2 -Landmarks_Route110_1: - .4byte Landmark_CyclingRoad - .4byte NULL - - .align 2 -Landmarks_Route110_2: - .4byte Landmark_CyclingRoad - .4byte Landmark_TrickHouse - .4byte NULL - - .align 2 -Landmarks_Route111_0: - .4byte Landmark_OldLadysRestShop - .4byte NULL - - .align 2 -Landmarks_Route111_1: - .4byte Landmark_Desert - .4byte NULL - - .align 2 -Landmarks_Route111_3: - .4byte Landmark_DesertRuins - .4byte Landmark_Desert - .4byte NULL - - .align 2 -Landmarks_Route111_4: - .4byte Landmark_WinstrateFamily - .4byte Landmark_Desert - .4byte NULL - - .align 2 -Landmarks_Route112_0: - .4byte Landmark_FieryPath - .4byte Landmark_JaggedPass - .4byte NULL - - .align 2 -Landmarks_Route112_1: - .4byte Landmark_CableCar - .4byte Landmark_FieryPath - .4byte NULL - - .align 2 -Landmarks_Route113_1: - .4byte Landmark_GlassWorkshop - .4byte NULL - - .align 2 -Landmarks_Route114_1: - .4byte Landmark_FossilManiacsHouse - .4byte NULL - - .align 2 -Landmarks_Route114_2: - .4byte Landmark_LanettesHouse - .4byte NULL - - .align 2 -Landmarks_MeteorFalls: - .4byte Landmark_MeteorFalls - .4byte NULL - - .align 2 -Landmarks_Route116_1: - .4byte Landmark_TunnelersRestHouse - .4byte Landmark_RusturfTunnel - .4byte NULL - - .align 2 -Landmarks_Route116_2: - .4byte Landmark_RusturfTunnel - .4byte NULL - - .align 2 -Landmarks_Route117_2: - .4byte Landmark_PokemonDayCare - .4byte NULL - - .align 2 -Landmarks_Route119_1: - .4byte Landmark_WeatherInstitute - .4byte NULL - - .align 2 -Landmarks_Route120_0: - .4byte Landmark_ScorchedSlab - .4byte NULL - - .align 2 -Landmarks_Route120_2: - .4byte Landmark_AncientTomb - .4byte NULL - - .align 2 -Landmarks_Route121_2: - .4byte Landmark_SafariZoneEntrance - .4byte NULL - - .align 2 -Landmarks_Route122_0: - .4byte Landmark_MtPyre - .4byte NULL - - .align 2 -Landmarks_Route123_0: - .4byte Landmark_BerryMastersHouse - .4byte NULL - - .align 2 -Landmarks_Route124_7: - .4byte Landmark_HuntersHouse - .4byte NULL - - .align 2 -Landmarks_Route125_2: - .4byte Landmark_ShoalCave - .4byte NULL - - .align 2 -Landmarks_Route128_1: - .4byte Landmark_SeafloorCavern - .4byte NULL - - .align 2 -Landmarks_Route131_1: - .4byte Landmark_SkyPillar - .4byte NULL - - .align 2 -Landmarks_OceanCurrent: - .4byte Landmark_OceanCurrent - .4byte NULL - - .align 2 -Landmarks_Route134_2: - .4byte Landmark_SealedChamber - .4byte Landmark_OceanCurrent - .4byte NULL - - .align 2 -Landmarks_MtChimney_2: - .4byte Landmark_CableCar - .4byte Landmark_JaggedPass - .4byte NULL - - .align 2 -gLandmarkLists:: @ 83FBA18 - .byte MAPSEC_Route104, 0 - .space 2 - .4byte Landmarks_Route104_0 - - .byte MAPSEC_Route104, 1 - .space 2 - .4byte Landmarks_Route104_1 - - .byte MAPSEC_Route105, 0 - .space 2 - .4byte Landmarks_Route105_0 - - .byte MAPSEC_Route106, 1 - .space 2 - .4byte Landmarks_Route106_1 - - .byte MAPSEC_Route108, 0 - .space 2 - .4byte Landmarks_Route108_0 - - .byte MAPSEC_Route109, 0 - .space 2 - .4byte Landmarks_Route109_0 - - .byte MAPSEC_Route110, 0 - .space 2 - .4byte Landmarks_Route110_0 - - .byte MAPSEC_Route110, 1 - .space 2 - .4byte Landmarks_Route110_1 - - .byte MAPSEC_Route110, 2 - .space 2 - .4byte Landmarks_Route110_2 - - .byte MAPSEC_Route111, 0 - .space 2 - .4byte Landmarks_Route111_0 - - .byte MAPSEC_Route111, 1 - .space 2 - .4byte Landmarks_Route111_1 - - .byte MAPSEC_Route111, 2 - .space 2 - .4byte Landmarks_Route111_1 - - .byte MAPSEC_Route111, 3 - .space 2 - .4byte Landmarks_Route111_3 - - .byte MAPSEC_Route111, 4 - .space 2 - .4byte Landmarks_Route111_4 - - .byte MAPSEC_Route112, 0 - .space 2 - .4byte Landmarks_Route112_0 - - .byte MAPSEC_Route112, 1 - .space 2 - .4byte Landmarks_Route112_1 - - .byte MAPSEC_Route113, 1 - .space 2 - .4byte Landmarks_Route113_1 - - .byte MAPSEC_Route114, 1 - .space 2 - .4byte Landmarks_Route114_1 - - .byte MAPSEC_Route114, 2 - .space 2 - .4byte Landmarks_Route114_2 - - .byte MAPSEC_Route114, 3 - .space 2 - .4byte Landmarks_MeteorFalls - - .byte MAPSEC_Route115, 0 - .space 2 - .4byte Landmarks_MeteorFalls - - .byte MAPSEC_Route115, 1 - .space 2 - .4byte Landmarks_MeteorFalls - - .byte MAPSEC_Route116, 1 - .space 2 - .4byte Landmarks_Route116_1 - - .byte MAPSEC_Route116, 2 - .space 2 - .4byte Landmarks_Route116_2 - - .byte MAPSEC_Route117, 2 - .space 2 - .4byte Landmarks_Route117_2 - - .byte MAPSEC_Route119, 1 - .space 2 - .4byte Landmarks_Route119_1 - - .byte MAPSEC_Route120, 0 - .space 2 - .4byte Landmarks_Route120_0 - - .byte MAPSEC_Route120, 2 - .space 2 - .4byte Landmarks_Route120_2 - - .byte MAPSEC_Route121, 2 - .space 2 - .4byte Landmarks_Route121_2 - - .byte MAPSEC_Route122, 0 - .space 2 - .4byte Landmarks_Route122_0 - - .byte MAPSEC_Route123, 0 - .space 2 - .4byte Landmarks_Route123_0 - - .byte MAPSEC_Route122, 1 - .space 2 - .4byte Landmarks_Route122_0 - - .byte MAPSEC_Route124, 7 - .space 2 - .4byte Landmarks_Route124_7 - - .byte MAPSEC_Route125, 2 - .space 2 - .4byte Landmarks_Route125_2 - - .byte MAPSEC_Route128, 1 - .space 2 - .4byte Landmarks_Route128_1 - - .byte MAPSEC_Route131, 1 - .space 2 - .4byte Landmarks_Route131_1 - - .byte MAPSEC_Route132, 0 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route132, 1 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route133, 0 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route133, 1 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route133, 2 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route134, 0 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route134, 1 - .space 2 - .4byte Landmarks_OceanCurrent - - .byte MAPSEC_Route134, 2 - .space 2 - .4byte Landmarks_Route134_2 - - .byte MAPSEC_MtChimney, 2 - .space 2 - .4byte Landmarks_MtChimney_2 - - .byte MAPSEC_Nothing, 0 - .space 2 - .4byte NULL -- cgit v1.2.3 From bc8f4541f3fe290e7deee61954f38c23c011169f Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 27 Nov 2017 17:54:49 -0600 Subject: convert wild_encounter data to C --- data/wild_encounter.s | 20 -- data/wild_mons.inc | 688 -------------------------------------------------- 2 files changed, 708 deletions(-) delete mode 100644 data/wild_encounter.s delete mode 100644 data/wild_mons.inc (limited to 'data') diff --git a/data/wild_encounter.s b/data/wild_encounter.s deleted file mode 100644 index b906a21f1..000000000 --- a/data/wild_encounter.s +++ /dev/null @@ -1,20 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 839B540 - .include "data/wild_mons.inc" - - .align 2 -gWildFeebasRoute119Data:: @ 839DBFC - .byte 20, 25 @ Min/Max level - .2byte SPECIES_FEEBAS - - .align 2 -gRoute119WaterTileData:: @ 839DC00 - .2byte 0x0, 0x2D, 0x0 - .2byte 0x2E, 0x5B, 0x83 - .2byte 0x5C, 0x8B, 0x12A diff --git a/data/wild_mons.inc b/data/wild_mons.inc deleted file mode 100644 index 01ebd8a16..000000000 --- a/data/wild_mons.inc +++ /dev/null @@ -1,688 +0,0 @@ - - .align 2 -gWildMonHeaders:: - map PetalburgCity - .2byte 0 @ padding - .4byte NULL - .4byte PetalburgCity_WaterMonsInfo - .4byte NULL - .4byte PetalburgCity_FishingMonsInfo - - map SlateportCity - .2byte 0 @ padding - .4byte NULL - .4byte SlateportCity_WaterMonsInfo - .4byte NULL - .4byte SlateportCity_FishingMonsInfo - - map LilycoveCity - .2byte 0 @ padding - .4byte NULL - .4byte LilycoveCity_WaterMonsInfo - .4byte NULL - .4byte LilycoveCity_FishingMonsInfo - - map MossdeepCity - .2byte 0 @ padding - .4byte NULL - .4byte MossdeepCity_WaterMonsInfo - .4byte NULL - .4byte MossdeepCity_FishingMonsInfo - - map SootopolisCity - .2byte 0 @ padding - .4byte NULL - .4byte SootopolisCity_WaterMonsInfo - .4byte NULL - .4byte SootopolisCity_FishingMonsInfo - - map EverGrandeCity - .2byte 0 @ padding - .4byte NULL - .4byte EverGrandeCity_WaterMonsInfo - .4byte NULL - .4byte EverGrandeCity_FishingMonsInfo - - map MeteorFalls_1F_1R - .2byte 0 @ padding - .4byte MeteorFalls_1F_1R_LandMonsInfo - .4byte MeteorFalls_1F_1R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_1F_1R_FishingMonsInfo - - map MeteorFalls_1F_2R - .2byte 0 @ padding - .4byte MeteorFalls_1F_2R_LandMonsInfo - .4byte MeteorFalls_1F_2R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_1F_2R_FishingMonsInfo - - map MeteorFalls_B1F_1R - .2byte 0 @ padding - .4byte MeteorFalls_B1F_1R_LandMonsInfo - .4byte MeteorFalls_B1F_1R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_B1F_1R_FishingMonsInfo - - map MeteorFalls_B1F_2R - .2byte 0 @ padding - .4byte MeteorFalls_B1F_2R_LandMonsInfo - .4byte MeteorFalls_B1F_2R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_B1F_2R_FishingMonsInfo - - map RusturfTunnel - .2byte 0 @ padding - .4byte RusturfTunnel_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map GraniteCave_1F - .2byte 0 @ padding - .4byte GraniteCave_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map GraniteCave_B1F - .2byte 0 @ padding - .4byte GraniteCave_B1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map GraniteCave_B2F - .2byte 0 @ padding - .4byte GraniteCave_B2F_LandMonsInfo - .4byte NULL - .4byte GraniteCave_B2F_RockSmashMonsInfo - .4byte NULL - - map GraniteCave_StevensRoom - .2byte 0 @ padding - .4byte GraniteCave_StevensRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map PetalburgWoods - .2byte 0 @ padding - .4byte PetalburgWoods_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map JaggedPass - .2byte 0 @ padding - .4byte JaggedPass_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map FieryPath - .2byte 0 @ padding - .4byte FieryPath_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_1F - .2byte 0 @ padding - .4byte MtPyre_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_2F - .2byte 0 @ padding - .4byte MtPyre_2F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_3F - .2byte 0 @ padding - .4byte MtPyre_3F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_4F - .2byte 0 @ padding - .4byte MtPyre_4F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_5F - .2byte 0 @ padding - .4byte MtPyre_5F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_6F - .2byte 0 @ padding - .4byte MtPyre_6F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_Exterior - .2byte 0 @ padding - .4byte MtPyre_Exterior_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_Summit - .2byte 0 @ padding - .4byte MtPyre_Summit_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Entrance - .2byte 0 @ padding - .4byte NULL - .4byte SeafloorCavern_Entrance_WaterMonsInfo - .4byte NULL - .4byte SeafloorCavern_Entrance_FishingMonsInfo - - map SeafloorCavern_Room1 - .2byte 0 @ padding - .4byte SeafloorCavern_Room1_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room2 - .2byte 0 @ padding - .4byte SeafloorCavern_Room2_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room3 - .2byte 0 @ padding - .4byte SeafloorCavern_Room3_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room4 - .2byte 0 @ padding - .4byte SeafloorCavern_Room4_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room5 - .2byte 0 @ padding - .4byte SeafloorCavern_Room5_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room6 - .2byte 0 @ padding - .4byte SeafloorCavern_Room6_LandMonsInfo - .4byte SeafloorCavern_Room6_WaterMonsInfo - .4byte NULL - .4byte SeafloorCavern_Room6_FishingMonsInfo - - map SeafloorCavern_Room7 - .2byte 0 @ padding - .4byte SeafloorCavern_Room7_LandMonsInfo - .4byte SeafloorCavern_Room7_WaterMonsInfo - .4byte NULL - .4byte SeafloorCavern_Room7_FishingMonsInfo - - map SeafloorCavern_Room8 - .2byte 0 @ padding - .4byte SeafloorCavern_Room8_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_Entrance - .2byte 0 @ padding - .4byte CaveOfOrigin_Entrance_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_1F - .2byte 0 @ padding - .4byte CaveOfOrigin_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_B1F - .2byte 0 @ padding - .4byte CaveOfOrigin_B1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_B2F - .2byte 0 @ padding - .4byte CaveOfOrigin_B2F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_B3F - .2byte 0 @ padding - .4byte CaveOfOrigin_B3F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map VictoryRoad_1F - .2byte 0 @ padding - .4byte VictoryRoad_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map VictoryRoad_B1F - .2byte 0 @ padding - .4byte VictoryRoad_B1F_LandMonsInfo - .4byte NULL - .4byte VictoryRoad_B1F_RockSmashMonsInfo - .4byte NULL - - map VictoryRoad_B2F - .2byte 0 @ padding - .4byte VictoryRoad_B2F_LandMonsInfo - .4byte VictoryRoad_B2F_WaterMonsInfo - .4byte NULL - .4byte VictoryRoad_B2F_FishingMonsInfo - - map ShoalCave_LowTideEntranceRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideEntranceRoom_LandMonsInfo - .4byte ShoalCave_LowTideEntranceRoom_WaterMonsInfo - .4byte NULL - .4byte ShoalCave_LowTideEntranceRoom_FishingMonsInfo - - map ShoalCave_LowTideInnerRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideInnerRoom_LandMonsInfo - .4byte ShoalCave_LowTideInnerRoom_WaterMonsInfo - .4byte NULL - .4byte ShoalCave_LowTideInnerRoom_FishingMonsInfo - - map ShoalCave_LowTideStairsRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideStairsRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map ShoalCave_LowTideLowerRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideLowerRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map ShoalCave_LowTideIceRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideIceRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map NewMauville_Entrance - .2byte 0 @ padding - .4byte NewMauville_Entrance_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map NewMauville_Inside - .2byte 0 @ padding - .4byte NewMauville_Inside_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map AbandonedShip_Rooms_B1F - .2byte 0 @ padding - .4byte NULL - .4byte AbandonedShip_Rooms_B1F_WaterMonsInfo - .4byte NULL - .4byte AbandonedShip_Rooms_B1F_FishingMonsInfo - - map AbandonedShip_HiddenFloorCorridors - .2byte 0 @ padding - .4byte NULL - .4byte AbandonedShip_HiddenFloorCorridors_WaterMonsInfo - .4byte NULL - .4byte AbandonedShip_HiddenFloorCorridors_FishingMonsInfo - - map SkyPillar_1F - .2byte 0 @ padding - .4byte SkyPillar_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SkyPillar_3F - .2byte 0 @ padding - .4byte SkyPillar_3F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SkyPillar_5F - .2byte 0 @ padding - .4byte SkyPillar_5F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route101 - .2byte 0 @ padding - .4byte Route101_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route102 - .2byte 0 @ padding - .4byte Route102_LandMonsInfo - .4byte Route102_WaterMonsInfo - .4byte NULL - .4byte Route102_FishingMonsInfo - - map Route103 - .2byte 0 @ padding - .4byte Route103_LandMonsInfo - .4byte Route103_WaterMonsInfo - .4byte NULL - .4byte Route103_FishingMonsInfo - - map Route104 - .2byte 0 @ padding - .4byte Route104_LandMonsInfo - .4byte Route104_WaterMonsInfo - .4byte NULL - .4byte Route104_FishingMonsInfo - - map Route105 - .2byte 0 @ padding - .4byte NULL - .4byte Route105_WaterMonsInfo - .4byte NULL - .4byte Route105_FishingMonsInfo - - map Route106 - .2byte 0 @ padding - .4byte NULL - .4byte Route106_WaterMonsInfo - .4byte NULL - .4byte Route106_FishingMonsInfo - - map Route107 - .2byte 0 @ padding - .4byte NULL - .4byte Route107_WaterMonsInfo - .4byte NULL - .4byte Route107_FishingMonsInfo - - map Route108 - .2byte 0 @ padding - .4byte NULL - .4byte Route108_WaterMonsInfo - .4byte NULL - .4byte Route108_FishingMonsInfo - - map Route109 - .2byte 0 @ padding - .4byte NULL - .4byte Route109_WaterMonsInfo - .4byte NULL - .4byte Route109_FishingMonsInfo - - map Route110 - .2byte 0 @ padding - .4byte Route110_LandMonsInfo - .4byte Route110_WaterMonsInfo - .4byte NULL - .4byte Route110_FishingMonsInfo - - map Route111 - .2byte 0 @ padding - .4byte Route111_LandMonsInfo - .4byte Route111_WaterMonsInfo - .4byte Route111_RockSmashMonsInfo - .4byte Route111_FishingMonsInfo - - map Route112 - .2byte 0 @ padding - .4byte Route112_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route113 - .2byte 0 @ padding - .4byte Route113_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route114 - .2byte 0 @ padding - .4byte Route114_LandMonsInfo - .4byte Route114_WaterMonsInfo - .4byte Route114_RockSmashMonsInfo - .4byte Route114_FishingMonsInfo - - map Route115 - .2byte 0 @ padding - .4byte Route115_LandMonsInfo - .4byte Route115_WaterMonsInfo - .4byte NULL - .4byte Route115_FishingMonsInfo - - map Route116 - .2byte 0 @ padding - .4byte Route116_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route117 - .2byte 0 @ padding - .4byte Route117_LandMonsInfo - .4byte Route117_WaterMonsInfo - .4byte NULL - .4byte Route117_FishingMonsInfo - - map Route118 - .2byte 0 @ padding - .4byte Route118_LandMonsInfo - .4byte Route118_WaterMonsInfo - .4byte NULL - .4byte Route118_FishingMonsInfo - - map Route119 - .2byte 0 @ padding - .4byte Route119_LandMonsInfo - .4byte Route119_WaterMonsInfo - .4byte NULL - .4byte Route119_FishingMonsInfo - - map Route120 - .2byte 0 @ padding - .4byte Route120_LandMonsInfo - .4byte Route120_WaterMonsInfo - .4byte NULL - .4byte Route120_FishingMonsInfo - - map Route121 - .2byte 0 @ padding - .4byte Route121_LandMonsInfo - .4byte Route121_WaterMonsInfo - .4byte NULL - .4byte Route121_FishingMonsInfo - - map Route122 - .2byte 0 @ padding - .4byte NULL - .4byte Route122_WaterMonsInfo - .4byte NULL - .4byte Route122_FishingMonsInfo - - map Route123 - .2byte 0 @ padding - .4byte Route123_LandMonsInfo - .4byte Route123_WaterMonsInfo - .4byte NULL - .4byte Route123_FishingMonsInfo - - map Route124 - .2byte 0 @ padding - .4byte NULL - .4byte Route124_WaterMonsInfo - .4byte NULL - .4byte Route124_FishingMonsInfo - - map Route125 - .2byte 0 @ padding - .4byte NULL - .4byte Route125_WaterMonsInfo - .4byte NULL - .4byte Route125_FishingMonsInfo - - map Route126 - .2byte 0 @ padding - .4byte NULL - .4byte Route126_WaterMonsInfo - .4byte NULL - .4byte Route126_FishingMonsInfo - - map Route127 - .2byte 0 @ padding - .4byte NULL - .4byte Route127_WaterMonsInfo - .4byte NULL - .4byte Route127_FishingMonsInfo - - map Route128 - .2byte 0 @ padding - .4byte NULL - .4byte Route128_WaterMonsInfo - .4byte NULL - .4byte Route128_FishingMonsInfo - - map Route129 - .2byte 0 @ padding - .4byte NULL - .4byte Route129_WaterMonsInfo - .4byte NULL - .4byte Route129_FishingMonsInfo - - map Route130 - .2byte 0 @ padding - .4byte Route130_LandMonsInfo - .4byte Route130_WaterMonsInfo - .4byte NULL - .4byte Route130_FishingMonsInfo - - map Route131 - .2byte 0 @ padding - .4byte NULL - .4byte Route131_WaterMonsInfo - .4byte NULL - .4byte Route131_FishingMonsInfo - - map Route132 - .2byte 0 @ padding - .4byte NULL - .4byte Route132_WaterMonsInfo - .4byte NULL - .4byte Route132_FishingMonsInfo - - map Route133 - .2byte 0 @ padding - .4byte NULL - .4byte Route133_WaterMonsInfo - .4byte NULL - .4byte Route133_FishingMonsInfo - - map Route134 - .2byte 0 @ padding - .4byte NULL - .4byte Route134_WaterMonsInfo - .4byte NULL - .4byte Route134_FishingMonsInfo - - map SafariZone_Northwest - .2byte 0 @ padding - .4byte SafariZone_Northwest_LandMonsInfo - .4byte SafariZone_Northwest_WaterMonsInfo - .4byte NULL - .4byte SafariZone_Northwest_FishingMonsInfo - - map SafariZone_Northeast - .2byte 0 @ padding - .4byte SafariZone_Northeast_LandMonsInfo - .4byte NULL - .4byte SafariZone_Northeast_RockSmashMonsInfo - .4byte NULL - - map SafariZone_Southwest - .2byte 0 @ padding - .4byte SafariZone_Southwest_LandMonsInfo - .4byte SafariZone_Southwest_WaterMonsInfo - .4byte NULL - .4byte SafariZone_Southwest_FishingMonsInfo - - map SafariZone_Southeast - .2byte 0 @ padding - .4byte SafariZone_Southeast_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map DewfordTown - .2byte 0 @ padding - .4byte NULL - .4byte DewfordTown_WaterMonsInfo - .4byte NULL - .4byte DewfordTown_FishingMonsInfo - - map PacifidlogTown - .2byte 0 @ padding - .4byte NULL - .4byte PacifidlogTown_WaterMonsInfo - .4byte NULL - .4byte PacifidlogTown_FishingMonsInfo - - map Underwater1 - .2byte 0 @ padding - .4byte NULL - .4byte Underwater1_WaterMonsInfo - .4byte NULL - .4byte NULL - - map Underwater2 - .2byte 0 @ padding - .4byte NULL - .4byte Underwater2_WaterMonsInfo - .4byte NULL - .4byte NULL - - map UNDEFINED - .2byte 0 @ padding - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL -- cgit v1.2.3 From 0d56f7654f543100f827ebceaf3491d2d386ac4b Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 27 Nov 2017 21:17:36 -0600 Subject: fix build --- data/event_scripts.s | 2 +- data/maps/events/DoubleBattleColosseum.inc | 8 ++++---- data/maps/events/InsideOfTruck.inc | 6 +++--- data/maps/events/LilycoveCity_DepartmentStoreElevator.inc | 4 ++-- data/maps/events/RecordCorner.inc | 8 ++++---- data/maps/events/SecretBase_BlueCave1.inc | 2 +- data/maps/events/SecretBase_BlueCave2.inc | 2 +- data/maps/events/SecretBase_BlueCave3.inc | 2 +- data/maps/events/SecretBase_BlueCave4.inc | 2 +- data/maps/events/SecretBase_BrownCave1.inc | 2 +- data/maps/events/SecretBase_BrownCave2.inc | 2 +- data/maps/events/SecretBase_BrownCave3.inc | 2 +- data/maps/events/SecretBase_BrownCave4.inc | 2 +- data/maps/events/SecretBase_RedCave1.inc | 2 +- data/maps/events/SecretBase_RedCave2.inc | 2 +- data/maps/events/SecretBase_RedCave3.inc | 2 +- data/maps/events/SecretBase_RedCave4.inc | 2 +- data/maps/events/SecretBase_Shrub1.inc | 2 +- data/maps/events/SecretBase_Shrub2.inc | 2 +- data/maps/events/SecretBase_Shrub3.inc | 2 +- data/maps/events/SecretBase_Shrub4.inc | 2 +- data/maps/events/SecretBase_Tree1.inc | 2 +- data/maps/events/SecretBase_Tree2.inc | 2 +- data/maps/events/SecretBase_Tree3.inc | 2 +- data/maps/events/SecretBase_Tree4.inc | 2 +- data/maps/events/SecretBase_YellowCave1.inc | 2 +- data/maps/events/SecretBase_YellowCave2.inc | 2 +- data/maps/events/SecretBase_YellowCave3.inc | 2 +- data/maps/events/SecretBase_YellowCave4.inc | 2 +- data/maps/events/SingleBattleColosseum.inc | 4 ++-- data/maps/events/TradeCenter.inc | 4 ++-- 31 files changed, 42 insertions(+), 42 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index faa9b8406..ebc1a0de8 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4883,7 +4883,7 @@ S_FallDownHole:: @ 81C6BC5 waitmovement 0 playse 43 delay 60 - warphole UNDEFINED + warphole Undefined waitstate end diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc index f6142c4b4..a1dd533c1 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/events/DoubleBattleColosseum.inc @@ -1,8 +1,8 @@ DoubleBattleColosseum_MapWarps:: @ 8391428 - warp_def 5, 8, 3, 127, NONE - warp_def 6, 8, 3, 127, NONE - warp_def 7, 8, 3, 127, NONE - warp_def 8, 8, 3, 127, NONE + warp_def 5, 8, 3, 127, None + warp_def 6, 8, 3, 127, None + warp_def 7, 8, 3, 127, None + warp_def 8, 8, 3, 127, None DoubleBattleColosseum_MapCoordEvents:: @ 8391448 coord_event 3, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A4383 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index faf7a5274..7656e2679 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -4,9 +4,9 @@ InsideOfTruck_MapObjects:: @ 8391618 object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0 InsideOfTruck_MapWarps:: @ 8391660 - warp_def 4, 1, 0, 127, NONE - warp_def 4, 2, 0, 127, NONE - warp_def 4, 3, 0, 127, NONE + warp_def 4, 1, 0, 127, None + warp_def 4, 2, 0, 127, None + warp_def 4, 3, 0, 127, None InsideOfTruck_MapCoordEvents:: @ 8391678 coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index 896a96649..d35f50db9 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -2,8 +2,8 @@ LilycoveCity_DepartmentStoreElevator_MapObjects:: @ 838A624 object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0 LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C - warp_def 1, 5, 3, 127, NONE - warp_def 2, 5, 3, 127, NONE + warp_def 1, 5, 3, 127, None + warp_def 2, 5, 3, 127, None LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index 7062f61ea..6ef149ab4 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -2,10 +2,10 @@ RecordCorner_MapObjects:: @ 839139C object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0 RecordCorner_MapWarps:: @ 83913B4 - warp_def 8, 9, 3, 127, NONE - warp_def 9, 9, 3, 127, NONE - warp_def 11, 9, 3, 127, NONE - warp_def 10, 9, 3, 127, NONE + warp_def 8, 9, 3, 127, None + warp_def 9, 9, 3, 127, None + warp_def 11, 9, 3, 127, None + warp_def 10, 9, 3, 127, None RecordCorner_MapCoordEvents:: @ 83913D4 coord_event 6, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4418 diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index 25bab40da..dd73f50a8 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave1_MapObjects:: @ 838F18C object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave1_MapWarps:: @ 838F2F4 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_BlueCave1_MapEvents:: @ 838F2FC map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index a7eac24a4..9b2b6e885 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave2_MapObjects:: @ 838FAA4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave2_MapWarps:: @ 838FC0C - warp_def 7, 5, 0, 126, NONE + warp_def 7, 5, 0, 126, None SecretBase_BlueCave2_MapEvents:: @ 838FC14 map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index 202c2bc4e..dd37c2ac5 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave3_MapObjects:: @ 83903BC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave3_MapWarps:: @ 8390524 - warp_def 4, 15, 0, 126, NONE + warp_def 4, 15, 0, 126, None SecretBase_BlueCave3_MapEvents:: @ 839052C map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index 2975c0b37..23ec030e7 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave4_MapObjects:: @ 8390CD4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave4_MapWarps:: @ 8390E3C - warp_def 4, 15, 0, 126, NONE + warp_def 4, 15, 0, 126, None SecretBase_BlueCave4_MapEvents:: @ 8390E44 map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index 31e2d0117..0fcac5940 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave1_MapObjects:: @ 838F008 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave1_MapWarps:: @ 838F170 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_BrownCave1_MapEvents:: @ 838F178 map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index 93f9a3c03..c305485b8 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave2_MapObjects:: @ 838F920 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave2_MapWarps:: @ 838FA88 - warp_def 1, 7, 0, 126, NONE + warp_def 1, 7, 0, 126, None SecretBase_BrownCave2_MapEvents:: @ 838FA90 map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 5aa5aed7a..65b38542f 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave3_MapObjects:: @ 8390238 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave3_MapWarps:: @ 83903A0 - warp_def 11, 9, 0, 126, NONE + warp_def 11, 9, 0, 126, None SecretBase_BrownCave3_MapEvents:: @ 83903A8 map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index fc66e8fb5..782671574 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave4_MapObjects:: @ 8390B50 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave4_MapWarps:: @ 8390CB8 - warp_def 2, 8, 0, 126, NONE + warp_def 2, 8, 0, 126, None SecretBase_BrownCave4_MapEvents:: @ 8390CC0 map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index dbc8c7593..b30608dbc 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -16,7 +16,7 @@ SecretBase_RedCave1_MapObjects:: @ 838EE84 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave1_MapWarps:: @ 838EFEC - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_RedCave1_MapEvents:: @ 838EFF4 map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index 910b2c074..eb247278b 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -16,7 +16,7 @@ SecretBase_RedCave2_MapObjects:: @ 838F79C object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave2_MapWarps:: @ 838F904 - warp_def 3, 14, 0, 126, NONE + warp_def 3, 14, 0, 126, None SecretBase_RedCave2_MapEvents:: @ 838F90C map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index 8745b272f..f71021236 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -16,7 +16,7 @@ SecretBase_RedCave3_MapObjects:: @ 83900B4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave3_MapWarps:: @ 839021C - warp_def 3, 6, 0, 126, NONE + warp_def 3, 6, 0, 126, None SecretBase_RedCave3_MapEvents:: @ 8390224 map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index 60928ef5c..2ed7c8af5 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -16,7 +16,7 @@ SecretBase_RedCave4_MapObjects:: @ 83909CC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave4_MapWarps:: @ 8390B34 - warp_def 2, 12, 0, 126, NONE + warp_def 2, 12, 0, 126, None SecretBase_RedCave4_MapEvents:: @ 8390B3C map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 17c2f2530..23387eede 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -16,7 +16,7 @@ SecretBase_Shrub1_MapObjects:: @ 838F618 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub1_MapWarps:: @ 838F780 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_Shrub1_MapEvents:: @ 838F788 map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 6b973e730..090a9b0d6 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -16,7 +16,7 @@ SecretBase_Shrub2_MapObjects:: @ 838FF30 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub2_MapWarps:: @ 8390098 - warp_def 7, 5, 0, 126, NONE + warp_def 7, 5, 0, 126, None SecretBase_Shrub2_MapEvents:: @ 83900A0 map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index 12e2c7c81..7f4370f2d 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -16,7 +16,7 @@ SecretBase_Shrub3_MapObjects:: @ 8390848 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub3_MapWarps:: @ 83909B0 - warp_def 6, 9, 0, 126, NONE + warp_def 6, 9, 0, 126, None SecretBase_Shrub3_MapEvents:: @ 83909B8 map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index bd3b94522..6aa04277c 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -16,7 +16,7 @@ SecretBase_Shrub4_MapObjects:: @ 8391160 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub4_MapWarps:: @ 83912C8 - warp_def 11, 8, 0, 126, NONE + warp_def 11, 8, 0, 126, None SecretBase_Shrub4_MapEvents:: @ 83912D0 map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index 465a0d2be..a5d9e2fad 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -16,7 +16,7 @@ SecretBase_Tree1_MapObjects:: @ 838F494 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree1_MapWarps:: @ 838F5FC - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_Tree1_MapEvents:: @ 838F604 map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index d780ed779..8089c6605 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -16,7 +16,7 @@ SecretBase_Tree2_MapObjects:: @ 838FDAC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree2_MapWarps:: @ 838FF14 - warp_def 3, 14, 0, 126, NONE + warp_def 3, 14, 0, 126, None SecretBase_Tree2_MapEvents:: @ 838FF1C map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index 0c8888764..a77f56364 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -16,7 +16,7 @@ SecretBase_Tree3_MapObjects:: @ 83906C4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree3_MapWarps:: @ 839082C - warp_def 8, 6, 0, 126, NONE + warp_def 8, 6, 0, 126, None SecretBase_Tree3_MapEvents:: @ 8390834 map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index 675ee1b8e..c687e3e48 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -16,7 +16,7 @@ SecretBase_Tree4_MapObjects:: @ 8390FDC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree4_MapWarps:: @ 8391144 - warp_def 7, 12, 0, 126, NONE + warp_def 7, 12, 0, 126, None SecretBase_Tree4_MapEvents:: @ 839114C map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 8c6999f9b..8d8e2bece 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave1_MapObjects:: @ 838F310 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave1_MapWarps:: @ 838F478 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_YellowCave1_MapEvents:: @ 838F480 map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 8825836bf..99cef474a 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave2_MapObjects:: @ 838FC28 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave2_MapWarps:: @ 838FD90 - warp_def 12, 7, 0, 126, NONE + warp_def 12, 7, 0, 126, None SecretBase_YellowCave2_MapEvents:: @ 838FD98 map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index a88e44190..82eef2946 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave3_MapObjects:: @ 8390540 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave3_MapWarps:: @ 83906A8 - warp_def 5, 9, 0, 126, NONE + warp_def 5, 9, 0, 126, None SecretBase_YellowCave3_MapEvents:: @ 83906B0 map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index 0280e088a..545f65e04 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave4_MapObjects:: @ 8390E58 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave4_MapWarps:: @ 8390FC0 - warp_def 6, 12, 0, 126, NONE + warp_def 6, 12, 0, 126, None SecretBase_YellowCave4_MapEvents:: @ 8390FC8 map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 1d4b51476..68615ad3e 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -2,8 +2,8 @@ SingleBattleColosseum_MapObjects:: @ 83912E4 object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0 SingleBattleColosseum_MapWarps:: @ 83912FC - warp_def 6, 8, 3, 127, NONE - warp_def 7, 8, 3, 127, NONE + warp_def 6, 8, 3, 127, None + warp_def 7, 8, 3, 127, None SingleBattleColosseum_MapCoordEvents:: @ 839130C coord_event 3, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A436F diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index 8c5ff5578..f49e755f3 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -2,8 +2,8 @@ TradeCenter_MapObjects:: @ 8391340 object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0 TradeCenter_MapWarps:: @ 8391358 - warp_def 5, 8, 3, 127, NONE - warp_def 6, 8, 3, 127, NONE + warp_def 5, 8, 3, 127, None + warp_def 6, 8, 3, 127, None TradeCenter_MapCoordEvents:: @ 8391368 coord_event 4, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43F0 -- cgit v1.2.3 From 2fea5bf7d82e85f4b33857e6eb5b4ddc6e7542d2 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 27 Nov 2017 22:12:09 -0600 Subject: convert data files to use constants/map.h --- data/event_scripts.s | 3 +- data/map_events.s | 1 + data/maps.s | 1 + data/maps/DewfordTown/connections.inc | 4 +- data/maps/EverGrandeCity/connections.inc | 2 +- data/maps/FallarborTown/connections.inc | 4 +- data/maps/FortreeCity/connections.inc | 4 +- data/maps/LavaridgeTown/connections.inc | 2 +- data/maps/LilycoveCity/connections.inc | 4 +- data/maps/LittlerootTown/connections.inc | 2 +- data/maps/MauvilleCity/connections.inc | 8 +-- data/maps/MossdeepCity/connections.inc | 6 +- data/maps/OldaleTown/connections.inc | 6 +- data/maps/PacifidlogTown/connections.inc | 4 +- data/maps/PetalburgCity/connections.inc | 4 +- data/maps/Route101/connections.inc | 4 +- data/maps/Route102/connections.inc | 4 +- data/maps/Route103/connections.inc | 4 +- data/maps/Route104/connections.inc | 6 +- data/maps/Route105/connections.inc | 4 +- data/maps/Route106/connections.inc | 4 +- data/maps/Route107/connections.inc | 4 +- data/maps/Route108/connections.inc | 4 +- data/maps/Route109/connections.inc | 4 +- data/maps/Route110/connections.inc | 6 +- data/maps/Route111/connections.inc | 6 +- data/maps/Route112/connections.inc | 6 +- data/maps/Route113/connections.inc | 6 +- data/maps/Route114/connections.inc | 4 +- data/maps/Route115/connections.inc | 4 +- data/maps/Route116/connections.inc | 4 +- data/maps/Route117/connections.inc | 4 +- data/maps/Route118/connections.inc | 6 +- data/maps/Route119/connections.inc | 4 +- data/maps/Route120/connections.inc | 4 +- data/maps/Route121/connections.inc | 6 +- data/maps/Route122/connections.inc | 4 +- data/maps/Route123/connections.inc | 4 +- data/maps/Route124/connections.inc | 10 +-- data/maps/Route125/connections.inc | 4 +- data/maps/Route126/connections.inc | 6 +- data/maps/Route127/connections.inc | 8 +-- data/maps/Route128/connections.inc | 8 +-- data/maps/Route129/connections.inc | 4 +- data/maps/Route130/connections.inc | 4 +- data/maps/Route131/connections.inc | 4 +- data/maps/Route132/connections.inc | 4 +- data/maps/Route133/connections.inc | 4 +- data/maps/Route134/connections.inc | 4 +- data/maps/RustboroCity/connections.inc | 6 +- data/maps/SafariZone_Northeast/connections.inc | 4 +- data/maps/SafariZone_Northwest/connections.inc | 4 +- data/maps/SafariZone_Southeast/connections.inc | 4 +- data/maps/SafariZone_Southwest/connections.inc | 4 +- data/maps/SlateportCity/connections.inc | 6 +- data/maps/Underwater1/connections.inc | 4 +- data/maps/Underwater2/connections.inc | 6 +- data/maps/Underwater3/connections.inc | 6 +- data/maps/Underwater4/connections.inc | 4 +- data/maps/VerdanturfTown/connections.inc | 4 +- data/maps/events/AbandonedShip_CaptainsOffice.inc | 4 +- data/maps/events/AbandonedShip_Corridors_1F.inc | 24 +++---- data/maps/events/AbandonedShip_Corridors_B1F.inc | 16 ++--- data/maps/events/AbandonedShip_Deck.inc | 10 +-- .../events/AbandonedShip_HiddenFloorCorridors.inc | 12 ++-- .../maps/events/AbandonedShip_HiddenFloorRooms.inc | 18 ++--- data/maps/events/AbandonedShip_Room_B1F.inc | 4 +- data/maps/events/AbandonedShip_Rooms2_1F.inc | 6 +- data/maps/events/AbandonedShip_Rooms2_B1F.inc | 8 +-- data/maps/events/AbandonedShip_Rooms_1F.inc | 12 ++-- data/maps/events/AbandonedShip_Rooms_B1F.inc | 6 +- data/maps/events/AbandonedShip_Underwater1.inc | 4 +- data/maps/events/AbandonedShip_Underwater2.inc | 2 +- data/maps/events/AncientTomb.inc | 6 +- data/maps/events/AquaHideout_1F.inc | 6 +- data/maps/events/AquaHideout_B1F.inc | 50 +++++++------- data/maps/events/AquaHideout_B2F.inc | 20 +++--- data/maps/events/BattleTower_BattleRoom.inc | 4 +- data/maps/events/BattleTower_Lobby.inc | 6 +- data/maps/events/BattleTower_Outside.inc | 2 +- data/maps/events/CaveOfOrigin_1F.inc | 4 +- data/maps/events/CaveOfOrigin_B1F.inc | 4 +- data/maps/events/CaveOfOrigin_B2F.inc | 4 +- data/maps/events/CaveOfOrigin_B3F.inc | 4 +- data/maps/events/CaveOfOrigin_B4F.inc | 2 +- data/maps/events/CaveOfOrigin_Entrance.inc | 4 +- data/maps/events/DesertRuins.inc | 6 +- data/maps/events/DewfordTown.inc | 10 +-- data/maps/events/DewfordTown_Gym.inc | 4 +- data/maps/events/DewfordTown_Hall.inc | 4 +- data/maps/events/DewfordTown_House1.inc | 4 +- data/maps/events/DewfordTown_House2.inc | 4 +- data/maps/events/DewfordTown_PokemonCenter_1F.inc | 6 +- data/maps/events/DewfordTown_PokemonCenter_2F.inc | 10 +-- data/maps/events/DoubleBattleColosseum.inc | 8 +-- data/maps/events/EverGrandeCity.inc | 8 +-- data/maps/events/EverGrandeCity_ChampionsRoom.inc | 4 +- data/maps/events/EverGrandeCity_Corridor1.inc | 8 +-- data/maps/events/EverGrandeCity_Corridor2.inc | 8 +-- data/maps/events/EverGrandeCity_Corridor3.inc | 8 +-- data/maps/events/EverGrandeCity_Corridor4.inc | 4 +- data/maps/events/EverGrandeCity_Corridor5.inc | 8 +-- data/maps/events/EverGrandeCity_DrakesRoom.inc | 4 +- data/maps/events/EverGrandeCity_GlaciasRoom.inc | 4 +- data/maps/events/EverGrandeCity_HallOfFame.inc | 2 +- data/maps/events/EverGrandeCity_PhoebesRoom.inc | 4 +- .../events/EverGrandeCity_PokemonCenter_1F.inc | 6 +- .../events/EverGrandeCity_PokemonCenter_2F.inc | 10 +-- data/maps/events/EverGrandeCity_PokemonLeague.inc | 8 +-- data/maps/events/EverGrandeCity_SidneysRoom.inc | 4 +- data/maps/events/FallarborTown.inc | 10 +-- data/maps/events/FallarborTown_ContestHall.inc | 4 +- data/maps/events/FallarborTown_ContestLobby.inc | 6 +- data/maps/events/FallarborTown_House1.inc | 4 +- data/maps/events/FallarborTown_House2.inc | 4 +- data/maps/events/FallarborTown_Mart.inc | 4 +- .../maps/events/FallarborTown_PokemonCenter_1F.inc | 6 +- .../maps/events/FallarborTown_PokemonCenter_2F.inc | 10 +-- data/maps/events/FieryPath.inc | 4 +- data/maps/events/FortreeCity.inc | 18 ++--- data/maps/events/FortreeCity_DecorationShop.inc | 4 +- data/maps/events/FortreeCity_Gym.inc | 4 +- data/maps/events/FortreeCity_House1.inc | 4 +- data/maps/events/FortreeCity_House2.inc | 4 +- data/maps/events/FortreeCity_House3.inc | 4 +- data/maps/events/FortreeCity_House4.inc | 4 +- data/maps/events/FortreeCity_House5.inc | 4 +- data/maps/events/FortreeCity_Mart.inc | 4 +- data/maps/events/FortreeCity_PokemonCenter_1F.inc | 6 +- data/maps/events/FortreeCity_PokemonCenter_2F.inc | 10 +-- data/maps/events/GraniteCave_1F.inc | 8 +-- data/maps/events/GraniteCave_B1F.inc | 14 ++-- data/maps/events/GraniteCave_B2F.inc | 10 +-- data/maps/events/GraniteCave_StevensRoom.inc | 2 +- data/maps/events/InsideOfTruck.inc | 6 +- data/maps/events/IslandCave.inc | 6 +- data/maps/events/JaggedPass.inc | 8 +-- data/maps/events/LavaridgeTown.inc | 12 ++-- data/maps/events/LavaridgeTown_Gym_1F.inc | 44 ++++++------- data/maps/events/LavaridgeTown_Gym_B1F.inc | 40 ++++++------ data/maps/events/LavaridgeTown_HerbShop.inc | 4 +- data/maps/events/LavaridgeTown_House.inc | 4 +- data/maps/events/LavaridgeTown_Mart.inc | 4 +- .../maps/events/LavaridgeTown_PokemonCenter_1F.inc | 8 +-- .../maps/events/LavaridgeTown_PokemonCenter_2F.inc | 10 +-- data/maps/events/LilycoveCity.inc | 30 ++++----- data/maps/events/LilycoveCity_ContestHall.inc | 8 +-- data/maps/events/LilycoveCity_ContestLobby.inc | 8 +-- data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc | 6 +- data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../LilycoveCity_DepartmentStoreElevator.inc | 4 +- .../events/LilycoveCity_DepartmentStoreRooftop.inc | 2 +- .../events/LilycoveCity_DepartmentStore_1F.inc | 8 +-- .../events/LilycoveCity_DepartmentStore_2F.inc | 6 +- .../events/LilycoveCity_DepartmentStore_3F.inc | 6 +- .../events/LilycoveCity_DepartmentStore_4F.inc | 6 +- .../events/LilycoveCity_DepartmentStore_5F.inc | 6 +- data/maps/events/LilycoveCity_EmptyMap.inc | 2 +- data/maps/events/LilycoveCity_Harbor.inc | 8 +-- data/maps/events/LilycoveCity_House1.inc | 4 +- data/maps/events/LilycoveCity_House2.inc | 4 +- data/maps/events/LilycoveCity_House3.inc | 4 +- data/maps/events/LilycoveCity_House4.inc | 4 +- .../maps/events/LilycoveCity_LilycoveMuseum_1F.inc | 6 +- .../maps/events/LilycoveCity_LilycoveMuseum_2F.inc | 2 +- .../maps/events/LilycoveCity_MoveDeletersHouse.inc | 4 +- data/maps/events/LilycoveCity_PokemonCenter_1F.inc | 6 +- data/maps/events/LilycoveCity_PokemonCenter_2F.inc | 10 +-- .../events/LilycoveCity_PokemonTrainerFanClub.inc | 4 +- data/maps/events/LilycoveCity_UnusedMart.inc | 4 +- data/maps/events/LittlerootTown.inc | 6 +- .../events/LittlerootTown_BrendansHouse_1F.inc | 6 +- .../events/LittlerootTown_BrendansHouse_2F.inc | 2 +- data/maps/events/LittlerootTown_MaysHouse_1F.inc | 6 +- data/maps/events/LittlerootTown_MaysHouse_2F.inc | 2 +- .../events/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/maps/events/MagmaHideout_1F.inc | 4 +- data/maps/events/MagmaHideout_B1F.inc | 58 ++++++++--------- data/maps/events/MagmaHideout_B2F.inc | 16 ++--- data/maps/events/MauvilleCity.inc | 14 ++-- data/maps/events/MauvilleCity_BikeShop.inc | 4 +- data/maps/events/MauvilleCity_GameCorner.inc | 4 +- data/maps/events/MauvilleCity_Gym.inc | 4 +- data/maps/events/MauvilleCity_House1.inc | 4 +- data/maps/events/MauvilleCity_House2.inc | 4 +- data/maps/events/MauvilleCity_Mart.inc | 4 +- data/maps/events/MauvilleCity_PokemonCenter_1F.inc | 6 +- data/maps/events/MauvilleCity_PokemonCenter_2F.inc | 10 +-- data/maps/events/MeteorFalls_1F_1R.inc | 10 +-- data/maps/events/MeteorFalls_1F_2R.inc | 8 +-- data/maps/events/MeteorFalls_B1F_1R.inc | 12 ++-- data/maps/events/MeteorFalls_B1F_2R.inc | 2 +- data/maps/events/MossdeepCity.inc | 20 +++--- data/maps/events/MossdeepCity_GameCorner_1F.inc | 6 +- data/maps/events/MossdeepCity_GameCorner_B1F.inc | 2 +- data/maps/events/MossdeepCity_Gym.inc | 4 +- data/maps/events/MossdeepCity_House1.inc | 4 +- data/maps/events/MossdeepCity_House2.inc | 4 +- data/maps/events/MossdeepCity_House3.inc | 4 +- data/maps/events/MossdeepCity_House4.inc | 4 +- data/maps/events/MossdeepCity_Mart.inc | 4 +- data/maps/events/MossdeepCity_PokemonCenter_1F.inc | 6 +- data/maps/events/MossdeepCity_PokemonCenter_2F.inc | 10 +-- data/maps/events/MossdeepCity_SpaceCenter_1F.inc | 6 +- data/maps/events/MossdeepCity_SpaceCenter_2F.inc | 2 +- data/maps/events/MossdeepCity_StevensHouse.inc | 4 +- data/maps/events/MtChimney.inc | 8 +-- data/maps/events/MtChimney_CableCarStation.inc | 4 +- data/maps/events/MtPyre_1F.inc | 12 ++-- data/maps/events/MtPyre_2F.inc | 10 +-- data/maps/events/MtPyre_3F.inc | 12 ++-- data/maps/events/MtPyre_4F.inc | 12 ++-- data/maps/events/MtPyre_5F.inc | 10 +-- data/maps/events/MtPyre_6F.inc | 4 +- data/maps/events/MtPyre_Exterior.inc | 6 +- data/maps/events/MtPyre_Summit.inc | 6 +- data/maps/events/NewMauville_Entrance.inc | 4 +- data/maps/events/NewMauville_Inside.inc | 2 +- data/maps/events/OldaleTown.inc | 8 +-- data/maps/events/OldaleTown_House1.inc | 4 +- data/maps/events/OldaleTown_House2.inc | 4 +- data/maps/events/OldaleTown_Mart.inc | 4 +- data/maps/events/OldaleTown_PokemonCenter_1F.inc | 6 +- data/maps/events/OldaleTown_PokemonCenter_2F.inc | 10 +-- data/maps/events/PacifidlogTown.inc | 12 ++-- data/maps/events/PacifidlogTown_House1.inc | 4 +- data/maps/events/PacifidlogTown_House2.inc | 4 +- data/maps/events/PacifidlogTown_House3.inc | 4 +- data/maps/events/PacifidlogTown_House4.inc | 4 +- data/maps/events/PacifidlogTown_House5.inc | 4 +- .../events/PacifidlogTown_PokemonCenter_1F.inc | 6 +- .../events/PacifidlogTown_PokemonCenter_2F.inc | 10 +-- data/maps/events/PetalburgCity.inc | 12 ++-- data/maps/events/PetalburgCity_Gym.inc | 76 +++++++++++----------- data/maps/events/PetalburgCity_House1.inc | 4 +- data/maps/events/PetalburgCity_House2.inc | 4 +- data/maps/events/PetalburgCity_Mart.inc | 4 +- .../maps/events/PetalburgCity_PokemonCenter_1F.inc | 6 +- .../maps/events/PetalburgCity_PokemonCenter_2F.inc | 10 +-- data/maps/events/PetalburgCity_WallysHouse.inc | 4 +- data/maps/events/PetalburgWoods.inc | 12 ++-- data/maps/events/RecordCorner.inc | 8 +-- data/maps/events/Route104.inc | 16 ++--- data/maps/events/Route104_MrBrineysHouse.inc | 4 +- .../maps/events/Route104_PrettyPetalFlowerShop.inc | 4 +- data/maps/events/Route104_Prototype.inc | 2 +- .../Route104_PrototypePrettyPetalFlowerShop.inc | 4 +- data/maps/events/Route105.inc | 2 +- data/maps/events/Route106.inc | 2 +- data/maps/events/Route108.inc | 2 +- data/maps/events/Route109.inc | 2 +- data/maps/events/Route109_SeashoreHouse.inc | 4 +- data/maps/events/Route110.inc | 12 ++-- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 8 +-- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 8 +-- data/maps/events/Route110_TrickHouseCorridor.inc | 8 +-- data/maps/events/Route110_TrickHouseEnd.inc | 4 +- data/maps/events/Route110_TrickHouseEntrance.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle1.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle2.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle3.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle4.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle5.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle6.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle7.inc | 6 +- data/maps/events/Route110_TrickHousePuzzle8.inc | 6 +- data/maps/events/Route111.inc | 6 +- data/maps/events/Route111_OldLadysRestStop.inc | 4 +- .../maps/events/Route111_WinstrateFamilysHouse.inc | 4 +- data/maps/events/Route112.inc | 12 ++-- data/maps/events/Route112_CableCarStation.inc | 4 +- data/maps/events/Route113.inc | 2 +- data/maps/events/Route113_GlassWorkshop.inc | 4 +- data/maps/events/Route114.inc | 6 +- data/maps/events/Route114_FossilManiacsHouse.inc | 6 +- data/maps/events/Route114_FossilManiacsTunnel.inc | 4 +- data/maps/events/Route114_LanettesHouse.inc | 4 +- data/maps/events/Route115.inc | 2 +- data/maps/events/Route116.inc | 6 +- data/maps/events/Route116_TunnelersRestHouse.inc | 4 +- data/maps/events/Route117.inc | 2 +- data/maps/events/Route117_PokemonDayCare.inc | 4 +- data/maps/events/Route119.inc | 4 +- data/maps/events/Route119_House.inc | 4 +- data/maps/events/Route119_WeatherInstitute_1F.inc | 6 +- data/maps/events/Route119_WeatherInstitute_2F.inc | 2 +- data/maps/events/Route120.inc | 4 +- data/maps/events/Route121.inc | 2 +- data/maps/events/Route121_SafariZoneEntrance.inc | 8 +-- data/maps/events/Route122.inc | 2 +- data/maps/events/Route123.inc | 2 +- data/maps/events/Route123_BerryMastersHouse.inc | 4 +- data/maps/events/Route124.inc | 2 +- .../events/Route124_DivingTreasureHuntersHouse.inc | 4 +- data/maps/events/Route125.inc | 2 +- data/maps/events/Route131.inc | 2 +- data/maps/events/RustboroCity.inc | 24 +++---- data/maps/events/RustboroCity_CuttersHouse.inc | 4 +- data/maps/events/RustboroCity_DevonCorp_1F.inc | 6 +- data/maps/events/RustboroCity_DevonCorp_2F.inc | 4 +- data/maps/events/RustboroCity_DevonCorp_3F.inc | 2 +- data/maps/events/RustboroCity_Flat1_1F.inc | 6 +- data/maps/events/RustboroCity_Flat1_2F.inc | 2 +- data/maps/events/RustboroCity_Flat2_1F.inc | 6 +- data/maps/events/RustboroCity_Flat2_2F.inc | 4 +- data/maps/events/RustboroCity_Flat2_3F.inc | 2 +- data/maps/events/RustboroCity_Gym.inc | 4 +- data/maps/events/RustboroCity_House1.inc | 4 +- data/maps/events/RustboroCity_House2.inc | 4 +- data/maps/events/RustboroCity_House3.inc | 4 +- data/maps/events/RustboroCity_Mart.inc | 4 +- data/maps/events/RustboroCity_PokemonCenter_1F.inc | 6 +- data/maps/events/RustboroCity_PokemonCenter_2F.inc | 10 +-- data/maps/events/RustboroCity_PokemonSchool.inc | 4 +- data/maps/events/RusturfTunnel.inc | 6 +- data/maps/events/SSTidalCorridor.inc | 18 ++--- data/maps/events/SSTidalLowerDeck.inc | 2 +- data/maps/events/SSTidalRooms.inc | 24 +++---- data/maps/events/SafariZone_RestHouse.inc | 4 +- data/maps/events/SafariZone_Southeast.inc | 2 +- data/maps/events/SafariZone_Southwest.inc | 2 +- data/maps/events/ScorchedSlab.inc | 2 +- data/maps/events/SeafloorCavern_Entrance.inc | 4 +- data/maps/events/SeafloorCavern_Room1.inc | 6 +- data/maps/events/SeafloorCavern_Room2.inc | 8 +-- data/maps/events/SeafloorCavern_Room3.inc | 6 +- data/maps/events/SeafloorCavern_Room4.inc | 8 +-- data/maps/events/SeafloorCavern_Room5.inc | 6 +- data/maps/events/SeafloorCavern_Room6.inc | 6 +- data/maps/events/SeafloorCavern_Room7.inc | 4 +- data/maps/events/SeafloorCavern_Room8.inc | 4 +- data/maps/events/SeafloorCavern_Room9.inc | 2 +- data/maps/events/SealedChamber_InnerRoom.inc | 2 +- data/maps/events/SealedChamber_OuterRoom.inc | 2 +- data/maps/events/SecretBase_BlueCave1.inc | 2 +- data/maps/events/SecretBase_BlueCave2.inc | 2 +- data/maps/events/SecretBase_BlueCave3.inc | 2 +- data/maps/events/SecretBase_BlueCave4.inc | 2 +- data/maps/events/SecretBase_BrownCave1.inc | 2 +- data/maps/events/SecretBase_BrownCave2.inc | 2 +- data/maps/events/SecretBase_BrownCave3.inc | 2 +- data/maps/events/SecretBase_BrownCave4.inc | 2 +- data/maps/events/SecretBase_RedCave1.inc | 2 +- data/maps/events/SecretBase_RedCave2.inc | 2 +- data/maps/events/SecretBase_RedCave3.inc | 2 +- data/maps/events/SecretBase_RedCave4.inc | 2 +- data/maps/events/SecretBase_Shrub1.inc | 2 +- data/maps/events/SecretBase_Shrub2.inc | 2 +- data/maps/events/SecretBase_Shrub3.inc | 2 +- data/maps/events/SecretBase_Shrub4.inc | 2 +- data/maps/events/SecretBase_Tree1.inc | 2 +- data/maps/events/SecretBase_Tree2.inc | 2 +- data/maps/events/SecretBase_Tree3.inc | 2 +- data/maps/events/SecretBase_Tree4.inc | 2 +- data/maps/events/SecretBase_YellowCave1.inc | 2 +- data/maps/events/SecretBase_YellowCave2.inc | 2 +- data/maps/events/SecretBase_YellowCave3.inc | 2 +- data/maps/events/SecretBase_YellowCave4.inc | 2 +- data/maps/events/ShoalCave_LowTideEntranceRoom.inc | 8 +-- data/maps/events/ShoalCave_LowTideIceRoom.inc | 2 +- data/maps/events/ShoalCave_LowTideInnerRoom.inc | 16 ++--- data/maps/events/ShoalCave_LowTideLowerRoom.inc | 8 +-- data/maps/events/ShoalCave_LowTideStairsRoom.inc | 4 +- data/maps/events/SingleBattleColosseum.inc | 4 +- data/maps/events/SkyPillar_1F.inc | 6 +- data/maps/events/SkyPillar_2F.inc | 4 +- data/maps/events/SkyPillar_3F.inc | 6 +- data/maps/events/SkyPillar_4F.inc | 6 +- data/maps/events/SkyPillar_5F.inc | 4 +- data/maps/events/SkyPillar_Entrance.inc | 4 +- data/maps/events/SkyPillar_Outside.inc | 4 +- data/maps/events/SkyPillar_Top.inc | 2 +- data/maps/events/SlateportCity.inc | 22 +++---- data/maps/events/SlateportCity_ContestHall.inc | 4 +- data/maps/events/SlateportCity_ContestLobby.inc | 6 +- data/maps/events/SlateportCity_Harbor.inc | 8 +-- data/maps/events/SlateportCity_House1.inc | 4 +- data/maps/events/SlateportCity_House2.inc | 4 +- data/maps/events/SlateportCity_Mart.inc | 4 +- .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 6 +- .../maps/events/SlateportCity_OceanicMuseum_2F.inc | 2 +- .../maps/events/SlateportCity_PokemonCenter_1F.inc | 6 +- .../maps/events/SlateportCity_PokemonCenter_2F.inc | 10 +-- data/maps/events/SlateportCity_PokemonFanClub.inc | 4 +- .../events/SlateportCity_SternsShipyard_1F.inc | 6 +- .../events/SlateportCity_SternsShipyard_2F.inc | 2 +- data/maps/events/SootopolisCity.inc | 24 +++---- data/maps/events/SootopolisCity_Gym_1F.inc | 6 +- data/maps/events/SootopolisCity_Gym_B1F.inc | 2 +- data/maps/events/SootopolisCity_House1.inc | 4 +- data/maps/events/SootopolisCity_House2.inc | 4 +- data/maps/events/SootopolisCity_House3.inc | 4 +- data/maps/events/SootopolisCity_House4.inc | 4 +- data/maps/events/SootopolisCity_House5.inc | 4 +- data/maps/events/SootopolisCity_House6.inc | 4 +- data/maps/events/SootopolisCity_House7.inc | 4 +- data/maps/events/SootopolisCity_House8.inc | 4 +- data/maps/events/SootopolisCity_Mart.inc | 4 +- .../events/SootopolisCity_PokemonCenter_1F.inc | 6 +- .../events/SootopolisCity_PokemonCenter_2F.inc | 10 +-- data/maps/events/SouthernIsland_Exterior.inc | 4 +- data/maps/events/SouthernIsland_Interior.inc | 4 +- data/maps/events/TradeCenter.inc | 4 +- data/maps/events/Underwater2.inc | 2 +- data/maps/events/Underwater4.inc | 2 +- data/maps/events/Underwater_Route134.inc | 2 +- data/maps/events/Underwater_SeafloorCavern.inc | 2 +- data/maps/events/Underwater_SealedChamber.inc | 2 +- data/maps/events/Underwater_SootopolisCity.inc | 4 +- data/maps/events/VerdanturfTown.inc | 14 ++-- data/maps/events/VerdanturfTown_ContestHall.inc | 4 +- data/maps/events/VerdanturfTown_ContestLobby.inc | 6 +- .../VerdanturfTown_FriendshipRatersHouse.inc | 4 +- data/maps/events/VerdanturfTown_House.inc | 4 +- data/maps/events/VerdanturfTown_Mart.inc | 4 +- .../events/VerdanturfTown_PokemonCenter_1F.inc | 6 +- .../events/VerdanturfTown_PokemonCenter_2F.inc | 10 +-- data/maps/events/VerdanturfTown_WandasHouse.inc | 4 +- data/maps/events/VictoryRoad_1F.inc | 10 +-- data/maps/events/VictoryRoad_B1F.inc | 14 ++-- data/maps/events/VictoryRoad_B2F.inc | 8 +-- data/scripts/cable_club.inc | 4 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 2 +- data/scripts/maps/AbandonedShip_Rooms_B1F.inc | 2 +- data/scripts/maps/AbandonedShip_Underwater1.inc | 2 +- data/scripts/maps/AbandonedShip_Underwater2.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 +- data/scripts/maps/BattleTower_Corridor.inc | 2 +- data/scripts/maps/BattleTower_Elevator.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 4 +- data/scripts/maps/BattleTower_Outside.inc | 4 +- data/scripts/maps/DewfordTown.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/GraniteCave_B1F.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 10 +-- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 10 +-- data/scripts/maps/LilycoveCity_Harbor.inc | 8 +-- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 6 +- data/scripts/maps/LittlerootTown.inc | 4 +- .../maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MtPyre_2F.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 4 +- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 2 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 18 ++--- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/Route134.inc | 2 +- data/scripts/maps/RustboroCity.inc | 2 +- data/scripts/maps/SSTidalCorridor.inc | 4 +- data/scripts/maps/SafariZone_Southeast.inc | 2 +- data/scripts/maps/SeafloorCavern_Entrance.inc | 4 +- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 4 +- data/scripts/maps/SkyPillar_2F.inc | 2 +- data/scripts/maps/SkyPillar_4F.inc | 2 +- data/scripts/maps/SlateportCity.inc | 2 +- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 6 +- data/scripts/maps/SootopolisCity.inc | 2 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/Underwater_Route134.inc | 2 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/Underwater_SootopolisCity.inc | 2 +- data/scripts/maps/UnknownMap_25_34.inc | 10 +-- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- data/scripts/safari_zone.inc | 4 +- 479 files changed, 1391 insertions(+), 1388 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index ebc1a0de8..495f78dfc 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -2,6 +2,7 @@ #include "constants/game_stat.h" #include "constants/items.h" #include "constants/map_objects.h" +#include "constants/maps.h" #include "constants/moves.h" #include "constants/opponents.h" #include "constants/songs.h" @@ -4883,7 +4884,7 @@ S_FallDownHole:: @ 81C6BC5 waitmovement 0 playse 43 delay 60 - warphole Undefined + warphole MAP_UNDEFINED waitstate end diff --git a/data/map_events.s b/data/map_events.s index 57b3adab5..547e6ceb3 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,5 +1,6 @@ #include "constants/items.h" #include "constants/map_objects.h" +#include "constants/maps.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps.s b/data/maps.s index 8848ac242..92f5544a1 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,3 +1,4 @@ +#include "constants/maps.h" #include "constants/songs.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc index 4f47ce304..52339411b 100644 --- a/data/maps/DewfordTown/connections.inc +++ b/data/maps/DewfordTown/connections.inc @@ -1,6 +1,6 @@ DewfordTown_MapConnectionsList:: @ 8308650 - connection up, -60, Route106 - connection right, 0, Route107 + connection up, -60, MAP_ROUTE106 + connection right, 0, MAP_ROUTE107 DewfordTown_MapConnections:: @ 8308668 .4byte 0x2 diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc index fd81ce46b..7833824d8 100644 --- a/data/maps/EverGrandeCity/connections.inc +++ b/data/maps/EverGrandeCity/connections.inc @@ -1,5 +1,5 @@ EverGrandeCity_MapConnectionsList:: @ 8308808 - connection left, 40, Route128 + connection left, 40, MAP_ROUTE128 EverGrandeCity_MapConnections:: @ 8308814 .4byte 0x1 diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc index 259d5adf0..369d244fc 100644 --- a/data/maps/FallarborTown/connections.inc +++ b/data/maps/FallarborTown/connections.inc @@ -1,6 +1,6 @@ FallarborTown_MapConnectionsList:: @ 8308684 - connection left, 0, Route114 - connection right, 0, Route113 + connection left, 0, MAP_ROUTE114 + connection right, 0, MAP_ROUTE113 FallarborTown_MapConnections:: @ 830869C .4byte 0x2 diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc index 3012973d8..4243269aa 100644 --- a/data/maps/FortreeCity/connections.inc +++ b/data/maps/FortreeCity/connections.inc @@ -1,6 +1,6 @@ FortreeCity_MapConnectionsList:: @ 8308794 - connection left, 0, Route119 - connection right, 0, Route120 + connection left, 0, MAP_ROUTE119 + connection right, 0, MAP_ROUTE120 FortreeCity_MapConnections:: @ 83087AC .4byte 0x2 diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc index b31155ae3..5adf84bd2 100644 --- a/data/maps/LavaridgeTown/connections.inc +++ b/data/maps/LavaridgeTown/connections.inc @@ -1,5 +1,5 @@ LavaridgeTown_MapConnectionsList:: @ 8308670 - connection right, -40, Route112 + connection right, -40, MAP_ROUTE112 LavaridgeTown_MapConnections:: @ 830867C .4byte 0x1 diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc index a476e2de2..4181dbc05 100644 --- a/data/maps/LilycoveCity/connections.inc +++ b/data/maps/LilycoveCity/connections.inc @@ -1,6 +1,6 @@ LilycoveCity_MapConnectionsList:: @ 83087B4 - connection left, 10, Route121 - connection right, -10, Route124 + connection left, 10, MAP_ROUTE121 + connection right, -10, MAP_ROUTE124 LilycoveCity_MapConnections:: @ 83087CC .4byte 0x2 diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc index d045d04d7..8484aa4b9 100644 --- a/data/maps/LittlerootTown/connections.inc +++ b/data/maps/LittlerootTown/connections.inc @@ -1,5 +1,5 @@ LittlerootTown_MapConnectionsList:: @ 8308610 - connection up, 0, Route101 + connection up, 0, MAP_ROUTE101 LittlerootTown_MapConnections:: @ 830861C .4byte 0x1 diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc index 07f3649cd..cc06f45e7 100644 --- a/data/maps/MauvilleCity/connections.inc +++ b/data/maps/MauvilleCity/connections.inc @@ -1,8 +1,8 @@ MauvilleCity_MapConnectionsList:: @ 8308730 - connection up, 0, Route111 - connection down, 0, Route110 - connection left, 0, Route117 - connection right, 0, Route118 + connection up, 0, MAP_ROUTE111 + connection down, 0, MAP_ROUTE110 + connection left, 0, MAP_ROUTE117 + connection right, 0, MAP_ROUTE118 MauvilleCity_MapConnections:: @ 8308760 .4byte 0x4 diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc index 0e654d9cc..5fb40e7f4 100644 --- a/data/maps/MossdeepCity/connections.inc +++ b/data/maps/MossdeepCity/connections.inc @@ -1,7 +1,7 @@ MossdeepCity_MapConnectionsList:: @ 83087D4 - connection up, 0, Route125 - connection down, 0, Route127 - connection left, -40, Route124 + connection up, 0, MAP_ROUTE125 + connection down, 0, MAP_ROUTE127 + connection left, -40, MAP_ROUTE124 MossdeepCity_MapConnections:: @ 83087F8 .4byte 0x3 diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc index fc5495101..1e4bdeea8 100644 --- a/data/maps/OldaleTown/connections.inc +++ b/data/maps/OldaleTown/connections.inc @@ -1,7 +1,7 @@ OldaleTown_MapConnectionsList:: @ 8308624 - connection up, 0, Route103 - connection down, 0, Route101 - connection left, 0, Route102 + connection up, 0, MAP_ROUTE103 + connection down, 0, MAP_ROUTE101 + connection left, 0, MAP_ROUTE102 OldaleTown_MapConnections:: @ 8308648 .4byte 0x3 diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc index 3c0ae1a62..0a6083d00 100644 --- a/data/maps/PacifidlogTown/connections.inc +++ b/data/maps/PacifidlogTown/connections.inc @@ -1,6 +1,6 @@ PacifidlogTown_MapConnectionsList:: @ 83086C4 - connection left, 0, Route132 - connection right, 0, Route131 + connection left, 0, MAP_ROUTE132 + connection right, 0, MAP_ROUTE131 PacifidlogTown_MapConnections:: @ 83086DC .4byte 0x2 diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc index cabded017..b412774bf 100644 --- a/data/maps/PetalburgCity/connections.inc +++ b/data/maps/PetalburgCity/connections.inc @@ -1,6 +1,6 @@ PetalburgCity_MapConnectionsList:: @ 83086E4 - connection left, -50, Route104 - connection right, 10, Route102 + connection left, -50, MAP_ROUTE104 + connection right, 10, MAP_ROUTE102 PetalburgCity_MapConnections:: @ 83086FC .4byte 0x2 diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc index 78f73238b..2dd103b89 100644 --- a/data/maps/Route101/connections.inc +++ b/data/maps/Route101/connections.inc @@ -1,6 +1,6 @@ Route101_MapConnectionsList:: @ 830881C - connection up, 0, OldaleTown - connection down, 0, LittlerootTown + connection up, 0, MAP_OLDALE_TOWN + connection down, 0, MAP_LITTLEROOT_TOWN Route101_MapConnections:: @ 8308834 .4byte 0x2 diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc index c132f5fa7..56e30d843 100644 --- a/data/maps/Route102/connections.inc +++ b/data/maps/Route102/connections.inc @@ -1,6 +1,6 @@ Route102_MapConnectionsList:: @ 830883C - connection left, -10, PetalburgCity - connection right, 0, OldaleTown + connection left, -10, MAP_PETALBURG_CITY + connection right, 0, MAP_OLDALE_TOWN Route102_MapConnections:: @ 8308854 .4byte 0x2 diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc index 1510b33d2..e3ce959f8 100644 --- a/data/maps/Route103/connections.inc +++ b/data/maps/Route103/connections.inc @@ -1,6 +1,6 @@ Route103_MapConnectionsList:: @ 830885C - connection down, 0, OldaleTown - connection right, -60, Route110 + connection down, 0, MAP_OLDALE_TOWN + connection right, -60, MAP_ROUTE110 Route103_MapConnections:: @ 8308874 .4byte 0x2 diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc index 38085d1a8..488af7f8d 100644 --- a/data/maps/Route104/connections.inc +++ b/data/maps/Route104/connections.inc @@ -1,7 +1,7 @@ Route104_MapConnectionsList:: @ 830887C - connection up, 0, RustboroCity - connection down, 0, Route105 - connection right, 50, PetalburgCity + connection up, 0, MAP_RUSTBORO_CITY + connection down, 0, MAP_ROUTE105 + connection right, 50, MAP_PETALBURG_CITY Route104_MapConnections:: @ 83088A0 .4byte 0x3 diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc index 6915b9d08..dc0962e5f 100644 --- a/data/maps/Route105/connections.inc +++ b/data/maps/Route105/connections.inc @@ -1,6 +1,6 @@ Route105_MapConnectionsList:: @ 83088A8 - connection up, 0, Route104 - connection down, 0, Route106 + connection up, 0, MAP_ROUTE104 + connection down, 0, MAP_ROUTE106 Route105_MapConnections:: @ 83088C0 .4byte 0x2 diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc index 4d041e65c..41adbb9d1 100644 --- a/data/maps/Route106/connections.inc +++ b/data/maps/Route106/connections.inc @@ -1,6 +1,6 @@ Route106_MapConnectionsList:: @ 83088C8 - connection up, 0, Route105 - connection down, 60, DewfordTown + connection up, 0, MAP_ROUTE105 + connection down, 60, MAP_DEWFORD_TOWN Route106_MapConnections:: @ 83088E0 .4byte 0x2 diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc index a3da84672..c7c7174c1 100644 --- a/data/maps/Route107/connections.inc +++ b/data/maps/Route107/connections.inc @@ -1,6 +1,6 @@ Route107_MapConnectionsList:: @ 83088E8 - connection left, 0, DewfordTown - connection right, 0, Route108 + connection left, 0, MAP_DEWFORD_TOWN + connection right, 0, MAP_ROUTE108 Route107_MapConnections:: @ 8308900 .4byte 0x2 diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc index aba43d804..f5455457e 100644 --- a/data/maps/Route108/connections.inc +++ b/data/maps/Route108/connections.inc @@ -1,6 +1,6 @@ Route108_MapConnectionsList:: @ 8308908 - connection left, 0, Route107 - connection right, -40, Route109 + connection left, 0, MAP_ROUTE107 + connection right, -40, MAP_ROUTE109 Route108_MapConnections:: @ 8308920 .4byte 0x2 diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc index 5135e8e8b..44a65da35 100644 --- a/data/maps/Route109/connections.inc +++ b/data/maps/Route109/connections.inc @@ -1,6 +1,6 @@ Route109_MapConnectionsList:: @ 8308928 - connection up, 0, SlateportCity - connection left, 40, Route108 + connection up, 0, MAP_SLATEPORT_CITY + connection left, 40, MAP_ROUTE108 Route109_MapConnections:: @ 8308940 .4byte 0x2 diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc index d0f88deb3..9ba85fdbc 100644 --- a/data/maps/Route110/connections.inc +++ b/data/maps/Route110/connections.inc @@ -1,7 +1,7 @@ Route110_MapConnectionsList:: @ 8308948 - connection up, 0, MauvilleCity - connection down, 0, SlateportCity - connection left, 60, Route103 + connection up, 0, MAP_MAUVILLE_CITY + connection down, 0, MAP_SLATEPORT_CITY + connection left, 60, MAP_ROUTE103 Route110_MapConnections:: @ 830896C .4byte 0x3 diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc index 411dea34b..a48035299 100644 --- a/data/maps/Route111/connections.inc +++ b/data/maps/Route111/connections.inc @@ -1,7 +1,7 @@ Route111_MapConnectionsList:: @ 8308974 - connection down, 0, MauvilleCity - connection left, 0, Route113 - connection left, 20, Route112 + connection down, 0, MAP_MAUVILLE_CITY + connection left, 0, MAP_ROUTE113 + connection left, 20, MAP_ROUTE112 Route111_MapConnections:: @ 8308998 .4byte 0x3 diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc index eee04163c..88571a0ea 100644 --- a/data/maps/Route112/connections.inc +++ b/data/maps/Route112/connections.inc @@ -1,7 +1,7 @@ Route112_MapConnectionsList:: @ 83089A0 - connection up, -60, Route113 - connection left, 40, LavaridgeTown - connection right, -20, Route111 + connection up, -60, MAP_ROUTE113 + connection left, 40, MAP_LAVARIDGE_TOWN + connection right, -20, MAP_ROUTE111 Route112_MapConnections:: @ 83089C4 .4byte 0x3 diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc index ffa7b231d..fd6d20812 100644 --- a/data/maps/Route113/connections.inc +++ b/data/maps/Route113/connections.inc @@ -1,7 +1,7 @@ Route113_MapConnectionsList:: @ 83089CC - connection down, 60, Route112 - connection left, 0, FallarborTown - connection right, 0, Route111 + connection down, 60, MAP_ROUTE112 + connection left, 0, MAP_FALLARBOR_TOWN + connection right, 0, MAP_ROUTE111 Route113_MapConnections:: @ 83089F0 .4byte 0x3 diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc index 603c5e4b1..1a58d2439 100644 --- a/data/maps/Route114/connections.inc +++ b/data/maps/Route114/connections.inc @@ -1,6 +1,6 @@ Route114_MapConnectionsList:: @ 83089F8 - connection left, 40, Route115 - connection right, 0, FallarborTown + connection left, 40, MAP_ROUTE115 + connection right, 0, MAP_FALLARBOR_TOWN Route114_MapConnections:: @ 8308A10 .4byte 0x2 diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc index 3886f114f..80fad1097 100644 --- a/data/maps/Route115/connections.inc +++ b/data/maps/Route115/connections.inc @@ -1,6 +1,6 @@ Route115_MapConnectionsList:: @ 8308A18 - connection down, 0, RustboroCity - connection right, -40, Route114 + connection down, 0, MAP_RUSTBORO_CITY + connection right, -40, MAP_ROUTE114 Route115_MapConnections:: @ 8308A30 .4byte 0x2 diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc index 787314054..f8b3afd72 100644 --- a/data/maps/Route116/connections.inc +++ b/data/maps/Route116/connections.inc @@ -1,6 +1,6 @@ Route116_MapConnectionsList:: @ 8308A38 - connection down, 80, VerdanturfTown - connection left, 0, RustboroCity + connection down, 80, MAP_VERDANTURF_TOWN + connection left, 0, MAP_RUSTBORO_CITY Route116_MapConnections:: @ 8308A50 .4byte 0x2 diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc index 2de505e01..a66a5d6f9 100644 --- a/data/maps/Route117/connections.inc +++ b/data/maps/Route117/connections.inc @@ -1,6 +1,6 @@ Route117_MapConnectionsList:: @ 8308A58 - connection left, 0, VerdanturfTown - connection right, 0, MauvilleCity + connection left, 0, MAP_VERDANTURF_TOWN + connection right, 0, MAP_MAUVILLE_CITY Route117_MapConnections:: @ 8308A70 .4byte 0x2 diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc index 764071baf..9ec5d28b6 100644 --- a/data/maps/Route118/connections.inc +++ b/data/maps/Route118/connections.inc @@ -1,7 +1,7 @@ Route118_MapConnectionsList:: @ 8308A78 - connection up, 40, Route119 - connection left, 0, MauvilleCity - connection right, 0, Route123 + connection up, 40, MAP_ROUTE119 + connection left, 0, MAP_MAUVILLE_CITY + connection right, 0, MAP_ROUTE123 Route118_MapConnections:: @ 8308A9C .4byte 0x3 diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc index 26ce12a01..1a499afe5 100644 --- a/data/maps/Route119/connections.inc +++ b/data/maps/Route119/connections.inc @@ -1,6 +1,6 @@ Route119_MapConnectionsList:: @ 8308AA4 - connection down, -40, Route118 - connection right, 0, FortreeCity + connection down, -40, MAP_ROUTE118 + connection right, 0, MAP_FORTREE_CITY Route119_MapConnections:: @ 8308ABC .4byte 0x2 diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc index a0f747c68..714d8294e 100644 --- a/data/maps/Route120/connections.inc +++ b/data/maps/Route120/connections.inc @@ -1,6 +1,6 @@ Route120_MapConnectionsList:: @ 8308AC4 - connection left, 0, FortreeCity - connection right, 80, Route121 + connection left, 0, MAP_FORTREE_CITY + connection right, 80, MAP_ROUTE121 Route120_MapConnections:: @ 8308ADC .4byte 0x2 diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc index a77f1b828..80affb98d 100644 --- a/data/maps/Route121/connections.inc +++ b/data/maps/Route121/connections.inc @@ -1,7 +1,7 @@ Route121_MapConnectionsList:: @ 8308AE4 - connection down, 20, Route122 - connection left, -80, Route120 - connection right, -10, LilycoveCity + connection down, 20, MAP_ROUTE122 + connection left, -80, MAP_ROUTE120 + connection right, -10, MAP_LILYCOVE_CITY Route121_MapConnections:: @ 8308B08 .4byte 0x3 diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc index 214826c04..9e70cc5c0 100644 --- a/data/maps/Route122/connections.inc +++ b/data/maps/Route122/connections.inc @@ -1,6 +1,6 @@ Route122_MapConnectionsList:: @ 8308B10 - connection up, -20, Route121 - connection down, -100, Route123 + connection up, -20, MAP_ROUTE121 + connection down, -100, MAP_ROUTE123 Route122_MapConnections:: @ 8308B28 .4byte 0x2 diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc index cc54683f4..b57ce9d3b 100644 --- a/data/maps/Route123/connections.inc +++ b/data/maps/Route123/connections.inc @@ -1,6 +1,6 @@ Route123_MapConnectionsList:: @ 8308B30 - connection up, 100, Route122 - connection left, 0, Route118 + connection up, 100, MAP_ROUTE122 + connection left, 0, MAP_ROUTE118 Route123_MapConnections:: @ 8308B48 .4byte 0x2 diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index 5384926b0..e8ed0c8df 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,9 +1,9 @@ Route124_MapConnectionsList:: @ 8308B50 - connection down, 0, Route126 - connection left, 10, LilycoveCity - connection right, 0, Route125 - connection right, 40, MossdeepCity - connection dive, 0, Underwater1 + connection down, 0, MAP_ROUTE126 + connection left, 10, MAP_LILYCOVE_CITY + connection right, 0, MAP_ROUTE125 + connection right, 40, MAP_MOSSDEEP_CITY + connection dive, 0, MAP_UNDERWATER1 Route124_MapConnections:: @ 8308B8C .4byte 0x5 diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc index 33b7c705c..c573987eb 100644 --- a/data/maps/Route125/connections.inc +++ b/data/maps/Route125/connections.inc @@ -1,6 +1,6 @@ Route125_MapConnectionsList:: @ 8308B94 - connection down, 0, MossdeepCity - connection left, 0, Route124 + connection down, 0, MAP_MOSSDEEP_CITY + connection left, 0, MAP_ROUTE124 Route125_MapConnections:: @ 8308BAC .4byte 0x2 diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc index 9ff9688af..2bcf57ced 100644 --- a/data/maps/Route126/connections.inc +++ b/data/maps/Route126/connections.inc @@ -1,7 +1,7 @@ Route126_MapConnectionsList:: @ 8308BB4 - connection up, 0, Route124 - connection right, 0, Route127 - connection dive, 0, Underwater2 + connection up, 0, MAP_ROUTE124 + connection right, 0, MAP_ROUTE127 + connection dive, 0, MAP_UNDERWATER2 Route126_MapConnections:: @ 8308BD8 .4byte 0x3 diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc index 997c98c61..017f7de41 100644 --- a/data/maps/Route127/connections.inc +++ b/data/maps/Route127/connections.inc @@ -1,8 +1,8 @@ Route127_MapConnectionsList:: @ 8308BE0 - connection up, 0, MossdeepCity - connection down, 0, Route128 - connection left, 0, Route126 - connection dive, 0, Underwater3 + connection up, 0, MAP_MOSSDEEP_CITY + connection down, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE126 + connection dive, 0, MAP_UNDERWATER3 Route127_MapConnections:: @ 8308C10 .4byte 0x4 diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc index b187c7f64..e66b44582 100644 --- a/data/maps/Route128/connections.inc +++ b/data/maps/Route128/connections.inc @@ -1,8 +1,8 @@ Route128_MapConnectionsList:: @ 8308C18 - connection up, 0, Route127 - connection down, 0, Route129 - connection right, -40, EverGrandeCity - connection dive, 0, Underwater4 + connection up, 0, MAP_ROUTE127 + connection down, 0, MAP_ROUTE129 + connection right, -40, MAP_EVER_GRANDE_CITY + connection dive, 0, MAP_UNDERWATER4 Route128_MapConnections:: @ 8308C48 .4byte 0x4 diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc index 7a1db2bc7..d1022353e 100644 --- a/data/maps/Route129/connections.inc +++ b/data/maps/Route129/connections.inc @@ -1,6 +1,6 @@ Route129_MapConnectionsList:: @ 8308C50 - connection up, 0, Route128 - connection left, 0, Route130 + connection up, 0, MAP_ROUTE128 + connection left, 0, MAP_ROUTE130 Route129_MapConnections:: @ 8308C68 .4byte 0x2 diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc index 211eba7f1..535725bb0 100644 --- a/data/maps/Route130/connections.inc +++ b/data/maps/Route130/connections.inc @@ -1,6 +1,6 @@ Route130_MapConnectionsList:: @ 8308C70 - connection left, 0, Route131 - connection right, 0, Route129 + connection left, 0, MAP_ROUTE131 + connection right, 0, MAP_ROUTE129 Route130_MapConnections:: @ 8308C88 .4byte 0x2 diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc index a1b1adff7..2ac2b6770 100644 --- a/data/maps/Route131/connections.inc +++ b/data/maps/Route131/connections.inc @@ -1,6 +1,6 @@ Route131_MapConnectionsList:: @ 8308C90 - connection left, 0, PacifidlogTown - connection right, 0, Route130 + connection left, 0, MAP_PACIFIDLOG_TOWN + connection right, 0, MAP_ROUTE130 Route131_MapConnections:: @ 8308CA8 .4byte 0x2 diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc index a0aff0a42..94feb7dec 100644 --- a/data/maps/Route132/connections.inc +++ b/data/maps/Route132/connections.inc @@ -1,6 +1,6 @@ Route132_MapConnectionsList:: @ 8308CB0 - connection left, 0, Route133 - connection right, 0, PacifidlogTown + connection left, 0, MAP_ROUTE133 + connection right, 0, MAP_PACIFIDLOG_TOWN Route132_MapConnections:: @ 8308CC8 .4byte 0x2 diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc index 979b49ee9..28445baca 100644 --- a/data/maps/Route133/connections.inc +++ b/data/maps/Route133/connections.inc @@ -1,6 +1,6 @@ Route133_MapConnectionsList:: @ 8308CD0 - connection left, 0, Route134 - connection right, 0, Route132 + connection left, 0, MAP_ROUTE134 + connection right, 0, MAP_ROUTE132 Route133_MapConnections:: @ 8308CE8 .4byte 0x2 diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc index aba5c2c9a..4b90e83ed 100644 --- a/data/maps/Route134/connections.inc +++ b/data/maps/Route134/connections.inc @@ -1,6 +1,6 @@ Route134_MapConnectionsList:: @ 8308CF0 - connection left, 0, SlateportCity - connection right, 0, Route133 + connection left, 0, MAP_SLATEPORT_CITY + connection right, 0, MAP_ROUTE133 Route134_MapConnections:: @ 8308D08 .4byte 0x2 diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc index fd1fa519c..70e96e5b6 100644 --- a/data/maps/RustboroCity/connections.inc +++ b/data/maps/RustboroCity/connections.inc @@ -1,7 +1,7 @@ RustboroCity_MapConnectionsList:: @ 8308768 - connection up, 0, Route115 - connection down, 0, Route104 - connection right, 0, Route116 + connection up, 0, MAP_ROUTE115 + connection down, 0, MAP_ROUTE104 + connection right, 0, MAP_ROUTE116 RustboroCity_MapConnections:: @ 830878C .4byte 0x3 diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc index 5c9c47793..6093ed2a0 100644 --- a/data/maps/SafariZone_Northeast/connections.inc +++ b/data/maps/SafariZone_Northeast/connections.inc @@ -1,6 +1,6 @@ SafariZone_Northeast_MapConnectionsList:: @ 8308DC8 - connection left, 0, SafariZone_Northwest - connection down, 0, SafariZone_Southeast + connection left, 0, MAP_SAFARI_ZONE_NORTHWEST + connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST SafariZone_Northeast_MapConnections:: @ 8308DE0 .4byte 0x2 diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc index b36d15bad..a7b459df2 100644 --- a/data/maps/SafariZone_Northwest/connections.inc +++ b/data/maps/SafariZone_Northwest/connections.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_MapConnectionsList:: @ 8308DA8 - connection right, 0, SafariZone_Northeast - connection down, 0, SafariZone_Southwest + connection right, 0, MAP_SAFARI_ZONE_NORTHEAST + connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_Northwest_MapConnections:: @ 8308DC0 .4byte 0x2 diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc index e4782d1aa..c9c6d2143 100644 --- a/data/maps/SafariZone_Southeast/connections.inc +++ b/data/maps/SafariZone_Southeast/connections.inc @@ -1,6 +1,6 @@ SafariZone_Southeast_MapConnectionsList:: @ 8308E08 - connection up, 0, SafariZone_Northeast - connection left, 0, SafariZone_Southwest + connection up, 0, MAP_SAFARI_ZONE_NORTHEAST + connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_Southeast_MapConnections:: @ 8308E20 .4byte 0x2 diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc index a0fea0609..84e103cb4 100644 --- a/data/maps/SafariZone_Southwest/connections.inc +++ b/data/maps/SafariZone_Southwest/connections.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_MapConnectionsList:: @ 8308DE8 - connection up, 0, SafariZone_Northwest - connection right, 0, SafariZone_Southeast + connection up, 0, MAP_SAFARI_ZONE_NORTHWEST + connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST SafariZone_Southwest_MapConnections:: @ 8308E00 .4byte 0x2 diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc index 2d3980a8c..082ed59e0 100644 --- a/data/maps/SlateportCity/connections.inc +++ b/data/maps/SlateportCity/connections.inc @@ -1,7 +1,7 @@ SlateportCity_MapConnectionsList:: @ 8308704 - connection up, 0, Route110 - connection down, 0, Route109 - connection right, 0, Route134 + connection up, 0, MAP_ROUTE110 + connection down, 0, MAP_ROUTE109 + connection right, 0, MAP_ROUTE134 SlateportCity_MapConnections:: @ 8308728 .4byte 0x3 diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc index 65c1db901..7eaebf9da 100644 --- a/data/maps/Underwater1/connections.inc +++ b/data/maps/Underwater1/connections.inc @@ -1,6 +1,6 @@ Underwater1_MapConnectionsList:: @ 8308D10 - connection down, 0, Underwater2 - connection emerge, 0, Route124 + connection down, 0, MAP_UNDERWATER2 + connection emerge, 0, MAP_ROUTE124 Underwater1_MapConnections:: @ 8308D28 .4byte 0x2 diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc index 58a4db314..e24e6e122 100644 --- a/data/maps/Underwater2/connections.inc +++ b/data/maps/Underwater2/connections.inc @@ -1,7 +1,7 @@ Underwater2_MapConnectionsList:: @ 8308D30 - connection up, 0, Underwater1 - connection right, 0, Underwater3 - connection emerge, 0, Route126 + connection up, 0, MAP_UNDERWATER1 + connection right, 0, MAP_UNDERWATER3 + connection emerge, 0, MAP_ROUTE126 Underwater2_MapConnections:: @ 8308D54 .4byte 0x3 diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc index 7d6401826..ef0acd44b 100644 --- a/data/maps/Underwater3/connections.inc +++ b/data/maps/Underwater3/connections.inc @@ -1,7 +1,7 @@ Underwater3_MapConnectionsList:: @ 8308D5C - connection emerge, 0, Route127 - connection left, 0, Underwater2 - connection down, 0, Underwater4 + connection emerge, 0, MAP_ROUTE127 + connection left, 0, MAP_UNDERWATER2 + connection down, 0, MAP_UNDERWATER4 Underwater3_MapConnections:: @ 8308D80 .4byte 0x3 diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc index 0b9a523ea..f29aba11e 100644 --- a/data/maps/Underwater4/connections.inc +++ b/data/maps/Underwater4/connections.inc @@ -1,6 +1,6 @@ Underwater4_MapConnectionsList:: @ 8308D88 - connection up, 0, Underwater3 - connection emerge, 0, Route128 + connection up, 0, MAP_UNDERWATER3 + connection emerge, 0, MAP_ROUTE128 Underwater4_MapConnections:: @ 8308DA0 .4byte 0x2 diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc index e1c9c2418..16b03bc03 100644 --- a/data/maps/VerdanturfTown/connections.inc +++ b/data/maps/VerdanturfTown/connections.inc @@ -1,6 +1,6 @@ VerdanturfTown_MapConnectionsList:: @ 83086A4 - connection up, -80, Route116 - connection right, 0, Route117 + connection up, -80, MAP_ROUTE116 + connection right, 0, MAP_ROUTE117 VerdanturfTown_MapConnections:: @ 83086BC .4byte 0x2 diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index e05bee18c..e33de80a9 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -3,8 +3,8 @@ AbandonedShip_CaptainsOffice_MapObjects:: @ 838E45C object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, 1100, 0, 0 AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C - warp_def 7, 6, 3, 4, AbandonedShip_Deck - warp_def 8, 6, 3, 4, AbandonedShip_Deck + warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK + warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc index 8a42d3204..661fbdb09 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_1F.inc @@ -3,18 +3,18 @@ AbandonedShip_Corridors_1F_MapObjects:: @ 838E120 object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 5, 0, 10, 0, 3, 45, 116, 0, 1, 0, 3, 0, AbandonedShip_Corridors_1F_EventScript_15E96E, 0, 0, 0 AbandonedShip_Corridors_1F_MapWarps:: @ 838E150 - warp_def 9, 11, 3, 2, AbandonedShip_Deck - warp_def 8, 11, 3, 2, AbandonedShip_Deck - warp_def 0, 11, 3, 3, AbandonedShip_Deck - warp_def 1, 11, 3, 3, AbandonedShip_Deck - warp_def 11, 9, 3, 0, AbandonedShip_Rooms_1F - warp_def 14, 9, 3, 3, AbandonedShip_Rooms_1F - warp_def 11, 3, 3, 2, AbandonedShip_Rooms_1F - warp_def 14, 3, 3, 4, AbandonedShip_Rooms_1F - warp_def 3, 9, 3, 0, AbandonedShip_Rooms2_1F - warp_def 16, 2, 3, 7, AbandonedShip_Corridors_B1F - warp_def 5, 2, 3, 6, AbandonedShip_Corridors_B1F - warp_def 3, 3, 3, 2, AbandonedShip_Rooms2_1F + warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK + warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK + warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK + warp_def 1, 11, 3, 3, MAP_ABANDONED_SHIP_DECK + warp_def 11, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 14, 9, 3, 3, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 11, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 14, 3, 3, 4, MAP_ABANDONED_SHIP_ROOMS_1F + warp_def 3, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_1F + warp_def 16, 2, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F AbandonedShip_Corridors_1F_MapEvents:: @ 838E1B0 map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc index 7b50cf2fe..d889f1ade 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc @@ -3,14 +3,14 @@ AbandonedShip_Corridors_B1F_MapObjects:: @ 838E238 object_event 2, MAP_OBJ_GFX_SAILOR, 0, 9, 0, 6, 0, 3, 14, 0, 0, 1, 0, 4, 0, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0, 0, 0 AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 - warp_def 6, 4, 3, 2, AbandonedShip_Rooms2_B1F - warp_def 3, 4, 3, 0, AbandonedShip_Rooms2_B1F - warp_def 5, 7, 3, 0, AbandonedShip_Rooms_B1F - warp_def 8, 7, 3, 1, AbandonedShip_Rooms_B1F - warp_def 11, 7, 3, 2, AbandonedShip_Rooms_B1F - warp_def 11, 4, 3, 0, AbandonedShip_Room_B1F - warp_def 0, 2, 3, 10, AbandonedShip_Corridors_1F - warp_def 8, 2, 3, 9, AbandonedShip_Corridors_1F + warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F + warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F + warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 8, 7, 3, 1, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 11, 7, 3, 2, MAP_ABANDONED_SHIP_ROOMS_B1F + warp_def 11, 4, 3, 0, MAP_ABANDONED_SHIP_ROOM_B1F + warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Corridors_B1F_MapBGEvents:: @ 838E2A8 bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3 diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/events/AbandonedShip_Deck.inc index 6988f8568..15f54114b 100644 --- a/data/maps/events/AbandonedShip_Deck.inc +++ b/data/maps/events/AbandonedShip_Deck.inc @@ -1,9 +1,9 @@ AbandonedShip_Deck_MapWarps:: @ 838E0E4 - warp_def 13, 15, 3, 0, Route108 - warp_def 14, 15, 3, 0, Route108 - warp_def 13, 9, 3, 1, AbandonedShip_Corridors_1F - warp_def 8, 9, 3, 2, AbandonedShip_Corridors_1F - warp_def 12, 5, 3, 0, AbandonedShip_CaptainsOffice + warp_def 13, 15, 3, 0, MAP_ROUTE108 + warp_def 14, 15, 3, 0, MAP_ROUTE108 + warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE AbandonedShip_Deck_MapEvents:: @ 838E10C map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc index e5f17046d..97bdf37c5 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc @@ -1,10 +1,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps:: @ 838E4CC - warp_def 3, 8, 3, 0, AbandonedShip_HiddenFloorRooms - warp_def 6, 8, 3, 2, AbandonedShip_HiddenFloorRooms - warp_def 9, 8, 3, 4, AbandonedShip_HiddenFloorRooms - warp_def 3, 3, 3, 6, AbandonedShip_HiddenFloorRooms - warp_def 6, 3, 3, 7, AbandonedShip_HiddenFloorRooms - warp_def 9, 3, 3, 8, AbandonedShip_HiddenFloorRooms + warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 3, 3, 3, 6, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS + warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS AbandonedShip_HiddenFloorCorridors_MapBGEvents:: @ 838E4FC bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index e110e051d..46c8eb47a 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -5,15 +5,15 @@ AbandonedShip_HiddenFloorRooms_MapObjects:: @ 838E540 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, 1101, 0, 0 AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 - warp_def 6, 14, 3, 0, AbandonedShip_HiddenFloorCorridors - warp_def 7, 14, 3, 0, AbandonedShip_HiddenFloorCorridors - warp_def 21, 14, 3, 1, AbandonedShip_HiddenFloorCorridors - warp_def 22, 14, 3, 1, AbandonedShip_HiddenFloorCorridors - warp_def 36, 14, 3, 2, AbandonedShip_HiddenFloorCorridors - warp_def 37, 14, 3, 2, AbandonedShip_HiddenFloorCorridors - warp_def 6, 1, 3, 3, AbandonedShip_HiddenFloorCorridors - warp_def 21, 1, 3, 4, AbandonedShip_HiddenFloorCorridors - warp_def 36, 1, 3, 5, AbandonedShip_HiddenFloorCorridors + warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 22, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 36, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 37, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 6, 1, 3, 3, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS + warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8 bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0 diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc index 9213f3e98..d60f9ec94 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -2,8 +2,8 @@ AbandonedShip_Room_B1F_MapObjects:: @ 838E3AC object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, 1098, 0, 0 AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 - warp_def 4, 7, 3, 5, AbandonedShip_Corridors_B1F - warp_def 5, 7, 3, 5, AbandonedShip_Corridors_B1F + warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Room_B1F_MapEvents:: @ 838E3D4 map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc index 842f972fa..34de5e0af 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -4,9 +4,9 @@ AbandonedShip_Rooms2_1F_MapObjects:: @ 838E3E8 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, 1099, 0, 0 AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 - warp_def 4, 16, 3, 8, AbandonedShip_Corridors_1F - warp_def 5, 16, 3, 8, AbandonedShip_Corridors_1F - warp_def 4, 1, 3, 11, AbandonedShip_Corridors_1F + warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms2_1F_MapEvents:: @ 838E448 map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc index 2ad55a5e9..ece0138dd 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc @@ -3,10 +3,10 @@ AbandonedShip_Rooms2_B1F_MapObjects:: @ 838E324 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, 1097, 0, 0 AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 - warp_def 4, 7, 3, 1, AbandonedShip_Corridors_B1F - warp_def 5, 7, 3, 1, AbandonedShip_Corridors_B1F - warp_def 13, 7, 3, 0, AbandonedShip_Corridors_B1F - warp_def 14, 7, 3, 0, AbandonedShip_Corridors_B1F + warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms2_B1F_MapEvents:: @ 838E374 map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc index 90578df28..e41bce58c 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -3,12 +3,12 @@ AbandonedShip_Rooms_1F_MapObjects:: @ 838E1C4 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, 1095, 0, 0 AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 - warp_def 4, 16, 3, 4, AbandonedShip_Corridors_1F - warp_def 5, 16, 3, 4, AbandonedShip_Corridors_1F - warp_def 4, 1, 3, 6, AbandonedShip_Corridors_1F - warp_def 13, 16, 3, 5, AbandonedShip_Corridors_1F - warp_def 13, 1, 3, 7, AbandonedShip_Corridors_1F - warp_def 14, 16, 3, 5, AbandonedShip_Corridors_1F + warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 13, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F + warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms_1F_MapEvents:: @ 838E224 map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc index 692883bec..455a439cb 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc @@ -3,9 +3,9 @@ AbandonedShip_Rooms_B1F_MapObjects:: @ 838E2C8 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, 1096, 0, 0 AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 - warp_def 4, 1, 3, 2, AbandonedShip_Corridors_B1F - warp_def 13, 1, 3, 3, AbandonedShip_Corridors_B1F - warp_def 22, 1, 3, 4, AbandonedShip_Corridors_B1F + warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F + warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms_B1F_MapEvents:: @ 838E310 map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/events/AbandonedShip_Underwater1.inc index 9a4634860..17a89c2aa 100644 --- a/data/maps/events/AbandonedShip_Underwater1.inc +++ b/data/maps/events/AbandonedShip_Underwater1.inc @@ -1,6 +1,6 @@ AbandonedShip_Underwater1_MapWarps:: @ 838E388 - warp_def 3, 7, 3, 0, AbandonedShip_Underwater2 - warp_def 4, 7, 3, 0, AbandonedShip_Underwater2 + warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 + warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 AbandonedShip_Underwater1_MapEvents:: @ 838E398 map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/events/AbandonedShip_Underwater2.inc index a3a181773..6eb94059c 100644 --- a/data/maps/events/AbandonedShip_Underwater2.inc +++ b/data/maps/events/AbandonedShip_Underwater2.inc @@ -1,5 +1,5 @@ AbandonedShip_Underwater2_MapWarps:: @ 838E4B0 - warp_def 3, 1, 3, 0, AbandonedShip_Underwater1 + warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 AbandonedShip_Underwater2_MapEvents:: @ 838E4B8 map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc index 1f527288b..ebe2147b6 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -2,9 +2,9 @@ AncientTomb_MapObjects:: @ 838E6DC object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, 937, 0, 0 AncientTomb_MapWarps:: @ 838E6F4 - warp_def 8, 29, 3, 0, Route120 - warp_def 8, 20, 0, 2, AncientTomb - warp_def 8, 11, 3, 1, AncientTomb + warp_def 8, 29, 3, 0, MAP_ROUTE120 + warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB + warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB AncientTomb_MapBGEvents:: @ 838E70C bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021 diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index 5c59bbf12..0c8ed6773 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -4,9 +4,9 @@ AquaHideout_1F_MapObjects:: @ 838CD0C object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, 924, 0, 0 AquaHideout_1F_MapWarps:: @ 838CD54 - warp_def 13, 27, 1, 6, LilycoveCity - warp_def 14, 27, 1, 6, LilycoveCity - warp_def 22, 1, 3, 0, AquaHideout_B1F + warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY + warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY + warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F AquaHideout_1F_MapEvents:: @ 838CD6C map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index 742761833..723586d41 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -9,31 +9,31 @@ AquaHideout_B1F_MapObjects:: @ 838CD80 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, 978, 0, 0 AquaHideout_B1F_MapWarps:: @ 838CE40 - warp_def 29, 1, 3, 2, AquaHideout_1F - warp_def 18, 1, 3, 0, AquaHideout_B2F - warp_def 12, 1, 3, 1, AquaHideout_B2F - warp_def 3, 3, 3, 2, AquaHideout_B2F - warp_def 31, 4, 3, 7, AquaHideout_B1F - warp_def 27, 4, 3, 8, AquaHideout_B1F - warp_def 20, 4, 3, 10, AquaHideout_B1F - warp_def 27, 12, 3, 4, AquaHideout_B1F - warp_def 3, 15, 3, 5, AquaHideout_B1F - warp_def 3, 20, 3, 12, AquaHideout_B1F - warp_def 32, 19, 3, 6, AquaHideout_B1F - warp_def 23, 10, 3, 22, AquaHideout_B1F - warp_def 45, 3, 3, 9, AquaHideout_B1F - warp_def 42, 5, 3, 18, AquaHideout_B1F - warp_def 45, 5, 3, 12, AquaHideout_B1F - warp_def 48, 5, 3, 16, AquaHideout_B1F - warp_def 42, 9, 3, 15, AquaHideout_B1F - warp_def 45, 9, 3, 20, AquaHideout_B1F - warp_def 48, 9, 3, 13, AquaHideout_B1F - warp_def 42, 13, 3, 24, AquaHideout_B1F - warp_def 45, 13, 3, 17, AquaHideout_B1F - warp_def 48, 13, 3, 12, AquaHideout_B1F - warp_def 42, 17, 3, 11, AquaHideout_B1F - warp_def 45, 17, 3, 17, AquaHideout_B1F - warp_def 48, 17, 3, 19, AquaHideout_B1F + warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F + warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F + warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F + warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F + warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F + warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F + warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F + warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F + warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F + warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F + warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F + warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F AquaHideout_B1F_MapEvents:: @ 838CF08 map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index d2cce8ab9..570348b57 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -6,16 +6,16 @@ AquaHideout_B2F_MapObjects:: @ 838CF1C object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, 924, 0, 0 AquaHideout_B2F_MapWarps:: @ 838CF94 - warp_def 18, 1, 3, 1, AquaHideout_B1F - warp_def 12, 1, 3, 2, AquaHideout_B1F - warp_def 3, 3, 3, 3, AquaHideout_B1F - warp_def 31, 8, 3, 5, AquaHideout_B2F - warp_def 8, 8, 3, 8, AquaHideout_B2F - warp_def 5, 8, 3, 3, AquaHideout_B2F - warp_def 18, 13, 3, 7, AquaHideout_B2F - warp_def 12, 13, 3, 6, AquaHideout_B2F - warp_def 31, 17, 3, 4, AquaHideout_B2F - warp_def 32, 20, 3, 4, AquaHideout_B1F + warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F + warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F + warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F + warp_def 31, 8, 3, 5, MAP_AQUA_HIDEOUT_B2F + warp_def 8, 8, 3, 8, MAP_AQUA_HIDEOUT_B2F + warp_def 5, 8, 3, 3, MAP_AQUA_HIDEOUT_B2F + warp_def 18, 13, 3, 7, MAP_AQUA_HIDEOUT_B2F + warp_def 12, 13, 3, 6, MAP_AQUA_HIDEOUT_B2F + warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F + warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents:: @ 838CFE4 coord_event 28, 17, 3, 0, 0x4001, 0, 0, AquaHideout_B2F_EventScript_15D8BD diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc index dda5621b6..2f7a46a05 100644 --- a/data/maps/events/BattleTower_BattleRoom.inc +++ b/data/maps/events/BattleTower_BattleRoom.inc @@ -3,8 +3,8 @@ BattleTower_BattleRoom_MapObjects:: @ 8391DAC object_event 2, MAP_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleTower_BattleRoom_MapWarps:: @ 8391DDC - warp_def 5, 8, 0, 2, BattleTower_Lobby - warp_def 6, 8, 0, 2, BattleTower_Lobby + warp_def 5, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY + warp_def 6, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY BattleTower_BattleRoom_MapEvents:: @ 8391DEC map_events BattleTower_BattleRoom_MapObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/events/BattleTower_Lobby.inc index 6d4e15f7a..b0a0bf435 100644 --- a/data/maps/events/BattleTower_Lobby.inc +++ b/data/maps/events/BattleTower_Lobby.inc @@ -7,9 +7,9 @@ BattleTower_Lobby_MapObjects:: @ 8391C8C object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, 941, 0, 0 BattleTower_Lobby_MapWarps:: @ 8391D1C - warp_def 6, 8, 0, 0, BattleTower_Outside - warp_def 7, 8, 0, 0, BattleTower_Outside - warp_def 6, 1, 0, 0, BattleTower_BattleRoom + warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE + warp_def 7, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE + warp_def 6, 1, 0, 0, MAP_BATTLE_TOWER_BATTLE_ROOM BattleTower_Lobby_MapBGEvents:: @ 8391D34 bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727 diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/events/BattleTower_Outside.inc index 04085c346..902a779f1 100644 --- a/data/maps/events/BattleTower_Outside.inc +++ b/data/maps/events/BattleTower_Outside.inc @@ -6,7 +6,7 @@ BattleTower_Outside_MapObjects:: @ 8391BEC object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 19, 0, 24, 0, 3, 7, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160168, 0, 0, 0 BattleTower_Outside_MapWarps:: @ 8391C64 - warp_def 14, 8, 0, 0, BattleTower_Lobby + warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY BattleTower_Outside_MapBGEvents:: @ 8391C6C bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/events/CaveOfOrigin_1F.inc index 43b0b615d..1e2185e9b 100644 --- a/data/maps/events/CaveOfOrigin_1F.inc +++ b/data/maps/events/CaveOfOrigin_1F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_1F_MapWarps:: @ 838D718 - warp_def 11, 17, 3, 1, CaveOfOrigin_Entrance - warp_def 14, 5, 3, 0, CaveOfOrigin_B1F + warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE + warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_1F_MapCoordEvents:: @ 838D728 coord_event 7, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 0a3df0655..905954d9b 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_B1F_MapWarps:: @ 838D76C - warp_def 13, 5, 3, 1, CaveOfOrigin_1F - warp_def 5, 11, 3, 0, CaveOfOrigin_B2F + warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F + warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_B2F CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C coord_event 12, 15, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/events/CaveOfOrigin_B2F.inc index 9c04629f0..2d98e50ac 100644 --- a/data/maps/events/CaveOfOrigin_B2F.inc +++ b/data/maps/events/CaveOfOrigin_B2F.inc @@ -1,6 +1,6 @@ CaveOfOrigin_B2F_MapWarps:: @ 838D7C0 - warp_def 5, 10, 3, 1, CaveOfOrigin_B1F - warp_def 8, 14, 3, 0, CaveOfOrigin_B3F + warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_B1F + warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 coord_event 10, 6, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc index 0d0b44eea..8eb114b74 100644 --- a/data/maps/events/CaveOfOrigin_B3F.inc +++ b/data/maps/events/CaveOfOrigin_B3F.inc @@ -2,8 +2,8 @@ CaveOfOrigin_B3F_MapObjects:: @ 838D814 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, 1059, 0, 0 CaveOfOrigin_B3F_MapWarps:: @ 838D82C - warp_def 7, 14, 3, 1, CaveOfOrigin_B2F - warp_def 12, 6, 3, 0, CaveOfOrigin_B4F + warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F + warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C coord_event 5, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index 3b4beb038..35dc61fe8 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -2,7 +2,7 @@ CaveOfOrigin_B4F_MapObjects:: @ 838D880 object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 825, 0, 0 CaveOfOrigin_B4F_MapWarps:: @ 838D898 - warp_def 12, 5, 3, 1, CaveOfOrigin_B3F + warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 coord_event 9, 13, 3, 0, 0x409b, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/events/CaveOfOrigin_Entrance.inc index 4e61e3d82..cab14e4d7 100644 --- a/data/maps/events/CaveOfOrigin_Entrance.inc +++ b/data/maps/events/CaveOfOrigin_Entrance.inc @@ -1,6 +1,6 @@ CaveOfOrigin_Entrance_MapWarps:: @ 838D6F4 - warp_def 9, 20, 3, 3, SootopolisCity - warp_def 9, 5, 3, 0, CaveOfOrigin_1F + warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY + warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F CaveOfOrigin_Entrance_MapEvents:: @ 838D704 map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index 849c7f729..fed9dd8f2 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -2,9 +2,9 @@ DesertRuins_MapObjects:: @ 838BEBC object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, 935, 0, 0 DesertRuins_MapWarps:: @ 838BED4 - warp_def 8, 29, 3, 1, Route111 - warp_def 8, 20, 0, 2, DesertRuins - warp_def 8, 11, 3, 1, DesertRuins + warp_def 8, 29, 3, 1, MAP_ROUTE111 + warp_def 8, 20, 0, 2, MAP_DESERT_RUINS + warp_def 8, 11, 3, 1, MAP_DESERT_RUINS DesertRuins_MapBGEvents:: @ 838BEEC bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56 diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 8a5fc1fed..47a200874 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -6,11 +6,11 @@ DewfordTown_MapObjects:: @ 8380B88 object_event 5, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0, 0, 0 DewfordTown_MapWarps:: @ 8380C00 - warp_def 3, 3, 0, 0, DewfordTown_Hall - warp_def 2, 10, 0, 0, DewfordTown_PokemonCenter_1F - warp_def 8, 17, 0, 0, DewfordTown_Gym - warp_def 17, 14, 0, 0, DewfordTown_House1 - warp_def 8, 8, 0, 0, DewfordTown_House2 + warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL + warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F + warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM + warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1 + warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 DewfordTown_MapBGEvents:: @ 8380C28 bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc index 2e36395c1..10a5f8499 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/events/DewfordTown_Gym.inc @@ -6,8 +6,8 @@ DewfordTown_Gym_MapObjects:: @ 8385FBC object_event 5, MAP_OBJ_GFX_MAN_2, 0, 5, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0, 0, 0 DewfordTown_Gym_MapWarps:: @ 8386034 - warp_def 5, 27, 0, 2, DewfordTown - warp_def 6, 27, 0, 2, DewfordTown + warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN + warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN DewfordTown_Gym_MapBGEvents:: @ 8386044 bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc index d58fbfbd4..dc05cb15e 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -10,8 +10,8 @@ DewfordTown_Hall_MapObjects:: @ 8386088 object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, 940, 0, 0 DewfordTown_Hall_MapWarps:: @ 8386160 - warp_def 5, 8, 0, 0, DewfordTown - warp_def 6, 8, 0, 0, DewfordTown + warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN + warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN DewfordTown_Hall_MapBGEvents:: @ 8386170 bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353 diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc index 9bed6ac7a..daedf3d19 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/events/DewfordTown_House1.inc @@ -4,8 +4,8 @@ DewfordTown_House1_MapObjects:: @ 8385E58 object_event 3, MAP_OBJ_GFX_ZIGZAGOON, 0, 4, 0, 2, 0, 3, 8, 19, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_153001, 0, 0, 0 DewfordTown_House1_MapWarps:: @ 8385EA0 - warp_def 3, 7, 0, 3, DewfordTown - warp_def 4, 7, 0, 3, DewfordTown + warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN + warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN DewfordTown_House1_MapEvents:: @ 8385EB0 map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc index eae9ff28e..0553bc23a 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/events/DewfordTown_House2.inc @@ -3,8 +3,8 @@ DewfordTown_House2_MapObjects:: @ 838619C object_event 2, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0, 0, 0 DewfordTown_House2_MapWarps:: @ 83861CC - warp_def 3, 8, 0, 4, DewfordTown - warp_def 4, 8, 0, 4, DewfordTown + warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN + warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN DewfordTown_House2_MapEvents:: @ 83861DC map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc index a870483b3..b1a13dd8a 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ DewfordTown_PokemonCenter_1F_MapObjects:: @ 8385EC4 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 0, 5, 18, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0, 0, 0 DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C - warp_def 7, 8, 3, 1, DewfordTown - warp_def 6, 8, 3, 1, DewfordTown - warp_def 1, 6, 4, 0, DewfordTown_PokemonCenter_2F + warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN + warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN + warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F DewfordTown_PokemonCenter_1F_MapEvents:: @ 8385F24 map_events DewfordTown_PokemonCenter_1F_MapObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc index 0d17672de..00e066e2f 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ DewfordTown_PokemonCenter_2F_MapObjects:: @ 8385F38 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0, 0, 0 DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80 - warp_def 1, 5, 4, 2, DewfordTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8 map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc index a1dd533c1..4c1058845 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/events/DoubleBattleColosseum.inc @@ -1,8 +1,8 @@ DoubleBattleColosseum_MapWarps:: @ 8391428 - warp_def 5, 8, 3, 127, None - warp_def 6, 8, 3, 127, None - warp_def 7, 8, 3, 127, None - warp_def 8, 8, 3, 127, None + warp_def 5, 8, 3, 127, MAP_NONE + warp_def 6, 8, 3, 127, MAP_NONE + warp_def 7, 8, 3, 127, MAP_NONE + warp_def 8, 8, 3, 127, MAP_NONE DoubleBattleColosseum_MapCoordEvents:: @ 8391448 coord_event 3, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A4383 diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc index 41fd48f06..a4b62f583 100644 --- a/data/maps/events/EverGrandeCity.inc +++ b/data/maps/events/EverGrandeCity.inc @@ -1,8 +1,8 @@ EverGrandeCity_MapWarps:: @ 83807DC - warp_def 18, 5, 0, 0, EverGrandeCity_PokemonLeague - warp_def 27, 48, 0, 0, EverGrandeCity_PokemonCenter_1F - warp_def 18, 41, 0, 0, VictoryRoad_1F - warp_def 18, 27, 0, 1, VictoryRoad_1F + warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F + warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F + warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents:: @ 83807FC coord_event 17, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index 5d97fe89c..867456c4f 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -4,8 +4,8 @@ EverGrandeCity_ChampionsRoom_MapObjects:: @ 838B334 object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 921, 0, 0 EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C - warp_def 6, 12, 3, 1, EverGrandeCity_Corridor4 - warp_def 6, 2, 0, 0, EverGrandeCity_HallOfFame + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME EverGrandeCity_ChampionsRoom_MapEvents:: @ 838B38C map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor1.inc b/data/maps/events/EverGrandeCity_Corridor1.inc index df9176426..f3ec6727e 100644 --- a/data/maps/events/EverGrandeCity_Corridor1.inc +++ b/data/maps/events/EverGrandeCity_Corridor1.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor1_MapWarps:: @ 838B3A0 - warp_def 5, 12, 3, 1, EverGrandeCity_SidneysRoom - warp_def 5, 2, 0, 0, EverGrandeCity_PhoebesRoom - warp_def 4, 12, 3, 1, EverGrandeCity_SidneysRoom - warp_def 6, 12, 3, 1, EverGrandeCity_SidneysRoom + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM EverGrandeCity_Corridor1_MapEvents:: @ 838B3C0 map_events 0x0, EverGrandeCity_Corridor1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor2.inc b/data/maps/events/EverGrandeCity_Corridor2.inc index 35dfa181c..e9a9cdc4c 100644 --- a/data/maps/events/EverGrandeCity_Corridor2.inc +++ b/data/maps/events/EverGrandeCity_Corridor2.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor2_MapWarps:: @ 838B3D4 - warp_def 5, 12, 3, 1, EverGrandeCity_PhoebesRoom - warp_def 5, 2, 0, 0, EverGrandeCity_GlaciasRoom - warp_def 4, 12, 3, 1, EverGrandeCity_PhoebesRoom - warp_def 6, 12, 3, 1, EverGrandeCity_PhoebesRoom + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM EverGrandeCity_Corridor2_MapEvents:: @ 838B3F4 map_events 0x0, EverGrandeCity_Corridor2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor3.inc b/data/maps/events/EverGrandeCity_Corridor3.inc index daf135a5f..98d5f7b81 100644 --- a/data/maps/events/EverGrandeCity_Corridor3.inc +++ b/data/maps/events/EverGrandeCity_Corridor3.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor3_MapWarps:: @ 838B408 - warp_def 5, 12, 3, 1, EverGrandeCity_GlaciasRoom - warp_def 5, 2, 0, 0, EverGrandeCity_DrakesRoom - warp_def 4, 12, 3, 1, EverGrandeCity_GlaciasRoom - warp_def 6, 12, 3, 1, EverGrandeCity_GlaciasRoom + warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM + warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM EverGrandeCity_Corridor3_MapEvents:: @ 838B428 map_events 0x0, EverGrandeCity_Corridor3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor4.inc b/data/maps/events/EverGrandeCity_Corridor4.inc index 55757ea4c..cbcf9f77e 100644 --- a/data/maps/events/EverGrandeCity_Corridor4.inc +++ b/data/maps/events/EverGrandeCity_Corridor4.inc @@ -1,6 +1,6 @@ EverGrandeCity_Corridor4_MapWarps:: @ 838B43C - warp_def 5, 33, 3, 1, EverGrandeCity_DrakesRoom - warp_def 5, 2, 0, 0, EverGrandeCity_ChampionsRoom + warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_Corridor4_MapEvents:: @ 838B44C map_events 0x0, EverGrandeCity_Corridor4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor5.inc b/data/maps/events/EverGrandeCity_Corridor5.inc index bd07dd7e0..5b77148ca 100644 --- a/data/maps/events/EverGrandeCity_Corridor5.inc +++ b/data/maps/events/EverGrandeCity_Corridor5.inc @@ -1,8 +1,8 @@ EverGrandeCity_Corridor5_MapWarps:: @ 838B460 - warp_def 5, 12, 3, 2, EverGrandeCity_PokemonLeague - warp_def 5, 2, 0, 0, EverGrandeCity_SidneysRoom - warp_def 4, 12, 3, 2, EverGrandeCity_PokemonLeague - warp_def 6, 12, 3, 2, EverGrandeCity_PokemonLeague + warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE EverGrandeCity_Corridor5_MapEvents:: @ 838B480 map_events 0x0, EverGrandeCity_Corridor5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc index a925ffed8..e7ac276aa 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_DrakesRoom_MapObjects:: @ 838B2F8 object_event 1, MAP_OBJ_GFX_DRAKE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0, 0, 0 EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310 - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor3 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor4 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4 EverGrandeCity_DrakesRoom_MapEvents:: @ 838B320 map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc index 806cfe7e1..f6c6ce97e 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_GlaciasRoom_MapObjects:: @ 838B2BC object_event 1, MAP_OBJ_GFX_GLACIA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0, 0, 0 EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4 - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor2 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor3 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3 EverGrandeCity_GlaciasRoom_MapEvents:: @ 838B2E4 map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc index 1860ee397..9290c4530 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/events/EverGrandeCity_HallOfFame.inc @@ -2,7 +2,7 @@ EverGrandeCity_HallOfFame_MapObjects:: @ 838B528 object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 16, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 EverGrandeCity_HallOfFame_MapWarps:: @ 838B540 - warp_def 7, 11, 3, 1, EverGrandeCity_ChampionsRoom + warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_HallOfFame_MapEvents:: @ 838B548 map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc index aab61bcf4..a2de097b8 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_PhoebesRoom_MapObjects:: @ 838B280 object_event 1, MAP_OBJ_GFX_PHOEBE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0, 0, 0 EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298 - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor1 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor2 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2 EverGrandeCity_PhoebesRoom_MapEvents:: @ 838B2A8 map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc index 25aee1300..f0709710d 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ EverGrandeCity_PokemonCenter_1F_MapObjects:: @ 838B55C object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0, 0, 0 EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4 - warp_def 7, 8, 3, 1, EverGrandeCity - warp_def 6, 8, 3, 1, EverGrandeCity - warp_def 1, 6, 4, 0, EverGrandeCity_PokemonCenter_2F + warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY + warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY + warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 838B5BC map_events EverGrandeCity_PokemonCenter_1F_MapObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc index 2bc94cdcc..e7502055a 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ EverGrandeCity_PokemonCenter_2F_MapObjects:: @ 838B5D0 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0, 0, 0 EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618 - warp_def 1, 5, 4, 2, EverGrandeCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640 map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/events/EverGrandeCity_PokemonLeague.inc index d60761727..77247e665 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague.inc @@ -5,10 +5,10 @@ EverGrandeCity_PokemonLeague_MapObjects:: @ 838B494 object_event 4, MAP_OBJ_GFX_MAN_4, 0, 11, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0 EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4 - warp_def 9, 11, 3, 0, EverGrandeCity - warp_def 10, 11, 3, 0, EverGrandeCity - warp_def 9, 1, 3, 0, EverGrandeCity_Corridor5 - warp_def 10, 1, 3, 0, EverGrandeCity_Corridor5 + warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY + warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY + warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514 map_events EverGrandeCity_PokemonLeague_MapObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc index ff370d4ef..c2a7ce10d 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc @@ -2,8 +2,8 @@ EverGrandeCity_SidneysRoom_MapObjects:: @ 838B244 object_event 1, MAP_OBJ_GFX_SIDNEY, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0, 0, 0 EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C - warp_def 6, 13, 3, 1, EverGrandeCity_Corridor5 - warp_def 6, 2, 0, 0, EverGrandeCity_Corridor1 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1 EverGrandeCity_SidneysRoom_MapEvents:: @ 838B26C map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index 2d69688e7..57d59dac9 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -5,11 +5,11 @@ FallarborTown_MapObjects:: @ 8380E04 object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, 907, 0, 0 FallarborTown_MapWarps:: @ 8380E64 - warp_def 15, 15, 0, 0, FallarborTown_Mart - warp_def 8, 7, 0, 0, FallarborTown_ContestLobby - warp_def 14, 7, 0, 0, FallarborTown_PokemonCenter_1F - warp_def 6, 17, 0, 0, FallarborTown_House1 - warp_def 1, 6, 0, 0, FallarborTown_House2 + warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART + warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_LOBBY + warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F + warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 + warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 FallarborTown_MapBGEvents:: @ 8380E8C bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/events/FallarborTown_ContestHall.inc index 93b43eccc..30b602e60 100644 --- a/data/maps/events/FallarborTown_ContestHall.inc +++ b/data/maps/events/FallarborTown_ContestHall.inc @@ -4,8 +4,8 @@ FallarborTown_ContestHall_MapObjects:: @ 83867DC object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 0, 15, 0, 0, 2, 51, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0, 0, 0 FallarborTown_ContestHall_MapWarps:: @ 8386824 - warp_def 10, 17, 0, 2, FallarborTown_ContestLobby - warp_def 11, 17, 0, 2, FallarborTown_ContestLobby + warp_def 10, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY + warp_def 11, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY FallarborTown_ContestHall_MapBGEvents:: @ 8386834 bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/events/FallarborTown_ContestLobby.inc index af7ca5ed1..d34bc68d1 100644 --- a/data/maps/events/FallarborTown_ContestLobby.inc +++ b/data/maps/events/FallarborTown_ContestLobby.inc @@ -7,9 +7,9 @@ FallarborTown_ContestLobby_MapObjects:: @ 83866F0 object_event 6, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0, 0, 0 FallarborTown_ContestLobby_MapWarps:: @ 8386780 - warp_def 5, 6, 0, 1, FallarborTown - warp_def 6, 6, 0, 1, FallarborTown - warp_def 1, 1, 0, 0, FallarborTown_ContestHall + warp_def 5, 6, 0, 1, MAP_FALLARBOR_TOWN + warp_def 6, 6, 0, 1, MAP_FALLARBOR_TOWN + warp_def 1, 1, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_HALL FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823 diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index d4cd3e0c9..256b8a339 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -3,8 +3,8 @@ FallarborTown_House1_MapObjects:: @ 8386970 object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0, 0, 0 FallarborTown_House1_MapWarps:: @ 83869A0 - warp_def 3, 8, 0, 3, FallarborTown - warp_def 4, 8, 0, 3, FallarborTown + warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN + warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN FallarborTown_House1_MapEvents:: @ 83869B0 map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc index 0b1c64162..e24fef7a9 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/events/FallarborTown_House2.inc @@ -2,8 +2,8 @@ FallarborTown_House2_MapObjects:: @ 83869C4 object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0, 0, 0 FallarborTown_House2_MapWarps:: @ 83869DC - warp_def 3, 7, 0, 4, FallarborTown - warp_def 4, 7, 0, 4, FallarborTown + warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN FallarborTown_House2_MapEvents:: @ 83869EC map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc index 584b70447..c343e017e 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/events/FallarborTown_Mart.inc @@ -5,8 +5,8 @@ FallarborTown_Mart_MapObjects:: @ 838666C object_event 4, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0, 0, 0 FallarborTown_Mart_MapWarps:: @ 83866CC - warp_def 3, 7, 0, 0, FallarborTown - warp_def 4, 7, 0, 0, FallarborTown + warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN FallarborTown_Mart_MapEvents:: @ 83866DC map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index 16f90af9d..e537f497d 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ FallarborTown_PokemonCenter_1F_MapObjects:: @ 8386860 object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, 871, 0, 0 FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 - warp_def 7, 8, 3, 2, FallarborTown - warp_def 6, 8, 3, 2, FallarborTown - warp_def 1, 6, 4, 0, FallarborTown_PokemonCenter_2F + warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN + warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN + warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F FallarborTown_PokemonCenter_1F_MapEvents:: @ 83868D8 map_events FallarborTown_PokemonCenter_1F_MapObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc index 05ea78f75..1ae7bba2a 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ FallarborTown_PokemonCenter_2F_MapObjects:: @ 83868EC object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0, 0, 0 FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 - warp_def 1, 5, 4, 2, FallarborTown_PokemonCenter_1F - warp_def 5, 1, 3, 0, SingleBattleColosseum - warp_def 8, 1, 3, 0, TradeCenter - warp_def 11, 1, 3, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 3, 0, MAP_TRADE_CENTER + warp_def 11, 1, 3, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index a4ac688d8..22f2b403e 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -9,8 +9,8 @@ FieryPath_MapObjects:: @ 838C718 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0 FieryPath_MapWarps:: @ 838C7D8 - warp_def 26, 36, 3, 4, Route112 - warp_def 26, 4, 3, 5, Route112 + warp_def 26, 36, 3, 4, MAP_ROUTE112 + warp_def 26, 4, 3, 5, MAP_ROUTE112 FieryPath_MapEvents:: @ 838C7E8 map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc index 437852d25..c25f6f6ed 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -8,15 +8,15 @@ FortreeCity_MapObjects:: @ 8380020 object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, 969, 0, 0 FortreeCity_MapWarps:: @ 83800C8 - warp_def 5, 6, 0, 0, FortreeCity_PokemonCenter_1F - warp_def 10, 3, 0, 0, FortreeCity_House1 - warp_def 22, 11, 0, 0, FortreeCity_Gym - warp_def 4, 14, 0, 0, FortreeCity_Mart - warp_def 17, 3, 0, 0, FortreeCity_House2 - warp_def 25, 3, 0, 0, FortreeCity_House3 - warp_def 32, 2, 0, 0, FortreeCity_House4 - warp_def 12, 13, 0, 0, FortreeCity_House5 - warp_def 37, 13, 0, 0, FortreeCity_DecorationShop + warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F + warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1 + warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM + warp_def 4, 14, 0, 0, MAP_FORTREE_CITY_MART + warp_def 17, 3, 0, 0, MAP_FORTREE_CITY_HOUSE2 + warp_def 25, 3, 0, 0, MAP_FORTREE_CITY_HOUSE3 + warp_def 32, 2, 0, 0, MAP_FORTREE_CITY_HOUSE4 + warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5 + warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP FortreeCity_MapBGEvents:: @ 8380110 bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1 diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc index cc9894b5c..930a73b55 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/events/FortreeCity_DecorationShop.inc @@ -5,8 +5,8 @@ FortreeCity_DecorationShop_MapObjects:: @ 83893E0 object_event 4, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0, 0, 0 FortreeCity_DecorationShop_MapWarps:: @ 8389440 - warp_def 3, 5, 0, 8, FortreeCity - warp_def 4, 5, 0, 8, FortreeCity + warp_def 3, 5, 0, 8, MAP_FORTREE_CITY + warp_def 4, 5, 0, 8, MAP_FORTREE_CITY FortreeCity_DecorationShop_MapEvents:: @ 8389450 map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc index ad983f81b..523dd3fdc 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/events/FortreeCity_Gym.inc @@ -7,8 +7,8 @@ FortreeCity_Gym_MapObjects:: @ 8389018 object_event 6, MAP_OBJ_GFX_MAN_2, 0, 2, 0, 19, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0, 0, 0 FortreeCity_Gym_MapWarps:: @ 83890A8 - warp_def 2, 24, 0, 2, FortreeCity - warp_def 3, 24, 0, 2, FortreeCity + warp_def 2, 24, 0, 2, MAP_FORTREE_CITY + warp_def 3, 24, 0, 2, MAP_FORTREE_CITY FortreeCity_Gym_MapBGEvents:: @ 83890B8 bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc index ff383b464..23cd52fdc 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/events/FortreeCity_House1.inc @@ -4,8 +4,8 @@ FortreeCity_House1_MapObjects:: @ 8388FAC object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EB7, 0, 0, 0 FortreeCity_House1_MapWarps:: @ 8388FF4 - warp_def 3, 5, 0, 1, FortreeCity - warp_def 4, 5, 0, 1, FortreeCity + warp_def 3, 5, 0, 1, MAP_FORTREE_CITY + warp_def 4, 5, 0, 1, MAP_FORTREE_CITY FortreeCity_House1_MapEvents:: @ 8389004 map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc index 3b0943b2e..1c7246100 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/events/FortreeCity_House2.inc @@ -2,8 +2,8 @@ FortreeCity_House2_MapObjects:: @ 8389278 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 2, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0, 0, 0 FortreeCity_House2_MapWarps:: @ 8389290 - warp_def 3, 5, 0, 4, FortreeCity - warp_def 4, 5, 0, 4, FortreeCity + warp_def 3, 5, 0, 4, MAP_FORTREE_CITY + warp_def 4, 5, 0, 4, MAP_FORTREE_CITY FortreeCity_House2_MapEvents:: @ 83892A0 map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc index b0b5a7412..359953246 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/events/FortreeCity_House3.inc @@ -3,8 +3,8 @@ FortreeCity_House3_MapObjects:: @ 83892B4 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_158175, 0, 0, 0 FortreeCity_House3_MapWarps:: @ 83892E4 - warp_def 3, 5, 0, 5, FortreeCity - warp_def 4, 5, 0, 5, FortreeCity + warp_def 3, 5, 0, 5, MAP_FORTREE_CITY + warp_def 4, 5, 0, 5, MAP_FORTREE_CITY FortreeCity_House3_MapEvents:: @ 83892F4 map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc index 8b85660c7..38bdacf44 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -4,8 +4,8 @@ FortreeCity_House4_MapObjects:: @ 8389308 object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, 933, 0, 0 FortreeCity_House4_MapWarps:: @ 8389350 - warp_def 3, 5, 0, 6, FortreeCity - warp_def 4, 5, 0, 6, FortreeCity + warp_def 3, 5, 0, 6, MAP_FORTREE_CITY + warp_def 4, 5, 0, 6, MAP_FORTREE_CITY FortreeCity_House4_MapEvents:: @ 8389360 map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc index ffaa59e69..94ff0ebb1 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/events/FortreeCity_House5.inc @@ -4,8 +4,8 @@ FortreeCity_House5_MapObjects:: @ 8389374 object_event 3, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0, 0, 0 FortreeCity_House5_MapWarps:: @ 83893BC - warp_def 3, 5, 0, 7, FortreeCity - warp_def 4, 5, 0, 7, FortreeCity + warp_def 3, 5, 0, 7, MAP_FORTREE_CITY + warp_def 4, 5, 0, 7, MAP_FORTREE_CITY FortreeCity_House5_MapEvents:: @ 83893CC map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc index 5d1996fc2..2353c3c1f 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/events/FortreeCity_Mart.inc @@ -5,8 +5,8 @@ FortreeCity_Mart_MapObjects:: @ 83891F4 object_event 4, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0, 0, 0 FortreeCity_Mart_MapWarps:: @ 8389254 - warp_def 3, 7, 0, 3, FortreeCity - warp_def 4, 7, 0, 3, FortreeCity + warp_def 3, 7, 0, 3, MAP_FORTREE_CITY + warp_def 4, 7, 0, 3, MAP_FORTREE_CITY FortreeCity_Mart_MapEvents:: @ 8389264 map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc index bd7877e24..bc06da7ca 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ FortreeCity_PokemonCenter_1F_MapObjects:: @ 83890E4 object_event 4, MAP_OBJ_GFX_BOY_3, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0, 0, 0 FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144 - warp_def 7, 8, 3, 0, FortreeCity - warp_def 6, 8, 3, 0, FortreeCity - warp_def 1, 6, 4, 0, FortreeCity_PokemonCenter_2F + warp_def 7, 8, 3, 0, MAP_FORTREE_CITY + warp_def 6, 8, 3, 0, MAP_FORTREE_CITY + warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F FortreeCity_PokemonCenter_1F_MapEvents:: @ 838915C map_events FortreeCity_PokemonCenter_1F_MapObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc index b6a10428c..f16c59cce 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ FortreeCity_PokemonCenter_2F_MapObjects:: @ 8389170 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0, 0, 0 FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8 - warp_def 1, 5, 4, 2, FortreeCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0 map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc index 760c1b0e9..1728858fb 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -3,10 +3,10 @@ GraniteCave_1F_MapObjects:: @ 838BF24 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, 1050, 0, 0 GraniteCave_1F_MapWarps:: @ 838BF54 - warp_def 37, 12, 3, 0, Route106 - warp_def 35, 3, 3, 0, GraniteCave_B1F - warp_def 17, 11, 3, 1, GraniteCave_B1F - warp_def 5, 10, 3, 0, GraniteCave_StevensRoom + warp_def 37, 12, 3, 0, MAP_ROUTE106 + warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F + warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F + warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM GraniteCave_1F_MapEvents:: @ 838BF74 map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc index 2bfd8257d..bc0cc5dfc 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -2,13 +2,13 @@ GraniteCave_B1F_MapObjects:: @ 838BF88 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, 1051, 0, 0 GraniteCave_B1F_MapWarps:: @ 838BFA0 - warp_def 25, 13, 3, 1, GraniteCave_1F - warp_def 4, 21, 3, 2, GraniteCave_1F - warp_def 29, 13, 3, 0, GraniteCave_B2F - warp_def 28, 21, 3, 1, GraniteCave_B2F - warp_def 8, 5, 3, 2, GraniteCave_B2F - warp_def 12, 3, 3, 3, GraniteCave_B2F - warp_def 29, 2, 3, 4, GraniteCave_B2F + warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F + warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F + warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F + warp_def 28, 21, 3, 1, MAP_GRANITE_CAVE_B2F + warp_def 8, 5, 3, 2, MAP_GRANITE_CAVE_B2F + warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F + warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F GraniteCave_B1F_MapEvents:: @ 838BFD8 map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index 158577482..ec4b309a5 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -10,11 +10,11 @@ GraniteCave_B2F_MapObjects:: @ 838BFEC object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 23, 0, 0 GraniteCave_B2F_MapWarps:: @ 838C0C4 - warp_def 29, 13, 3, 2, GraniteCave_B1F - warp_def 28, 21, 3, 3, GraniteCave_B1F - warp_def 8, 5, 3, 4, GraniteCave_B1F - warp_def 12, 3, 3, 5, GraniteCave_B1F - warp_def 29, 2, 3, 6, GraniteCave_B1F + warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F + warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F + warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F + warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F + warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F GraniteCave_B2F_MapBGEvents:: @ 838C0EC bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0 diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc index 2e4d9cd30..121ae31cd 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -2,7 +2,7 @@ GraniteCave_StevensRoom_MapObjects:: @ 838C118 object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, 833, 0, 0 GraniteCave_StevensRoom_MapWarps:: @ 838C130 - warp_def 7, 3, 3, 3, GraniteCave_1F + warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F GraniteCave_StevensRoom_MapEvents:: @ 838C138 map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index 7656e2679..3b177129a 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -4,9 +4,9 @@ InsideOfTruck_MapObjects:: @ 8391618 object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0 InsideOfTruck_MapWarps:: @ 8391660 - warp_def 4, 1, 0, 127, None - warp_def 4, 2, 0, 127, None - warp_def 4, 3, 0, 127, None + warp_def 4, 1, 0, 127, MAP_NONE + warp_def 4, 2, 0, 127, MAP_NONE + warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents:: @ 8391678 coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc index a3fbc959a..372097a07 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -2,9 +2,9 @@ IslandCave_MapObjects:: @ 838E674 object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, 936, 0, 0 IslandCave_MapWarps:: @ 838E68C - warp_def 8, 29, 3, 0, Route105 - warp_def 8, 20, 0, 2, IslandCave - warp_def 8, 11, 3, 1, IslandCave + warp_def 8, 29, 3, 0, MAP_ROUTE105 + warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE + warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE IslandCave_MapBGEvents:: @ 838E6A4 bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59 diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index 245871e9b..dfcc6cbac 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -5,10 +5,10 @@ JaggedPass_MapObjects:: @ 838C61C object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 13, 0, 35, 0, 3, 15, 17, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D29C, 0, 0, 0 JaggedPass_MapWarps:: @ 838C67C - warp_def 14, 40, 3, 2, Route112 - warp_def 15, 40, 3, 3, Route112 - warp_def 13, 5, 3, 2, MtChimney - warp_def 14, 5, 3, 3, MtChimney + warp_def 14, 40, 3, 2, MAP_ROUTE112 + warp_def 15, 40, 3, 3, MAP_ROUTE112 + warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY + warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY JaggedPass_MapCoordEvents:: @ 838C69C coord_event 13, 15, 3, 0, 2, 0, 0, 0x0 diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index 47dd5ab4a..406abd6dc 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -10,12 +10,12 @@ LavaridgeTown_MapObjects:: @ 8380C78 object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E75A, 0, 0, 0 LavaridgeTown_MapWarps:: @ 8380D50 - warp_def 12, 15, 0, 0, LavaridgeTown_HerbShop - warp_def 5, 15, 0, 0, LavaridgeTown_Gym_1F - warp_def 15, 5, 0, 0, LavaridgeTown_Mart - warp_def 9, 6, 0, 0, LavaridgeTown_PokemonCenter_1F - warp_def 16, 15, 0, 0, LavaridgeTown_House - warp_def 9, 2, 3, 3, LavaridgeTown_PokemonCenter_1F + warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP + warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART + warp_def 9, 6, 0, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE + warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F LavaridgeTown_MapCoordEvents:: @ 8380D80 coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc index add699f5d..0df412932 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_1F.inc @@ -8,28 +8,28 @@ LavaridgeTown_Gym_1F_MapObjects:: @ 838625C object_event 7, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153808, 0, 0, 0 LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 - warp_def 8, 23, 3, 1, LavaridgeTown - warp_def 9, 23, 3, 1, LavaridgeTown - warp_def 3, 21, 3, 0, LavaridgeTown_Gym_B1F - warp_def 1, 14, 3, 2, LavaridgeTown_Gym_B1F - warp_def 6, 14, 3, 4, LavaridgeTown_Gym_B1F - warp_def 1, 6, 3, 3, LavaridgeTown_Gym_B1F - warp_def 9, 2, 3, 1, LavaridgeTown_Gym_B1F - warp_def 6, 20, 3, 5, LavaridgeTown_Gym_B1F - warp_def 0, 23, 3, 6, LavaridgeTown_Gym_B1F - warp_def 0, 17, 3, 7, LavaridgeTown_Gym_B1F - warp_def 4, 17, 3, 8, LavaridgeTown_Gym_B1F - warp_def 0, 11, 3, 9, LavaridgeTown_Gym_B1F - warp_def 4, 12, 3, 10, LavaridgeTown_Gym_B1F - warp_def 4, 9, 3, 11, LavaridgeTown_Gym_B1F - warp_def 0, 2, 3, 12, LavaridgeTown_Gym_B1F - warp_def 4, 6, 3, 13, LavaridgeTown_Gym_B1F - warp_def 4, 2, 3, 14, LavaridgeTown_Gym_B1F - warp_def 10, 19, 3, 15, LavaridgeTown_Gym_B1F - warp_def 10, 14, 3, 16, LavaridgeTown_Gym_B1F - warp_def 6, 6, 3, 17, LavaridgeTown_Gym_B1F - warp_def 6, 2, 3, 18, LavaridgeTown_Gym_B1F - warp_def 10, 6, 3, 19, LavaridgeTown_Gym_B1F + warp_def 8, 23, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 9, 23, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 3, 21, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 1, 14, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 1, 6, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 9, 2, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 20, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 23, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 17, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 17, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 11, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 12, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 9, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 2, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 19, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 14, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878 diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc index 4cff944bc..9492194a8 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc @@ -1,24 +1,24 @@ LavaridgeTown_Gym_B1F_MapWarps:: @ 83863E0 - warp_def 3, 21, 3, 2, LavaridgeTown_Gym_1F - warp_def 9, 2, 3, 6, LavaridgeTown_Gym_1F - warp_def 1, 14, 3, 3, LavaridgeTown_Gym_1F - warp_def 1, 6, 3, 5, LavaridgeTown_Gym_1F - warp_def 6, 14, 3, 4, LavaridgeTown_Gym_1F - warp_def 6, 20, 3, 7, LavaridgeTown_Gym_1F - warp_def 0, 23, 3, 8, LavaridgeTown_Gym_1F - warp_def 0, 17, 3, 9, LavaridgeTown_Gym_1F - warp_def 4, 17, 3, 10, LavaridgeTown_Gym_1F - warp_def 0, 11, 3, 11, LavaridgeTown_Gym_1F - warp_def 4, 12, 3, 12, LavaridgeTown_Gym_1F - warp_def 4, 9, 3, 13, LavaridgeTown_Gym_1F - warp_def 0, 2, 3, 14, LavaridgeTown_Gym_1F - warp_def 4, 6, 3, 15, LavaridgeTown_Gym_1F - warp_def 4, 2, 3, 16, LavaridgeTown_Gym_1F - warp_def 10, 18, 3, 17, LavaridgeTown_Gym_1F - warp_def 10, 14, 3, 18, LavaridgeTown_Gym_1F - warp_def 6, 6, 3, 19, LavaridgeTown_Gym_1F - warp_def 6, 2, 3, 20, LavaridgeTown_Gym_1F - warp_def 10, 6, 3, 21, LavaridgeTown_Gym_1F + warp_def 3, 21, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 9, 2, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 1, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 1, 6, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 20, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 23, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 17, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 17, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 11, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 12, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 9, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 18, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 14, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 2, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F LavaridgeTown_Gym_B1F_MapEvents:: @ 8386480 map_events 0x0, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc index cb04b19d4..8223a30c3 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/events/LavaridgeTown_HerbShop.inc @@ -4,8 +4,8 @@ LavaridgeTown_HerbShop_MapObjects:: @ 83861F0 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 3, 5, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0, 0, 0 LavaridgeTown_HerbShop_MapWarps:: @ 8386238 - warp_def 3, 7, 0, 0, LavaridgeTown - warp_def 4, 7, 0, 0, LavaridgeTown + warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN LavaridgeTown_HerbShop_MapEvents:: @ 8386248 map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc index feb226cd0..771b9669b 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/events/LavaridgeTown_House.inc @@ -3,8 +3,8 @@ LavaridgeTown_House_MapObjects:: @ 8386494 object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0, 0, 0 LavaridgeTown_House_MapWarps:: @ 83864C4 - warp_def 3, 7, 0, 4, LavaridgeTown - warp_def 4, 7, 0, 4, LavaridgeTown + warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN LavaridgeTown_House_MapEvents:: @ 83864D4 map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc index 8a07501f7..ff184b78e 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/events/LavaridgeTown_Mart.inc @@ -4,8 +4,8 @@ LavaridgeTown_Mart_MapObjects:: @ 83864E8 object_event 3, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0, 0, 0 LavaridgeTown_Mart_MapWarps:: @ 8386530 - warp_def 3, 7, 0, 2, LavaridgeTown - warp_def 4, 7, 0, 2, LavaridgeTown + warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN LavaridgeTown_Mart_MapEvents:: @ 8386540 map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc index dac3d4a72..5e529bb1e 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc @@ -5,10 +5,10 @@ LavaridgeTown_PokemonCenter_1F_MapObjects:: @ 8386554 object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0, 0, 0 LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4 - warp_def 7, 8, 3, 3, LavaridgeTown - warp_def 6, 8, 3, 3, LavaridgeTown - warp_def 1, 6, 4, 0, LavaridgeTown_PokemonCenter_2F - warp_def 2, 1, 0, 5, LavaridgeTown + warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN + warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN + warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F + warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 83865D4 map_events LavaridgeTown_PokemonCenter_1F_MapObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc index 3ef0517b1..39035ba87 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ LavaridgeTown_PokemonCenter_2F_MapObjects:: @ 83865E8 object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0, 0, 0 LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630 - warp_def 1, 5, 4, 2, LavaridgeTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658 map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index a356e2b9e..5dd100302 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -18,21 +18,21 @@ LilycoveCity_MapObjects:: @ 838016C object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, 971, 0, 0 LilycoveCity_MapWarps:: @ 8380304 - warp_def 27, 6, 0, 0, LilycoveCity_DepartmentStore_1F - warp_def 37, 24, 0, 0, LilycoveCity_CoveLilyMotel_1F - warp_def 24, 14, 0, 0, LilycoveCity_PokemonCenter_1F - warp_def 11, 5, 0, 0, LilycoveCity_LilycoveMuseum_1F - warp_def 23, 24, 0, 0, LilycoveCity_ContestLobby - warp_def 39, 14, 0, 1, LilycoveCity_PokemonTrainerFanClub - warp_def 70, 5, 1, 0, AquaHideout_1F - warp_def 36, 6, 0, 0, LilycoveCity_MoveDeletersHouse - warp_def 42, 6, 0, 0, LilycoveCity_House1 - warp_def 55, 15, 0, 0, LilycoveCity_House2 - warp_def 11, 22, 0, 0, LilycoveCity_House3 - warp_def 12, 14, 0, 0, LilycoveCity_House4 - warp_def 12, 32, 0, 0, LilycoveCity_Harbor - warp_def 12, 5, 0, 1, LilycoveCity_LilycoveMuseum_1F - warp_def 71, 5, 1, 0, MagmaHideout_1F + warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F + warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F + warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F + warp_def 11, 5, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + warp_def 23, 24, 0, 0, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 39, 14, 0, 1, MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB + warp_def 70, 5, 1, 0, MAP_AQUA_HIDEOUT_1F + warp_def 36, 6, 0, 0, MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE + warp_def 42, 6, 0, 0, MAP_LILYCOVE_CITY_HOUSE1 + warp_def 55, 15, 0, 0, MAP_LILYCOVE_CITY_HOUSE2 + warp_def 11, 22, 0, 0, MAP_LILYCOVE_CITY_HOUSE3 + warp_def 12, 14, 0, 0, MAP_LILYCOVE_CITY_HOUSE4 + warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR + warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + warp_def 71, 5, 1, 0, MAP_MAGMA_HIDEOUT_1F LilycoveCity_MapBGEvents:: @ 838037C bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82 diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc index 4246afd33..307f23974 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/events/LilycoveCity_ContestHall.inc @@ -33,10 +33,10 @@ LilycoveCity_ContestHall_MapObjects:: @ 8389A18 object_event 32, MAP_OBJ_GFX_SAILOR, 0, 23, 0, 26, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0, 0, 0 LilycoveCity_ContestHall_MapWarps:: @ 8389D18 - warp_def 19, 32, 0, 2, LilycoveCity_ContestLobby - warp_def 30, 32, 0, 3, LilycoveCity_ContestLobby - warp_def 20, 32, 0, 2, LilycoveCity_ContestLobby - warp_def 31, 32, 0, 3, LilycoveCity_ContestLobby + warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY + warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38 bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index 2e41e6e49..b0ea1e677 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -15,10 +15,10 @@ LilycoveCity_ContestLobby_MapObjects:: @ 838984C object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 7, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0, 0, 0 LilycoveCity_ContestLobby_MapWarps:: @ 838999C - warp_def 6, 11, 0, 4, LilycoveCity - warp_def 7, 11, 0, 4, LilycoveCity - warp_def 1, 1, 0, 0, LilycoveCity_ContestHall - warp_def 13, 1, 0, 1, LilycoveCity_ContestHall + warp_def 6, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 7, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 1, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index 31bd1c94f..ec57d4ba8 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -2,9 +2,9 @@ LilycoveCity_CoveLilyMotel_1F_MapObjects:: @ 8389464 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 10, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0, 0, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C - warp_def 5, 8, 0, 1, LilycoveCity - warp_def 6, 8, 0, 1, LilycoveCity - warp_def 2, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F + warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY + warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494 coord_event 10, 2, 3, 0, 0x4001, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc index 2117774f0..5398693c7 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_2F_MapObjects:: @ 83894B8 object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, 925, 0, 0 LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 - warp_def 2, 1, 0, 2, LilycoveCity_CoveLilyMotel_1F + warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550 map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index d35f50db9..eea28d624 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -2,8 +2,8 @@ LilycoveCity_DepartmentStoreElevator_MapObjects:: @ 838A624 object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0 LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C - warp_def 1, 5, 3, 127, None - warp_def 2, 5, 3, 127, None + warp_def 1, 5, 3, 127, MAP_NONE + warp_def 2, 5, 3, 127, MAP_NONE LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc index ac72a87c1..363800ad2 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -4,7 +4,7 @@ LilycoveCity_DepartmentStoreRooftop_MapObjects:: @ 838A5A8 object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, 962, 0, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 - warp_def 13, 3, 0, 2, LilycoveCity_DepartmentStore_5F + warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc index 28bc93a75..b9104a1ee 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc @@ -7,10 +7,10 @@ LilycoveCity_DepartmentStore_1F_MapObjects:: @ 838A218 object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0, 0, 0 LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 - warp_def 8, 7, 0, 0, LilycoveCity - warp_def 9, 7, 0, 0, LilycoveCity - warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStore_2F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_1F_MapBGEvents:: @ 838A2C8 bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc index fc8872103..441c43a4c 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_2F_MapObjects:: @ 838A2E8 object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0, 0, 0 LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360 - warp_def 16, 1, 0, 2, LilycoveCity_DepartmentStore_1F - warp_def 13, 1, 0, 0, LilycoveCity_DepartmentStore_3F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F + warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_2F_MapEvents:: @ 838A378 map_events LilycoveCity_DepartmentStore_2F_MapObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc index bf3d1647f..920327ab8 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_3F_MapObjects:: @ 838A38C object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0, 0, 0 LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404 - warp_def 13, 1, 0, 1, LilycoveCity_DepartmentStore_2F - warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStore_4F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_3F_MapEvents:: @ 838A41C map_events LilycoveCity_DepartmentStore_3F_MapObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc index 007cc8bf4..a387cfbf2 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc @@ -6,9 +6,9 @@ LilycoveCity_DepartmentStore_4F_MapObjects:: @ 838A430 object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0, 0, 0 LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8 - warp_def 16, 1, 0, 1, LilycoveCity_DepartmentStore_3F - warp_def 13, 1, 0, 0, LilycoveCity_DepartmentStore_5F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F + warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_4F_MapEvents:: @ 838A4C0 map_events LilycoveCity_DepartmentStore_4F_MapObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc index 85cf2431f..e794452b9 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc @@ -8,9 +8,9 @@ LilycoveCity_DepartmentStore_5F_MapObjects:: @ 838A4D4 object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0, 0, 0 LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C - warp_def 13, 1, 0, 1, LilycoveCity_DepartmentStore_4F - warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator - warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F + warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP LilycoveCity_DepartmentStore_5F_MapEvents:: @ 838A594 map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_EmptyMap.inc b/data/maps/events/LilycoveCity_EmptyMap.inc index 906453882..4ac5c42b8 100644 --- a/data/maps/events/LilycoveCity_EmptyMap.inc +++ b/data/maps/events/LilycoveCity_EmptyMap.inc @@ -1,5 +1,5 @@ LilycoveCity_EmptyMap_MapWarps:: @ 838A028 - warp_def 7, 5, 0, 2, LilycoveCity_Harbor + warp_def 7, 5, 0, 2, MAP_LILYCOVE_CITY_HARBOR LilycoveCity_EmptyMap_MapEvents:: @ 838A030 map_events 0x0, LilycoveCity_EmptyMap_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index 5682ada0e..fa651e557 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -5,10 +5,10 @@ LilycoveCity_Harbor_MapObjects:: @ 8389F94 object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 909, 0, 0 LilycoveCity_Harbor_MapWarps:: @ 8389FF4 - warp_def 11, 14, 0, 12, LilycoveCity - warp_def 12, 14, 0, 12, LilycoveCity - warp_def 20, 15, 0, 0, LilycoveCity_EmptyMap - warp_def 21, 15, 0, 0, LilycoveCity_EmptyMap + warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY + warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY + warp_def 20, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP + warp_def 21, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP LilycoveCity_Harbor_MapEvents:: @ 838A014 map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc index cdae83007..8d6e6b8ce 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/events/LilycoveCity_House1.inc @@ -3,8 +3,8 @@ LilycoveCity_House1_MapObjects:: @ 838A080 object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0, 0, 0 LilycoveCity_House1_MapWarps:: @ 838A0B0 - warp_def 3, 8, 0, 8, LilycoveCity - warp_def 4, 8, 0, 8, LilycoveCity + warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY LilycoveCity_House1_MapEvents:: @ 838A0C0 map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc index 50b44e253..8cb92dfa4 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/events/LilycoveCity_House2.inc @@ -2,8 +2,8 @@ LilycoveCity_House2_MapObjects:: @ 838A0D4 object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0, 0, 0 LilycoveCity_House2_MapWarps:: @ 838A0EC - warp_def 2, 7, 0, 9, LilycoveCity - warp_def 3, 7, 0, 9, LilycoveCity + warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY + warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY LilycoveCity_House2_MapEvents:: @ 838A0FC map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc index 43a1068f1..db7113ef1 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/events/LilycoveCity_House3.inc @@ -7,8 +7,8 @@ LilycoveCity_House3_MapObjects:: @ 838A110 object_event 6, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C32, 0, 0, 0 LilycoveCity_House3_MapWarps:: @ 838A1A0 - warp_def 3, 7, 0, 10, LilycoveCity - warp_def 4, 7, 0, 10, LilycoveCity + warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY LilycoveCity_House3_MapEvents:: @ 838A1B0 map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc index 88522497d..376afb431 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/events/LilycoveCity_House4.inc @@ -3,8 +3,8 @@ LilycoveCity_House4_MapObjects:: @ 838A1C4 object_event 2, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0, 0, 0 LilycoveCity_House4_MapWarps:: @ 838A1F4 - warp_def 3, 8, 0, 11, LilycoveCity - warp_def 4, 8, 0, 11, LilycoveCity + warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY LilycoveCity_House4_MapEvents:: @ 838A204 map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index 983736d73..900cba08f 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_MapObjects:: @ 8389564 object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, 778, 0, 0 LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 - warp_def 9, 13, 0, 3, LilycoveCity - warp_def 10, 13, 0, 13, LilycoveCity - warp_def 16, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F + warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY + warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY + warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index 98c1aa9cd..372007d1f 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -5,7 +5,7 @@ LilycoveCity_LilycoveMuseum_2F_MapObjects:: @ 8389740 object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, 780, 0, 0 LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 - warp_def 13, 1, 0, 2, LilycoveCity_LilycoveMuseum_1F + warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc index 563052712..d4969c39e 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc @@ -2,8 +2,8 @@ LilycoveCity_MoveDeletersHouse_MapObjects:: @ 838A044 object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0, 0, 0 LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C - warp_def 3, 7, 0, 7, LilycoveCity - warp_def 4, 7, 0, 7, LilycoveCity + warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc index c33a07b6a..c0f27f6c7 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ LilycoveCity_PokemonCenter_1F_MapObjects:: @ 8389D94 object_event 3, MAP_OBJ_GFX_MANIAC, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0, 0, 0 LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC - warp_def 7, 8, 3, 2, LilycoveCity - warp_def 6, 8, 3, 2, LilycoveCity - warp_def 1, 6, 4, 0, LilycoveCity_PokemonCenter_2F + warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY + warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY + warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8389DF4 map_events LilycoveCity_PokemonCenter_1F_MapObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc index 736ef1151..e1723d489 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ LilycoveCity_PokemonCenter_2F_MapObjects:: @ 8389E08 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0, 0, 0 LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50 - warp_def 1, 5, 4, 2, LilycoveCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78 map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index 38007b34f..a710e1f5e 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -9,8 +9,8 @@ LilycoveCity_PokemonTrainerFanClub_MapObjects:: @ 8389EB0 object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, 789, 0, 0 LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 - warp_def 6, 13, 0, 5, LilycoveCity - warp_def 5, 13, 0, 5, LilycoveCity + warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY + warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80 map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/events/LilycoveCity_UnusedMart.inc index 1eefb6a8f..4a0127506 100644 --- a/data/maps/events/LilycoveCity_UnusedMart.inc +++ b/data/maps/events/LilycoveCity_UnusedMart.inc @@ -1,6 +1,6 @@ LilycoveCity_UnusedMart_MapWarps:: @ 8389E8C - warp_def 3, 7, 0, 0, LilycoveCity - warp_def 4, 7, 0, 0, LilycoveCity + warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY LilycoveCity_UnusedMart_MapEvents:: @ 8389E9C map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index 62a564821..b31b06b61 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -7,9 +7,9 @@ LittlerootTown_MapObjects:: @ 83808FC object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 762, 0, 0 LittlerootTown_MapWarps:: @ 838098C - warp_def 14, 8, 0, 1, LittlerootTown_MaysHouse_1F - warp_def 5, 8, 0, 1, LittlerootTown_BrendansHouse_1F - warp_def 7, 16, 0, 0, LittlerootTown_ProfessorBirchsLab + warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F + warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F + warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents:: @ 83809A4 coord_event 10, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D739 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index f60a59018..cf0d27876 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -6,9 +6,9 @@ LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674 object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC - warp_def 9, 8, 0, 1, LittlerootTown - warp_def 8, 8, 0, 1, LittlerootTown - warp_def 8, 2, 0, 0, LittlerootTown_BrendansHouse_2F + warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN + warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN + warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704 coord_event 8, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index a28a2d0d1..ac77a80f9 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -15,7 +15,7 @@ LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728 object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 - warp_def 7, 1, 0, 2, LittlerootTown_BrendansHouse_1F + warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index d5874624b..875022b3b 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -6,9 +6,9 @@ LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4 object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C - warp_def 1, 8, 0, 0, LittlerootTown - warp_def 2, 8, 0, 0, LittlerootTown - warp_def 2, 2, 0, 0, LittlerootTown_MaysHouse_2F + warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN + warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN + warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954 coord_event 2, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index 3a3656287..ef2ea416a 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -16,7 +16,7 @@ LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978 object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, 849, 0, 0 LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 - warp_def 1, 1, 0, 2, LittlerootTown_MaysHouse_1F + warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870 diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index cbc1e4154..9a69cfafd 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -4,8 +4,8 @@ LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, 889, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 - warp_def 6, 12, 0, 2, LittlerootTown - warp_def 7, 12, 0, 2, LittlerootTown + warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN + warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index b90e53ff8..acd337496 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -4,8 +4,8 @@ MagmaHideout_1F_MapObjects:: @ 838E9BC object_event 3, 241, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0 MagmaHideout_1F_MapWarps:: @ 838EA04 - warp_def 13, 27, 1, 14, LilycoveCity - warp_def 13, 1, 3, 0, MagmaHideout_B1F + warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY + warp_def 13, 1, 3, 0, MAP_MAGMA_HIDEOUT_B1F MagmaHideout_1F_MapEvents:: @ 838EA14 map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc index c9f1101cc..db457bb45 100644 --- a/data/maps/events/MagmaHideout_B1F.inc +++ b/data/maps/events/MagmaHideout_B1F.inc @@ -9,35 +9,35 @@ MagmaHideout_B1F_MapObjects:: @ 838EA28 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, 978, 0, 0 MagmaHideout_B1F_MapWarps:: @ 838EAE8 - warp_def 3, 3, 3, 1, MagmaHideout_1F - warp_def 14, 3, 3, 0, MagmaHideout_B2F - warp_def 23, 1, 3, 1, MagmaHideout_B2F - warp_def 29, 1, 3, 2, MagmaHideout_B2F - warp_def 8, 5, 3, 6, MagmaHideout_B1F - warp_def 8, 7, 3, 9, MagmaHideout_B1F - warp_def 14, 8, 3, 4, MagmaHideout_B1F - warp_def 23, 5, 3, 10, MagmaHideout_B1F - warp_def 39, 5, 3, 13, MagmaHideout_B1F - warp_def 16, 16, 3, 5, MagmaHideout_B1F - warp_def 21, 14, 3, 7, MagmaHideout_B1F - warp_def 21, 20, 3, 12, MagmaHideout_B1F - warp_def 38, 11, 3, 11, MagmaHideout_B1F - warp_def 43, 19, 3, 8, MagmaHideout_B1F - warp_def 34, 11, 3, 28, MagmaHideout_B1F - warp_def 41, 11, 3, 16, MagmaHideout_B1F - warp_def 56, 3, 3, 15, MagmaHideout_B1F - warp_def 56, 5, 3, 16, MagmaHideout_B1F - warp_def 53, 5, 3, 22, MagmaHideout_B1F - warp_def 59, 5, 3, 20, MagmaHideout_B1F - warp_def 53, 9, 3, 19, MagmaHideout_B1F - warp_def 56, 9, 3, 24, MagmaHideout_B1F - warp_def 59, 9, 3, 18, MagmaHideout_B1F - warp_def 53, 13, 3, 17, MagmaHideout_B1F - warp_def 56, 13, 3, 21, MagmaHideout_B1F - warp_def 59, 13, 3, 26, MagmaHideout_B1F - warp_def 53, 17, 3, 25, MagmaHideout_B1F - warp_def 56, 17, 3, 21, MagmaHideout_B1F - warp_def 59, 17, 3, 14, MagmaHideout_B1F + warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F + warp_def 14, 3, 3, 0, MAP_MAGMA_HIDEOUT_B2F + warp_def 23, 1, 3, 1, MAP_MAGMA_HIDEOUT_B2F + warp_def 29, 1, 3, 2, MAP_MAGMA_HIDEOUT_B2F + warp_def 8, 5, 3, 6, MAP_MAGMA_HIDEOUT_B1F + warp_def 8, 7, 3, 9, MAP_MAGMA_HIDEOUT_B1F + warp_def 14, 8, 3, 4, MAP_MAGMA_HIDEOUT_B1F + warp_def 23, 5, 3, 10, MAP_MAGMA_HIDEOUT_B1F + warp_def 39, 5, 3, 13, MAP_MAGMA_HIDEOUT_B1F + warp_def 16, 16, 3, 5, MAP_MAGMA_HIDEOUT_B1F + warp_def 21, 14, 3, 7, MAP_MAGMA_HIDEOUT_B1F + warp_def 21, 20, 3, 12, MAP_MAGMA_HIDEOUT_B1F + warp_def 38, 11, 3, 11, MAP_MAGMA_HIDEOUT_B1F + warp_def 43, 19, 3, 8, MAP_MAGMA_HIDEOUT_B1F + warp_def 34, 11, 3, 28, MAP_MAGMA_HIDEOUT_B1F + warp_def 41, 11, 3, 16, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 3, 3, 15, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 5, 3, 16, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 5, 3, 22, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 5, 3, 20, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 9, 3, 19, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 9, 3, 24, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 9, 3, 18, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 13, 3, 17, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 13, 3, 21, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 13, 3, 26, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 17, 3, 25, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 17, 3, 21, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 17, 3, 14, MAP_MAGMA_HIDEOUT_B1F MagmaHideout_B1F_MapEvents:: @ 838EBD0 map_events MagmaHideout_B1F_MapObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc index 258592732..eb6340758 100644 --- a/data/maps/events/MagmaHideout_B2F.inc +++ b/data/maps/events/MagmaHideout_B2F.inc @@ -6,14 +6,14 @@ MagmaHideout_B2F_MapObjects:: @ 838EBE4 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, 1127, 0, 0 MagmaHideout_B2F_MapWarps:: @ 838EC5C - warp_def 3, 3, 3, 1, MagmaHideout_B1F - warp_def 12, 1, 3, 2, MagmaHideout_B1F - warp_def 18, 1, 3, 3, MagmaHideout_B1F - warp_def 2, 14, 3, 4, MagmaHideout_B1F - warp_def 12, 13, 3, 5, MagmaHideout_B2F - warp_def 17, 13, 3, 4, MagmaHideout_B2F - warp_def 31, 4, 3, 7, MagmaHideout_B2F - warp_def 31, 16, 3, 6, MagmaHideout_B2F + warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F + warp_def 12, 1, 3, 2, MAP_MAGMA_HIDEOUT_B1F + warp_def 18, 1, 3, 3, MAP_MAGMA_HIDEOUT_B1F + warp_def 2, 14, 3, 4, MAP_MAGMA_HIDEOUT_B1F + warp_def 12, 13, 3, 5, MAP_MAGMA_HIDEOUT_B2F + warp_def 17, 13, 3, 4, MAP_MAGMA_HIDEOUT_B2F + warp_def 31, 4, 3, 7, MAP_MAGMA_HIDEOUT_B2F + warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C coord_event 7, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index 4d228a92c..4b5b2f17a 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -10,13 +10,13 @@ MauvilleCity_MapObjects:: @ 837FB90 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, 1116, 0, 0 MauvilleCity_MapWarps:: @ 837FC68 - warp_def 8, 5, 0, 0, MauvilleCity_Gym - warp_def 22, 5, 0, 0, MauvilleCity_PokemonCenter_1F - warp_def 35, 5, 0, 0, MauvilleCity_BikeShop - warp_def 23, 14, 0, 0, MauvilleCity_Mart - warp_def 32, 14, 0, 0, MauvilleCity_House1 - warp_def 8, 13, 0, 0, MauvilleCity_GameCorner - warp_def 19, 14, 0, 0, MauvilleCity_House2 + warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM + warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F + warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP + warp_def 23, 14, 0, 0, MAP_MAUVILLE_CITY_MART + warp_def 32, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE1 + warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER + warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 MauvilleCity_MapBGEvents:: @ 837FCA0 bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc index 6c064a1f7..c215f96b0 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/events/MauvilleCity_BikeShop.inc @@ -3,8 +3,8 @@ MauvilleCity_BikeShop_MapObjects:: @ 8388318 object_event 2, MAP_OBJ_GFX_MAN_6, 0, 7, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0, 0, 0 MauvilleCity_BikeShop_MapWarps:: @ 8388348 - warp_def 3, 8, 0, 2, MauvilleCity - warp_def 4, 8, 0, 2, MauvilleCity + warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914 diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc index ed8549079..bd0b472a2 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/events/MauvilleCity_GameCorner.inc @@ -13,8 +13,8 @@ MauvilleCity_GameCorner_MapObjects:: @ 83883C0 object_event 12, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0, 0, 0 MauvilleCity_GameCorner_MapWarps:: @ 83884E0 - warp_def 11, 10, 3, 5, MauvilleCity - warp_def 12, 10, 3, 5, MauvilleCity + warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY + warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135 diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index 4a9ee563f..0987f3389 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -7,8 +7,8 @@ MauvilleCity_Gym_MapObjects:: @ 838821C object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 20, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0, 0, 0 MauvilleCity_Gym_MapWarps:: @ 83882AC - warp_def 4, 20, 0, 0, MauvilleCity - warp_def 5, 20, 0, 0, MauvilleCity + warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY + warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents:: @ 83882BC coord_event 0, 9, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_15664B diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc index 12d6d8cc8..86b07e3dd 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/events/MauvilleCity_House1.inc @@ -2,8 +2,8 @@ MauvilleCity_House1_MapObjects:: @ 8388384 object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0, 0, 0 MauvilleCity_House1_MapWarps:: @ 838839C - warp_def 3, 7, 0, 4, MauvilleCity - warp_def 4, 7, 0, 4, MauvilleCity + warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY MauvilleCity_House1_MapEvents:: @ 83883AC map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc index 9feaafe2c..2e5a39157 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/events/MauvilleCity_House2.inc @@ -2,8 +2,8 @@ MauvilleCity_House2_MapObjects:: @ 8388624 object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 4, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0, 0, 0 MauvilleCity_House2_MapWarps:: @ 838863C - warp_def 3, 8, 0, 6, MauvilleCity - warp_def 4, 8, 0, 6, MauvilleCity + warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY MauvilleCity_House2_MapEvents:: @ 838864C map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc index 05951f578..3453c6fce 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/events/MauvilleCity_Mart.inc @@ -4,8 +4,8 @@ MauvilleCity_Mart_MapObjects:: @ 83887A0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0, 0, 0 MauvilleCity_Mart_MapWarps:: @ 83887E8 - warp_def 3, 7, 0, 3, MauvilleCity - warp_def 4, 7, 0, 3, MauvilleCity + warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY MauvilleCity_Mart_MapEvents:: @ 83887F8 map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc index 0f8e80d5c..da60ac284 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ MauvilleCity_PokemonCenter_1F_MapObjects:: @ 8388660 object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 2, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0, 0, 0 MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8 - warp_def 7, 8, 3, 1, MauvilleCity - warp_def 6, 8, 3, 1, MauvilleCity - warp_def 1, 6, 4, 0, MauvilleCity_PokemonCenter_2F + warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY + warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY + warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F MauvilleCity_PokemonCenter_1F_MapEvents:: @ 83886F0 map_events MauvilleCity_PokemonCenter_1F_MapObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc index dbd55e499..501c40012 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc @@ -5,11 +5,11 @@ MauvilleCity_PokemonCenter_2F_MapObjects:: @ 8388704 object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 6, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0, 0, 0 MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764 - warp_def 1, 5, 4, 2, MauvilleCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C map_events MauvilleCity_PokemonCenter_2F_MapObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index 1178bf543..41be1c60b 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -11,11 +11,11 @@ MeteorFalls_1F_1R_MapObjects:: @ 838BACC object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, 942, 0, 0 MeteorFalls_1F_1R_MapWarps:: @ 838BBBC - warp_def 27, 18, 4, 0, Route114 - warp_def 6, 39, 3, 0, Route115 - warp_def 10, 3, 3, 0, MeteorFalls_1F_2R - warp_def 5, 4, 3, 4, MeteorFalls_B1F_1R - warp_def 26, 28, 3, 5, MeteorFalls_B1F_1R + warp_def 27, 18, 4, 0, MAP_ROUTE114 + warp_def 6, 39, 3, 0, MAP_ROUTE115 + warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R + warp_def 5, 4, 3, 4, MAP_METEOR_FALLS_B1F_1R + warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 coord_event 14, 18, 4, 0, 0x40bf, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc index 549620aa9..060f9a84d 100644 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ b/data/maps/events/MeteorFalls_1F_2R.inc @@ -4,10 +4,10 @@ MeteorFalls_1F_2R_MapObjects:: @ 838BC20 object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0, 0, 0 MeteorFalls_1F_2R_MapWarps:: @ 838BC68 - warp_def 10, 29, 3, 2, MeteorFalls_1F_1R - warp_def 4, 14, 3, 0, MeteorFalls_B1F_1R - warp_def 7, 20, 3, 1, MeteorFalls_B1F_1R - warp_def 21, 23, 3, 2, MeteorFalls_B1F_1R + warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R + warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R + warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R + warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88 bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842 diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/events/MeteorFalls_B1F_1R.inc index 796e31cd2..053c932ce 100644 --- a/data/maps/events/MeteorFalls_B1F_1R.inc +++ b/data/maps/events/MeteorFalls_B1F_1R.inc @@ -1,10 +1,10 @@ MeteorFalls_B1F_1R_MapWarps:: @ 838BCB4 - warp_def 5, 6, 4, 1, MeteorFalls_1F_2R - warp_def 7, 11, 5, 2, MeteorFalls_1F_2R - warp_def 18, 15, 4, 3, MeteorFalls_1F_2R - warp_def 17, 3, 3, 0, MeteorFalls_B1F_2R - warp_def 3, 23, 5, 3, MeteorFalls_1F_1R - warp_def 20, 36, 3, 4, MeteorFalls_1F_1R + warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R + warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R + warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R + warp_def 17, 3, 3, 0, MAP_METEOR_FALLS_B1F_2R + warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R + warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R MeteorFalls_B1F_1R_MapEvents:: @ 838BCE4 map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc index abdad1f03..d892b1ac0 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -2,7 +2,7 @@ MeteorFalls_B1F_2R_MapObjects:: @ 838BCF8 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, 1080, 0, 0 MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 - warp_def 5, 15, 3, 3, MeteorFalls_B1F_1R + warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R MeteorFalls_B1F_2R_MapEvents:: @ 838BD18 map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index b73bc64f3..a8162d215 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -10,16 +10,16 @@ MossdeepCity_MapObjects:: @ 838042C object_event 9, MAP_OBJ_GFX_BOY_2, 0, 23, 0, 13, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D027, 0, 0, 0 MossdeepCity_MapWarps:: @ 8380504 - warp_def 28, 9, 0, 0, MossdeepCity_House1 - warp_def 38, 9, 0, 0, MossdeepCity_Gym - warp_def 28, 16, 0, 0, MossdeepCity_PokemonCenter_1F - warp_def 67, 24, 0, 0, MossdeepCity_House2 - warp_def 37, 18, 0, 0, MossdeepCity_Mart - warp_def 49, 6, 0, 0, MossdeepCity_House3 - warp_def 19, 10, 0, 0, MossdeepCity_StevensHouse - warp_def 18, 16, 0, 1, MossdeepCity_House4 - warp_def 64, 13, 0, 0, MossdeepCity_SpaceCenter_1F - warp_def 36, 24, 0, 0, MossdeepCity_GameCorner_1F + warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 + warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM + warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F + warp_def 67, 24, 0, 0, MAP_MOSSDEEP_CITY_HOUSE2 + warp_def 37, 18, 0, 0, MAP_MOSSDEEP_CITY_MART + warp_def 49, 6, 0, 0, MAP_MOSSDEEP_CITY_HOUSE3 + warp_def 19, 10, 0, 0, MAP_MOSSDEEP_CITY_STEVENS_HOUSE + warp_def 18, 16, 0, 1, MAP_MOSSDEEP_CITY_HOUSE4 + warp_def 64, 13, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F + warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents:: @ 8380554 coord_event 25, 25, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc index 99350c4b0..f525533b2 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc @@ -2,9 +2,9 @@ MossdeepCity_GameCorner_1F_MapObjects:: @ 838AC6C object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0, 0, 0 MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 - warp_def 3, 7, 0, 9, MossdeepCity - warp_def 4, 7, 0, 9, MossdeepCity - warp_def 3, 1, 0, 0, MossdeepCity_GameCorner_B1F + warp_def 3, 7, 0, 9, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 9, MAP_MOSSDEEP_CITY + warp_def 3, 1, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc index 98c843f52..58acb3300 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -2,7 +2,7 @@ MossdeepCity_GameCorner_B1F_MapObjects:: @ 838ACBC object_event 1, 240, 0, 6, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4 - warp_def 3, 1, 0, 2, MossdeepCity_GameCorner_1F + warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index d80237a3a..80812cc4d 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -10,8 +10,8 @@ MossdeepCity_Gym_MapObjects:: @ 838A660 object_event 9, MAP_OBJ_GFX_LIZA, 0, 9, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0 MossdeepCity_Gym_MapWarps:: @ 838A738 - warp_def 9, 29, 0, 1, MossdeepCity - warp_def 10, 29, 0, 1, MossdeepCity + warp_def 9, 29, 0, 1, MAP_MOSSDEEP_CITY + warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY MossdeepCity_Gym_MapCoordEvents:: @ 838A748 coord_event 12, 3, 3, 0, 0x4001, 0, 0, MossdeepCity_Gym_EventScript_15A742 diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc index 251440343..ec7bbdc58 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/events/MossdeepCity_House1.inc @@ -3,8 +3,8 @@ MossdeepCity_House1_MapObjects:: @ 838A7B4 object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0, 0, 0 MossdeepCity_House1_MapWarps:: @ 838A7E4 - warp_def 3, 7, 0, 0, MossdeepCity - warp_def 4, 7, 0, 0, MossdeepCity + warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY MossdeepCity_House1_MapEvents:: @ 838A7F4 map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc index 31ef3ab7b..a932ce465 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -4,8 +4,8 @@ MossdeepCity_House2_MapObjects:: @ 838A808 object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, 934, 0, 0 MossdeepCity_House2_MapWarps:: @ 838A850 - warp_def 3, 8, 0, 3, MossdeepCity - warp_def 4, 8, 0, 3, MossdeepCity + warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY + warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY MossdeepCity_House2_MapEvents:: @ 838A860 map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc index b1503decc..37c96933c 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/events/MossdeepCity_House3.inc @@ -2,8 +2,8 @@ MossdeepCity_House3_MapObjects:: @ 838AA08 object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0, 0, 0 MossdeepCity_House3_MapWarps:: @ 838AA20 - warp_def 3, 7, 0, 5, MossdeepCity - warp_def 4, 7, 0, 5, MossdeepCity + warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY MossdeepCity_House3_MapEvents:: @ 838AA30 map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc index dc0fdfed8..6c07d0101 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/events/MossdeepCity_House4.inc @@ -4,8 +4,8 @@ MossdeepCity_House4_MapObjects:: @ 838AAF8 object_event 3, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0, 0, 0 MossdeepCity_House4_MapWarps:: @ 838AB40 - warp_def 4, 7, 0, 7, MossdeepCity - warp_def 3, 7, 0, 7, MossdeepCity + warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY + warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY MossdeepCity_House4_MapEvents:: @ 838AB50 map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc index 80514f1f8..74141c0cc 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/events/MossdeepCity_Mart.inc @@ -5,8 +5,8 @@ MossdeepCity_Mart_MapObjects:: @ 838A984 object_event 4, MAP_OBJ_GFX_SAILOR, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0, 0, 0 MossdeepCity_Mart_MapWarps:: @ 838A9E4 - warp_def 3, 7, 0, 4, MossdeepCity - warp_def 4, 7, 0, 4, MossdeepCity + warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY MossdeepCity_Mart_MapEvents:: @ 838A9F4 map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc index d7cf07f6a..a9555d59b 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ MossdeepCity_PokemonCenter_1F_MapObjects:: @ 838A874 object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 3, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0, 0, 0 MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC - warp_def 7, 8, 3, 2, MossdeepCity - warp_def 6, 8, 3, 2, MossdeepCity - warp_def 1, 6, 4, 0, MossdeepCity_PokemonCenter_2F + warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY + warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY + warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F MossdeepCity_PokemonCenter_1F_MapEvents:: @ 838A8D4 map_events MossdeepCity_PokemonCenter_1F_MapObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc index 337467351..3f3d05e5a 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc @@ -5,11 +5,11 @@ MossdeepCity_PokemonCenter_2F_MapObjects:: @ 838A8E8 object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 6, 0, 3, 5, 18, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0, 0, 0 MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948 - warp_def 1, 5, 4, 2, MossdeepCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970 map_events MossdeepCity_PokemonCenter_2F_MapObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc index d79459eb8..ab9872c2f 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc @@ -6,9 +6,9 @@ MossdeepCity_SpaceCenter_1F_MapObjects:: @ 838AB64 object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 14, 0, 7, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0, 0, 0 MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC - warp_def 7, 9, 0, 8, MossdeepCity - warp_def 8, 9, 0, 8, MossdeepCity - warp_def 13, 1, 0, 0, MossdeepCity_SpaceCenter_2F + warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY + warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY + warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F MossdeepCity_SpaceCenter_1F_MapEvents:: @ 838ABF4 map_events MossdeepCity_SpaceCenter_1F_MapObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc index 2dc4f843a..bcef30b09 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc @@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_2F_MapObjects:: @ 838AC08 object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 5, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0, 0, 0 MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50 - warp_def 13, 1, 0, 2, MossdeepCity_SpaceCenter_1F + warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58 map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index ce240d81f..0aef37766 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -5,8 +5,8 @@ MossdeepCity_StevensHouse_MapObjects:: @ 838AA44 object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, 727, 0, 0 MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 - warp_def 3, 7, 0, 6, MossdeepCity - warp_def 4, 7, 0, 6, MossdeepCity + warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index 468edda1d..acab0d36b 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -29,10 +29,10 @@ MtChimney_MapObjects:: @ 838C330 object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, 877, 0, 0 MtChimney_MapWarps:: @ 838C5D0 - warp_def 17, 36, 0, 0, MtChimney_CableCarStation - warp_def 18, 36, 0, 1, MtChimney_CableCarStation - warp_def 20, 41, 3, 2, JaggedPass - warp_def 21, 41, 3, 3, JaggedPass + warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION + warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION + warp_def 20, 41, 3, 2, MAP_JAGGED_PASS + warp_def 21, 41, 3, 3, MAP_JAGGED_PASS MtChimney_MapBGEvents:: @ 838C5F0 bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc index db4eef0fa..971dcda65 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/events/MtChimney_CableCarStation.inc @@ -3,8 +3,8 @@ MtChimney_CableCarStation_MapObjects:: @ 838B828 object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 MtChimney_CableCarStation_MapWarps:: @ 838B858 - warp_def 6, 11, 0, 0, MtChimney - warp_def 7, 11, 0, 1, MtChimney + warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY + warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY MtChimney_CableCarStation_MapEvents:: @ 838B868 map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc index 3f4263f9e..480bcdbe9 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/events/MtPyre_1F.inc @@ -4,12 +4,12 @@ MtPyre_1F_MapObjects:: @ 838C7FC object_event 3, MAP_OBJ_GFX_MAN_5, 0, 13, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D365, 0, 0, 0 MtPyre_1F_MapWarps:: @ 838C844 - warp_def 17, 18, 3, 0, Route122 - warp_def 3, 6, 3, 0, MtPyre_Exterior - warp_def 18, 18, 3, 0, Route122 - warp_def 4, 6, 3, 0, MtPyre_Exterior - warp_def 11, 1, 3, 0, MtPyre_2F - warp_def 20, 9, 3, 4, MtPyre_2F + warp_def 17, 18, 3, 0, MAP_ROUTE122 + warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR + warp_def 18, 18, 3, 0, MAP_ROUTE122 + warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR + warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F + warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F MtPyre_1F_MapEvents:: @ 838C874 map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc index 320be57af..1d776173d 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -7,11 +7,11 @@ MtPyre_2F_MapObjects:: @ 838C888 object_event 6, MAP_OBJ_GFX_MAN_5, 0, 3, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3B2, 0, 0, 0 MtPyre_2F_MapWarps:: @ 838C918 - warp_def 2, 1, 3, 4, MtPyre_1F - warp_def 10, 1, 3, 0, MtPyre_3F - warp_def 10, 12, 3, 4, MtPyre_3F - warp_def 6, 12, 3, 5, MtPyre_3F - warp_def 11, 9, 3, 5, MtPyre_1F + warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F + warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F + warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F + warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F + warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F MtPyre_2F_MapEvents:: @ 838C940 map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc index ba5428cb2..0cccd1bb2 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -4,12 +4,12 @@ MtPyre_3F_MapObjects:: @ 838C954 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, 1120, 0, 0 MtPyre_3F_MapWarps:: @ 838C99C - warp_def 10, 1, 3, 1, MtPyre_2F - warp_def 2, 1, 3, 1, MtPyre_4F - warp_def 9, 10, 3, 4, MtPyre_4F - warp_def 1, 12, 3, 5, MtPyre_4F - warp_def 10, 12, 3, 2, MtPyre_2F - warp_def 6, 12, 3, 3, MtPyre_2F + warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F + warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F + warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F + warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F + warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F + warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F MtPyre_3F_MapEvents:: @ 838C9CC map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc index c54b36645..bc6cc02eb 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -3,12 +3,12 @@ MtPyre_4F_MapObjects:: @ 838C9E0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, 1130, 0, 0 MtPyre_4F_MapWarps:: @ 838CA10 - warp_def 10, 1, 3, 1, MtPyre_5F - warp_def 2, 5, 3, 1, MtPyre_3F - warp_def 12, 10, 3, 3, MtPyre_5F - warp_def 12, 12, 3, 4, MtPyre_5F - warp_def 9, 10, 3, 2, MtPyre_3F - warp_def 2, 12, 3, 3, MtPyre_3F + warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F + warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F + warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F + warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F + warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F + warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F MtPyre_4F_MapEvents:: @ 838CA40 map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc index 73b97a40d..340274836 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -3,11 +3,11 @@ MtPyre_5F_MapObjects:: @ 838CA54 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, 1052, 0, 0 MtPyre_5F_MapWarps:: @ 838CA84 - warp_def 2, 1, 3, 0, MtPyre_6F - warp_def 10, 5, 3, 0, MtPyre_4F - warp_def 1, 10, 3, 1, MtPyre_6F - warp_def 12, 10, 3, 2, MtPyre_4F - warp_def 12, 12, 3, 3, MtPyre_4F + warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F + warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F + warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F + warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F + warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F MtPyre_5F_MapEvents:: @ 838CAAC map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc index 70228bc42..e0d12d296 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -3,8 +3,8 @@ MtPyre_6F_MapObjects:: @ 838CAC0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, 1089, 0, 0 MtPyre_6F_MapWarps:: @ 838CAF0 - warp_def 2, 1, 3, 0, MtPyre_5F - warp_def 1, 10, 3, 2, MtPyre_5F + warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F + warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F MtPyre_6F_MapEvents:: @ 838CB00 map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index ac372a2f0..044ff7fb5 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -3,9 +3,9 @@ MtPyre_Exterior_MapObjects:: @ 838CB14 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, 1074, 0, 0 MtPyre_Exterior_MapWarps:: @ 838CB44 - warp_def 10, 42, 3, 1, MtPyre_1F - warp_def 19, 10, 3, 1, MtPyre_Summit - warp_def 20, 10, 3, 1, MtPyre_Summit + warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F + warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT + warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT MtPyre_Exterior_MapCoordEvents:: @ 838CB5C coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 4f5047765..360c0c21e 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -7,9 +7,9 @@ MtPyre_Summit_MapObjects:: @ 838CBD8 object_event 6, 241, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, 917, 0, 0 MtPyre_Summit_MapWarps:: @ 838CC68 - warp_def 22, 31, 3, 1, MtPyre_Exterior - warp_def 23, 31, 3, 1, MtPyre_Exterior - warp_def 24, 31, 3, 1, MtPyre_Exterior + warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR + warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR + warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents:: @ 838CC80 coord_event 22, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4BD diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc index 482ff83ca..65405fbe7 100644 --- a/data/maps/events/NewMauville_Entrance.inc +++ b/data/maps/events/NewMauville_Entrance.inc @@ -1,6 +1,6 @@ NewMauville_Entrance_MapWarps:: @ 838DED4 - warp_def 4, 6, 3, 0, Route110 - warp_def 4, 1, 3, 0, NewMauville_Inside + warp_def 4, 6, 3, 0, MAP_ROUTE110 + warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 coord_event 4, 2, 3, 0, 0x40ba, 0, 0, NewMauville_Entrance_EventScript_15E4DC diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index a7384520d..826e6a089 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -9,7 +9,7 @@ NewMauville_Inside_MapObjects:: @ 838DF08 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, 976, 0, 0 NewMauville_Inside_MapWarps:: @ 838DFC8 - warp_def 32, 33, 3, 1, NewMauville_Entrance + warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents:: @ 838DFD0 coord_event 30, 38, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index a09a08fe2..3b5fc9150 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -5,10 +5,10 @@ OldaleTown_MapObjects:: @ 8380A78 object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, 979, 0, 0 OldaleTown_MapWarps:: @ 8380AD8 - warp_def 5, 7, 0, 0, OldaleTown_House1 - warp_def 15, 16, 0, 0, OldaleTown_House2 - warp_def 6, 16, 0, 0, OldaleTown_PokemonCenter_1F - warp_def 14, 6, 0, 0, OldaleTown_Mart + warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 + warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2 + warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F + warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents:: @ 8380AF8 coord_event 0, 10, 3, 0, 0x4051, 0, 0, OldaleTown_EventScript_14DEFF diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc index 16f29b00e..1c2eb5bce 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/events/OldaleTown_House1.inc @@ -2,8 +2,8 @@ OldaleTown_House1_MapObjects:: @ 8385C4C object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, OldaleTown_House1_EventScript_152EEC, 0, 0, 0 OldaleTown_House1_MapWarps:: @ 8385C64 - warp_def 3, 8, 0, 0, OldaleTown - warp_def 4, 8, 0, 0, OldaleTown + warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN + warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN OldaleTown_House1_MapEvents:: @ 8385C74 map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc index 904291576..458ca9420 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/events/OldaleTown_House2.inc @@ -3,8 +3,8 @@ OldaleTown_House2_MapObjects:: @ 8385C88 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0, 0, 0 OldaleTown_House2_MapWarps:: @ 8385CB8 - warp_def 3, 7, 0, 1, OldaleTown - warp_def 4, 7, 0, 1, OldaleTown + warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN OldaleTown_House2_MapEvents:: @ 8385CC8 map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc index a06ece505..839ec3b49 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/events/OldaleTown_Mart.inc @@ -4,8 +4,8 @@ OldaleTown_Mart_MapObjects:: @ 8385DEC object_event 3, MAP_OBJ_GFX_BOY_1, 0, 9, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0, 0, 0 OldaleTown_Mart_MapWarps:: @ 8385E34 - warp_def 3, 7, 0, 3, OldaleTown - warp_def 4, 7, 0, 3, OldaleTown + warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN OldaleTown_Mart_MapEvents:: @ 8385E44 map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc index 161baec86..0c9bdfe8c 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ OldaleTown_PokemonCenter_1F_MapObjects:: @ 8385CDC object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 3, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0, 0, 0 OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C - warp_def 7, 8, 3, 2, OldaleTown - warp_def 6, 8, 3, 2, OldaleTown - warp_def 1, 6, 4, 0, OldaleTown_PokemonCenter_2F + warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN + warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN + warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F OldaleTown_PokemonCenter_1F_MapEvents:: @ 8385D54 map_events OldaleTown_PokemonCenter_1F_MapObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc index e2675bb14..e94d29970 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ OldaleTown_PokemonCenter_2F_MapObjects:: @ 8385D68 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0, 0, 0 OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0 - warp_def 1, 5, 4, 2, OldaleTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8 map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc index 1823e9afd..2161172a5 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/events/PacifidlogTown.inc @@ -4,12 +4,12 @@ PacifidlogTown_MapObjects:: @ 838100C object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0, 0, 0 PacifidlogTown_MapWarps:: @ 8381054 - warp_def 8, 15, 0, 0, PacifidlogTown_PokemonCenter_1F - warp_def 16, 13, 0, 0, PacifidlogTown_House1 - warp_def 3, 22, 0, 0, PacifidlogTown_House2 - warp_def 12, 24, 0, 0, PacifidlogTown_House3 - warp_def 2, 12, 0, 0, PacifidlogTown_House4 - warp_def 17, 21, 0, 0, PacifidlogTown_House5 + warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F + warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1 + warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2 + warp_def 12, 24, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE3 + warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4 + warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 PacifidlogTown_MapBGEvents:: @ 8381084 bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc index 233fa7604..3e0e7dc23 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/events/PacifidlogTown_House1.inc @@ -3,8 +3,8 @@ PacifidlogTown_House1_MapObjects:: @ 8386F40 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0, 0, 0 PacifidlogTown_House1_MapWarps:: @ 8386F70 - warp_def 4, 8, 0, 1, PacifidlogTown - warp_def 5, 8, 0, 1, PacifidlogTown + warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN PacifidlogTown_House1_MapEvents:: @ 8386F80 map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc index aa1940d29..7c4de826c 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/events/PacifidlogTown_House2.inc @@ -4,8 +4,8 @@ PacifidlogTown_House2_MapObjects:: @ 8386F94 object_event 3, MAP_OBJ_GFX_AZURILL, 0, 1, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154282, 0, 0, 0 PacifidlogTown_House2_MapWarps:: @ 8386FDC - warp_def 4, 8, 0, 2, PacifidlogTown - warp_def 5, 8, 0, 2, PacifidlogTown + warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN PacifidlogTown_House2_MapEvents:: @ 8386FEC map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc index 80ab8d7f5..642613434 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/events/PacifidlogTown_House3.inc @@ -3,8 +3,8 @@ PacifidlogTown_House3_MapObjects:: @ 8387000 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 4, 0, 2, 0, 3, 10, 17, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0, 0, 0 PacifidlogTown_House3_MapWarps:: @ 8387030 - warp_def 4, 8, 0, 3, PacifidlogTown - warp_def 5, 8, 0, 3, PacifidlogTown + warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN PacifidlogTown_House3_MapEvents:: @ 8387040 map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc index a7dd1469b..bf010eaf3 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/events/PacifidlogTown_House4.inc @@ -4,8 +4,8 @@ PacifidlogTown_House4_MapObjects:: @ 8387054 object_event 3, MAP_OBJ_GFX_BOY_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0, 0, 0 PacifidlogTown_House4_MapWarps:: @ 838709C - warp_def 4, 8, 0, 4, PacifidlogTown - warp_def 5, 8, 0, 4, PacifidlogTown + warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN PacifidlogTown_House4_MapEvents:: @ 83870AC map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc index 963a319cf..cd7c5dae0 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/events/PacifidlogTown_House5.inc @@ -3,8 +3,8 @@ PacifidlogTown_House5_MapObjects:: @ 83870C0 object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0, 0, 0 PacifidlogTown_House5_MapWarps:: @ 83870F0 - warp_def 4, 8, 0, 5, PacifidlogTown - warp_def 5, 8, 0, 5, PacifidlogTown + warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN PacifidlogTown_House5_MapEvents:: @ 8387100 map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc index 432ba616d..e0990b224 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ PacifidlogTown_PokemonCenter_1F_MapObjects:: @ 8386E30 object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0, 0, 0 PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90 - warp_def 7, 8, 3, 0, PacifidlogTown - warp_def 6, 8, 3, 0, PacifidlogTown - warp_def 1, 6, 4, 0, PacifidlogTown_PokemonCenter_2F + warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN + warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN + warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 8386EA8 map_events PacifidlogTown_PokemonCenter_1F_MapObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc index f4110623f..fb594733e 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ PacifidlogTown_PokemonCenter_2F_MapObjects:: @ 8386EBC object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0, 0, 0 PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04 - warp_def 1, 5, 4, 2, PacifidlogTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 1, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 1, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 4c36c49ab..3b6329587 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -10,12 +10,12 @@ PetalburgCity_MapObjects:: @ 837F5F0 object_event 9, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0 PetalburgCity_MapWarps:: @ 837F6C8 - warp_def 10, 19, 0, 0, PetalburgCity_House1 - warp_def 7, 5, 0, 0, PetalburgCity_WallysHouse - warp_def 15, 8, 0, 0, PetalburgCity_Gym - warp_def 20, 16, 0, 0, PetalburgCity_PokemonCenter_1F - warp_def 20, 24, 0, 0, PetalburgCity_House2 - warp_def 25, 12, 0, 0, PetalburgCity_Mart + warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 + warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE + warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM + warp_def 20, 16, 0, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_1F + warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2 + warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents:: @ 837F6F8 coord_event 8, 10, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B836 diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index 47205e253..2b09951ee 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -11,44 +11,44 @@ PetalburgCity_Gym_MapObjects:: @ 8387168 object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 866, 0, 0 PetalburgCity_Gym_MapWarps:: @ 8387258 - warp_def 4, 111, 3, 2, PetalburgCity - warp_def 5, 111, 3, 2, PetalburgCity - warp_def 1, 105, 3, 3, PetalburgCity_Gym - warp_def 7, 85, 3, 2, PetalburgCity_Gym - warp_def 6, 85, 3, 2, PetalburgCity_Gym - warp_def 7, 105, 3, 6, PetalburgCity_Gym - warp_def 1, 98, 3, 5, PetalburgCity_Gym - warp_def 2, 98, 3, 5, PetalburgCity_Gym - warp_def 1, 79, 3, 10, PetalburgCity_Gym - warp_def 7, 79, 3, 12, PetalburgCity_Gym - warp_def 7, 46, 3, 8, PetalburgCity_Gym - warp_def 6, 46, 3, 8, PetalburgCity_Gym - warp_def 1, 59, 3, 9, PetalburgCity_Gym - warp_def 2, 59, 3, 9, PetalburgCity_Gym - warp_def 1, 92, 3, 16, PetalburgCity_Gym - warp_def 7, 92, 3, 18, PetalburgCity_Gym - warp_def 7, 59, 3, 14, PetalburgCity_Gym - warp_def 6, 59, 3, 14, PetalburgCity_Gym - warp_def 1, 72, 3, 15, PetalburgCity_Gym - warp_def 2, 72, 3, 15, PetalburgCity_Gym - warp_def 7, 40, 3, 24, PetalburgCity_Gym - warp_def 1, 53, 3, 26, PetalburgCity_Gym - warp_def 7, 53, 3, 28, PetalburgCity_Gym - warp_def 1, 66, 3, 30, PetalburgCity_Gym - warp_def 1, 20, 3, 20, PetalburgCity_Gym - warp_def 2, 20, 3, 20, PetalburgCity_Gym - warp_def 7, 20, 3, 21, PetalburgCity_Gym - warp_def 6, 20, 3, 21, PetalburgCity_Gym - warp_def 1, 33, 3, 22, PetalburgCity_Gym - warp_def 2, 33, 3, 22, PetalburgCity_Gym - warp_def 7, 33, 3, 23, PetalburgCity_Gym - warp_def 6, 33, 3, 23, PetalburgCity_Gym - warp_def 7, 14, 3, 34, PetalburgCity_Gym - warp_def 1, 27, 3, 36, PetalburgCity_Gym - warp_def 1, 7, 3, 32, PetalburgCity_Gym - warp_def 2, 7, 3, 32, PetalburgCity_Gym - warp_def 7, 7, 3, 33, PetalburgCity_Gym - warp_def 6, 7, 3, 33, PetalburgCity_Gym + warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY + warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY + warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM + warp_def 7, 85, 3, 2, MAP_PETALBURG_CITY_GYM + warp_def 6, 85, 3, 2, MAP_PETALBURG_CITY_GYM + warp_def 7, 105, 3, 6, MAP_PETALBURG_CITY_GYM + warp_def 1, 98, 3, 5, MAP_PETALBURG_CITY_GYM + warp_def 2, 98, 3, 5, MAP_PETALBURG_CITY_GYM + warp_def 1, 79, 3, 10, MAP_PETALBURG_CITY_GYM + warp_def 7, 79, 3, 12, MAP_PETALBURG_CITY_GYM + warp_def 7, 46, 3, 8, MAP_PETALBURG_CITY_GYM + warp_def 6, 46, 3, 8, MAP_PETALBURG_CITY_GYM + warp_def 1, 59, 3, 9, MAP_PETALBURG_CITY_GYM + warp_def 2, 59, 3, 9, MAP_PETALBURG_CITY_GYM + warp_def 1, 92, 3, 16, MAP_PETALBURG_CITY_GYM + warp_def 7, 92, 3, 18, MAP_PETALBURG_CITY_GYM + warp_def 7, 59, 3, 14, MAP_PETALBURG_CITY_GYM + warp_def 6, 59, 3, 14, MAP_PETALBURG_CITY_GYM + warp_def 1, 72, 3, 15, MAP_PETALBURG_CITY_GYM + warp_def 2, 72, 3, 15, MAP_PETALBURG_CITY_GYM + warp_def 7, 40, 3, 24, MAP_PETALBURG_CITY_GYM + warp_def 1, 53, 3, 26, MAP_PETALBURG_CITY_GYM + warp_def 7, 53, 3, 28, MAP_PETALBURG_CITY_GYM + warp_def 1, 66, 3, 30, MAP_PETALBURG_CITY_GYM + warp_def 1, 20, 3, 20, MAP_PETALBURG_CITY_GYM + warp_def 2, 20, 3, 20, MAP_PETALBURG_CITY_GYM + warp_def 7, 20, 3, 21, MAP_PETALBURG_CITY_GYM + warp_def 6, 20, 3, 21, MAP_PETALBURG_CITY_GYM + warp_def 1, 33, 3, 22, MAP_PETALBURG_CITY_GYM + warp_def 2, 33, 3, 22, MAP_PETALBURG_CITY_GYM + warp_def 7, 33, 3, 23, MAP_PETALBURG_CITY_GYM + warp_def 6, 33, 3, 23, MAP_PETALBURG_CITY_GYM + warp_def 7, 14, 3, 34, MAP_PETALBURG_CITY_GYM + warp_def 1, 27, 3, 36, MAP_PETALBURG_CITY_GYM + warp_def 1, 7, 3, 32, MAP_PETALBURG_CITY_GYM + warp_def 2, 7, 3, 32, MAP_PETALBURG_CITY_GYM + warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM + warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM PetalburgCity_Gym_MapBGEvents:: @ 8387388 bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73 diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc index 2d6a28056..9faa2873a 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/events/PetalburgCity_House1.inc @@ -3,8 +3,8 @@ PetalburgCity_House1_MapObjects:: @ 8387444 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0, 0, 0 PetalburgCity_House1_MapWarps:: @ 8387474 - warp_def 3, 8, 0, 0, PetalburgCity - warp_def 4, 8, 0, 0, PetalburgCity + warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY + warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY PetalburgCity_House1_MapEvents:: @ 8387484 map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc index 0797b9bab..29a2226d1 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/events/PetalburgCity_House2.inc @@ -3,8 +3,8 @@ PetalburgCity_House2_MapObjects:: @ 8387498 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0, 0, 0 PetalburgCity_House2_MapWarps:: @ 83874C8 - warp_def 3, 7, 0, 4, PetalburgCity - warp_def 4, 7, 0, 4, PetalburgCity + warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY PetalburgCity_House2_MapEvents:: @ 83874D8 map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc index 2fbed4b9d..358618d7e 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/events/PetalburgCity_Mart.inc @@ -5,8 +5,8 @@ PetalburgCity_Mart_MapObjects:: @ 8387614 object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0, 0, 0 PetalburgCity_Mart_MapWarps:: @ 8387674 - warp_def 3, 7, 0, 5, PetalburgCity - warp_def 4, 7, 0, 5, PetalburgCity + warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY PetalburgCity_Mart_MapEvents:: @ 8387684 map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc index 5fb3186e5..8bdc1e1bf 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc @@ -6,9 +6,9 @@ PetalburgCity_PokemonCenter_1F_MapObjects:: @ 83874EC object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0, 0, 0 PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564 - warp_def 7, 8, 3, 3, PetalburgCity - warp_def 6, 8, 3, 3, PetalburgCity - warp_def 1, 6, 4, 0, PetalburgCity_PokemonCenter_2F + warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY + warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY + warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F PetalburgCity_PokemonCenter_1F_MapEvents:: @ 838757C map_events PetalburgCity_PokemonCenter_1F_MapObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc index eab3d7dd5..cdbefe565 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ PetalburgCity_PokemonCenter_2F_MapObjects:: @ 8387590 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0, 0, 0 PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8 - warp_def 1, 5, 4, 2, PetalburgCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600 map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc index 724b84f0f..4485f518d 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/events/PetalburgCity_WallysHouse.inc @@ -3,8 +3,8 @@ PetalburgCity_WallysHouse_MapObjects:: @ 8387114 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0, 0, 0 PetalburgCity_WallysHouse_MapWarps:: @ 8387144 - warp_def 3, 7, 0, 1, PetalburgCity - warp_def 4, 7, 0, 1, PetalburgCity + warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY PetalburgCity_WallysHouse_MapEvents:: @ 8387154 map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index cb0ff7ca1..73a1d4cfb 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -14,12 +14,12 @@ PetalburgWoods_MapObjects:: @ 838C14C object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CEDC, 0, 0, 0 PetalburgWoods_MapWarps:: @ 838C284 - warp_def 14, 5, 0, 2, Route104 - warp_def 15, 5, 0, 3, Route104 - warp_def 16, 38, 0, 4, Route104 - warp_def 17, 38, 0, 5, Route104 - warp_def 36, 38, 0, 6, Route104 - warp_def 37, 38, 0, 7, Route104 + warp_def 14, 5, 0, 2, MAP_ROUTE104 + warp_def 15, 5, 0, 3, MAP_ROUTE104 + warp_def 16, 38, 0, 4, MAP_ROUTE104 + warp_def 17, 38, 0, 5, MAP_ROUTE104 + warp_def 36, 38, 0, 6, MAP_ROUTE104 + warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents:: @ 838C2B4 coord_event 26, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CCA8 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index 6ef149ab4..df26386b3 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -2,10 +2,10 @@ RecordCorner_MapObjects:: @ 839139C object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0 RecordCorner_MapWarps:: @ 83913B4 - warp_def 8, 9, 3, 127, None - warp_def 9, 9, 3, 127, None - warp_def 11, 9, 3, 127, None - warp_def 10, 9, 3, 127, None + warp_def 8, 9, 3, 127, MAP_NONE + warp_def 9, 9, 3, 127, MAP_NONE + warp_def 11, 9, 3, 127, MAP_NONE + warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents:: @ 83913D4 coord_event 6, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4418 diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index b4c8a2834..8ddfab738 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -33,14 +33,14 @@ Route104_MapObjects:: @ 8381488 object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0 Route104_MapWarps:: @ 8381788 - warp_def 17, 50, 0, 0, Route104_MrBrineysHouse - warp_def 5, 18, 0, 0, Route104_PrettyPetalFlowerShop - warp_def 10, 30, 3, 0, PetalburgWoods - warp_def 11, 30, 3, 1, PetalburgWoods - warp_def 10, 38, 3, 2, PetalburgWoods - warp_def 11, 38, 3, 3, PetalburgWoods - warp_def 32, 42, 3, 4, PetalburgWoods - warp_def 33, 42, 3, 5, PetalburgWoods + warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE + warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP + warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS + warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS + warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS + warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS + warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS + warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS Route104_MapBGEvents:: @ 83817C8 bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54 diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index d8b2ff252..f04195c9b 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -3,8 +3,8 @@ Route104_MrBrineysHouse_MapObjects:: @ 838B654 object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, 881, 0, 0 Route104_MrBrineysHouse_MapWarps:: @ 838B684 - warp_def 5, 8, 0, 0, Route104 - warp_def 6, 8, 0, 0, Route104 + warp_def 5, 8, 0, 0, MAP_ROUTE104 + warp_def 6, 8, 0, 0, MAP_ROUTE104 Route104_MrBrineysHouse_MapEvents:: @ 838B694 map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc index 0c540e940..c02950add 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc @@ -4,8 +4,8 @@ Route104_PrettyPetalFlowerShop_MapObjects:: @ 838B6A8 object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 11, 0, 6, 0, 4, 2, 34, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0, 0, 0 Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0 - warp_def 2, 8, 0, 1, Route104 - warp_def 3, 8, 0, 1, Route104 + warp_def 2, 8, 0, 1, MAP_ROUTE104 + warp_def 3, 8, 0, 1, MAP_ROUTE104 Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700 map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/events/Route104_Prototype.inc index 6748fe0ed..80dcf5108 100644 --- a/data/maps/events/Route104_Prototype.inc +++ b/data/maps/events/Route104_Prototype.inc @@ -13,7 +13,7 @@ Route104_Prototype_MapObjects:: @ 8391F2C object_event 12, MAP_OBJ_GFX_MAN_3, 0, 11, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D0A, 0, 0, 0 Route104_Prototype_MapWarps:: @ 839204C - warp_def 5, 24, 0, 0, Route104_PrototypePrettyPetalFlowerShop + warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP Route104_Prototype_MapBGEvents:: @ 8392054 bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc index 96cac1e71..4ec99895c 100644 --- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc @@ -2,8 +2,8 @@ Route104_PrototypePrettyPetalFlowerShop_MapObjects:: @ 8392080 object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0, 0, 0 Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098 - warp_def 2, 8, 0, 0, Route104_Prototype - warp_def 3, 8, 0, 0, Route104_Prototype + warp_def 2, 8, 0, 0, MAP_ROUTE104_PROTOTYPE + warp_def 3, 8, 0, 0, MAP_ROUTE104_PROTOTYPE Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8 map_events Route104_PrototypePrettyPetalFlowerShop_MapObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index 5f7f6c13d..7cf684e55 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -7,7 +7,7 @@ Route105_MapObjects:: @ 8381854 object_event 6, MAP_OBJ_GFX_HIKER, 0, 12, 0, 51, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route105_EventScript_14F2BB, 0, 0, 0 Route105_MapWarps:: @ 83818E4 - warp_def 9, 20, 0, 0, IslandCave + warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE Route105_MapBGEvents:: @ 83818EC bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0 diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc index 51c093fe5..6af8d92fa 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -6,7 +6,7 @@ Route106_MapObjects:: @ 838190C object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, 1004, 0, 0 Route106_MapWarps:: @ 8381984 - warp_def 48, 16, 0, 0, GraniteCave_1F + warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents:: @ 838198C bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0 diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc index 1f49a1e0c..ad695e8b9 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -5,7 +5,7 @@ Route108_MapObjects:: @ 8381A74 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 36, 0, 12, 0, 1, 51, 54, 0, 1, 0, 3, 0, Route108_EventScript_14F4BB, 0, 0, 0 Route108_MapWarps:: @ 8381AD4 - warp_def 29, 6, 3, 0, AbandonedShip_Deck + warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents:: @ 8381ADC bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index 511579650..3156a5cb3 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -21,7 +21,7 @@ Route109_MapObjects:: @ 8381AFC object_event 20, MAP_OBJ_GFX_ZIGZAGOON, 0, 32, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F788, 0, 0, 0 Route109_MapWarps:: @ 8381CDC - warp_def 12, 5, 0, 0, Route109_SeashoreHouse + warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE Route109_MapBGEvents:: @ 8381CE4 bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc index 5036df1e7..abaf7abcc 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/events/Route109_SeashoreHouse.inc @@ -5,8 +5,8 @@ Route109_SeashoreHouse_MapObjects:: @ 83920BC object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 10, 0, 5, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160ED3, 0, 0, 0 Route109_SeashoreHouse_MapWarps:: @ 839211C - warp_def 6, 9, 0, 0, Route109 - warp_def 7, 9, 0, 0, Route109 + warp_def 6, 9, 0, 0, MAP_ROUTE109 + warp_def 7, 9, 0, 0, MAP_ROUTE109 Route109_SeashoreHouse_MapEvents:: @ 839212C map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 3db4ce8e8..5c94ac7bc 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -32,12 +32,12 @@ Route110_MapObjects:: @ 8381D58 object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 73, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route110_EventScript_14FBD2, 0, 0, 0 Route110_MapWarps:: @ 8382040 - warp_def 35, 24, 3, 0, NewMauville_Entrance - warp_def 11, 66, 0, 0, Route110_TrickHouseEntrance - warp_def 15, 16, 0, 0, Route110_SeasideCyclingRoadNorthEntrance - warp_def 18, 16, 0, 2, Route110_SeasideCyclingRoadNorthEntrance - warp_def 16, 88, 0, 0, Route110_SeasideCyclingRoadSouthEntrance - warp_def 19, 88, 0, 2, Route110_SeasideCyclingRoadSouthEntrance + warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE + warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE Route110_MapCoordEvents:: @ 8382070 coord_event 28, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27 diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc index e1ca6b4de..9051ad929 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadNorthEntrance_MapObjects:: @ 8392CAC object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0, 0, 0 Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 - warp_def 1, 5, 0, 2, Route110 - warp_def 2, 5, 0, 2, Route110 - warp_def 12, 5, 0, 3, Route110 - warp_def 13, 5, 0, 3, Route110 + warp_def 1, 5, 0, 2, MAP_ROUTE110 + warp_def 2, 5, 0, 2, MAP_ROUTE110 + warp_def 12, 5, 0, 3, MAP_ROUTE110 + warp_def 13, 5, 0, 3, MAP_ROUTE110 Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc index 24ae3600f..947cc714a 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -2,10 +2,10 @@ Route110_SeasideCyclingRoadSouthEntrance_MapObjects:: @ 8392C40 object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0, 0, 0 Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 - warp_def 1, 5, 0, 4, Route110 - warp_def 2, 5, 0, 4, Route110 - warp_def 12, 5, 0, 5, Route110 - warp_def 13, 5, 0, 5, Route110 + warp_def 1, 5, 0, 4, MAP_ROUTE110 + warp_def 2, 5, 0, 4, MAP_ROUTE110 + warp_def 12, 5, 0, 5, MAP_ROUTE110 + warp_def 13, 5, 0, 5, MAP_ROUTE110 Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/events/Route110_TrickHouseCorridor.inc index 105701e55..4b7e39efd 100644 --- a/data/maps/events/Route110_TrickHouseCorridor.inc +++ b/data/maps/events/Route110_TrickHouseCorridor.inc @@ -1,8 +1,8 @@ Route110_TrickHouseCorridor_MapWarps:: @ 8392228 - warp_def 13, 3, 3, 1, Route110_TrickHouseEnd - warp_def 14, 3, 3, 1, Route110_TrickHouseEnd - warp_def 4, 23, 3, 2, Route110_TrickHouseEntrance - warp_def 5, 23, 3, 2, Route110_TrickHouseEntrance + warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END + warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END + warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE Route110_TrickHouseCorridor_MapEvents:: @ 8392248 map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index f050e3270..bedc6357d 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -2,8 +2,8 @@ Route110_TrickHouseEnd_MapObjects:: @ 83921D0 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, 899, 0, 0 Route110_TrickHouseEnd_MapWarps:: @ 83921E8 - warp_def 10, 1, 3, 2, Route110_TrickHousePuzzle1 - warp_def 2, 1, 3, 0, Route110_TrickHouseCorridor + warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 + warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents:: @ 83921F8 coord_event 2, 2, 3, 0, 0x4002, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index a1f67bd3d..59e329d98 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -2,9 +2,9 @@ Route110_TrickHouseEntrance_MapObjects:: @ 8392140 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, 872, 0, 0 Route110_TrickHouseEntrance_MapWarps:: @ 8392158 - warp_def 5, 7, 3, 1, Route110 - warp_def 6, 7, 3, 1, Route110 - warp_def 5, 2, 3, 0, Route110_TrickHousePuzzle1 + warp_def 5, 7, 3, 1, MAP_ROUTE110 + warp_def 6, 7, 3, 1, MAP_ROUTE110 + warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170 coord_event 4, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 3660e3c3f..8a3bb24a3 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -20,9 +20,9 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 31, 0, 0 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle1_MapBGEvents:: @ 839243C bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14 diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index d77fd66a1..f92097eec 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle2_MapObjects:: @ 839245C object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, 1061, 0, 0 Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC coord_event 14, 21, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index abccae1d4..9a666766f 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -12,9 +12,9 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C coord_event 5, 20, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index ef450800d..26efce267 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -16,9 +16,9 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle4_MapBGEvents:: @ 839287C bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index be38ef452..ac40ffef4 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle5_MapObjects:: @ 839289C object_event 5, MAP_OBJ_GFX_MAN_1, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0, 0, 0 Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C coord_event 8, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc index 1e6c7869b..ad7c26e44 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle6_MapObjects:: @ 8392A2C object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, 1067, 0, 0 Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle6_MapBGEvents:: @ 8392AA4 bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index d5e4f14af..f666b4640 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle7_MapObjects:: @ 8392AC4 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, 1068, 0, 0 Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C coord_event 9, 2, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc index accb0b3a2..0caa0e68d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle8_MapObjects:: @ 8392BA8 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, 1069, 0, 0 Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 - warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance - warp_def 13, 1, 0, 0, Route110_TrickHouseEnd + warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE + warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle8_MapBGEvents:: @ 8392C20 bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index e36cd7e74..6de5deba0 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -37,9 +37,9 @@ Route111_MapObjects:: @ 83821A0 object_event 36, MAP_OBJ_GFX_MAN_5, 0, 20, 0, 114, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_15039E, 0, 0, 0 Route111_MapWarps:: @ 8382500 - warp_def 13, 113, 0, 0, Route111_WinstrateFamilysHouse - warp_def 29, 87, 0, 0, DesertRuins - warp_def 26, 18, 0, 0, Route111_OldLadysRestStop + warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE + warp_def 29, 87, 0, 0, MAP_DESERT_RUINS + warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP Route111_MapCoordEvents:: @ 8382518 coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc index c295aa0c9..fbd9b7ab1 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/events/Route111_OldLadysRestStop.inc @@ -2,8 +2,8 @@ Route111_OldLadysRestStop_MapObjects:: @ 838B798 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0, 0, 0 Route111_OldLadysRestStop_MapWarps:: @ 838B7B0 - warp_def 3, 7, 0, 2, Route111 - warp_def 4, 7, 0, 2, Route111 + warp_def 3, 7, 0, 2, MAP_ROUTE111 + warp_def 4, 7, 0, 2, MAP_ROUTE111 Route111_OldLadysRestStop_MapEvents:: @ 838B7C0 map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc index 8cb265965..ef2286c97 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc @@ -5,8 +5,8 @@ Route111_WinstrateFamilysHouse_MapObjects:: @ 838B714 object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0, 0, 0 Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774 - warp_def 3, 7, 0, 0, Route111 - warp_def 4, 7, 0, 0, Route111 + warp_def 3, 7, 0, 0, MAP_ROUTE111 + warp_def 4, 7, 0, 0, MAP_ROUTE111 Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784 map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index a4991a907..50b300bc9 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -13,12 +13,12 @@ Route112_MapObjects:: @ 8382818 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0 Route112_MapWarps:: @ 8382938 - warp_def 28, 27, 0, 0, Route112_CableCarStation - warp_def 29, 27, 0, 1, Route112_CableCarStation - warp_def 6, 46, 3, 0, JaggedPass - warp_def 7, 46, 3, 1, JaggedPass - warp_def 11, 36, 0, 0, FieryPath - warp_def 22, 10, 0, 1, FieryPath + warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION + warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION + warp_def 6, 46, 3, 0, MAP_JAGGED_PASS + warp_def 7, 46, 3, 1, MAP_JAGGED_PASS + warp_def 11, 36, 0, 0, MAP_FIERY_PATH + warp_def 22, 10, 0, 1, MAP_FIERY_PATH Route112_MapBGEvents:: @ 8382968 bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc index 6ca18059b..cc2dfa38a 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/events/Route112_CableCarStation.inc @@ -3,8 +3,8 @@ Route112_CableCarStation_MapObjects:: @ 838B7D4 object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 Route112_CableCarStation_MapWarps:: @ 838B804 - warp_def 6, 11, 0, 0, Route112 - warp_def 7, 11, 0, 1, Route112 + warp_def 6, 11, 0, 0, MAP_ROUTE112 + warp_def 7, 11, 0, 1, MAP_ROUTE112 Route112_CableCarStation_MapEvents:: @ 838B814 map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index ee145eb76..4e9bd98b5 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -12,7 +12,7 @@ Route113_MapObjects:: @ 83829A0 object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_150717, 0, 0, 0 Route113_MapWarps:: @ 8382AA8 - warp_def 33, 5, 0, 0, Route113_GlassWorkshop + warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP Route113_MapCoordEvents:: @ 8382AB0 coord_event 19, 11, 3, 0, 8, 0, 0, 0x0 diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc index 68b47709d..74953c4da 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/events/Route113_GlassWorkshop.inc @@ -3,8 +3,8 @@ Route113_GlassWorkshop_MapObjects:: @ 8392D18 object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0, 0, 0 Route113_GlassWorkshop_MapWarps:: @ 8392D48 - warp_def 3, 8, 0, 0, Route113 - warp_def 4, 8, 0, 0, Route113 + warp_def 3, 8, 0, 0, MAP_ROUTE113 + warp_def 4, 8, 0, 0, MAP_ROUTE113 Route113_GlassWorkshop_MapEvents:: @ 8392D58 map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index 1f4d761e3..4717199da 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -24,9 +24,9 @@ Route114_MapObjects:: @ 8382C48 object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0 Route114_MapWarps:: @ 8382E70 - warp_def 8, 63, 0, 0, MeteorFalls_1F_1R - warp_def 29, 5, 0, 0, Route114_FossilManiacsHouse - warp_def 27, 36, 0, 0, Route114_LanettesHouse + warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R + warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE Route114_MapBGEvents:: @ 8382E88 bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc index f7bf465e9..01fc6106f 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/events/Route114_FossilManiacsHouse.inc @@ -2,9 +2,9 @@ Route114_FossilManiacsHouse_MapObjects:: @ 838B87C object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0, 0, 0 Route114_FossilManiacsHouse_MapWarps:: @ 838B894 - warp_def 4, 7, 0, 1, Route114 - warp_def 5, 7, 0, 1, Route114 - warp_def 4, 1, 0, 0, Route114_FossilManiacsTunnel + warp_def 4, 7, 0, 1, MAP_ROUTE114 + warp_def 5, 7, 0, 1, MAP_ROUTE114 + warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc index 89c231d7e..259445d43 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/events/Route114_FossilManiacsTunnel.inc @@ -2,8 +2,8 @@ Route114_FossilManiacsTunnel_MapObjects:: @ 838B8F0 object_event 1, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0, 0, 0 Route114_FossilManiacsTunnel_MapWarps:: @ 838B908 - warp_def 6, 25, 3, 2, Route114_FossilManiacsHouse - warp_def 7, 25, 3, 2, Route114_FossilManiacsHouse + warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE Route114_FossilManiacsTunnel_MapEvents:: @ 838B918 map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index e62f6e0ad..40ff30536 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -2,8 +2,8 @@ Route114_LanettesHouse_MapObjects:: @ 838B92C object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, 870, 0, 0 Route114_LanettesHouse_MapWarps:: @ 838B944 - warp_def 5, 7, 0, 2, Route114 - warp_def 6, 7, 0, 2, Route114 + warp_def 5, 7, 0, 2, MAP_ROUTE114 + warp_def 6, 7, 0, 2, MAP_ROUTE114 Route114_LanettesHouse_MapBGEvents:: @ 838B954 bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index ddca08fad..23250916c 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -17,7 +17,7 @@ Route115_MapObjects:: @ 8382F2C object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0 Route115_MapWarps:: @ 83830AC - warp_def 27, 37, 0, 1, MeteorFalls_1F_1R + warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R Route115_MapBGEvents:: @ 83830B4 bg_event 32, 6, 0, 8, 0, 72, 0, 0 diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index b5f922524..699ed4616 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -23,9 +23,9 @@ Route116_MapObjects:: @ 8383170 object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, 813, 0, 0 Route116_MapWarps:: @ 8383380 - warp_def 47, 8, 0, 0, RusturfTunnel - warp_def 38, 8, 0, 0, Route116_TunnelersRestHouse - warp_def 65, 10, 0, 2, RusturfTunnel + warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL + warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE + warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL Route116_MapCoordEvents:: @ 8383398 coord_event 47, 9, 3, 0, 0x406f, 1, 0, Route116_EventScript_150B6E diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc index 4e4553567..2676d7a68 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/events/Route116_TunnelersRestHouse.inc @@ -4,8 +4,8 @@ Route116_TunnelersRestHouse_MapObjects:: @ 838B98C object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0, 0, 0 Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4 - warp_def 4, 8, 0, 1, Route116 - warp_def 5, 8, 0, 1, Route116 + warp_def 4, 8, 0, 1, MAP_ROUTE116 + warp_def 5, 8, 0, 1, MAP_ROUTE116 Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4 map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index bf6aeb5d0..67d391044 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -22,7 +22,7 @@ Route117_MapObjects:: @ 8383440 object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 48, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route117_EventScript_150D69, 0, 0, 0 Route117_MapWarps:: @ 8383638 - warp_def 51, 5, 0, 0, Route117_PokemonDayCare + warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE Route117_MapBGEvents:: @ 8383640 bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72 diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc index 69ede9610..b1df05d06 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/events/Route117_PokemonDayCare.inc @@ -2,8 +2,8 @@ Route117_PokemonDayCare_MapObjects:: @ 838B9F8 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0, 0, 0 Route117_PokemonDayCare_MapWarps:: @ 838BA10 - warp_def 2, 8, 0, 0, Route117 - warp_def 3, 8, 0, 0, Route117 + warp_def 2, 8, 0, 0, MAP_ROUTE117 + warp_def 3, 8, 0, 0, MAP_ROUTE117 Route117_PokemonDayCare_MapEvents:: @ 838BA20 map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 08e6e3649..491f5b469 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -38,8 +38,8 @@ Route119_MapObjects:: @ 8383914 object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 104, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route119_EventScript_1515AE, 0, 0, 0 Route119_MapWarps:: @ 8383C8C - warp_def 6, 32, 0, 0, Route119_WeatherInstitute_1F - warp_def 33, 109, 0, 0, Route119_House + warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F + warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents:: @ 8383C9C coord_event 25, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511C5 diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc index 45267ca0e..255913651 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/events/Route119_House.inc @@ -8,8 +8,8 @@ Route119_House_MapObjects:: @ 8392F40 object_event 7, MAP_OBJ_GFX_WINGULL, 0, 5, 0, 3, 0, 3, 2, 49, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0 Route119_House_MapWarps:: @ 8392FE8 - warp_def 3, 8, 0, 1, Route119 - warp_def 4, 8, 0, 1, Route119 + warp_def 3, 8, 0, 1, MAP_ROUTE119 + warp_def 4, 8, 0, 1, MAP_ROUTE119 Route119_House_MapEvents:: @ 8392FF8 map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index 1472fb569..58c20fc6e 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -6,9 +6,9 @@ Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0 object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0 Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 - warp_def 9, 12, 0, 0, Route119 - warp_def 10, 12, 0, 0, Route119 - warp_def 17, 1, 0, 0, Route119_WeatherInstitute_2F + warp_def 9, 12, 0, 0, MAP_ROUTE119 + warp_def 10, 12, 0, 0, MAP_ROUTE119 + warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50 bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index d2dbce24d..b78eb76d6 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -7,7 +7,7 @@ Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94 object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0 Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 - warp_def 17, 1, 0, 2, Route119_WeatherInstitute_1F + warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 81fa21c7f..febefb26a 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -42,8 +42,8 @@ Route120_MapObjects:: @ 8383F30 object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, 987, 0, 0 Route120_MapWarps:: @ 8384308 - warp_def 7, 55, 0, 0, AncientTomb - warp_def 19, 23, 1, 0, ScorchedSlab + warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB + warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB Route120_MapCoordEvents:: @ 8384318 coord_event 7, 15, 0, 0, 3, 0, 0, 0x0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index 9961344a8..94de6ed39 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -23,7 +23,7 @@ Route121_MapObjects:: @ 8384504 object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 Route121_MapWarps:: @ 8384714 - warp_def 37, 5, 0, 2, Route121_SafariZoneEntrance + warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents:: @ 838471C coord_event 25, 5, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index c3880d4b3..68ee79ca1 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -4,10 +4,10 @@ Route121_SafariZoneEntrance_MapObjects:: @ 838BA34 object_event 3, MAP_OBJ_GFX_CAMPER, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C - warp_def 2, 5, 0, 0, SafariZone_Southeast - warp_def 3, 5, 0, 0, SafariZone_Southeast - warp_def 14, 13, 0, 0, Route121 - warp_def 15, 13, 0, 0, Route121 + warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST + warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST + warp_def 14, 13, 0, 0, MAP_ROUTE121 + warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C coord_event 8, 4, 3, 0, 0x4001, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 diff --git a/data/maps/events/Route122.inc b/data/maps/events/Route122.inc index 217c28ee1..3bad2b895 100644 --- a/data/maps/events/Route122.inc +++ b/data/maps/events/Route122.inc @@ -1,5 +1,5 @@ Route122_MapWarps:: @ 83847DC - warp_def 22, 29, 0, 0, MtPyre_1F + warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F Route122_MapEvents:: @ 83847E4 map_events 0x0, Route122_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index dc5ac0fb4..f29d5d242 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -35,7 +35,7 @@ Route123_MapObjects:: @ 83847F8 object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, 1109, 0, 0 Route123_MapWarps:: @ 8384B28 - warp_def 22, 6, 0, 0, Route123_BerryMastersHouse + warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE Route123_MapCoordEvents:: @ 8384B30 coord_event 90, 16, 3, 0, 21, 0, 0, 0x0 diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc index 183e19415..a17a04e19 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/events/Route123_BerryMastersHouse.inc @@ -3,8 +3,8 @@ Route123_BerryMastersHouse_MapObjects:: @ 8392D6C object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0, 0, 0 Route123_BerryMastersHouse_MapWarps:: @ 8392D9C - warp_def 3, 7, 0, 0, Route123 - warp_def 4, 7, 0, 0, Route123 + warp_def 3, 7, 0, 0, MAP_ROUTE123 + warp_def 4, 7, 0, 0, MAP_ROUTE123 Route123_BerryMastersHouse_MapEvents:: @ 8392DAC map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc index 83db7f24b..7001c5928 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -11,7 +11,7 @@ Route124_MapObjects:: @ 8384D10 object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151ED8, 0, 0, 0 Route124_MapWarps:: @ 8384E00 - warp_def 70, 48, 3, 0, Route124_DivingTreasureHuntersHouse + warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE Route124_MapBGEvents:: @ 8384E08 bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc index 5d60c795e..17ec713de 100755 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -2,8 +2,8 @@ Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0 Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 - warp_def 3, 8, 0, 0, Route124 - warp_def 4, 8, 0, 0, Route124 + warp_def 3, 8, 0, 0, MAP_ROUTE124 + warp_def 4, 8, 0, 0, MAP_ROUTE124 Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 0c7d12643..585296ac3 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -8,7 +8,7 @@ Route125_MapObjects:: @ 8384E28 object_event 7, MAP_OBJ_GFX_LASS, 0, 21, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FE3, 0, 0, 0 Route125_MapWarps:: @ 8384ED0 - warp_def 22, 19, 0, 0, ShoalCave_LowTideEntranceRoom + warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM Route125_MapBGEvents:: @ 8384ED8 bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0 diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc index ed1a33768..d387233d2 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/events/Route131.inc @@ -7,7 +7,7 @@ Route131_MapObjects:: @ 8385298 object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524C9, 0, 0, 0 Route131_MapWarps:: @ 8385328 - warp_def 36, 6, 3, 0, SkyPillar_Entrance + warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE Route131_MapEvents:: @ 8385330 map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 4bbf0a6a2..f42fd059c 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -15,18 +15,18 @@ RustboroCity_MapObjects:: @ 837FD14 object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, 814, 0, 0 RustboroCity_MapWarps:: @ 837FE64 - warp_def 27, 19, 0, 0, RustboroCity_Gym - warp_def 13, 30, 0, 0, RustboroCity_Flat1_1F - warp_def 16, 45, 0, 0, RustboroCity_Mart - warp_def 16, 38, 0, 0, RustboroCity_PokemonCenter_1F - warp_def 27, 34, 0, 0, RustboroCity_PokemonSchool - warp_def 11, 15, 0, 0, RustboroCity_DevonCorp_1F - warp_def 12, 15, 0, 1, RustboroCity_DevonCorp_1F - warp_def 33, 19, 0, 0, RustboroCity_House1 - warp_def 9, 38, 0, 0, RustboroCity_CuttersHouse - warp_def 30, 28, 0, 0, RustboroCity_House2 - warp_def 5, 51, 0, 0, RustboroCity_Flat2_1F - warp_def 26, 46, 0, 0, RustboroCity_House3 + warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM + warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F + warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART + warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL + warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1 + warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE + warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2 + warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F + warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents:: @ 837FEC4 coord_event 23, 20, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C481 diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc index b38fc9afe..e26127f38 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/events/RustboroCity_CuttersHouse.inc @@ -3,8 +3,8 @@ RustboroCity_CuttersHouse_MapObjects:: @ 8388D9C object_event 2, MAP_OBJ_GFX_LASS, 0, 9, 0, 2, 0, 3, 5, 1, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0, 0, 0 RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC - warp_def 5, 8, 0, 8, RustboroCity - warp_def 6, 8, 0, 8, RustboroCity + warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc index 72437229c..165089ee7 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc @@ -4,9 +4,9 @@ RustboroCity_DevonCorp_1F_MapObjects:: @ 838880C object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 5, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0, 0, 0 RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854 - warp_def 5, 8, 0, 5, RustboroCity - warp_def 6, 8, 0, 6, RustboroCity - warp_def 14, 1, 0, 0, RustboroCity_DevonCorp_2F + warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY + warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_1F_MapEvents:: @ 838886C map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc index 3ca57bf10..93335d22e 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc @@ -6,8 +6,8 @@ RustboroCity_DevonCorp_2F_MapObjects:: @ 8388880 object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 14, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0, 0, 0 RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8 - warp_def 14, 1, 0, 2, RustboroCity_DevonCorp_1F - warp_def 2, 1, 0, 0, RustboroCity_DevonCorp_3F + warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F + warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F RustboroCity_DevonCorp_2F_MapEvents:: @ 8388908 map_events RustboroCity_DevonCorp_2F_MapObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc index f0f8fadec..8e2aef57b 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_3F_MapObjects:: @ 838891C object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 15, 0, 5, 0, 3, 76, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0 RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 - warp_def 2, 1, 0, 1, RustboroCity_DevonCorp_2F + warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc index 9c637f0fb..d44df7638 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ b/data/maps/events/RustboroCity_Flat1_1F.inc @@ -3,9 +3,9 @@ RustboroCity_Flat1_1F_MapObjects:: @ 8388CB8 object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 12, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0, 0, 0 RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8 - warp_def 6, 7, 0, 1, RustboroCity - warp_def 7, 7, 0, 1, RustboroCity - warp_def 2, 1, 0, 0, RustboroCity_Flat1_2F + warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY + warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY + warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F RustboroCity_Flat1_1F_MapEvents:: @ 8388D00 map_events RustboroCity_Flat1_1F_MapObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc index 2d1d187e9..91f1d2f20 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/events/RustboroCity_Flat1_2F.inc @@ -2,7 +2,7 @@ RustboroCity_Flat1_2F_MapObjects:: @ 8388D14 object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 8, 0, 6, 0, 3, 5, 19, 0, 0, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0, 0, 0 RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C - warp_def 2, 1, 0, 2, RustboroCity_Flat1_1F + warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F RustboroCity_Flat1_2F_MapEvents:: @ 8388D34 map_events RustboroCity_Flat1_2F_MapObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc index bd9f4904e..17c11b21f 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ b/data/maps/events/RustboroCity_Flat2_1F.inc @@ -3,9 +3,9 @@ RustboroCity_Flat2_1F_MapObjects:: @ 8388E44 object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0, 0, 0 RustboroCity_Flat2_1F_MapWarps:: @ 8388E74 - warp_def 2, 8, 0, 10, RustboroCity - warp_def 3, 8, 0, 10, RustboroCity - warp_def 3, 1, 0, 0, RustboroCity_Flat2_2F + warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY + warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY + warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_1F_MapEvents:: @ 8388E8C map_events RustboroCity_Flat2_1F_MapObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc index 988e3797d..b881e1bd2 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/events/RustboroCity_Flat2_2F.inc @@ -3,8 +3,8 @@ RustboroCity_Flat2_2F_MapObjects:: @ 8388EA0 object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0, 0, 0 RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0 - warp_def 3, 1, 0, 2, RustboroCity_Flat2_1F - warp_def 1, 1, 0, 0, RustboroCity_Flat2_3F + warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F + warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F RustboroCity_Flat2_2F_MapEvents:: @ 8388EE0 map_events RustboroCity_Flat2_2F_MapObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc index 3c09ce553..4a00bb8f4 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/events/RustboroCity_Flat2_3F.inc @@ -3,7 +3,7 @@ RustboroCity_Flat2_3F_MapObjects:: @ 8388EF4 object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0, 0, 0 RustboroCity_Flat2_3F_MapWarps:: @ 8388F24 - warp_def 1, 1, 0, 1, RustboroCity_Flat2_2F + warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc index cfe9f420d..e77b55b7f 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/events/RustboroCity_Gym.inc @@ -5,8 +5,8 @@ RustboroCity_Gym_MapObjects:: @ 8388998 object_event 4, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0, 0, 0 RustboroCity_Gym_MapWarps:: @ 83889F8 - warp_def 5, 18, 0, 0, RustboroCity - warp_def 6, 18, 0, 0, RustboroCity + warp_def 5, 18, 0, 0, MAP_RUSTBORO_CITY + warp_def 6, 18, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents:: @ 8388A08 bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc index 8e1cb1c7e..a6471da2e 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/events/RustboroCity_House1.inc @@ -3,8 +3,8 @@ RustboroCity_House1_MapObjects:: @ 8388D48 object_event 2, MAP_OBJ_GFX_HIKER, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0, 0, 0 RustboroCity_House1_MapWarps:: @ 8388D78 - warp_def 5, 7, 0, 7, RustboroCity - warp_def 6, 7, 0, 7, RustboroCity + warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY + warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY RustboroCity_House1_MapEvents:: @ 8388D88 map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc index 33159faa4..5cdb4fc6c 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/events/RustboroCity_House2.inc @@ -3,8 +3,8 @@ RustboroCity_House2_MapObjects:: @ 8388DF0 object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0, 0, 0 RustboroCity_House2_MapWarps:: @ 8388E20 - warp_def 5, 8, 0, 9, RustboroCity - warp_def 6, 8, 0, 9, RustboroCity + warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY RustboroCity_House2_MapEvents:: @ 8388E30 map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc index 696350f00..96c2f2699 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/events/RustboroCity_House3.inc @@ -4,8 +4,8 @@ RustboroCity_House3_MapObjects:: @ 8388F40 object_event 3, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0, 0, 0 RustboroCity_House3_MapWarps:: @ 8388F88 - warp_def 5, 8, 0, 11, RustboroCity - warp_def 6, 8, 0, 11, RustboroCity + warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY RustboroCity_House3_MapEvents:: @ 8388F98 map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc index 3949dcd2e..b95aa32af 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/events/RustboroCity_Mart.inc @@ -5,8 +5,8 @@ RustboroCity_Mart_MapObjects:: @ 8388C34 object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C56, 0, 0, 0 RustboroCity_Mart_MapWarps:: @ 8388C94 - warp_def 3, 7, 0, 2, RustboroCity - warp_def 4, 7, 0, 2, RustboroCity + warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY + warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY RustboroCity_Mart_MapEvents:: @ 8388CA4 map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc index a0e7a3f76..83655d001 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc @@ -5,9 +5,9 @@ RustboroCity_PokemonCenter_1F_MapObjects:: @ 8388B24 object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0, 0, 0 RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84 - warp_def 7, 8, 3, 3, RustboroCity - warp_def 6, 8, 3, 3, RustboroCity - warp_def 1, 6, 4, 0, RustboroCity_PokemonCenter_2F + warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY + warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY + warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F RustboroCity_PokemonCenter_1F_MapEvents:: @ 8388B9C map_events RustboroCity_PokemonCenter_1F_MapObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc index c75817126..d0c39d80f 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ RustboroCity_PokemonCenter_2F_MapObjects:: @ 8388BB0 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0, 0, 0 RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 - warp_def 1, 5, 4, 2, RustboroCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20 map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc index 5ae481bad..ef873edb8 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/events/RustboroCity_PokemonSchool.inc @@ -7,8 +7,8 @@ RustboroCity_PokemonSchool_MapObjects:: @ 8388A34 object_event 6, MAP_OBJ_GFX_GENTLEMAN, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0, 0, 0 RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4 - warp_def 5, 10, 0, 4, RustboroCity - warp_def 6, 10, 0, 4, RustboroCity + warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY + warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index ef1559687..4779473d8 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -11,9 +11,9 @@ RusturfTunnel_MapObjects:: @ 838BD2C object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0 RusturfTunnel_MapWarps:: @ 838BE1C - warp_def 4, 10, 3, 0, Route116 - warp_def 29, 16, 3, 4, VerdanturfTown - warp_def 18, 20, 3, 2, Route116 + warp_def 4, 10, 3, 0, MAP_ROUTE116 + warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN + warp_def 18, 20, 3, 2, MAP_ROUTE116 RusturfTunnel_MapCoordEvents:: @ 838BE34 coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc index b7eb1eb8f..94b84a968 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -5,15 +5,15 @@ SSTidalCorridor_MapObjects:: @ 83916F8 object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, 950, 0, 0 SSTidalCorridor_MapWarps:: @ 8391758 - warp_def 4, 9, 3, 0, SSTidalRooms - warp_def 7, 9, 3, 2, SSTidalRooms - warp_def 10, 9, 3, 4, SSTidalRooms - warp_def 13, 9, 3, 6, SSTidalRooms - warp_def 4, 3, 3, 8, SSTidalRooms - warp_def 7, 3, 3, 9, SSTidalRooms - warp_def 10, 3, 3, 10, SSTidalRooms - warp_def 13, 3, 3, 11, SSTidalRooms - warp_def 16, 2, 3, 0, SSTidalLowerDeck + warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS + warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS + warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS + warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS + warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS + warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS + warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS + warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS + warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK SSTidalCorridor_MapBGEvents:: @ 83917A0 bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc index 6e8530c36..74c8458ce 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -3,7 +3,7 @@ SSTidalLowerDeck_MapObjects:: @ 8391844 object_event 2, MAP_OBJ_GFX_SAILOR, 0, 7, 0, 4, 0, 3, 50, 71, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FEEE, 0, 0, 0 SSTidalLowerDeck_MapWarps:: @ 8391874 - warp_def 15, 2, 3, 8, SSTidalCorridor + warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR SSTidalLowerDeck_MapBGEvents:: @ 839187C bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0 diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc index 0ffe1cbe7..82758cc57 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -9,18 +9,18 @@ SSTidalRooms_MapObjects:: @ 839189C object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, 951, 0, 0 SSTidalRooms_MapWarps:: @ 839195C - warp_def 4, 16, 0, 0, SSTidalCorridor - warp_def 5, 16, 0, 0, SSTidalCorridor - warp_def 13, 16, 0, 1, SSTidalCorridor - warp_def 14, 16, 0, 1, SSTidalCorridor - warp_def 22, 16, 0, 2, SSTidalCorridor - warp_def 23, 16, 0, 2, SSTidalCorridor - warp_def 31, 16, 0, 3, SSTidalCorridor - warp_def 32, 16, 0, 3, SSTidalCorridor - warp_def 4, 1, 0, 4, SSTidalCorridor - warp_def 13, 1, 0, 5, SSTidalCorridor - warp_def 22, 1, 0, 6, SSTidalCorridor - warp_def 31, 1, 0, 7, SSTidalCorridor + warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR + warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR + warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR + warp_def 14, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR + warp_def 22, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR + warp_def 23, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR + warp_def 31, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR + warp_def 32, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR + warp_def 4, 1, 0, 4, MAP_SS_TIDAL_CORRIDOR + warp_def 13, 1, 0, 5, MAP_SS_TIDAL_CORRIDOR + warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR + warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR SSTidalRooms_MapBGEvents:: @ 83919BC bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47 diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc index d6de3f747..f52e734b7 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/events/SafariZone_RestHouse.inc @@ -4,8 +4,8 @@ SafariZone_RestHouse_MapObjects:: @ 8391EC0 object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0, 0, 0 SafariZone_RestHouse_MapWarps:: @ 8391F08 - warp_def 3, 8, 0, 0, SafariZone_Southwest - warp_def 4, 8, 0, 0, SafariZone_Southwest + warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST + warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_RestHouse_MapEvents:: @ 8391F18 map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc index d67f018ab..c40dc967d 100644 --- a/data/maps/events/SafariZone_Southeast.inc +++ b/data/maps/events/SafariZone_Southeast.inc @@ -5,7 +5,7 @@ SafariZone_Southeast_MapObjects:: @ 8391B70 object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 15, 0, 31, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16009E, 0, 0, 0 SafariZone_Southeast_MapWarps:: @ 8391BD0 - warp_def 32, 33, 0, 0, Route121_SafariZoneEntrance + warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE SafariZone_Southeast_MapEvents:: @ 8391BD8 map_events SafariZone_Southeast_MapObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index 4f7f21de5..db8420a33 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -3,7 +3,7 @@ SafariZone_Southwest_MapObjects:: @ 8391B18 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, 1131, 0, 0 SafariZone_Southwest_MapWarps:: @ 8391B48 - warp_def 29, 7, 3, 0, SafariZone_RestHouse + warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE SafariZone_Southwest_MapBGEvents:: @ 8391B50 bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc index 4b6625b52..9ba2d3098 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -2,7 +2,7 @@ ScorchedSlab_MapObjects:: @ 838E988 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, 1079, 0, 0 ScorchedSlab_MapWarps:: @ 838E9A0 - warp_def 7, 16, 1, 1, Route120 + warp_def 7, 16, 1, 1, MAP_ROUTE120 ScorchedSlab_MapEvents:: @ 838E9A8 map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc index a7f08532c..4f6fa0c07 100644 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ b/data/maps/events/SeafloorCavern_Entrance.inc @@ -1,6 +1,6 @@ SeafloorCavern_Entrance_MapWarps:: @ 838D094 - warp_def 10, 18, 3, 0, Underwater4 - warp_def 10, 1, 3, 0, SeafloorCavern_Room1 + warp_def 10, 18, 3, 0, MAP_UNDERWATER4 + warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 SeafloorCavern_Entrance_MapEvents:: @ 838D0A4 map_events 0x0, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 093934481..c9d62777f 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -6,9 +6,9 @@ SeafloorCavern_Room1_MapObjects:: @ 838D0B8 object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0 SeafloorCavern_Room1_MapWarps:: @ 838D130 - warp_def 5, 18, 3, 1, SeafloorCavern_Entrance - warp_def 17, 13, 3, 0, SeafloorCavern_Room5 - warp_def 6, 2, 3, 0, SeafloorCavern_Room2 + warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE + warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 SeafloorCavern_Room1_MapEvents:: @ 838D148 map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index 86a0354e4..6a276fc3f 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -10,10 +10,10 @@ SeafloorCavern_Room2_MapObjects:: @ 838D15C object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 SeafloorCavern_Room2_MapWarps:: @ 838D234 - warp_def 12, 19, 3, 2, SeafloorCavern_Room1 - warp_def 5, 19, 3, 0, SeafloorCavern_Room4 - warp_def 5, 2, 3, 0, SeafloorCavern_Room6 - warp_def 12, 2, 3, 0, SeafloorCavern_Room7 + warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 + warp_def 5, 19, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 + warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 + warp_def 12, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 SeafloorCavern_Room2_MapEvents:: @ 838D254 map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index 5c5c9c219..8c6e2b4a2 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -11,9 +11,9 @@ SeafloorCavern_Room3_MapObjects:: @ 838D268 object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0 SeafloorCavern_Room3_MapWarps:: @ 838D358 - warp_def 8, 1, 3, 1, SeafloorCavern_Room8 - warp_def 10, 13, 3, 1, SeafloorCavern_Room7 - warp_def 4, 15, 3, 1, SeafloorCavern_Room6 + warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 + warp_def 10, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 + warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 SeafloorCavern_Room3_MapEvents:: @ 838D370 map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index 3233123b3..26016edf3 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -2,10 +2,10 @@ SeafloorCavern_Room4_MapObjects:: @ 838D384 object_event 1, 241, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, 946, 0, 0 SeafloorCavern_Room4_MapWarps:: @ 838D39C - warp_def 13, 1, 3, 1, SeafloorCavern_Room2 - warp_def 4, 1, 3, 1, SeafloorCavern_Room5 - warp_def 9, 10, 3, 2, SeafloorCavern_Room5 - warp_def 10, 15, 3, 1, SeafloorCavern_Entrance + warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5 + warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room4_MapEvents:: @ 838D3BC map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index 37a501512..c31d31042 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -7,9 +7,9 @@ SeafloorCavern_Room5_MapObjects:: @ 838D3D0 object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 SeafloorCavern_Room5_MapWarps:: @ 838D460 - warp_def 4, 1, 3, 1, SeafloorCavern_Room1 - warp_def 15, 12, 3, 1, SeafloorCavern_Room4 - warp_def 7, 17, 3, 2, SeafloorCavern_Room4 + warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 + warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4 + warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 SeafloorCavern_Room5_MapEvents:: @ 838D478 map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/events/SeafloorCavern_Room6.inc index 9055af75b..adf36455a 100644 --- a/data/maps/events/SeafloorCavern_Room6.inc +++ b/data/maps/events/SeafloorCavern_Room6.inc @@ -1,7 +1,7 @@ SeafloorCavern_Room6_MapWarps:: @ 838D48C - warp_def 11, 21, 3, 2, SeafloorCavern_Room2 - warp_def 4, 1, 3, 2, SeafloorCavern_Room3 - warp_def 14, 8, 1, 1, SeafloorCavern_Entrance + warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3 + warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room6_MapEvents:: @ 838D4A4 map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/events/SeafloorCavern_Room7.inc index 7125027fd..616376e32 100644 --- a/data/maps/events/SeafloorCavern_Room7.inc +++ b/data/maps/events/SeafloorCavern_Room7.inc @@ -1,6 +1,6 @@ SeafloorCavern_Room7_MapWarps:: @ 838D4B8 - warp_def 3, 23, 3, 3, SeafloorCavern_Room2 - warp_def 5, 1, 3, 1, SeafloorCavern_Room3 + warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room7_MapEvents:: @ 838D4C8 map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 2d7329aec..93c93e4a0 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -13,8 +13,8 @@ SeafloorCavern_Room8_MapObjects:: @ 838D4DC object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 28, 0, 0 SeafloorCavern_Room8_MapWarps:: @ 838D5FC - warp_def 5, 2, 3, 0, SeafloorCavern_Room9 - warp_def 5, 12, 3, 0, SeafloorCavern_Room3 + warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 + warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room8_MapEvents:: @ 838D60C map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 2fccd4fec..414ab7e07 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room9_MapObjects:: @ 838D620 object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 733, 0, 0 SeafloorCavern_Room9_MapWarps:: @ 838D6C8 - warp_def 5, 4, 3, 0, SeafloorCavern_Room8 + warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 coord_event 17, 42, 3, 0, 0x40a2, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/events/SealedChamber_InnerRoom.inc index 260de2dd9..a457a4e03 100644 --- a/data/maps/events/SealedChamber_InnerRoom.inc +++ b/data/maps/events/SealedChamber_InnerRoom.inc @@ -1,5 +1,5 @@ SealedChamber_InnerRoom_MapWarps:: @ 838E900 - warp_def 10, 19, 3, 0, SealedChamber_OuterRoom + warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM SealedChamber_InnerRoom_MapBGEvents:: @ 838E908 bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/events/SealedChamber_OuterRoom.inc index 5251d401a..634f41f60 100644 --- a/data/maps/events/SealedChamber_OuterRoom.inc +++ b/data/maps/events/SealedChamber_OuterRoom.inc @@ -1,5 +1,5 @@ SealedChamber_OuterRoom_MapWarps:: @ 838E788 - warp_def 10, 2, 3, 0, SealedChamber_InnerRoom + warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM SealedChamber_OuterRoom_MapBGEvents:: @ 838E790 bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index dd73f50a8..53d359f53 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave1_MapObjects:: @ 838F18C object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave1_MapWarps:: @ 838F2F4 - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BlueCave1_MapEvents:: @ 838F2FC map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index 9b2b6e885..ee1d5ddd0 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave2_MapObjects:: @ 838FAA4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave2_MapWarps:: @ 838FC0C - warp_def 7, 5, 0, 126, None + warp_def 7, 5, 0, 126, MAP_NONE SecretBase_BlueCave2_MapEvents:: @ 838FC14 map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index dd37c2ac5..453937fc6 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave3_MapObjects:: @ 83903BC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave3_MapWarps:: @ 8390524 - warp_def 4, 15, 0, 126, None + warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave3_MapEvents:: @ 839052C map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index 23ec030e7..28cfa89a3 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave4_MapObjects:: @ 8390CD4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave4_MapWarps:: @ 8390E3C - warp_def 4, 15, 0, 126, None + warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave4_MapEvents:: @ 8390E44 map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index 0fcac5940..10adecc59 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave1_MapObjects:: @ 838F008 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave1_MapWarps:: @ 838F170 - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BrownCave1_MapEvents:: @ 838F178 map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index c305485b8..098499878 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave2_MapObjects:: @ 838F920 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave2_MapWarps:: @ 838FA88 - warp_def 1, 7, 0, 126, None + warp_def 1, 7, 0, 126, MAP_NONE SecretBase_BrownCave2_MapEvents:: @ 838FA90 map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 65b38542f..34167d50b 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave3_MapObjects:: @ 8390238 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave3_MapWarps:: @ 83903A0 - warp_def 11, 9, 0, 126, None + warp_def 11, 9, 0, 126, MAP_NONE SecretBase_BrownCave3_MapEvents:: @ 83903A8 map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index 782671574..c1e884155 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave4_MapObjects:: @ 8390B50 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave4_MapWarps:: @ 8390CB8 - warp_def 2, 8, 0, 126, None + warp_def 2, 8, 0, 126, MAP_NONE SecretBase_BrownCave4_MapEvents:: @ 8390CC0 map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index b30608dbc..b9700b06f 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -16,7 +16,7 @@ SecretBase_RedCave1_MapObjects:: @ 838EE84 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave1_MapWarps:: @ 838EFEC - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_RedCave1_MapEvents:: @ 838EFF4 map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index eb247278b..b13f03a74 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -16,7 +16,7 @@ SecretBase_RedCave2_MapObjects:: @ 838F79C object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave2_MapWarps:: @ 838F904 - warp_def 3, 14, 0, 126, None + warp_def 3, 14, 0, 126, MAP_NONE SecretBase_RedCave2_MapEvents:: @ 838F90C map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index f71021236..209979af3 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -16,7 +16,7 @@ SecretBase_RedCave3_MapObjects:: @ 83900B4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave3_MapWarps:: @ 839021C - warp_def 3, 6, 0, 126, None + warp_def 3, 6, 0, 126, MAP_NONE SecretBase_RedCave3_MapEvents:: @ 8390224 map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index 2ed7c8af5..93b552df0 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -16,7 +16,7 @@ SecretBase_RedCave4_MapObjects:: @ 83909CC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave4_MapWarps:: @ 8390B34 - warp_def 2, 12, 0, 126, None + warp_def 2, 12, 0, 126, MAP_NONE SecretBase_RedCave4_MapEvents:: @ 8390B3C map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 23387eede..4f3fc1011 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -16,7 +16,7 @@ SecretBase_Shrub1_MapObjects:: @ 838F618 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub1_MapWarps:: @ 838F780 - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Shrub1_MapEvents:: @ 838F788 map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 090a9b0d6..43d752db7 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -16,7 +16,7 @@ SecretBase_Shrub2_MapObjects:: @ 838FF30 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub2_MapWarps:: @ 8390098 - warp_def 7, 5, 0, 126, None + warp_def 7, 5, 0, 126, MAP_NONE SecretBase_Shrub2_MapEvents:: @ 83900A0 map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index 7f4370f2d..80bc2a787 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -16,7 +16,7 @@ SecretBase_Shrub3_MapObjects:: @ 8390848 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub3_MapWarps:: @ 83909B0 - warp_def 6, 9, 0, 126, None + warp_def 6, 9, 0, 126, MAP_NONE SecretBase_Shrub3_MapEvents:: @ 83909B8 map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index 6aa04277c..1e72213d8 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -16,7 +16,7 @@ SecretBase_Shrub4_MapObjects:: @ 8391160 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub4_MapWarps:: @ 83912C8 - warp_def 11, 8, 0, 126, None + warp_def 11, 8, 0, 126, MAP_NONE SecretBase_Shrub4_MapEvents:: @ 83912D0 map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index a5d9e2fad..a7e0ff822 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -16,7 +16,7 @@ SecretBase_Tree1_MapObjects:: @ 838F494 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree1_MapWarps:: @ 838F5FC - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Tree1_MapEvents:: @ 838F604 map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index 8089c6605..3d58e58a5 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -16,7 +16,7 @@ SecretBase_Tree2_MapObjects:: @ 838FDAC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree2_MapWarps:: @ 838FF14 - warp_def 3, 14, 0, 126, None + warp_def 3, 14, 0, 126, MAP_NONE SecretBase_Tree2_MapEvents:: @ 838FF1C map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index a77f56364..18f2e0329 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -16,7 +16,7 @@ SecretBase_Tree3_MapObjects:: @ 83906C4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree3_MapWarps:: @ 839082C - warp_def 8, 6, 0, 126, None + warp_def 8, 6, 0, 126, MAP_NONE SecretBase_Tree3_MapEvents:: @ 8390834 map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index c687e3e48..c4e1fc225 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -16,7 +16,7 @@ SecretBase_Tree4_MapObjects:: @ 8390FDC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree4_MapWarps:: @ 8391144 - warp_def 7, 12, 0, 126, None + warp_def 7, 12, 0, 126, MAP_NONE SecretBase_Tree4_MapEvents:: @ 839114C map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 8d8e2bece..5ae83e9a8 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave1_MapObjects:: @ 838F310 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave1_MapWarps:: @ 838F478 - warp_def 5, 7, 0, 126, None + warp_def 5, 7, 0, 126, MAP_NONE SecretBase_YellowCave1_MapEvents:: @ 838F480 map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 99cef474a..d2dab3900 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave2_MapObjects:: @ 838FC28 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave2_MapWarps:: @ 838FD90 - warp_def 12, 7, 0, 126, None + warp_def 12, 7, 0, 126, MAP_NONE SecretBase_YellowCave2_MapEvents:: @ 838FD98 map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index 82eef2946..ef6c9a406 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave3_MapObjects:: @ 8390540 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave3_MapWarps:: @ 83906A8 - warp_def 5, 9, 0, 126, None + warp_def 5, 9, 0, 126, MAP_NONE SecretBase_YellowCave3_MapEvents:: @ 83906B0 map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index 545f65e04..9ef977a9a 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave4_MapObjects:: @ 8390E58 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave4_MapWarps:: @ 8390FC0 - warp_def 6, 12, 0, 126, None + warp_def 6, 12, 0, 126, MAP_NONE SecretBase_YellowCave4_MapEvents:: @ 8390FC8 map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc index a9381d0c4..33e8b8c6c 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -3,10 +3,10 @@ ShoalCave_LowTideEntranceRoom_MapObjects:: @ 838DCDC object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 18, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0, 0, 0 ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C - warp_def 20, 30, 3, 0, Route125 - warp_def 19, 5, 3, 0, ShoalCave_LowTideInnerRoom - warp_def 6, 2, 3, 6, ShoalCave_LowTideInnerRoom - warp_def 27, 2, 3, 7, ShoalCave_LowTideInnerRoom + warp_def 20, 30, 3, 0, MAP_ROUTE125 + warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideEntranceRoom_MapEvents:: @ 838DD2C map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc index 2d5958a37..7573a7040 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -3,7 +3,7 @@ ShoalCave_LowTideIceRoom_MapObjects:: @ 838EDE0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, 1113, 0, 0 ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 - warp_def 17, 10, 3, 3, ShoalCave_LowTideLowerRoom + warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18 map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc index 954c4c5e9..43a108e66 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -2,14 +2,14 @@ ShoalCave_LowTideInnerRoom_MapObjects:: @ 838DD40 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, 1082, 0, 0 ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 - warp_def 34, 29, 3, 1, ShoalCave_LowTideEntranceRoom - warp_def 38, 15, 3, 0, ShoalCave_LowTideStairsRoom - warp_def 42, 4, 3, 1, ShoalCave_LowTideStairsRoom - warp_def 19, 14, 4, 0, ShoalCave_LowTideLowerRoom - warp_def 15, 19, 3, 1, ShoalCave_LowTideLowerRoom - warp_def 30, 25, 3, 2, ShoalCave_LowTideLowerRoom - warp_def 14, 33, 5, 2, ShoalCave_LowTideEntranceRoom - warp_def 40, 33, 5, 3, ShoalCave_LowTideEntranceRoom + warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM + warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM + warp_def 19, 14, 4, 0, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 15, 19, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 30, 25, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98 bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329 diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index 858f919e0..5549afed7 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -3,10 +3,10 @@ ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C - warp_def 7, 2, 3, 3, ShoalCave_LowTideInnerRoom - warp_def 2, 6, 3, 4, ShoalCave_LowTideInnerRoom - warp_def 19, 11, 3, 5, ShoalCave_LowTideInnerRoom - warp_def 28, 11, 3, 0, ShoalCave_LowTideIceRoom + warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM ShoalCave_LowTideLowerRoom_MapBGEvents:: @ 838DE8C bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413 diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc index 878b1fca0..68f933e2b 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -2,8 +2,8 @@ ShoalCave_LowTideStairsRoom_MapObjects:: @ 838DDF4 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, 1083, 0, 0 ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C - warp_def 3, 12, 3, 1, ShoalCave_LowTideInnerRoom - warp_def 7, 4, 3, 2, ShoalCave_LowTideInnerRoom + warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM + warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideStairsRoom_MapBGEvents:: @ 838DE1C bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 68615ad3e..181195444 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -2,8 +2,8 @@ SingleBattleColosseum_MapObjects:: @ 83912E4 object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0 SingleBattleColosseum_MapWarps:: @ 83912FC - warp_def 6, 8, 3, 127, None - warp_def 7, 8, 3, 127, None + warp_def 6, 8, 3, 127, MAP_NONE + warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents:: @ 839130C coord_event 3, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A436F diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/events/SkyPillar_1F.inc index eaf7fa955..2af7aaa76 100644 --- a/data/maps/events/SkyPillar_1F.inc +++ b/data/maps/events/SkyPillar_1F.inc @@ -1,7 +1,7 @@ SkyPillar_1F_MapWarps:: @ 838ED38 - warp_def 6, 13, 3, 1, SkyPillar_Outside - warp_def 7, 13, 3, 1, SkyPillar_Outside - warp_def 10, 1, 3, 0, SkyPillar_2F + warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE + warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE + warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F SkyPillar_1F_MapEvents:: @ 838ED50 map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/events/SkyPillar_2F.inc index ffd0d7d25..48fcb9fec 100644 --- a/data/maps/events/SkyPillar_2F.inc +++ b/data/maps/events/SkyPillar_2F.inc @@ -1,6 +1,6 @@ SkyPillar_2F_MapWarps:: @ 838ED64 - warp_def 10, 1, 3, 2, SkyPillar_1F - warp_def 3, 1, 3, 0, SkyPillar_3F + warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F + warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F SkyPillar_2F_MapEvents:: @ 838ED74 map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/events/SkyPillar_3F.inc index c34440ab7..4aeda3339 100644 --- a/data/maps/events/SkyPillar_3F.inc +++ b/data/maps/events/SkyPillar_3F.inc @@ -1,7 +1,7 @@ SkyPillar_3F_MapWarps:: @ 838ED88 - warp_def 3, 1, 3, 1, SkyPillar_2F - warp_def 11, 1, 3, 0, SkyPillar_4F - warp_def 7, 1, 3, 1, SkyPillar_4F + warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F + warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F + warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F SkyPillar_3F_MapEvents:: @ 838EDA0 map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/events/SkyPillar_4F.inc index 77586a25a..3e908ed74 100644 --- a/data/maps/events/SkyPillar_4F.inc +++ b/data/maps/events/SkyPillar_4F.inc @@ -1,7 +1,7 @@ SkyPillar_4F_MapWarps:: @ 838EDB4 - warp_def 11, 1, 3, 1, SkyPillar_3F - warp_def 7, 1, 3, 2, SkyPillar_3F - warp_def 3, 1, 3, 0, SkyPillar_5F + warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F + warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F + warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F SkyPillar_4F_MapEvents:: @ 838EDCC map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/events/SkyPillar_5F.inc index 7c4ea5a97..badae77af 100644 --- a/data/maps/events/SkyPillar_5F.inc +++ b/data/maps/events/SkyPillar_5F.inc @@ -1,6 +1,6 @@ SkyPillar_5F_MapWarps:: @ 838EE2C - warp_def 3, 1, 3, 2, SkyPillar_4F - warp_def 10, 1, 3, 0, SkyPillar_Top + warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F + warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP SkyPillar_5F_MapEvents:: @ 838EE3C map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/events/SkyPillar_Entrance.inc index d27442989..904b3b9ae 100644 --- a/data/maps/events/SkyPillar_Entrance.inc +++ b/data/maps/events/SkyPillar_Entrance.inc @@ -1,6 +1,6 @@ SkyPillar_Entrance_MapWarps:: @ 838ECF0 - warp_def 6, 16, 3, 0, Route131 - warp_def 14, 4, 3, 0, SkyPillar_Outside + warp_def 6, 16, 3, 0, MAP_ROUTE131 + warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE SkyPillar_Entrance_MapEvents:: @ 838ED00 map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc index 05ffe4df8..120cd982b 100644 --- a/data/maps/events/SkyPillar_Outside.inc +++ b/data/maps/events/SkyPillar_Outside.inc @@ -1,6 +1,6 @@ SkyPillar_Outside_MapWarps:: @ 838ED14 - warp_def 17, 13, 3, 1, SkyPillar_Entrance - warp_def 14, 5, 3, 0, SkyPillar_1F + warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE + warp_def 14, 5, 3, 0, MAP_SKY_PILLAR_1F SkyPillar_Outside_MapEvents:: @ 838ED24 map_events 0x0, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index 6c9d8abc6..e7ef67860 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -2,7 +2,7 @@ SkyPillar_Top_MapObjects:: @ 838EE50 object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, 773, 0, 0 SkyPillar_Top_MapWarps:: @ 838EE68 - warp_def 16, 14, 3, 1, SkyPillar_5F + warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F SkyPillar_Top_MapEvents:: @ 838EE70 map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index bef2bf0d9..35416b72d 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -32,17 +32,17 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, 882, 0, 0 SlateportCity_MapWarps:: @ 837FA94 - warp_def 19, 19, 0, 0, SlateportCity_PokemonCenter_1F - warp_def 13, 26, 0, 0, SlateportCity_Mart - warp_def 26, 38, 0, 0, SlateportCity_SternsShipyard_1F - warp_def 10, 12, 0, 0, SlateportCity_ContestLobby - warp_def 4, 26, 0, 0, SlateportCity_PokemonFanClub - warp_def 30, 26, 0, 0, SlateportCity_OceanicMuseum_1F - warp_def 5, 19, 0, 0, SlateportCity_House1 - warp_def 31, 26, 0, 1, SlateportCity_OceanicMuseum_1F - warp_def 28, 12, 0, 0, SlateportCity_Harbor - warp_def 40, 7, 0, 2, SlateportCity_Harbor - warp_def 21, 44, 0, 0, SlateportCity_House2 + warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F + warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART + warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F + warp_def 10, 12, 0, 0, MAP_SLATEPORT_CITY_CONTEST_LOBBY + warp_def 4, 26, 0, 0, MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB + warp_def 30, 26, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F + warp_def 5, 19, 0, 0, MAP_SLATEPORT_CITY_HOUSE1 + warp_def 31, 26, 0, 1, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F + warp_def 28, 12, 0, 0, MAP_SLATEPORT_CITY_HARBOR + warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR + warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 SlateportCity_MapBGEvents:: @ 837FAEC bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/events/SlateportCity_ContestHall.inc index ae3e4ea7b..6bb6a4285 100644 --- a/data/maps/events/SlateportCity_ContestHall.inc +++ b/data/maps/events/SlateportCity_ContestHall.inc @@ -14,8 +14,8 @@ SlateportCity_ContestHall_MapObjects:: @ 83878A4 object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 17, 0, 3, 2, 65, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0, 0, 0 SlateportCity_ContestHall_MapWarps:: @ 83879DC - warp_def 10, 17, 0, 2, SlateportCity_ContestLobby - warp_def 11, 17, 0, 2, SlateportCity_ContestLobby + warp_def 10, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY + warp_def 11, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY SlateportCity_ContestHall_MapBGEvents:: @ 83879EC bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/events/SlateportCity_ContestLobby.inc index 74a8bc131..09e6c23fb 100644 --- a/data/maps/events/SlateportCity_ContestLobby.inc +++ b/data/maps/events/SlateportCity_ContestLobby.inc @@ -9,9 +9,9 @@ SlateportCity_ContestLobby_MapObjects:: @ 8387788 object_event 8, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0, 0, 0 SlateportCity_ContestLobby_MapWarps:: @ 8387848 - warp_def 5, 6, 0, 3, SlateportCity - warp_def 6, 6, 0, 3, SlateportCity - warp_def 1, 1, 0, 0, SlateportCity_ContestHall + warp_def 5, 6, 0, 3, MAP_SLATEPORT_CITY + warp_def 6, 6, 0, 3, MAP_SLATEPORT_CITY + warp_def 1, 1, 0, 0, MAP_SLATEPORT_CITY_CONTEST_HALL SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829 diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index 3fbbd72c2..c2f2d5afb 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -9,10 +9,10 @@ SlateportCity_Harbor_MapObjects:: @ 8387F30 object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 848, 0, 0 SlateportCity_Harbor_MapWarps:: @ 8387FF0 - warp_def 11, 14, 0, 8, SlateportCity - warp_def 12, 14, 0, 8, SlateportCity - warp_def 19, 15, 0, 9, SlateportCity - warp_def 20, 15, 0, 9, SlateportCity + warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY + warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY + warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY + warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents:: @ 8388010 coord_event 8, 11, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155F9B diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc index 3379b7fef..6f5f72944 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/events/SlateportCity_House1.inc @@ -2,8 +2,8 @@ SlateportCity_House1_MapObjects:: @ 8387A18 object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0, 0, 0 SlateportCity_House1_MapWarps:: @ 8387A30 - warp_def 3, 7, 0, 6, SlateportCity - warp_def 4, 7, 0, 6, SlateportCity + warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY SlateportCity_House1_MapEvents:: @ 8387A40 map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc index a147ec7ce..ae3f01900 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/events/SlateportCity_House2.inc @@ -3,8 +3,8 @@ SlateportCity_House2_MapObjects:: @ 8388064 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0, 0, 0 SlateportCity_House2_MapWarps:: @ 8388094 - warp_def 3, 7, 0, 10, SlateportCity - warp_def 4, 7, 0, 10, SlateportCity + warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY SlateportCity_House2_MapEvents:: @ 83880A4 map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc index 54072eccc..ae111b933 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/events/SlateportCity_Mart.inc @@ -4,8 +4,8 @@ SlateportCity_Mart_MapObjects:: @ 83881B0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0, 0, 0 SlateportCity_Mart_MapWarps:: @ 83881F8 - warp_def 3, 7, 0, 1, SlateportCity - warp_def 4, 7, 0, 1, SlateportCity + warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY SlateportCity_Mart_MapEvents:: @ 8388208 map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index 9756d6745..ede07b801 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -15,9 +15,9 @@ SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38 object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, 961, 0, 0 SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 - warp_def 9, 8, 0, 5, SlateportCity - warp_def 10, 8, 0, 7, SlateportCity - warp_def 6, 1, 0, 0, SlateportCity_OceanicMuseum_2F + warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY + warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY + warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0 coord_event 9, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index a081e15d3..67d7a6b18 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -8,7 +8,7 @@ SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70 object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, 961, 0, 0 SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 - warp_def 6, 1, 0, 2, SlateportCity_OceanicMuseum_1F + warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc index dfd38dc51..bdfabe5c6 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ SlateportCity_PokemonCenter_1F_MapObjects:: @ 83880B8 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0, 0, 0 SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100 - warp_def 7, 8, 3, 0, SlateportCity - warp_def 6, 8, 3, 0, SlateportCity - warp_def 1, 6, 4, 0, SlateportCity_PokemonCenter_2F + warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY + warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY + warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F SlateportCity_PokemonCenter_1F_MapEvents:: @ 8388118 map_events SlateportCity_PokemonCenter_1F_MapObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc index db723fa33..2ecc48423 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ SlateportCity_PokemonCenter_2F_MapObjects:: @ 838812C object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0, 0, 0 SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174 - warp_def 1, 5, 4, 2, SlateportCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc index 8003a3439..481886da8 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/events/SlateportCity_PokemonFanClub.inc @@ -9,8 +9,8 @@ SlateportCity_PokemonFanClub_MapObjects:: @ 8387A54 object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 10, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0, 0, 0 SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14 - warp_def 6, 10, 0, 4, SlateportCity - warp_def 7, 10, 0, 4, SlateportCity + warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY + warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24 map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index 38d14fa4e..8999b6887 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -5,9 +5,9 @@ SlateportCity_SternsShipyard_1F_MapObjects:: @ 8387698 object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, 869, 0, 0 SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 - warp_def 2, 14, 0, 2, SlateportCity - warp_def 3, 14, 0, 2, SlateportCity - warp_def 3, 1, 0, 0, SlateportCity_SternsShipyard_2F + warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY + warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY + warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F SlateportCity_SternsShipyard_1F_MapEvents:: @ 8387710 map_events SlateportCity_SternsShipyard_1F_MapObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc index cd26ed1cc..e6d3e7636 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc @@ -4,7 +4,7 @@ SlateportCity_SternsShipyard_2F_MapObjects:: @ 8387724 object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0, 0, 0 SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C - warp_def 3, 1, 0, 2, SlateportCity_SternsShipyard_1F + warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774 map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index a93db6a93..ed78d9136 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -12,18 +12,18 @@ SootopolisCity_MapObjects:: @ 8380608 object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, 854, 0, 0 SootopolisCity_MapWarps:: @ 8380710 - warp_def 43, 31, 0, 0, SootopolisCity_PokemonCenter_1F - warp_def 17, 29, 0, 0, SootopolisCity_Mart - warp_def 31, 32, 0, 0, SootopolisCity_Gym_1F - warp_def 31, 16, 3, 0, CaveOfOrigin_Entrance - warp_def 9, 6, 0, 0, SootopolisCity_House1 - warp_def 45, 6, 0, 0, SootopolisCity_House2 - warp_def 9, 17, 0, 0, SootopolisCity_House3 - warp_def 44, 17, 0, 0, SootopolisCity_House4 - warp_def 9, 26, 0, 0, SootopolisCity_House5 - warp_def 53, 28, 0, 0, SootopolisCity_House6 - warp_def 8, 35, 0, 0, SootopolisCity_House7 - warp_def 48, 25, 0, 0, SootopolisCity_House8 + warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F + warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART + warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F + warp_def 31, 16, 3, 0, MAP_CAVE_OF_ORIGIN_ENTRANCE + warp_def 9, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE1 + warp_def 45, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE2 + warp_def 9, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE3 + warp_def 44, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE4 + warp_def 9, 26, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE5 + warp_def 53, 28, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE6 + warp_def 8, 35, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE7 + warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE8 SootopolisCity_MapCoordEvents:: @ 8380770 coord_event 25, 6, 3, 0, 0x405e, 1, 0, SootopolisCity_EventScript_14D308 diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index 88707692e..6145c4afc 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -3,9 +3,9 @@ SootopolisCity_Gym_1F_MapObjects:: @ 838ACF0 object_event 2, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0, 0, 0 SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 - warp_def 8, 25, 0, 2, SootopolisCity - warp_def 9, 25, 0, 2, SootopolisCity - warp_def 11, 22, 3, 0, SootopolisCity_Gym_B1F + warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY + warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY + warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38 bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3 diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc index 44827aaf5..a1f3c92cb 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/events/SootopolisCity_Gym_B1F.inc @@ -9,7 +9,7 @@ SootopolisCity_Gym_B1F_MapObjects:: @ 838AD64 object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, SootopolisCity_Gym_B1F_EventScript_15B14B, 0, 0, 0 SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24 - warp_def 11, 22, 3, 2, SootopolisCity_Gym_1F + warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc index bddda2d88..fc6a57516 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/events/SootopolisCity_House1.inc @@ -3,8 +3,8 @@ SootopolisCity_House1_MapObjects:: @ 838AFA4 object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0, 0, 0 SootopolisCity_House1_MapWarps:: @ 838AFD4 - warp_def 3, 6, 0, 4, SootopolisCity - warp_def 4, 6, 0, 4, SootopolisCity + warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY SootopolisCity_House1_MapEvents:: @ 838AFE4 map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc index 01cf77ddb..5fac2c45e 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/events/SootopolisCity_House2.inc @@ -2,8 +2,8 @@ SootopolisCity_House2_MapObjects:: @ 838AFF8 object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0, 0, 0 SootopolisCity_House2_MapWarps:: @ 838B010 - warp_def 3, 6, 0, 5, SootopolisCity - warp_def 4, 6, 0, 5, SootopolisCity + warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY SootopolisCity_House2_MapEvents:: @ 838B020 map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc index dfae0f969..343bc0d2b 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/events/SootopolisCity_House3.inc @@ -3,8 +3,8 @@ SootopolisCity_House3_MapObjects:: @ 838B034 object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B343, 0, 0, 0 SootopolisCity_House3_MapWarps:: @ 838B064 - warp_def 3, 6, 0, 6, SootopolisCity - warp_def 4, 6, 0, 6, SootopolisCity + warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY SootopolisCity_House3_MapEvents:: @ 838B074 map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc index 766dbc682..f50aa1fe1 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/events/SootopolisCity_House4.inc @@ -4,8 +4,8 @@ SootopolisCity_House4_MapObjects:: @ 838B088 object_event 3, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0, 0, 0 SootopolisCity_House4_MapWarps:: @ 838B0D0 - warp_def 3, 6, 0, 7, SootopolisCity - warp_def 4, 6, 0, 7, SootopolisCity + warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY SootopolisCity_House4_MapEvents:: @ 838B0E0 map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc index 499bc26de..f574443e8 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/events/SootopolisCity_House5.inc @@ -3,8 +3,8 @@ SootopolisCity_House5_MapObjects:: @ 838B0F4 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0, 0, 0 SootopolisCity_House5_MapWarps:: @ 838B124 - warp_def 3, 6, 0, 8, SootopolisCity - warp_def 4, 6, 0, 8, SootopolisCity + warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY SootopolisCity_House5_MapEvents:: @ 838B134 map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc index 9fcb17f50..a943baf27 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/events/SootopolisCity_House6.inc @@ -2,8 +2,8 @@ SootopolisCity_House6_MapObjects:: @ 838B148 object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House6_EventScript_15B386, 0, 0, 0 SootopolisCity_House6_MapWarps:: @ 838B160 - warp_def 3, 6, 0, 9, SootopolisCity - warp_def 4, 6, 0, 9, SootopolisCity + warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY SootopolisCity_House6_MapEvents:: @ 838B170 map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc index d23992a32..f1ac930cc 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/events/SootopolisCity_House7.inc @@ -3,8 +3,8 @@ SootopolisCity_House7_MapObjects:: @ 838B184 object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0, 0, 0 SootopolisCity_House7_MapWarps:: @ 838B1B4 - warp_def 3, 6, 0, 10, SootopolisCity - warp_def 4, 6, 0, 10, SootopolisCity + warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY SootopolisCity_House7_MapEvents:: @ 838B1C4 map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/events/SootopolisCity_House8.inc index 4fd384f2b..b6f35a8d0 100644 --- a/data/maps/events/SootopolisCity_House8.inc +++ b/data/maps/events/SootopolisCity_House8.inc @@ -3,8 +3,8 @@ SootopolisCity_House8_MapObjects:: @ 838B1D8 object_event 2, MAP_OBJ_GFX_HIKER, 0, 5, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0, 0, 0 SootopolisCity_House8_MapWarps:: @ 838B208 - warp_def 3, 6, 0, 11, SootopolisCity - warp_def 4, 6, 0, 11, SootopolisCity + warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY SootopolisCity_House8_MapBGEvents:: @ 838B218 bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523 diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc index 144a2b79b..0cc9dc532 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/events/SootopolisCity_Mart.inc @@ -4,8 +4,8 @@ SootopolisCity_Mart_MapObjects:: @ 838AF38 object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0, 0, 0 SootopolisCity_Mart_MapWarps:: @ 838AF80 - warp_def 3, 7, 0, 1, SootopolisCity - warp_def 4, 7, 0, 1, SootopolisCity + warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY + warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY SootopolisCity_Mart_MapEvents:: @ 838AF90 map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc index c69ebb84c..94091956e 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ SootopolisCity_PokemonCenter_1F_MapObjects:: @ 838AE40 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0, 0, 0 SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88 - warp_def 7, 8, 3, 0, SootopolisCity - warp_def 6, 8, 3, 0, SootopolisCity - warp_def 1, 6, 4, 0, SootopolisCity_PokemonCenter_2F + warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY + warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY + warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F SootopolisCity_PokemonCenter_1F_MapEvents:: @ 838AEA0 map_events SootopolisCity_PokemonCenter_1F_MapObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc index 217185c78..4ce8631e8 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ SootopolisCity_PokemonCenter_2F_MapObjects:: @ 838AEB4 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0, 0, 0 SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC - warp_def 1, 5, 4, 2, SootopolisCity_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24 map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc index 062b72d1f..da65af081 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/events/SouthernIsland_Exterior.inc @@ -3,8 +3,8 @@ SouthernIsland_Exterior_MapObjects:: @ 8391E00 object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 13, 0, 25, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 SouthernIsland_Exterior_MapWarps:: @ 8391E30 - warp_def 14, 5, 3, 0, SouthernIsland_Interior - warp_def 15, 5, 3, 1, SouthernIsland_Interior + warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR + warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR SouthernIsland_Exterior_MapBGEvents:: @ 8391E40 bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index 77073fc85..c2990f0da 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -3,8 +3,8 @@ SouthernIsland_Interior_MapObjects:: @ 8391E60 object_event 2, 241, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 911, 0, 0 SouthernIsland_Interior_MapWarps:: @ 8391E90 - warp_def 13, 18, 3, 0, SouthernIsland_Exterior - warp_def 14, 18, 3, 1, SouthernIsland_Exterior + warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR + warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR SouthernIsland_Interior_MapBGEvents:: @ 8391EA0 bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index f49e755f3..8ecbb7e09 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -2,8 +2,8 @@ TradeCenter_MapObjects:: @ 8391340 object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0 TradeCenter_MapWarps:: @ 8391358 - warp_def 5, 8, 3, 127, None - warp_def 6, 8, 3, 127, None + warp_def 5, 8, 3, 127, MAP_NONE + warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents:: @ 8391368 coord_event 4, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43F0 diff --git a/data/maps/events/Underwater2.inc b/data/maps/events/Underwater2.inc index a9ecbd465..89b36919b 100644 --- a/data/maps/events/Underwater2.inc +++ b/data/maps/events/Underwater2.inc @@ -1,5 +1,5 @@ Underwater2_MapWarps:: @ 8385580 - warp_def 45, 65, 0, 0, Underwater_SootopolisCity + warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY Underwater2_MapBGEvents:: @ 8385588 bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0 diff --git a/data/maps/events/Underwater4.inc b/data/maps/events/Underwater4.inc index 711131621..1d3938031 100644 --- a/data/maps/events/Underwater4.inc +++ b/data/maps/events/Underwater4.inc @@ -1,5 +1,5 @@ Underwater4_MapWarps:: @ 8385640 - warp_def 38, 26, 3, 0, Underwater_SeafloorCavern + warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN Underwater4_MapBGEvents:: @ 8385648 bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0 diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/events/Underwater_Route134.inc index f6c734112..6dc462c80 100644 --- a/data/maps/events/Underwater_Route134.inc +++ b/data/maps/events/Underwater_Route134.inc @@ -1,5 +1,5 @@ Underwater_Route134_MapWarps:: @ 838E744 - warp_def 8, 8, 0, 0, Underwater_SealedChamber + warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER Underwater_Route134_MapEvents:: @ 838E74C map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc index e06e0a498..1dff571c3 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern_MapObjects:: @ 838D018 object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 Underwater_SeafloorCavern_MapWarps:: @ 838D078 - warp_def 6, 7, 0, 0, Underwater4 + warp_def 6, 7, 0, 0, MAP_UNDERWATER4 Underwater_SeafloorCavern_MapEvents:: @ 838D080 map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/events/Underwater_SealedChamber.inc index 867527aaf..ede501142 100644 --- a/data/maps/events/Underwater_SealedChamber.inc +++ b/data/maps/events/Underwater_SealedChamber.inc @@ -1,5 +1,5 @@ Underwater_SealedChamber_MapWarps:: @ 838E760 - warp_def 7, 1, 0, 0, Underwater_Route134 + warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 Underwater_SealedChamber_MapBGEvents:: @ 838E768 bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_15F0B8 diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/events/Underwater_SootopolisCity.inc index fb48a32fb..f745dc557 100644 --- a/data/maps/events/Underwater_SootopolisCity.inc +++ b/data/maps/events/Underwater_SootopolisCity.inc @@ -1,6 +1,6 @@ Underwater_SootopolisCity_MapWarps:: @ 838BE98 - warp_def 9, 8, 0, 0, Underwater2 - warp_def 10, 8, 0, 0, Underwater2 + warp_def 9, 8, 0, 0, MAP_UNDERWATER2 + warp_def 10, 8, 0, 0, MAP_UNDERWATER2 Underwater_SootopolisCity_MapEvents:: @ 838BEA8 map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc index 1d40f7f53..b8f74073e 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/events/VerdanturfTown.inc @@ -5,13 +5,13 @@ VerdanturfTown_MapObjects:: @ 8380F00 object_event 4, MAP_OBJ_GFX_CAMPER, 0, 6, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0, 0, 0 VerdanturfTown_MapWarps:: @ 8380F60 - warp_def 4, 7, 0, 0, VerdanturfTown_ContestLobby - warp_def 12, 3, 0, 0, VerdanturfTown_Mart - warp_def 16, 3, 0, 0, VerdanturfTown_PokemonCenter_1F - warp_def 10, 14, 0, 0, VerdanturfTown_WandasHouse - warp_def 8, 1, 0, 1, RusturfTunnel - warp_def 1, 14, 0, 0, VerdanturfTown_FriendshipRatersHouse - warp_def 17, 15, 0, 0, VerdanturfTown_House + warp_def 4, 7, 0, 0, MAP_VERDANTURF_TOWN_CONTEST_LOBBY + warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART + warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F + warp_def 10, 14, 0, 0, MAP_VERDANTURF_TOWN_WANDAS_HOUSE + warp_def 8, 1, 0, 1, MAP_RUSTURF_TUNNEL + warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE + warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE VerdanturfTown_MapBGEvents:: @ 8380F98 bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/events/VerdanturfTown_ContestHall.inc index 36f4d58e4..4e21027c4 100644 --- a/data/maps/events/VerdanturfTown_ContestHall.inc +++ b/data/maps/events/VerdanturfTown_ContestHall.inc @@ -4,8 +4,8 @@ VerdanturfTown_ContestHall_MapObjects:: @ 8386AEC object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0, 0, 0 VerdanturfTown_ContestHall_MapWarps:: @ 8386B34 - warp_def 11, 17, 0, 2, VerdanturfTown_ContestLobby - warp_def 10, 17, 0, 2, VerdanturfTown_ContestLobby + warp_def 11, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY + warp_def 10, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/events/VerdanturfTown_ContestLobby.inc index ec9d88d71..2fe386421 100644 --- a/data/maps/events/VerdanturfTown_ContestLobby.inc +++ b/data/maps/events/VerdanturfTown_ContestLobby.inc @@ -7,9 +7,9 @@ VerdanturfTown_ContestLobby_MapObjects:: @ 8386A00 object_event 6, MAP_OBJ_GFX_BOY_3, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0, 0, 0 VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 - warp_def 5, 6, 0, 0, VerdanturfTown - warp_def 6, 6, 0, 0, VerdanturfTown - warp_def 1, 1, 0, 1, VerdanturfTown_ContestHall + warp_def 5, 6, 0, 0, MAP_VERDANTURF_TOWN + warp_def 6, 6, 0, 0, MAP_VERDANTURF_TOWN + warp_def 1, 1, 0, 1, MAP_VERDANTURF_TOWN_CONTEST_HALL VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc index 6ec948511..8a731fab0 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc @@ -3,8 +3,8 @@ VerdanturfTown_FriendshipRatersHouse_MapObjects:: @ 8386D88 object_event 2, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0, 0, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8 - warp_def 3, 7, 0, 5, VerdanturfTown - warp_def 4, 7, 0, 5, VerdanturfTown + warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8 map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc index 91a54684b..5bf1c7cae 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/events/VerdanturfTown_House.inc @@ -3,8 +3,8 @@ VerdanturfTown_House_MapObjects:: @ 8386DDC object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0, 0, 0 VerdanturfTown_House_MapWarps:: @ 8386E0C - warp_def 3, 8, 0, 6, VerdanturfTown - warp_def 4, 8, 0, 6, VerdanturfTown + warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN + warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN VerdanturfTown_House_MapEvents:: @ 8386E1C map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc index 90e1cf014..341055a52 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/events/VerdanturfTown_Mart.inc @@ -5,8 +5,8 @@ VerdanturfTown_Mart_MapObjects:: @ 8386B70 object_event 4, MAP_OBJ_GFX_LASS, 0, 3, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0, 0, 0 VerdanturfTown_Mart_MapWarps:: @ 8386BD0 - warp_def 3, 7, 0, 1, VerdanturfTown - warp_def 4, 7, 0, 1, VerdanturfTown + warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN VerdanturfTown_Mart_MapEvents:: @ 8386BE0 map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc index 3db30796c..db6d4400b 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc @@ -4,9 +4,9 @@ VerdanturfTown_PokemonCenter_1F_MapObjects:: @ 8386BF4 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0, 0, 0 VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C - warp_def 7, 8, 3, 2, VerdanturfTown - warp_def 6, 8, 3, 2, VerdanturfTown - warp_def 1, 6, 4, 0, VerdanturfTown_PokemonCenter_2F + warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN + warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN + warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 8386C54 map_events VerdanturfTown_PokemonCenter_1F_MapObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc index 89f02e31f..43cd0dc12 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc @@ -4,11 +4,11 @@ VerdanturfTown_PokemonCenter_2F_MapObjects:: @ 8386C68 object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0, 0, 0 VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0 - warp_def 1, 5, 4, 2, VerdanturfTown_PokemonCenter_1F - warp_def 5, 1, 0, 0, SingleBattleColosseum - warp_def 8, 1, 0, 0, TradeCenter - warp_def 11, 1, 0, 0, RecordCorner - warp_def 0, 0, 0, 0, DoubleBattleColosseum + warp_def 1, 5, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8 map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index 5d0f3e572..daa90d499 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -6,8 +6,8 @@ VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, 984, 0, 0 VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 - warp_def 7, 7, 0, 3, VerdanturfTown - warp_def 8, 7, 0, 3, VerdanturfTown + warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN + warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74 map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index f3f8dcad6..1d64e4f3a 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -8,11 +8,11 @@ VictoryRoad_1F_MapObjects:: @ 838D8E4 object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, 751, 0, 0 VictoryRoad_1F_MapWarps:: @ 838D98C - warp_def 15, 40, 3, 2, EverGrandeCity - warp_def 39, 5, 3, 3, EverGrandeCity - warp_def 21, 32, 3, 5, VictoryRoad_B1F - warp_def 42, 38, 4, 2, VictoryRoad_B1F - warp_def 9, 14, 4, 4, VictoryRoad_B1F + warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY + warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY + warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F + warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F + warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents:: @ 838D9B4 coord_event 34, 3, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DE97 diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index b00074990..8c3f6d2ff 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -20,13 +20,13 @@ VictoryRoad_B1F_MapObjects:: @ 838DA04 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0 VictoryRoad_B1F_MapWarps:: @ 838DBCC - warp_def 30, 25, 3, 0, VictoryRoad_B2F - warp_def 17, 16, 3, 2, VictoryRoad_B2F - warp_def 42, 25, 3, 3, VictoryRoad_1F - warp_def 42, 2, 4, 1, VictoryRoad_B2F - warp_def 8, 3, 3, 4, VictoryRoad_1F - warp_def 20, 21, 3, 2, VictoryRoad_1F - warp_def 5, 26, 3, 3, VictoryRoad_B2F + warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F + warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F + warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F + warp_def 42, 2, 4, 1, MAP_VICTORY_ROAD_B2F + warp_def 8, 3, 3, 4, MAP_VICTORY_ROAD_1F + warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F + warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F VictoryRoad_B1F_MapEvents:: @ 838DC04 map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index b4aa07e59..9ef5d819b 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -6,10 +6,10 @@ VictoryRoad_B2F_MapObjects:: @ 838DC18 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, 1088, 0, 0 VictoryRoad_B2F_MapWarps:: @ 838DC90 - warp_def 30, 25, 3, 0, VictoryRoad_B1F - warp_def 43, 2, 3, 3, VictoryRoad_B1F - warp_def 19, 12, 3, 1, VictoryRoad_B1F - warp_def 5, 26, 3, 6, VictoryRoad_B1F + warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F + warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F + warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F + warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F VictoryRoad_B2F_MapBGEvents:: @ 838DCB0 bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 9f44e131b..279fa0451 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -240,14 +240,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E compare 0x8004, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp - warp SingleBattleColosseum, 255, 6, 8 + warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 special DoCableClubWarp waitstate end OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD special SetCableClubWarp - warp DoubleBattleColosseum, 255, 5, 8 + warp MAP_DOUBLE_BATTLE_COLOSSEUM, 255, 5, 8 special DoCableClubWarp waitstate end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index f3c3c0aa0..de3ba5442 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -4,7 +4,7 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 815E98F .byte 0 AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A - setdivewarp AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 29a89a620..e6c143091 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -4,7 +4,7 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 815EB46 .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 - setdivewarp AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc index 218f1a2ca..4299c7da4 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 815EA35 .byte 0 AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B - setdivewarp AbandonedShip_Underwater2, 255, 17, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 end AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44 diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc index afac470ea..52ba61136 100644 --- a/data/scripts/maps/AbandonedShip_Underwater1.inc +++ b/data/scripts/maps/AbandonedShip_Underwater1.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 815EA57 .byte 0 AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D - setdivewarp AbandonedShip_HiddenFloorCorridors, 255, 0, 10 + setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 end diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/scripts/maps/AbandonedShip_Underwater2.inc index b8facc4ec..22113661a 100644 --- a/data/scripts/maps/AbandonedShip_Underwater2.inc +++ b/data/scripts/maps/AbandonedShip_Underwater2.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 815EB37 .byte 0 AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D - setdivewarp AbandonedShip_Rooms_B1F, 255, 13, 7 + setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 end diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index c3ff67902..3065c0cbb 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -35,7 +35,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special sub_8135668 setvar 0x8004, 3 special sub_810FF60 - warp BattleTower_Lobby, 255, 6, 6 + warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 @@ -101,7 +101,7 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special sub_8135668 setvar 0x8004, 3 special sub_810FF60 - warp BattleTower_Lobby, 255, 6, 6 + warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 9d4fbc844..ac97aa14b 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -35,7 +35,7 @@ BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 setvar 0x4000, 0 - warp BattleTower_BattleRoom, 255, 4, 8 + warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index a147a3b5a..c006cdffe 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -19,7 +19,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 255, BattleTower_Elevator_Movement_160841 waitmovement 0 setvar 0x4000, 0 - warp BattleTower_Corridor, 255, 8, 1 + warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate end diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 75d4f8731..5a0e6105c 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -177,7 +177,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 - warp BattleTower_Elevator, 255, 1, 6 + warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar 0x4000, 0 waitstate @@ -254,7 +254,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 - warp BattleTower_Elevator, 255, 1, 6 + warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar 0x4000, 0 waitstate diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 95c5a9d77..a37310d16 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -40,7 +40,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 - warp SlateportCity_Harbor, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -51,7 +51,7 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index aa3584741..7f8fe6fef 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -142,7 +142,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 hideobject 4, 0, 11 setvar 0x408e, 2 resetobjectpriority 255, 0, 11 - warp Route104_MrBrineysHouse, 255, 5, 4 + warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar 0x4096, 0x8008 waitstate release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 90df9ab4e..b13c930cf 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -137,7 +137,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 waitmovement 0 setflag 781 - warp EverGrandeCity_HallOfFame, 255, 7, 16 + warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index c4c590b53..da19b96a7 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -14,7 +14,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD special sub_80C4BF0 call FallarborTown_ContestLobby_EventScript_15FBDB setvar 0x4088, 2 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index aa8d705c7..07a95c3f1 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -6,5 +6,5 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED tileeffect 7 - setholewarp GraniteCave_B2F, 255, 0, 0 + setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index fc2930aa5..737bacf71 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -31,7 +31,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 setflag 784 setflag 760 setvar 0x408c, 1 - setdynamicwarp LittlerootTown, 255, 3, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end @@ -43,7 +43,7 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68 setflag 785 setflag 722 setvar 0x4082, 1 - setdynamicwarp LittlerootTown, 255, 12, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index a8c32a4fe..656516fd6 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -602,31 +602,31 @@ LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 return LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45 - setwarp LinkContestRoom4, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52 - setwarp LinkContestRoom2, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F - setwarp LinkContestRoom6, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C - setwarp LinkContestRoom5, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79 - setwarp LinkContestRoom3, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 special sub_8081334 waitstate return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 9d04d2e33..0e6bdc140 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C end LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 - setdynamicwarp LilycoveCity_DepartmentStore_1F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 - setdynamicwarp LilycoveCity_DepartmentStore_2F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -39,7 +39,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 - setdynamicwarp LilycoveCity_DepartmentStore_3F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -48,7 +48,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B - setdynamicwarp LilycoveCity_DepartmentStore_4F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -57,7 +57,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E - setdynamicwarp LilycoveCity_DepartmentStore_5F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 7e14db994..4dcc1ba71 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor_MapScripts:: @ 8159893 .byte 0 LilycoveCity_Harbor_MapScript1_159899:: @ 8159899 - setescapewarp LilycoveCity, 255, 12, 33 + setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 @@ -52,7 +52,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A - warp SSTidalCorridor, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -62,7 +62,7 @@ LilycoveCity_Harbor_EventScript_15995B:: @ 815995B compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A - warp BattleTower_Outside, 255, 19, 23 + warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 waitstate release end @@ -138,7 +138,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E - warp SouthernIsland_Exterior, 255, 13, 22 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 06e82d5f8..5d5b04114 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -49,7 +49,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504 waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -57,7 +57,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -65,7 +65,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501 waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 220aeead7..3027e1f77 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -81,7 +81,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B setflag 761 - warpsilent LittlerootTown_BrendansHouse_1F, 255, 8, 8 + warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall end @@ -92,7 +92,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B setflag 762 - warpsilent LittlerootTown_MaysHouse_1F, 255, 2, 8 + warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 04256cacb..d3694bd22 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -65,7 +65,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 waitmovement 0 - warp LittlerootTown_BrendansHouse_2F, 255, 7, 1 + warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 waitstate releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 14c7f5d8a..a4d6f2403 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -65,7 +65,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E waitmovement 0 - warp LittlerootTown_MaysHouse_2F, 255, 1, 1 + warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 waitstate releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index cef02df2c..afc02e82c 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -117,7 +117,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 compare FACING, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 - warp MossdeepCity_GameCorner_B1F, 255, 3, 1 + warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1 waitstate release end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 5a526bd60..94f44e311 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -34,7 +34,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E waitmovement 0 special LoadPlayerParty setvar 0x4001, 1 - warp MossdeepCity_GameCorner_1F, 255, 3, 1 + warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1 waitstate releaseall end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 944860f2d..19b3c5045 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -172,7 +172,7 @@ MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D MossdeepCity_Gym_EventScript_15A742:: @ 815A742 lockall - warpteleport MossdeepCity_Gym, 255, 14, 29 + warpteleport MAP_MOSSDEEP_CITY_GYM, 255, 14, 29 waitstate releaseall end diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index 8d48dac84..90ad1d9cc 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -6,7 +6,7 @@ MtPyre_2F_MapScripts:: @ 815D36E MtPyre_2F_MapScript1_15D37E:: @ 815D37E tileeffect 7 - setholewarp MtPyre_1F, 255, 0, 0 + setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end MtPyre_2F_EventScript_15D389:: @ 815D389 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 1c2711b83..b4548ddce 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -45,7 +45,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 clearflag 0x4001 special LoadPlayerParty setvar 0x4085, 1 - warp PetalburgCity_Gym, 255, 4, 108 + warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index b2d104894..6c92316d6 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -212,7 +212,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 clearflag 866 setflag 889 special InitBirchState - warp PetalburgCity, 255, 15, 8 + warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end @@ -606,7 +606,7 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 closemessage delay 30 - warpdoor PetalburgCity_Gym, 255, 32776, 32777 + warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 waitstate releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 2fe80e098..747b56197 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -236,7 +236,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F setvar 0x4084, 2 setvar 0x4060, 3 clearflag 0x4000 - warp LittlerootTown_ProfessorBirchsLab, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index f24e92cd4..a4c360bc0 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -83,7 +83,7 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB clearflag 738 setflag 739 setflag 881 - warp Route104, 255, 13, 51 + warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 568ba2af6..7d2c77645 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -266,7 +266,7 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closemessage setvar 0x40a6, 1 - warp Route110_TrickHouseEntrance, 255, 6, 2 + warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall end @@ -524,49 +524,49 @@ Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E step_end Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660 - warp Route110_TrickHousePuzzle1, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_16166B:: @ 816166B - warp Route110_TrickHousePuzzle2, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161676:: @ 8161676 - warp Route110_TrickHousePuzzle3, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161681:: @ 8161681 - warp Route110_TrickHousePuzzle4, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_16168C:: @ 816168C - warp Route110_TrickHousePuzzle5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161697:: @ 8161697 - warp Route110_TrickHousePuzzle6, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_1616A2:: @ 81616A2 - warp Route110_TrickHousePuzzle7, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD - warp Route110_TrickHousePuzzle8, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 222a71138..4b9031715 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -401,7 +401,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 closemessage msgbox Route110_TrickHousePuzzle5_Text_19D615, 4 closemessage - warp Route110_TrickHousePuzzle5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 3361e3e9d..1841b025f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -113,7 +113,7 @@ Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 lockall setvar 0x40b6, 1 - warpteleport Route110_TrickHousePuzzle7, 255, 3, 19 + warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 22534aa77..d414ca8ed 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -4,7 +4,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 .byte 0 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E - setescapewarp Route112, 255, 28, 28 + setescapewarp MAP_ROUTE112, 255, 28, 28 compare 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 9649271f4..9f8753b76 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -82,7 +82,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 waitmovement 0 special EnterSafariMode setvar 0x40a4, 2 - warp SafariZone_Southeast, 255, 32, 33 + warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33 waitstate end diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc index 6b4d330d1..06b53ce31 100644 --- a/data/scripts/maps/Route134.inc +++ b/data/scripts/maps/Route134.inc @@ -3,7 +3,7 @@ Route134_MapScripts:: @ 81525B5 .byte 0 Route134_MapScript1_1525BB:: @ 81525BB - setdivewarp Underwater_Route134, 255, 8, 6 + setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 end Route134_EventScript_1525C4:: @ 81525C4 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 916eb8108..3be6be562 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -477,7 +477,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D setflag 732 setvar 0x405a, 5 delay 30 - warp RustboroCity_DevonCorp_3F, 255, 2, 2 + warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate releaseall end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 2c55a9443..59ab89112 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -126,7 +126,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag 260 call_if 1, SSTidalCorridor_EventScript_15FE36 - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -136,7 +136,7 @@ SSTidalCorridor_EventScript_15FE17:: @ 815FE17 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag 260 call_if 1, SSTidalCorridor_EventScript_15FE36 - warp SlateportCity_Harbor, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 06a400810..6d31cf981 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -94,7 +94,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F SafariZone_Southeast_EventScript_160139:: @ 8160139 setvar 0x40a4, 1 special ExitSafariMode - warpdoor Route121_SafariZoneEntrance, 255, 2, 5 + warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index 7ea46d9b0..9d59279ea 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -3,6 +3,6 @@ SeafloorCavern_Entrance_MapScripts:: @ 815DA4A .byte 0 SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 - setdivewarp Underwater_SeafloorCavern, 255, 6, 5 - setescapewarp Underwater_SeafloorCavern, 255, 6, 5 + setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index eb3d108a6..26cb2321a 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -210,7 +210,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setflag 831 setflag 859 setflag 946 - warp Route128, 255, 38, 22 + warp MAP_ROUTE128, 255, 38, 22 waitstate releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index f16a88802..5ff94be19 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -5,8 +5,8 @@ SealedChamber_OuterRoom_MapScripts:: @ 815F0C6 .byte 0 SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 - setdivewarp Underwater_SealedChamber, 255, 12, 44 - setescapewarp Underwater_SealedChamber, 255, 12, 44 + setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 end SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index 3b3585bf8..3f388127b 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -6,5 +6,5 @@ SkyPillar_2F_MapScripts:: @ 815F2C9 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 tileeffect 7 - setholewarp SkyPillar_1F, 255, 0, 0 + setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index 3d535a25a..f0b9a6f85 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -6,5 +6,5 @@ SkyPillar_4F_MapScripts:: @ 815F2E5 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 tileeffect 7 - setholewarp SkyPillar_3F, 255, 0, 0 + setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index bea1455a7..600cfc959 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -538,7 +538,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC clearflag 845 clearflag 846 setvar 0x4058, 2 - warp SlateportCity_Harbor, 255, 11, 14 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall end diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index cb4632d77..85a8fe40e 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -14,7 +14,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D special sub_80C4BF0 call SlateportCity_ContestLobby_EventScript_15FBDB setvar 0x4088, 3 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index f145c4a3d..34d927753 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -3,7 +3,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D .byte 0 SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 - setescapewarp SlateportCity, 255, 28, 13 + setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 @@ -195,7 +195,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 - warp SSTidalCorridor, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -205,7 +205,7 @@ SlateportCity_Harbor_EventScript_156167:: @ 8156167 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 - warp BattleTower_Outside, 255, 19, 23 + warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 waitstate release end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index bddc5965d..994e33197 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -62,7 +62,7 @@ SootopolisCity_EventScript_14D159:: @ 814D159 return SootopolisCity_MapScript1_14D165:: @ 814D165 - setdivewarp Underwater_SootopolisCity, 255, 9, 6 + setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 end SootopolisCity_EventScript_14D16E:: @ 814D16E diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 51b67ee4b..29b62402f 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -77,7 +77,7 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 waitmovement 0 playse 43 delay 60 - warphole SootopolisCity_Gym_B1F + warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 3c6426024..4ee0d0ec3 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -20,7 +20,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 hideobject 1, 26, 9 setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/scripts/maps/Underwater_Route134.inc index bbe7e1ce2..464731b10 100644 --- a/data/scripts/maps/Underwater_Route134.inc +++ b/data/scripts/maps/Underwater_Route134.inc @@ -3,5 +3,5 @@ Underwater_Route134_MapScripts:: @ 815F071 .byte 0 Underwater_Route134_MapScript1_15F077:: @ 815F077 - setdivewarp Route134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 3d2fe81b2..ce2de5124 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -35,7 +35,7 @@ Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 return Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 - setdivewarp SeafloorCavern_Entrance, 255, 10, 17 + setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 end Underwater_SeafloorCavern_EventScript_15DA3F:: @ 815DA3F diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 836ad86e2..733a060c3 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -11,11 +11,11 @@ Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 - setdivewarp Route134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF - setdivewarp SealedChamber_OuterRoom, 255, 10, 19 + setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 end Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc index c9405dfd7..bba04eec8 100644 --- a/data/scripts/maps/Underwater_SootopolisCity.inc +++ b/data/scripts/maps/Underwater_SootopolisCity.inc @@ -3,5 +3,5 @@ Underwater_SootopolisCity_MapScripts:: @ 815CAE4 .byte 0 Underwater_SootopolisCity_MapScript1_15CAEA:: @ 815CAEA - setdivewarp SootopolisCity, 255, 29, 53 + setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53 end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 34d0bb70b..213a3609a 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -382,30 +382,30 @@ LinkContestRoom1_EventScript_15FB64:: @ 815FB64 LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp VerdanturfTown_ContestLobby, 255, 5, 4 + warp MAP_VERDANTURF_TOWN_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD incrementgamestat GAME_STAT_ENTERED_CONTEST - warp FallarborTown_ContestLobby, 255, 5, 4 + warp MAP_FALLARBOR_TOWN_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp SlateportCity_ContestLobby, 255, 5, 4 + warp MAP_SLATEPORT_CITY_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp LilycoveCity_ContestLobby, 255, 6, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 6, 4 waitstate end LinkContestRoom1_EventScript_15FBD1:: @ 815FBD1 - warp LilycoveCity_ContestLobby, 255, 7, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 7, 4 waitstate end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 8462892e6..67554d26b 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -14,7 +14,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 special sub_80C4BF0 call VerdanturfTown_ContestLobby_EventScript_15FBDB setvar 0x4088, 1 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index d0283f072..385f93d22 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,13 +1,13 @@ gUnknown_081C340A:: @ 81C340A setvar 0x40a4, 1 special ExitSafariMode - setwarp Route121_SafariZoneEntrance, 255, 2, 5 + setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_1C341B: @ 81C341B setvar 0x40a4, 1 special ExitSafariMode - warp Route121_SafariZoneEntrance, 255, 2, 5 + warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end -- cgit v1.2.3 From 8215d028078128c6b28119fe2420229cb1828e6b Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 27 Nov 2017 23:09:02 -0600 Subject: fldeff_cut.c data --- data/fldeff_cut.s | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 data/fldeff_cut.s (limited to 'data') diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s deleted file mode 100644 index e1d27647e..000000000 --- a/data/fldeff_cut.s +++ /dev/null @@ -1,31 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gOamData_CutGrass:: @ 83C15DC - .2byte 0 - .2byte 0 - .2byte 0x1401 - - .align 2 -gSpriteAnim_CutGrass:: @ 83C15E4 - obj_image_anim_frame 0, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_CutGrass:: @ 83C15EC - .4byte gSpriteAnim_CutGrass - - .align 2 -gSpriteImageTable_CutGrass:: @ 83C15F0 - obj_frame_tiles gFieldEffectPic_CutGrass, 0x20 - - .align 2 -gFieldEffectObjectPaletteInfo6:: @ 83C15F8 - obj_pal gFieldEffectObjectPalette6, 0x1000 - - .align 2 -gSpriteTemplate_CutGrass:: @ 83C1600 - spr_template 0xFFFF, 0x1000, gOamData_CutGrass, gSpriteAnimTable_CutGrass, gSpriteImageTable_CutGrass, gDummySpriteAffineAnimTable, sub_80A2A48 -- cgit v1.2.3 From 356c1f87c3a787013123b2f36ddcaa3fae1db8d8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 27 Nov 2017 23:39:25 -0600 Subject: convert fldeff data to C --- data/fldeff_decoration.s | 36 -------- data/fldeff_secretpower.s | 208 ---------------------------------------------- 2 files changed, 244 deletions(-) delete mode 100755 data/fldeff_decoration.s delete mode 100755 data/fldeff_secretpower.s (limited to 'data') diff --git a/data/fldeff_decoration.s b/data/fldeff_decoration.s deleted file mode 100755 index 2081679cd..000000000 --- a/data/fldeff_decoration.s +++ /dev/null @@ -1,36 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gOamData_83D266C:: @ 83D266C - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83D2674:: @ 83D2674 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D2684:: @ 83D2684 - .4byte gSpriteAnim_83D2674 - - .align 2 -gSpriteImageTable_83D2688:: @ 83D2688 - obj_frame_tiles gSpriteImage_83D21EC, 0x100 - obj_frame_tiles gSpriteImage_83D22EC, 0x100 - obj_frame_tiles gSpriteImage_83D23EC, 0x100 - - .align 2 -gSpriteTemplate_83D26A0:: @ 83D26A0 - spr_template 0xFFFF, 4110, gOamData_83D266C, gSpriteAnimTable_83D2684, gSpriteImageTable_83D2688, gDummySpriteAffineAnimTable, SpriteCB_SandPillar_0 - -@ This uses one of the secret base palettes, so there is no "09.pal" file. - .align 2 -gFieldEffectObjectPaletteInfo9:: @ 83D26B8 - obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E diff --git a/data/fldeff_secretpower.s b/data/fldeff_secretpower.s deleted file mode 100755 index 589ded675..000000000 --- a/data/fldeff_secretpower.s +++ /dev/null @@ -1,208 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSpriteImage_83D198C:: @ 83D198C - .incbin "graphics/unknown_sprites/83D259C/0.4bpp" - - .align 2 -gSpriteImage_83D1A0C:: @ 83D1A0C - .incbin "graphics/unknown_sprites/83D259C/1.4bpp" - - .align 2 -gSpriteImage_83D1A8C:: @ 83D1A8C - .incbin "graphics/unknown_sprites/83D259C/2.4bpp" - - .align 2 -gSpriteImage_83D1B0C:: @ 83D1B0C - .incbin "graphics/unknown_sprites/83D259C/3.4bpp" - - .align 2 -gSpriteImage_83D1B8C:: @ 83D1B8C - .incbin "graphics/unknown_sprites/83D259C/4.4bpp" - - .space 32 - - .align 2 -gFieldEffectObjectPalette7: @ 83D1C2C - .incbin "graphics/field_effect_objects/palettes/07.gbapal" - - .align 2 -gSpriteImage_83D1C4C:: @ 83D1C4C - .incbin "graphics/unknown_sprites/83D25EC/0.4bpp" - - .align 2 -gSpriteImage_83D1CCC:: @ 83D1CCC - .incbin "graphics/unknown_sprites/83D25EC/1.4bpp" - - .align 2 -gSpriteImage_83D1D4C:: @ 83D1D4C - .incbin "graphics/unknown_sprites/83D25EC/2.4bpp" - - .align 2 -gSpriteImage_83D1DCC:: @ 83D1DCC - .incbin "graphics/unknown_sprites/83D25EC/3.4bpp" - - .align 2 -gSpriteImage_83D1E4C:: @ 83D1E4C - .incbin "graphics/unknown_sprites/83D25EC/4.4bpp" - - .align 2 -gSpriteImage_83D1ECC:: @ 83D1ECC - .incbin "graphics/unknown_sprites/83D25C4/0.4bpp" - - .align 2 -gSpriteImage_83D1F4C:: @ 83D1F4C - .incbin "graphics/unknown_sprites/83D25C4/1.4bpp" - - .align 2 -gSpriteImage_83D1FCC:: @ 83D1FCC - .incbin "graphics/unknown_sprites/83D25C4/2.4bpp" - - .align 2 -gSpriteImage_83D204C:: @ 83D204C - .incbin "graphics/unknown_sprites/83D25C4/3.4bpp" - - .align 2 -gSpriteImage_83D20CC:: @ 83D20CC - .incbin "graphics/unknown_sprites/83D25C4/4.4bpp" - - .align 2 - .incbin "graphics/unknown_sprites/83D25C4/5.4bpp" - - .align 2 -gFieldEffectObjectPalette8: @ 83D21CC - .incbin "graphics/field_effect_objects/palettes/08.gbapal" - - .align 2 -gSpriteImage_83D21EC:: @ 83D21EC - .incbin "graphics/unknown_sprites/83D2688/0.4bpp" - - .align 2 -gSpriteImage_83D22EC:: @ 83D22EC - .incbin "graphics/unknown_sprites/83D2688/1.4bpp" - - .align 2 -gSpriteImage_83D23EC:: @ 83D23EC - .incbin "graphics/unknown_sprites/83D2688/2.4bpp" - - .align 2 -gOamData_83D24EC:: @ 83D24EC - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0800 - - .align 2 -gSpriteAnim_83D24F4:: @ 83D24F4 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_83D250C:: @ 83D250C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_83D2524:: @ 83D2524 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_83D253C:: @ 83D253C - obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_83D2554:: @ 83D2554 - obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gSpriteAnim_83D256C:: @ 83D256C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83D2584:: @ 83D2584 - .4byte gSpriteAnim_83D24F4 - - .align 2 -gSpriteAnimTable_83D2588:: @ 83D2588 - .4byte gSpriteAnim_83D250C - .4byte gSpriteAnim_83D2524 - .4byte gSpriteAnim_83D253C - .4byte gSpriteAnim_83D2554 - - .align 2 -gSpriteAnimTable_83D2598:: @ 83D2598 - .4byte gSpriteAnim_83D256C - - .align 2 -gSpriteImageTable_83D259C:: @ 83D259C - obj_frame_tiles gSpriteImage_83D198C, 0x80 - obj_frame_tiles gSpriteImage_83D1A0C, 0x80 - obj_frame_tiles gSpriteImage_83D1A8C, 0x80 - obj_frame_tiles gSpriteImage_83D1B0C, 0x80 - obj_frame_tiles gSpriteImage_83D1B8C, 0x80 - - .align 2 -gSpriteImageTable_83D25C4:: @ 83D25C4 - obj_frame_tiles gSpriteImage_83D1ECC, 0x80 - obj_frame_tiles gSpriteImage_83D1F4C, 0x80 - obj_frame_tiles gSpriteImage_83D1FCC, 0x80 - obj_frame_tiles gSpriteImage_83D204C, 0x80 - obj_frame_tiles gSpriteImage_83D20CC, 0x80 - - .align 2 -gSpriteImageTable_83D25EC:: @ 83D25EC - obj_frame_tiles gSpriteImage_83D1C4C, 0x80 - obj_frame_tiles gSpriteImage_83D1CCC, 0x80 - obj_frame_tiles gSpriteImage_83D1D4C, 0x80 - obj_frame_tiles gSpriteImage_83D1DCC, 0x80 - obj_frame_tiles gSpriteImage_83D1E4C, 0x80 - - .align 2 -gSpriteTemplate_83D2614:: @ 83D2614 - spr_template 0xFFFF, 4099, gOamData_83D24EC, gSpriteAnimTable_83D2584, gSpriteImageTable_83D259C, gDummySpriteAffineAnimTable, sub_80C644C - - .align 2 -gSpriteTemplate_83D262C:: @ 83D262C - spr_template 0xFFFF, 4104, gOamData_83D24EC, gSpriteAnimTable_83D2588, gSpriteImageTable_83D25C4, gDummySpriteAffineAnimTable, sub_80C6598 - - .align 2 -gSpriteTemplate_83D2644:: @ 83D2644 - spr_template 0xFFFF, 4104, gOamData_83D24EC, gSpriteAnimTable_83D2598, gSpriteImageTable_83D25EC, gDummySpriteAffineAnimTable, sub_80C66BC - - .align 2 -gFieldEffectObjectPaletteInfo7:: @ 83D265C - obj_pal gFieldEffectObjectPalette7, 0x1003 - - .align 2 -gFieldEffectObjectPaletteInfo8:: @ 83D2664 - obj_pal gFieldEffectObjectPalette8, 0x1008 -- cgit v1.2.3 From 121cb02ff64bd8b8bd637d415e30d8782abb1717 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 28 Nov 2017 00:24:54 -0600 Subject: convert mail data to C --- data/mail.s | 178 ------------------------------------------------------------ 1 file changed, 178 deletions(-) delete mode 100644 data/mail.s (limited to 'data') diff --git a/data/mail.s b/data/mail.s deleted file mode 100644 index e82212a42..000000000 --- a/data/mail.s +++ /dev/null @@ -1,178 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 -gUnknown_083E562C:: @ 83E562C - .2byte 0x6ACD, 0x51A5 - .2byte 0x45FC, 0x38D4 - - .align 2 -gMailGraphicsTable:: @ 83E5634 - .4byte gMailPalette_Orange - .4byte gMailTiles_Orange - .4byte gMailTilemap_Orange - .2byte 0x2C0 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Harbor - .4byte gMailTiles_Harbor - .4byte gMailTilemap_Harbor - .2byte 0x2E0 - .2byte 0 - .2byte 0x7FFF - .2byte 0x4631 - - .4byte gMailPalette_Glitter - .4byte gMailTiles_Glitter - .4byte gMailTilemap_Glitter - .2byte 0x400 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Mech - .4byte gMailTiles_Mech - .4byte gMailTilemap_Mech - .2byte 0x1E0 - .2byte 0 - .2byte 0x7FFF - .2byte 0x4631 - - .4byte gMailPalette_Wood - .4byte gMailTiles_Wood - .4byte gMailTilemap_Wood - .2byte 0x2E0 - .2byte 0 - .2byte 0x7FFF - .2byte 0x4631 - - .4byte gMailPalette_Wave - .4byte gMailTiles_Wave - .4byte gMailTilemap_Wave - .2byte 0x300 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Bead - .4byte gMailTiles_Bead - .4byte gMailTilemap_Bead - .2byte 0x140 - .2byte 0 - .2byte 0x7FFF - .2byte 0x4631 - - .4byte gMailPalette_Shadow - .4byte gMailTiles_Shadow - .4byte gMailTilemap_Shadow - .2byte 0x300 - .2byte 0 - .2byte 0x7FFF - .2byte 0x4631 - - .4byte gMailPalette_Tropic - .4byte gMailTiles_Tropic - .4byte gMailTilemap_Tropic - .2byte 0x220 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Dream - .4byte gMailTiles_Dream - .4byte gMailTilemap_Dream - .2byte 0x340 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Fab - .4byte gMailTiles_Fab - .4byte gMailTilemap_Fab - .2byte 0x2A0 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .4byte gMailPalette_Retro - .4byte gMailTiles_Retro - .4byte gMailTilemap_Retro - .2byte 0x520 - .2byte 0 - .2byte 0x294A - .2byte 0x6739 - - .align 2 -Unknown_3E5724: @ 83E5724 - .4byte 0xC - .4byte 0xC - .4byte 0xC - -gUnknown_083E5730:: @ 83E5730 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 16, 27, 52 - .4byte Unknown_3E5724 - .byte 3, 15, 27, 52 - .4byte Unknown_3E5724 - - .align 2 -Unknown_3E5790: @ 83E5790 - .4byte 0x8 - .4byte 0x8 - .4byte 0x8 - .4byte 0x8 - .4byte 0x4 - - .align 2 -gUnknown_083E57A4:: @ 83E57A4 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 16, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 16, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 16, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 16, 15, 52 - .4byte Unknown_3E5790 - .byte 5, 15, 15, 52 - .4byte Unknown_3E5790 - -@ XXX: what is this? - .align 2 - .4byte gSharedMem -- cgit v1.2.3 From c8c4b27d70fd1bf01a048636873465753cc34e0d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 28 Nov 2017 00:42:11 -0600 Subject: mon_markings data --- data/mon_markings.s | 207 ---------------------------------------------------- 1 file changed, 207 deletions(-) delete mode 100644 data/mon_markings.s (limited to 'data') diff --git a/data/mon_markings.s b/data/mon_markings.s deleted file mode 100644 index b9ec7735f..000000000 --- a/data/mon_markings.s +++ /dev/null @@ -1,207 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083E49F4:: @ 83E49F4 - .incbin "graphics/misc/mon_markings.gbapal" - - .align 2 -gUnknown_083E4A14:: @ 83E4A14 - .incbin "graphics/misc/mon_markings.4bpp" - - .align 2 -gOamData_83E5214:: @ 83E5214 - .2byte 0x0 - .2byte 0xC000 - .2byte 0x0 - - .align 2 -gOamData_83E521C:: @ 83E521C - .2byte 0x0 - .2byte 0x0 - .2byte 0x0 - - .align 2 -gSpriteAnim_83E5224:: @ 83E5224 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E522C:: @ 83E522C - obj_image_anim_frame 1, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5234:: @ 83E5234 - obj_image_anim_frame 2, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E523C:: @ 83E523C - obj_image_anim_frame 3, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5244:: @ 83E5244 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E524C:: @ 83E524C - obj_image_anim_frame 5, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5254:: @ 83E5254 - obj_image_anim_frame 6, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E525C:: @ 83E525C - obj_image_anim_frame 7, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5264:: @ 83E5264 - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E526C:: @ 83E526C - obj_image_anim_frame 9, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E5274:: @ 83E5274 - .4byte gSpriteAnim_83E5224 - .4byte gSpriteAnim_83E522C - .4byte gSpriteAnim_83E5234 - .4byte gSpriteAnim_83E523C - .4byte gSpriteAnim_83E5244 - .4byte gSpriteAnim_83E524C - .4byte gSpriteAnim_83E5254 - .4byte gSpriteAnim_83E525C - .4byte gSpriteAnim_83E5264 - .4byte gSpriteAnim_83E526C - - .align 2 -gSpriteAnim_83E529C:: @ 83E529C - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52A4:: @ 83E52A4 - obj_image_anim_frame 64, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E52AC:: @ 83E52AC - .4byte gSpriteAnim_83E529C - .4byte gSpriteAnim_83E52A4 - - .align 2 -gOamData_83E52B4:: @ 83E52B4 - .2byte 0x4000 - .2byte 0x4000 - .2byte 0x0 - - .align 2 -gSpriteAnim_83E52BC:: @ 83E52BC - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52C4:: @ 83E52C4 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52CC:: @ 83E52CC - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52D4:: @ 83E52D4 - obj_image_anim_frame 12, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52DC:: @ 83E52DC - obj_image_anim_frame 16, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52E4:: @ 83E52E4 - obj_image_anim_frame 20, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52EC:: @ 83E52EC - obj_image_anim_frame 24, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52F4:: @ 83E52F4 - obj_image_anim_frame 28, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E52FC:: @ 83E52FC - obj_image_anim_frame 32, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5304:: @ 83E5304 - obj_image_anim_frame 36, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E530C:: @ 83E530C - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5314:: @ 83E5314 - obj_image_anim_frame 44, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E531C:: @ 83E531C - obj_image_anim_frame 48, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5324:: @ 83E5324 - obj_image_anim_frame 52, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E532C:: @ 83E532C - obj_image_anim_frame 56, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83E5334:: @ 83E5334 - obj_image_anim_frame 60, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83E533C:: @ 83E533C - .4byte gSpriteAnim_83E52BC - .4byte gSpriteAnim_83E52C4 - .4byte gSpriteAnim_83E52CC - .4byte gSpriteAnim_83E52D4 - .4byte gSpriteAnim_83E52DC - .4byte gSpriteAnim_83E52E4 - .4byte gSpriteAnim_83E52EC - .4byte gSpriteAnim_83E52F4 - .4byte gSpriteAnim_83E52FC - .4byte gSpriteAnim_83E5304 - .4byte gSpriteAnim_83E530C - .4byte gSpriteAnim_83E5314 - .4byte gSpriteAnim_83E531C - .4byte gSpriteAnim_83E5324 - .4byte gSpriteAnim_83E532C - .4byte gSpriteAnim_83E5334 -- cgit v1.2.3 From 4d93db09a365cfa68e30be93d94b8c0ad1f89f9b Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 28 Nov 2017 20:36:12 -0800 Subject: Use constants for temporary map flags --- data/event_scripts.s | 9 ++++--- data/map_events.s | 1 + data/maps/events/FieryPath.inc | 12 ++++----- data/maps/events/GraniteCave_B2F.inc | 14 +++++----- data/maps/events/PetalburgWoods.inc | 4 +-- data/maps/events/Route103.inc | 4 +-- data/maps/events/Route104.inc | 2 +- data/maps/events/Route110_TrickHousePuzzle1.inc | 30 +++++++++++----------- data/maps/events/Route110_TrickHousePuzzle3.inc | 12 ++++----- data/maps/events/Route110_TrickHousePuzzle4.inc | 22 ++++++++-------- data/maps/events/Route111.inc | 6 ++--- data/maps/events/Route114.inc | 10 ++++---- data/maps/events/Route115.inc | 2 +- data/maps/events/Route116.inc | 8 +++--- data/maps/events/Route117.inc | 2 +- data/maps/events/Route118.inc | 2 +- data/maps/events/Route120.inc | 6 ++--- data/maps/events/Route121.inc | 6 ++--- data/maps/events/Route123.inc | 6 ++--- data/maps/events/Route130.inc | 2 +- data/maps/events/SafariZone_Northeast.inc | 12 ++++----- data/maps/events/SeafloorCavern_Room1.inc | 6 ++--- data/maps/events/SeafloorCavern_Room2.inc | 18 ++++++------- data/maps/events/SeafloorCavern_Room3.inc | 18 ++++++------- data/maps/events/SeafloorCavern_Room5.inc | 12 ++++----- data/maps/events/SeafloorCavern_Room8.inc | 24 ++++++++--------- data/maps/events/ShoalCave_LowTideLowerRoom.inc | 2 +- data/maps/events/VictoryRoad_B1F.inc | 26 +++++++++---------- data/scripts/contest_hall.inc | 12 ++++----- data/scripts/gabby_and_ty.inc | 8 +++--- data/scripts/maps/FallarborTown_House1.inc | 6 ++--- data/scripts/maps/FallarborTown_House2.inc | 4 +-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 16 ++++++------ .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 6 ++--- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 4 +-- data/scripts/maps/OldaleTown.inc | 4 +-- .../maps/Route104_PrettyPetalFlowerShop.inc | 4 +-- data/scripts/maps/Route109_SeashoreHouse.inc | 4 +-- .../maps/Route111_WinstrateFamilysHouse.inc | 4 +-- data/scripts/maps/Route130.inc | 30 +++++++++++----------- data/scripts/maps/RusturfTunnel.inc | 4 +-- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 2 +- 42 files changed, 194 insertions(+), 192 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 495f78dfc..ccbb767f5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,4 +1,5 @@ #include "constants/decorations.h" +#include "constants/flags.h" #include "constants/game_stat.h" #include "constants/items.h" #include "constants/map_objects.h" @@ -4567,7 +4568,7 @@ SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 lock faceplayer - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar 0x8005, 6 special sub_80BF2C4 @@ -4613,7 +4614,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 - setflag 2 + setflag FLAG_TEMP_2 setvar 0x8005, 6 goto FallarborTown_ContestLobby_EventScript_1ADE46 end @@ -4664,7 +4665,7 @@ FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF lock faceplayer - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar 0x8005, 7 special sub_80BF2C4 @@ -4716,7 +4717,7 @@ BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 - setflag 2 + setflag FLAG_TEMP_2 copyvar 0x8004, 0x8008 setvar 0x8005, 7 goto BattleTower_Lobby_EventScript_1ADE46 diff --git a/data/map_events.s b/data/map_events.s index 547e6ceb3..e7fb03fb6 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,3 +1,4 @@ +#include "constants/flags.h" #include "constants/items.h" #include "constants/map_objects.h" #include "constants/maps.h" diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index 22f2b403e..7c618a4e7 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -1,11 +1,11 @@ FieryPath_MapObjects:: @ 838C718 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, 1091, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0 FieryPath_MapWarps:: @ 838C7D8 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index ec4b309a5..f662d175c 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -1,13 +1,13 @@ GraniteCave_B2F_MapObjects:: @ 838BFEC object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, 1053, 0, 0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, 1054, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 23, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_17, 0, 0 GraniteCave_B2F_MapWarps:: @ 838C0C4 warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 73a1d4cfb..be298246d 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,6 +1,6 @@ PetalburgWoods_MapObjects:: @ 838C14C - object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0 diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index 462fe1a3b..d108c2d46 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -12,8 +12,8 @@ Route103_MapObjects:: @ 8381300 object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, 898, 0, 0 object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0 object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 Route103_MapBGEvents:: @ 8381468 bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index 8ddfab738..7176521cc 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -28,7 +28,7 @@ Route104_MapObjects:: @ 8381488 object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, 1057, 0, 0 object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0 object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, 1115, 0, 0 - object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, 1135, 0, 0 object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 8a3bb24a3..2a778ed3e 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -2,22 +2,22 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0 object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0 object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 - object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 23, 0, 0 - object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 22, 0, 0 - object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 21, 0, 0 - object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 25, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 26, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 28, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 27, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 29, 0, 0 - object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 30, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 + object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17, 0, 0 + object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16, 0, 0 + object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15, 0, 0 + object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18, 0, 0 + object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D, 0, 0 + object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, 1060, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 31, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F, 0, 0 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index 9a666766f..f002c0871 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -2,14 +2,14 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0 object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, 1064, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, 1063, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index 26efce267..e95e63b85 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -3,17 +3,17 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, 1065, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 - object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0 - object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 + object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0 + object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index 6de5deba0..e502ae821 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -13,8 +13,8 @@ Route111_MapObjects:: @ 83821A0 object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0 object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, 796, 0, 0 object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, 796, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0 object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0 @@ -25,7 +25,7 @@ Route111_MapObjects:: @ 83821A0 object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0 object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0 object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0 - object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0 object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0 object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index 4717199da..d14f27737 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -9,17 +9,17 @@ Route114_MapObjects:: @ 8382C48 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, 1014, 0, 0 object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, 1015, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0 object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0 object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0 object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 - object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 - object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 - object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 + object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0 object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index 23250916c..6edb62e78 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -13,7 +13,7 @@ Route115_MapObjects:: @ 8382F2C object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, 1018, 0, 0 object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0 object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0 Route115_MapWarps:: @ 83830AC diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 699ed4616..32bd1ea57 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -2,17 +2,17 @@ Route116_MapObjects:: @ 8383170 object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0 object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0 object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, 1019, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, 891, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, 1021, 0, 0 object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index 67d391044..9f5c35207 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -13,7 +13,7 @@ Route117_MapObjects:: @ 8383440 object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0 object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0 object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, 1022, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, 1023, 0, 0 object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0 object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index df887ba1e..371b935a7 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -10,7 +10,7 @@ Route118_MapObjects:: @ 8383684 object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, 901, 0, 0 object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0 object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0 object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index febefb26a..0463d441d 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -19,7 +19,7 @@ Route120_MapObjects:: @ 8383F30 object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, 798, 0, 0 object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0 object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0 - object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0 object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0 @@ -30,8 +30,8 @@ Route120_MapObjects:: @ 8383F30 object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0 object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, 970, 0, 0 object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, 972, 0, 0 - object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 - object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 + object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0 object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0 object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index 94de6ed39..6aa848633 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -13,14 +13,14 @@ Route121_MapObjects:: @ 8384504 object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0 object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0 object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, 1103, 0, 0 - object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index f29d5d242..db9e8baed 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -16,9 +16,9 @@ Route123_MapObjects:: @ 83847F8 object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0 object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0 object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 - object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, 1032, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, 1033, 0, 0 object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0 diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc index 009604d4b..027519c2d 100644 --- a/data/maps/events/Route130.inc +++ b/data/maps/events/Route130.inc @@ -1,7 +1,7 @@ Route130_MapObjects:: @ 838523C object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, 17, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, FLAG_TEMP_11, 0, 0 Route130_MapEvents:: @ 8385284 map_events Route130_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc index cea87fb14..6fe5843fb 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/events/SafariZone_Northeast.inc @@ -1,12 +1,12 @@ SafariZone_Northeast_MapObjects:: @ 8391A2C object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, 1119, 0, 0 SafariZone_Northeast_MapEvents:: @ 8391B04 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index c9d62777f..4fc97414e 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -1,7 +1,7 @@ SeafloorCavern_Room1_MapObjects:: @ 838D0B8 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, 946, 0, 0 object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index 6a276fc3f..e9da0033e 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room2_MapObjects:: @ 838D15C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 24, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 SeafloorCavern_Room2_MapWarps:: @ 838D234 warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index 8c6e2b4a2..83f80b3e4 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room3_MapObjects:: @ 838D268 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0 SeafloorCavern_Room3_MapWarps:: @ 838D358 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index c31d31042..887ee1eb9 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -1,10 +1,10 @@ SeafloorCavern_Room5_MapObjects:: @ 838D3D0 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 SeafloorCavern_Room5_MapWarps:: @ 838D460 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 93c93e4a0..35d230ff2 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -1,16 +1,16 @@ SeafloorCavern_Room8_MapObjects:: @ 838D4DC - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 28, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C, 0, 0 SeafloorCavern_Room8_MapWarps:: @ 838D5FC warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index 5549afed7..ba5a0f495 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index 8c3f6d2ff..0f0679b56 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -1,17 +1,17 @@ VictoryRoad_B1F_MapObjects:: @ 838DA04 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 30, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 26, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 27, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 28, 0, 0 - object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 29, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 31, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C, 0, 0 + object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0 object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0 object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 1b5c29fee..ab57e9bf4 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -9,19 +9,19 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD compare 0x408a, 0 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F getstdstring 0, 0x800b msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1 - setflag 1 + setflag FLAG_TEMP_1 goto FallarborTown_ContestLobby_EventScript_1A4F8F end FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD - clearflag 1 + clearflag FLAG_TEMP_1 return FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 @@ -45,7 +45,7 @@ FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 msgbox FallarborTown_ContestLobby_Text_1A6583, 4 giveitem ITEM_CONTEST_PASS setflag 150 - setflag 1 + setflag FLAG_TEMP_1 msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 goto FallarborTown_ContestLobby_EventScript_1A4F8F end @@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB compare 0x4088, 5 goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq LinkContestRoom1_EventScript_1A5BF6 msgbox LinkContestRoom1_Text_1A6DC5, 3 waitmessage @@ -1035,7 +1035,7 @@ LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 LinkContestRoom1_EventScript_1A5C32:: @ 81A5C32 compare CONTEST_RANK, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C41 - setflag 2 + setflag FLAG_TEMP_2 return LinkContestRoom1_EventScript_1A5C41:: @ 81A5C41 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 214c61142..7d13f1cc6 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -208,7 +208,7 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 call_if 1, Route111_EventScript_1AE5EB compare FACING, 4 call_if 1, Route111_EventScript_1AE5FD - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq Route111_EventScript_1AE73A msgbox Route111_Text_1AC015, 5 goto Route111_EventScript_1AE6F3 @@ -242,7 +242,7 @@ Route120_EventScript_1AE60F:: @ 81AE60F call_if 1, Route111_EventScript_1AE5EB compare FACING, 4 call_if 1, Route111_EventScript_1AE5FD - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq Route111_EventScript_1AE73A specialvar RESULT, GabbyAndTyGetLastQuote compare RESULT, 0 @@ -311,13 +311,13 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 special sub_80BDC14 - setflag 1 + setflag FLAG_TEMP_1 release end Route111_EventScript_1AE72D:: @ 81AE72D msgbox Route111_Text_1AC553, 4 - setflag 1 + setflag FLAG_TEMP_1 release end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 0228fe25d..8e4b8bda3 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -18,9 +18,9 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 end FallarborTown_House1_EventScript_153BDA:: @ 8153BDA - checkflag 2 + checkflag FLAG_TEMP_2 call_if 0, FallarborTown_House1_EventScript_153C2D - checkflag 2 + checkflag FLAG_TEMP_2 call_if 1, FallarborTown_House1_EventScript_153C3E compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 @@ -45,7 +45,7 @@ FallarborTown_House1_EventScript_153C3E:: @ 8153C3E return FallarborTown_House1_EventScript_153C47:: @ 8153C47 - setflag 2 + setflag FLAG_TEMP_2 msgbox FallarborTown_House1_Text_17797D, 4 release end diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 3b215a697..c827eea7b 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -5,10 +5,10 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 lockall applymovement 1, FallarborTown_House2_Movement_1A0839 waitmovement 0 - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 - setflag 1 + setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_153CB6 end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 656516fd6..470af3871 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -307,11 +307,11 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C waitmessage - setflag 2 + setflag FLAG_TEMP_2 goto LilycoveCity_ContestLobby_EventScript_158BF0 end @@ -334,7 +334,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 erasebox 0, 0, 15, 9 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 - setflag 3 + setflag FLAG_TEMP_3 return LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0 @@ -354,7 +354,7 @@ LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27 LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35 msgbox LilycoveCity_ContestLobby_Text_188559, 4 releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 @@ -402,7 +402,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 end LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA - checkflag 3 + checkflag FLAG_TEMP_3 call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4 message LilycoveCity_ContestLobby_Text_1886DC waitmessage @@ -445,7 +445,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 msgbox LilycoveCity_ContestLobby_Text_18878D, 4 closemessage releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 @@ -453,7 +453,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 msgbox LilycoveCity_ContestLobby_Text_1887F4, 4 closemessage releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 @@ -461,7 +461,7 @@ LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 msgbox LilycoveCity_ContestLobby_Text_18881F, 4 closemessage releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index fd9ea8a58..00a10b655 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0 LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 lock faceplayer - checkflag 2 + checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 - checkflag 2 + checkflag FLAG_TEMP_2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialvar RESULT, sub_8090FC0 compare RESULT, 1 @@ -19,7 +19,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 return LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 - setflag 2 + setflag FLAG_TEMP_2 playfanfare 370 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 0e6bdc140..ca60bbc89 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -4,7 +4,7 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C lock faceplayer - checkflag 2 + checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar 0x8005, 0x4043 special sub_810E944 @@ -76,7 +76,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 waitmovement 0 special sub_810EBEC waitstate - setflag 2 + setflag FLAG_TEMP_2 return LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index e80df2cd2..1ac72a727 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -40,9 +40,9 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC faceplayer checkflag 132 goto_if_eq OldaleTown_EventScript_14DE79 - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq OldaleTown_EventScript_14DE79 - setflag 1 + setflag FLAG_TEMP_1 playbgm 420, 0 msgbox OldaleTown_Text_16AEF2, 4 closemessage diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 4c5becf88..34cc8e85d 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -8,7 +8,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 checkflag 2057 goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - setflag 1 + setflag FLAG_TEMP_1 end Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 @@ -18,7 +18,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B lock faceplayer - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 checkflag 127 diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 4d8d363aa..50278c024 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -13,10 +13,10 @@ Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 goto_if_eq Route109_SeashoreHouse_EventScript_160E36 checkflag 141 goto_if_eq Route109_SeashoreHouse_EventScript_160E08 - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq Route109_SeashoreHouse_EventScript_160DFE msgbox Route109_SeashoreHouse_Text_19B4D9, 4 - setflag 2 + setflag FLAG_TEMP_2 release end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index d9a94ce75..acd145dc3 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -40,10 +40,10 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer setvar 0x8008, 4 - checkflag 4 + checkflag FLAG_TEMP_4 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 - setflag 4 + setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 69da29471..897047edc 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -6,21 +6,21 @@ Route130_MapScript1_1523C8:: @ 81523C8 specialvar RESULT, IsMirageIslandPresent compare RESULT, 1 goto_if_eq Route130_EventScript_15240C - setflag 17 - setflag 18 - setflag 19 - setflag 20 - setflag 21 - setflag 22 - setflag 23 - setflag 24 - setflag 25 - setflag 26 - setflag 27 - setflag 28 - setflag 29 - setflag 30 - setflag 31 + setflag FLAG_TEMP_11 + setflag FLAG_TEMP_12 + setflag FLAG_TEMP_13 + setflag FLAG_TEMP_14 + setflag FLAG_TEMP_15 + setflag FLAG_TEMP_16 + setflag FLAG_TEMP_17 + setflag FLAG_TEMP_18 + setflag FLAG_TEMP_19 + setflag FLAG_TEMP_1A + setflag FLAG_TEMP_1B + setflag FLAG_TEMP_1C + setflag FLAG_TEMP_1D + setflag FLAG_TEMP_1E + setflag FLAG_TEMP_1F setflag 32 setmaplayoutindex 264 end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 28f6f0ad4..98061b926 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -32,9 +32,9 @@ RusturfTunnel_EventScript_15C782:: @ 815C782 RusturfTunnel_EventScript_15C799:: @ 815C799 lock faceplayer - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq RusturfTunnel_EventScript_15C7BC - setflag 1 + setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_1944C5, 4 closemessage applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 52d430db5..ab1e1ad7b 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -43,7 +43,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 - setflag 2 + setflag FLAG_TEMP_2 release end -- cgit v1.2.3 From 82f8159152472ecaf14556064d9ac082cdfc138f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 28 Nov 2017 21:07:04 -0800 Subject: Flag for buggy rock smash rock --- data/maps/events/VictoryRoad_B1F.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index 0f0679b56..575744050 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -15,7 +15,7 @@ VictoryRoad_B1F_MapObjects:: @ 838DA04 object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0 object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0 object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 32, 0, 0 + object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0 -- cgit v1.2.3 From d1b967444e7f0e21b8b5d1a09c8e164bd828da08 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 12:39:11 -0800 Subject: Label flags up to flag 99. --- data/event_scripts.s | 4 ++-- data/maps/events/LinkContestRoom1.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 4 ++-- data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc | 4 ++-- data/scripts/maps/MauvilleCity.inc | 6 +++--- data/scripts/maps/MauvilleCity_BikeShop.inc | 8 ++++---- data/scripts/maps/MauvilleCity_Gym.inc | 10 +++++----- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route104_PrettyPetalFlowerShop.inc | 4 ++-- data/scripts/maps/Route130.inc | 2 +- data/scripts/maps/SlateportCity.inc | 6 +++--- data/scripts/maps/SlateportCity_ContestLobby.inc | 4 ++-- data/scripts/players_house.inc | 6 +++--- data/scripts/secret_power_tm.inc | 2 +- 16 files changed, 34 insertions(+), 34 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index ccbb767f5..dfc251980 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1155,7 +1155,7 @@ Event_ResetBerryTrees: @ 19F940 return gUnknown_0819FA81:: @ 819FA81 - setflag 86 + setflag FLAG_LINK_CONTEST_ROOM_POKEBALL setflag 769 setflag 770 setflag 771 @@ -3747,7 +3747,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08 closemessage - setflag 96 + setflag FLAG_RECEIVED_SECRET_POWER special sub_80BBC78 waitstate end diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc index 6c1e09430..18d1dcd74 100644 --- a/data/maps/events/LinkContestRoom1.inc +++ b/data/maps/events/LinkContestRoom1.inc @@ -11,7 +11,7 @@ LinkContestRoom1_MapObjects:: @ 839149C object_event 10, 249, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 11, 250, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 12, 245, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 86, 0, 0 + object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL, 0, 0 object_event 14, 243, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 15, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 3027e1f77..7ce49b0cb 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -7,7 +7,7 @@ LittlerootTown_MapScript1_14D514:: @ 814D514 setflag 2063 compare 0x4092, 2 call_if 1, LittlerootTown_EventScript_14D57B - checkflag 82 + checkflag FLAG_RESCUED_BIRCH call_if 0, LittlerootTown_EventScript_14D583 compare 0x4050, 3 call_if 1, LittlerootTown_EventScript_14D5A6 @@ -189,7 +189,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF faceplayer checkflag 116 goto_if_eq LittlerootTown_EventScript_14D72F - checkflag 82 + checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_EventScript_14D722 compare 0x4050, 0 goto_if 5, LittlerootTown_EventScript_14D708 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index d3694bd22..a478270b0 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -100,7 +100,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 - setflag 87 + setflag FLAG_MET_RIVAL_MOM setvar 0x4082, 2 releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index a4d6f2403..100787ccf 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -100,7 +100,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4 - setflag 87 + setflag FLAG_MET_RIVAL_MOM setvar 0x408c, 2 releaseall end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index e7ccd73f6..dc7d48ea1 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -87,10 +87,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 faceplayer compare 0x4084, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 - checkflag 88 + checkflag FLAG_BIRCH_AIDE_MET goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4 - setflag 88 + setflag FLAG_BIRCH_AIDE_MET release end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 5c93aa252..8123c5f41 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -6,7 +6,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 setflag 2072 clearflag 961 setflag 2098 - clearflag 99 + clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 checkflag 209 call_if 1, MauvilleCity_EventScript_14C053 @@ -52,10 +52,10 @@ MauvilleCity_EventScript_14C099:: @ 814C099 MauvilleCity_EventScript_14C0A2:: @ 814C0A2 lock faceplayer - checkflag 98 + checkflag FLAG_TV_EXPLAINED goto_if_eq MauvilleCity_EventScript_14C0BA msgbox MauvilleCity_Text_16674A, 4 - setflag 98 + setflag FLAG_TV_EXPLAINED release end diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index a93ff5170..ef44a20bb 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -4,9 +4,9 @@ MauvilleCity_BikeShop_MapScripts:: @ 8156795 MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 lock faceplayer - checkflag 90 + checkflag FLAG_RECEIVED_BIKE goto_if_eq MauvilleCity_BikeShop_EventScript_15686E - checkflag 89 + checkflag FLAG_DECLINED_BIKE goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, 5 @@ -34,13 +34,13 @@ MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0 end MauvilleCity_BikeShop_EventScript_156817:: @ 8156817 - setflag 89 + setflag FLAG_DECLINED_BIKE msgbox MauvilleCity_BikeShop_Text_181067, 4 release end MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 - setflag 90 + setflag FLAG_RECEIVED_BIKE goto MauvilleCity_BikeShop_EventScript_1567F0 end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 5221add7a..1088c0802 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -13,7 +13,7 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456 end MauvilleCity_Gym_EventScript_156491:: @ 8156491 - checkflag 99 + checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if_eq MauvilleCity_Gym_EventScript_15649B end @@ -147,9 +147,9 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial1 special DrawWholeMapView playse 44 - checkflag 99 + checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if_eq MauvilleCity_Gym_EventScript_1566E1 - checkflag 99 + checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if 0, MauvilleCity_Gym_EventScript_1566DC releaseall end @@ -159,12 +159,12 @@ MauvilleCity_Gym_EventScript_1566DA:: @ 81566DA end MauvilleCity_Gym_EventScript_1566DC:: @ 81566DC - setflag 99 + setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 - clearflag 99 + clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 747b56197..86c22fa40 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -218,7 +218,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer setflag 2048 - setflag 82 + setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 setobjectxy 255, 6, 13 diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 34cc8e85d..904d39f05 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -72,7 +72,7 @@ Route104_PrettyPetalFlowerShop_Items:: @ 815BE94 Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 lock faceplayer - checkflag 94 + checkflag FLAG_RECEIVED_WAILMER_PAIL goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 release @@ -82,7 +82,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4 giveitem ITEM_WAILMER_PAIL msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 - setflag 94 + setflag FLAG_RECEIVED_WAILMER_PAIL release end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 897047edc..b0381969d 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -21,7 +21,7 @@ Route130_MapScript1_1523C8:: @ 81523C8 setflag FLAG_TEMP_1D setflag FLAG_TEMP_1E setflag FLAG_TEMP_1F - setflag 32 + setflag FLAG_TEMP_20 setmaplayoutindex 264 end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 600cfc959..129b6c447 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -125,7 +125,7 @@ SlateportCity_EventScript_14BB81:: @ 814BB81 faceplayer compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBA1 - checkflag 96 + checkflag FLAG_RECEIVED_SECRET_POWER goto_if_eq SlateportCity_EventScript_14BBAB msgbox SlateportCity_Text_164937, 4 release @@ -410,7 +410,7 @@ SlateportCity_EventScript_14BE16:: @ 814BE16 SlateportCity_EventScript_14BE20:: @ 814BE20 lock faceplayer - checkflag 96 + checkflag FLAG_RECEIVED_SECRET_POWER goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage @@ -442,7 +442,7 @@ SlateportCity_Decorations2:: @ 814BE40 @ 814BE60 lock faceplayer - checkflag 96 + checkflag FLAG_RECEIVED_SECRET_POWER goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 85a8fe40e..5a00f4830 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -101,13 +101,13 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall - checkflag 95 + checkflag FLAG_RECEIVED_POKEBLOCK_CASE goto_if_eq SlateportCity_ContestLobby_EventScript_155526 applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 giveitem ITEM_POKEBLOCK_CASE - setflag 95 + setflag FLAG_RECEIVED_POKEBLOCK_CASE releaseall end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 69a4dc3e9..0bf59d0b9 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -59,13 +59,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB - checkflag 81 + checkflag FLAG_SET_WALL_CLOCK goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4 call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B delay 30 setvar 0x4092, 6 - setflag 81 + setflag FLAG_SET_WALL_CLOCK setflag 754 setflag 755 checkplayergender @@ -258,7 +258,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 checkflag 2059 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D - checkflag 82 + checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 compare 0x4001, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index f3c03a853..743308b43 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -14,7 +14,7 @@ Route111_EventScript_1A3877:: @ 81A3877 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 closemessage - setflag 96 + setflag FLAG_RECEIVED_SECRET_POWER clearflag 948 compare FACING, 3 call_if 1, Route111_EventScript_1A38C3 -- cgit v1.2.3 From 765526b99f50bf6b8c41c69bd6b1dc82471cda2d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 14:01:50 -0800 Subject: Label flags up to flag 119. --- data/event_scripts.s | 4 +-- data/scripts/maps/AquaHideout_1F.inc | 4 +-- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/CaveOfOrigin_1F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B1F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B2F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B3F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 +-- data/scripts/maps/FortreeCity_House2.inc | 8 +++--- data/scripts/maps/GraniteCave_1F.inc | 4 +-- data/scripts/maps/LilycoveCity.inc | 6 ++-- data/scripts/maps/LittlerootTown.inc | 2 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +-- data/scripts/maps/MauvilleCity_House1.inc | 4 +-- data/scripts/maps/MossdeepCity.inc | 8 +++--- data/scripts/maps/MossdeepCity_Gym.inc | 32 +++++++++++----------- data/scripts/maps/MtChimney.inc | 4 +-- data/scripts/maps/MtPyre_Summit.inc | 4 +-- data/scripts/maps/OldaleTown.inc | 6 ++-- data/scripts/maps/OldaleTown_Mart.inc | 4 +-- data/scripts/maps/Route119.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 2 +- data/scripts/maps/SootopolisCity.inc | 14 +++++----- data/scripts/maps/SootopolisCity_Mart.inc | 4 +-- .../maps/SootopolisCity_PokemonCenter_1F.inc | 4 +-- 26 files changed, 68 insertions(+), 68 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index dfc251980..2a4fdebd8 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4439,9 +4439,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 - checkflag 105 + checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 - setflag 105 + setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc index 2eb2ae7e9..028a0ee7b 100644 --- a/data/scripts/maps/AquaHideout_1F.inc +++ b/data/scripts/maps/AquaHideout_1F.inc @@ -10,7 +10,7 @@ AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE lock faceplayer - checkflag 111 + checkflag FLAG_MT_PYRE_ORB_STOLEN goto_if_eq AquaHideout_1F_EventScript_15D7E3 msgbox AquaHideout_1F_Text_196AFD, 4 release @@ -25,7 +25,7 @@ AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED lock faceplayer - checkflag 111 + checkflag FLAG_MT_PYRE_ORB_STOLEN goto_if_eq AquaHideout_1F_EventScript_15D802 msgbox AquaHideout_1F_Text_196C83, 4 release diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 230d0e2db..c0437d804 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -64,7 +64,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 - setflag 112 + setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE setflag 852 release end diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc index 3ad36cc18..6411aad49 100644 --- a/data/scripts/maps/CaveOfOrigin_1F.inc +++ b/data/scripts/maps/CaveOfOrigin_1F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C .byte 0 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc index c3bbdd45f..b8d4149b6 100644 --- a/data/scripts/maps/CaveOfOrigin_B1F.inc +++ b/data/scripts/maps/CaveOfOrigin_B1F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C .byte 0 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc index fb65de171..9b014d0e9 100644 --- a/data/scripts/maps/CaveOfOrigin_B2F.inc +++ b/data/scripts/maps/CaveOfOrigin_B2F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C .byte 0 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc index c21b04e91..d6f7bdaf1 100644 --- a/data/scripts/maps/CaveOfOrigin_B3F.inc +++ b/data/scripts/maps/CaveOfOrigin_B3F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C .byte 0 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index c6c3cd45e..c9f7b5964 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -19,7 +19,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 setmaplayoutindex 313 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3 end @@ -73,7 +73,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setflag 856 clearflag 815 setvar 0x409b, 1 - setflag 113 + setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag 854 clearflag 2090 setvar 0x40b9, 2 diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index f210dd3ac..4d935e841 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -4,9 +4,9 @@ FortreeCity_House2_MapScripts:: @ 81580B3 FortreeCity_House2_EventScript_1580B4:: @ 81580B4 lock faceplayer - checkflag 264 + checkflag FLAG_RECEIVED_TM10 goto_if_eq FortreeCity_House2_EventScript_158157 - checkflag 118 + checkflag FLAG_MET_HIDDEN_POWER_GIVER call_if 0, FortreeCity_House2_EventScript_15814B msgbox FortreeCity_House2_Text_186360, 4 multichoice 21, 8, 54, 1 @@ -24,14 +24,14 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 giveitem ITEM_TM10 compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B - setflag 264 + setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_18652F, 4 release end FortreeCity_House2_EventScript_15814B:: @ 815814B msgbox FortreeCity_House2_Text_186306, 4 - setflag 118 + setflag FLAG_MET_HIDDEN_POWER_GIVER return FortreeCity_House2_EventScript_158157:: @ 8158157 diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index f389a774e..1932940c4 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -4,11 +4,11 @@ GraniteCave_1F_MapScripts:: @ 815CBA6 GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 lock faceplayer - checkflag 109 + checkflag FLAG_RECEIVED_HM05 goto_if_eq GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 giveitem ITEM_HM05 - setflag 109 + setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_194A3E, 4 release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index cf8e2e07d..9195cc9ec 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -28,7 +28,7 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F setmaptile 71, 6, 368, 0 setmaptile 72, 6, 445, 0 .endif - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE checkflag 2061 call_if 1, LilycoveCity_EventScript_14CB2B @@ -107,7 +107,7 @@ LilycoveCity_EventScript_14CBE6:: @ 814CBE6 LilycoveCity_EventScript_14CBEF:: @ 814CBEF lock faceplayer - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq LilycoveCity_EventScript_14CC04 msgbox LilycoveCity_Text_1688C1, 4 release @@ -121,7 +121,7 @@ LilycoveCity_EventScript_14CC04:: @ 814CC04 LilycoveCity_EventScript_14CC0E:: @ 814CC0E lock faceplayer - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq LilycoveCity_EventScript_14CC23 msgbox LilycoveCity_Text_1689BF, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 7ce49b0cb..fbec4f7a2 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -187,7 +187,7 @@ LittlerootTown_EventScript_14D6D6:: @ 814D6D6 LittlerootTown_EventScript_14D6DF:: @ 814D6DF lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq LittlerootTown_EventScript_14D72F checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_EventScript_14D722 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index dc7d48ea1..8e7a0854d 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -129,7 +129,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 - setflag 116 + setflag FLAG_ADVENTURE_STARTED setvar 0x4051, 1 setvar 0x408d, 4 setvar 0x4050, 3 @@ -159,7 +159,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage - setflag 2049 + setflag SYS_POKEDEX_GET return LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index e76564847..acb9f39fa 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -4,11 +4,11 @@ MauvilleCity_House1_MapScripts:: @ 81569FC MauvilleCity_House1_EventScript_1569FD:: @ 81569FD lock faceplayer - checkflag 107 + checkflag FLAG_RECEIVED_HM06 goto_if_eq MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 giveitem ITEM_HM06 - setflag 107 + setflag FLAG_RECEIVED_HM06 msgbox MauvilleCity_House1_Text_181B64, 4 release end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 44deb9d63..aad1c6e16 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -3,10 +3,10 @@ MossdeepCity_MapScripts:: @ 814CF92 .byte 0 MossdeepCity_MapScript1_14CF98:: @ 814CF98 - clearflag 100 - clearflag 101 - clearflag 102 - clearflag 103 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 checkflag 2090 call_if 1, MossdeepCity_EventScript_1A02C1 end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 19b3c5045..dbd48c7d2 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -3,25 +3,25 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 .byte 0 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 - checkflag 100 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 goto_if_eq MossdeepCity_Gym_EventScript_15A510 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 - checkflag 101 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 goto_if_eq MossdeepCity_Gym_EventScript_15A528 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 - checkflag 102 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 goto_if_eq MossdeepCity_Gym_EventScript_15A540 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 - checkflag 103 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 goto_if_eq MossdeepCity_Gym_EventScript_15A558 end @@ -82,9 +82,9 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA lockall - checkflag 100 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 goto_if_eq MossdeepCity_Gym_EventScript_15A621 - setflag 100 + setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 5, 5, 516, 0 @@ -99,7 +99,7 @@ MossdeepCity_Gym_EventScript_15A619:: @ 815A619 end MossdeepCity_Gym_EventScript_15A621:: @ 815A621 - clearflag 100 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 5, 5, 524, 0 @@ -109,9 +109,9 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 MossdeepCity_Gym_EventScript_15A646:: @ 815A646 lockall - checkflag 101 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 goto_if_eq MossdeepCity_Gym_EventScript_15A675 - setflag 101 + setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 8, 14, 516, 0 @@ -120,7 +120,7 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 end MossdeepCity_Gym_EventScript_15A675:: @ 815A675 - clearflag 101 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 8, 14, 517, 0 @@ -130,9 +130,9 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A lockall - checkflag 102 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 - setflag 102 + setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 15, 17, 524, 0 @@ -141,7 +141,7 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A end MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 - clearflag 102 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 15, 17, 516, 0 @@ -151,9 +151,9 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE lockall - checkflag 103 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 goto_if_eq MossdeepCity_Gym_EventScript_15A71D - setflag 103 + setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 1, 23, 525, 0 @@ -162,7 +162,7 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE end MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D - clearflag 103 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 1, 23, 516, 0 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a8eec9a32..d54976844 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -408,14 +408,14 @@ MtChimney_EventScript_15D17D:: @ 815D17D lockall checkflag 139 goto_if 0, MtChimney_EventScript_15D1D0 - checkflag 115 + checkflag FLAG_RECEIVED_METEORITE goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem ITEM_METEORITE - setflag 115 + setflag FLAG_RECEIVED_METEORITE releaseall end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 533fb6e90..1b128aef6 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -69,7 +69,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 end MtPyre_Summit_EventScript_15D57A:: @ 815D57A - setflag 111 + setflag FLAG_MT_PYRE_ORB_STOLEN setvar 0x4058, 1 clearflag 840 clearflag 835 @@ -171,7 +171,7 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 faceplayer checkflag 259 goto_if_eq MtPyre_Summit_EventScript_15D6C4 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq MtPyre_Summit_EventScript_15D64A checkflag 129 goto_if_eq MtPyre_Summit_EventScript_15D6BA diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 1ac72a727..ae4a2fb6e 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -5,11 +5,11 @@ OldaleTown_MapScripts:: @ 814DD62 OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E setflag 2064 - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED call_if 0, OldaleTown_EventScript_14DD92 checkflag 132 call_if 0, OldaleTown_EventScript_14DD9E - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED call_if 1, OldaleTown_EventScript_14DD8C end @@ -195,7 +195,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB OldaleTown_EventScript_14DEDF:: @ 814DEDF lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closemessage diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index b9698b58f..f90c787c2 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -6,7 +6,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 faceplayer message OldaleTown_Mart_Text_1A0BE4 waitmessage - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 msgbox OldaleTown_Mart_Text_1A0C02, 4 @@ -43,7 +43,7 @@ OldaleTown_Mart_Items2:: @ 8152FB8 OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_Mart_EventScript_152FDB msgbox OldaleTown_Mart_Text_174A8A, 4 release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 2179a7e18..08853ed32 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -149,7 +149,7 @@ Route119_EventScript_151337:: @ 8151337 Route119_EventScript_151352:: @ 8151352 giveitem ITEM_HM02 - setflag 110 + setflag FLAG_RECEIVED_HM02 return Route119_EventScript_151362:: @ 8151362 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 98061b926..ff21ff1ff 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -65,7 +65,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem ITEM_HM04 - setflag 106 + setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage compare 0x4001, 1 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 34d927753..7270aa5d4 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -272,7 +272,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_15626F checkflag 271 goto_if_eq SlateportCity_Harbor_EventScript_156265 - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq SlateportCity_Harbor_EventScript_156258 compare 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 994e33197..b907e7da3 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -17,7 +17,7 @@ SootopolisCity_EventScript_14D0A0:: @ 814D0A0 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 0, SootopolisCity_EventScript_14D0BB return @@ -35,7 +35,7 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag 2077 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, SootopolisCity_EventScript_14D159 checkflag 2090 call_if 1, SootopolisCity_EventScript_14D123 @@ -68,7 +68,7 @@ SootopolisCity_MapScript1_14D165:: @ 814D165 SootopolisCity_EventScript_14D16E:: @ 814D16E lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D183 msgbox SootopolisCity_Text_1696A4, 4 release @@ -156,7 +156,7 @@ SootopolisCity_EventScript_14D27D:: @ 814D27D SootopolisCity_EventScript_14D287:: @ 814D287 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D29C msgbox SootopolisCity_Text_169813, 4 release @@ -170,7 +170,7 @@ SootopolisCity_EventScript_14D29C:: @ 814D29C SootopolisCity_EventScript_14D2A6:: @ 814D2A6 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D2BB msgbox SootopolisCity_Text_1698A0, 4 release @@ -184,7 +184,7 @@ SootopolisCity_EventScript_14D2BB:: @ 814D2BB SootopolisCity_EventScript_14D2C5:: @ 814D2C5 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D2DA msgbox SootopolisCity_Text_1697A7, 4 release @@ -445,7 +445,7 @@ SootopolisCity_EventScript_14D48F:: @ 814D48F SootopolisCity_EventScript_14D498:: @ 814D498 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D4AD .ifdef SAPPHIRE msgbox SootopolisCity_Text_169DA6, 4 diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index b88347002..52ccf6b2b 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -29,7 +29,7 @@ SootopolisCity_Mart_Items:: @ 815B234 SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B268 checkflag 129 goto_if 0, SootopolisCity_Mart_EventScript_15B268 @@ -45,7 +45,7 @@ SootopolisCity_Mart_EventScript_15B268:: @ 815B268 SootopolisCity_Mart_EventScript_15B272:: @ 815B272 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B290 checkflag 129 goto_if 0, SootopolisCity_Mart_EventScript_15B290 diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index cb09d8856..e36d0ed7b 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -17,7 +17,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 checkflag 129 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 @@ -33,7 +33,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6 SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE checkflag 129 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE -- cgit v1.2.3 From 79e3d29c29335d7e1fb8478b16d100b1844f2da4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 14:38:49 -0800 Subject: Use constants for all SYS flags --- data/event_scripts.s | 22 +++++++++++----------- data/field_move_scripts.inc | 10 +++++----- data/scripts/cable_club.inc | 6 +++--- data/scripts/contest_hall.inc | 2 +- data/scripts/maps/AncientTomb.inc | 10 +++++----- data/scripts/maps/AquaHideout_B1F.inc | 2 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 8 ++++---- data/scripts/maps/DesertRuins.inc | 10 +++++----- data/scripts/maps/DewfordTown.inc | 2 +- data/scripts/maps/DewfordTown_Gym.inc | 6 +++--- data/scripts/maps/EverGrandeCity.inc | 4 ++-- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 ++-- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FortreeCity.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 6 +++--- data/scripts/maps/IslandCave.inc | 14 +++++++------- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 6 +++--- data/scripts/maps/LilycoveCity.inc | 22 +++++++++++----------- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 4 ++-- data/scripts/maps/LilycoveCity_Harbor.inc | 8 ++++---- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 4 ++-- data/scripts/maps/MagmaHideout_B1F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 4 ++-- data/scripts/maps/MauvilleCity_Gym.inc | 6 +++--- data/scripts/maps/MossdeepCity.inc | 4 ++-- data/scripts/maps/MossdeepCity_Gym.inc | 6 +++--- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 14 +++++++------- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PacifidlogTown.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 10 +++++----- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route104.inc | 2 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 2 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 4 ++-- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 4 ++-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 14 +++++++------- data/scripts/maps/Route114_LanettesHouse.inc | 2 +- data/scripts/maps/Route119.inc | 2 +- data/scripts/maps/Route120.inc | 6 +++--- data/scripts/maps/Route124.inc | 2 +- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route126.inc | 2 +- data/scripts/maps/Route127.inc | 2 +- data/scripts/maps/Route128.inc | 2 +- data/scripts/maps/Route131.inc | 2 +- data/scripts/maps/RustboroCity.inc | 4 ++-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 6 +++--- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 4 ++-- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 6 +++--- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 6 +++--- data/scripts/maps/SkyPillar_Top.inc | 6 +++--- data/scripts/maps/SlateportCity.inc | 8 ++++---- data/scripts/maps/SlateportCity_Harbor.inc | 8 ++++---- .../maps/SlateportCity_SternsShipyard_1F.inc | 4 ++-- data/scripts/maps/SootopolisCity.inc | 4 ++-- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 ++++---- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 8 ++++---- data/scripts/maps/VerdanturfTown.inc | 2 +- data/scripts/mauville_man.inc | 2 +- data/scripts/mystery_event_club.inc | 8 ++++---- data/scripts/players_house.inc | 4 ++-- data/scripts/tv.inc | 8 ++++---- 73 files changed, 186 insertions(+), 186 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 2a4fdebd8..97a7d3533 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1743,7 +1743,7 @@ EventScript_1A00BE: end EventScript_1A00CB: - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, EventScript_1A00BE playse 2 special AccessHallOfFamePC @@ -3943,7 +3943,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3086 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 @@ -3978,7 +3978,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 end SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3102 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 @@ -4013,7 +4013,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 end SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A317E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D @@ -4048,7 +4048,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D end SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A31FA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 @@ -4083,7 +4083,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 end SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3276 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 @@ -4118,7 +4118,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 end SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 @@ -4153,7 +4153,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 end SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A336E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D @@ -4188,7 +4188,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D end SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A33EA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 @@ -4223,7 +4223,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 end SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3466 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 @@ -4258,7 +4258,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 end SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index c36f95460..8fcf91616 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,6 +1,6 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag 2055 + checkflag BADGE01_GET goto_if 0, CannotUseCut checkpokemove MOVE_CUT compare RESULT, 6 @@ -58,7 +58,7 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag 2057 + checkflag BADGE03_GET goto_if 0, CannotUseRockSmash checkpokemove MOVE_ROCK_SMASH compare RESULT, 6 @@ -125,9 +125,9 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag 2058 + checkflag BADGE04_GET goto_if 0, CannotUseStrength - checkflag 2089 + checkflag SYS_USE_STRENGTH goto_if_eq AlreadyUsedStrength checkpokemove 70 compare RESULT, 6 @@ -150,7 +150,7 @@ S_UseStrength:: @ 81B100E end UsedStrength: @ 81B1019 - setflag 2089 + setflag SYS_USE_STRENGTH msgbox UsedStrengthText, 3 releaseall end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 279fa0451..e3efba4e7 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -174,7 +174,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 - checkflag 2049 + checkflag SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 copyvar 0x8007, LAST_TALKED lock @@ -346,7 +346,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC - checkflag 2049 + checkflag SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 copyvar 0x8007, LAST_TALKED lock @@ -443,7 +443,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SlateportCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB - checkflag 2072 + checkflag FLAG_VISITED_MAUVILLE_CITY goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B copyvar 0x8007, LAST_TALKED lock diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index ab57e9bf4..68fd92ac0 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B special sub_80C44C0 incrementgamestat GAME_STAT_RECEIVED_RIBBONS - setflag 2107 + setflag SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_1A6D6A, 4 playfanfare 370 diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 188691e73..36df2cb3f 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -5,7 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE .byte 0 AncientTomb_MapScript1_15EFCE:: @ 815EFCE - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, AncientTomb_EventScript_15EFD8 end @@ -18,7 +18,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 - checkflag 2130 + checkflag SYS_BRAILLE_FLY call_if 0, AncientTomb_EventScript_15EFEA end @@ -33,7 +33,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall - checkflag 2130 + checkflag SYS_BRAILLE_FLY goto_if_eq AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E waitbutton @@ -63,9 +63,9 @@ AncientTomb_EventScript_15F050:: @ 815F050 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag 937 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 0001d7574..9498864c3 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -4,7 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 .byte 0 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, AquaHideout_B1F_EventScript_15D846 end diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index a37310d16..1f3c0f105 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -3,7 +3,7 @@ BattleTower_Outside_MapScripts:: @ 8160156 .byte 0 BattleTower_Outside_MapScript1_16015C:: @ 816015C - setflag 2120 + setflag FLAG_UNLOCK_BATTLE_TOWER setvar 0x40bc, 0 setflag 918 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index c9f7b5964..c0a88a880 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -4,7 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC .byte 0 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 end @@ -61,10 +61,10 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 waitpokecry - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartGroudonKyogreBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE specialvar RESULT, sub_810E300 compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 @@ -75,7 +75,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setvar 0x409b, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag 854 - clearflag 2090 + clearflag SYS_WEATHER_CTRL setvar 0x40b9, 2 clearflag 916 releaseall diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 9f6f7b388..3ca08a6de 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -5,7 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, DesertRuins_EventScript_15CB0D end @@ -14,7 +14,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D return DesertRuins_MapScript1_15CB11:: @ 815CB11 - checkflag 2128 + checkflag SYS_BRAILLE_STRENGTH call_if 0, DesertRuins_EventScript_15CB1B end @@ -33,7 +33,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall - checkflag 2128 + checkflag SYS_BRAILLE_STRENGTH goto_if_eq DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 waitbutton @@ -63,9 +63,9 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag 935 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 7f8fe6fef..bea4fc475 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -3,7 +3,7 @@ DewfordTown_MapScripts:: @ 814DFF8 .byte 0 DewfordTown_MapScript1_14DFFE:: @ 814DFFE - setflag 2065 + setflag FLAG_VISITED_DEWFORD_TOWN end DewfordTown_EventScript_14E002:: @ 814E002 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 92776afb1..17b000711 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -113,7 +113,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 call DewfordTown_Gym_EventScript_1A02C5 msgbox DewfordTown_Gym_Text_1752E6, 4 setflag 1204 - setflag 2056 + setflag BADGE02_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB @@ -177,14 +177,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall - checkflag 2056 + checkflag BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall - checkflag 2056 + checkflag BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index c9768d006..c4f9ad315 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, EverGrandeCity_EventScript_1A02C1 end @@ -20,6 +20,6 @@ EverGrandeCity_EventScript_14D4F7:: @ 814D4F7 end EverGrandeCity_EventScript_14D500:: @ 814D500 - setflag 2078 + setflag FLAG_VISITED_EVER_GRANDE_CITY setvar 0x4001, 1 end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index acbdac899..7e26476fa 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B sethealplace 20 - setflag 2132 + setflag SYS_POKEMON_LEAGUE_FLY checkflag 263 call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B end @@ -57,7 +57,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage delay 75 - checkflag 2060 + checkflag BADGE06_GET goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 13c8a9f2e..286f01a93 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -3,7 +3,7 @@ FallarborTown_MapScripts:: @ 814E7E0 .byte 0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 - setflag 2067 + setflag FLAG_VISITED_FALLARBOR_TOWN setvar 0x4086, 0 setflag 800 clearflag 270 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 6ea89dcb7..ae0f53f5e 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -4,7 +4,7 @@ FortreeCity_MapScripts:: @ 814C943 .byte 0 FortreeCity_MapScript1_14C94E:: @ 814C94E - setflag 2074 + setflag FLAG_VISITED_FORTREE_CITY end FortreeCity_MapScript1_14C952:: @ 814C952 diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 7309be0bb..1e2d3c4f3 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -29,7 +29,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 call FortreeCity_Gym_EventScript_1A02C5 msgbox FortreeCity_Gym_Text_185E73, 4 setflag 1225 - setflag 2060 + setflag BADGE06_GET setvar 0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E @@ -80,14 +80,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall - checkflag 2060 + checkflag BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall - checkflag 2060 + checkflag BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 75399bde8..4b72b166c 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -5,7 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, IslandCave_EventScript_15EED0 end @@ -14,7 +14,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0 return IslandCave_MapScript1_15EED4:: @ 815EED4 - checkflag 2129 + checkflag SYS_BRAILLE_WAIT call_if 0, IslandCave_EventScript_15EEDE end @@ -40,12 +40,12 @@ S_OpenRegiceChamber:: @ 815EF19 setmaptile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN - setflag 2129 + setflag SYS_BRAILLE_WAIT end IslandCave_EventScript_15EF59:: @ 815EF59 lockall - checkflag 2129 + checkflag SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF72 braillemessage IslandCave_Braille_1C54FC special DoBrailleWait @@ -61,7 +61,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemessage IslandCave_Braille_1C54FC - checkflag 2129 + checkflag SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait waitstate @@ -83,9 +83,9 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag 936 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 5192176a7..6af7731e1 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -4,7 +4,7 @@ LavaridgeTown_MapScripts:: @ 814E4A3 .byte 0 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE - setflag 2066 + setflag FLAG_VISITED_LAVARIDGE_TOWN checkflag 139 call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 2edffe9f0..06cf57265 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -82,7 +82,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call LavaridgeTown_Gym_1F_EventScript_1A02C5 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 setflag 1213 - setflag 2058 + setflag BADGE04_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB @@ -148,14 +148,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall - checkflag 2058 + checkflag BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall - checkflag 2058 + checkflag BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 9195cc9ec..ed07b2171 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -4,10 +4,10 @@ LilycoveCity_MapScripts:: @ 814CA15 .byte 0 LilycoveCity_MapScript1_14CA20:: @ 814CA20 - setflag 2075 + setflag FLAG_VISITED_LILYCOVE_CITY setvar 0x4086, 0 setflag 802 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E @@ -30,7 +30,7 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F .endif checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE - checkflag 2061 + checkflag BADGE07_GET call_if 1, LilycoveCity_EventScript_14CB2B end @@ -89,7 +89,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer - checkflag 2061 + checkflag BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release @@ -147,7 +147,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer - checkflag 2061 + checkflag BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release @@ -186,7 +186,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall @@ -349,7 +349,7 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96 LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 - checkflag 2060 + checkflag BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE @@ -361,7 +361,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 end LilycoveCity_EventScript_14CEDE:: @ 814CEDE - checkflag 2062 + checkflag BADGE08_GET goto_if_eq LilycoveCity_EventScript_14CEE8 return @@ -374,7 +374,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE return LilycoveCity_EventScript_14CEF7:: @ 814CEF7 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -386,7 +386,7 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09 LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 - checkflag 2060 + checkflag BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 @@ -401,7 +401,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 return LilycoveCity_EventScript_14CF50:: @ 814CF50 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 470af3871..f2769ce3e 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -589,7 +589,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 setvar 0x4099, 1 - setflag 2107 + setflag SYS_RIBBON_GET end LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 7b602b2c7..62d35662d 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -3,9 +3,9 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 - checkflag 2061 + checkflag BADGE07_GET goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 4dcc1ba71..ae62caea7 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -16,7 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release @@ -106,11 +106,11 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 end LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, LilycoveCity_Harbor_EventScript_1598BA checkflag 206 goto_if_eq LilycoveCity_Harbor_EventScript_1598BA - checkflag 2131 + checkflag SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage @@ -159,7 +159,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 20b5c5f13..4b9de4d15 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -21,7 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer - checkflag 2061 + checkflag BADGE07_GET goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index fbec4f7a2..7d604d7f5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -4,7 +4,7 @@ LittlerootTown_MapScripts:: @ 814D509 .byte 0 LittlerootTown_MapScript1_14D514:: @ 814D514 - setflag 2063 + setflag FLAG_VISITED_LITTLEROOT_TOWN compare 0x4092, 2 call_if 1, LittlerootTown_EventScript_14D57B checkflag FLAG_RESCUED_BIRCH @@ -861,7 +861,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 LittlerootTown_EventScript_14DD2B:: @ 814DD2B removeobject 4 - setflag 2144 + setflag SYS_B_DASH setvar 0x4050, 4 release end diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 780eea4f5..3042d75dc 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -3,7 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 .byte 0 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, MagmaHideout_B1F_EventScript_15F2B8 end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 8123c5f41..f778b1eff 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -3,9 +3,9 @@ MauvilleCity_MapScripts:: @ 814C032 .byte 0 MauvilleCity_MapScript1_14C038:: @ 814C038 - setflag 2072 + setflag FLAG_VISITED_MAUVILLE_CITY clearflag 961 - setflag 2098 + setflag SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 checkflag 209 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 1088c0802..43c60dc31 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -83,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call MauvilleCity_Gym_EventScript_1A02C5 msgbox MauvilleCity_Gym_Text_180DDA, 4 setflag 1208 - setflag 2057 + setflag BADGE03_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB @@ -204,14 +204,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall - checkflag 2057 + checkflag BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall - checkflag 2057 + checkflag BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index aad1c6e16..998b850aa 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, MossdeepCity_EventScript_1A02C1 end @@ -52,7 +52,7 @@ MossdeepCity_EventScript_14CFFF:: @ 814CFFF end MossdeepCity_EventScript_14D008:: @ 814D008 - setflag 2076 + setflag FLAG_VISITED_MOSSDEEP_CITY setvar 0x4001, 1 end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index dbd48c7d2..ea79a03c3 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -62,7 +62,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 call MossdeepCity_Gym_EventScript_1A02C5 msgbox MossdeepCity_Gym_Text_18D128, 4 setflag 1229 - setflag 2061 + setflag BADGE07_GET clearflag 869 clearflag 915 setvar 0x8008, 7 @@ -228,14 +228,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall - checkflag 2061 + checkflag BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall - checkflag 2061 + checkflag BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index fd173899d..77953a959 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -4,7 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 8bf899780..e0d6aa69f 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -5,7 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 .byte 0 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 - checkflag 2052 + checkflag SYS_GAME_CLEAR call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 2d2a46ab4..62b8f4d59 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -9,7 +9,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F call_if 1, NewMauville_Inside_EventScript_15E5DA compare 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_15E58F end @@ -170,9 +170,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 delay 40 waitpokecry setflag 974 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end @@ -185,9 +185,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E delay 40 waitpokecry setflag 975 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end @@ -200,8 +200,8 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C delay 40 waitpokecry setflag 976 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index ae4a2fb6e..b9b712937 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -4,7 +4,7 @@ OldaleTown_MapScripts:: @ 814DD62 OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E - setflag 2064 + setflag FLAG_VISITED_OLDALE_TOWN checkflag FLAG_ADVENTURE_STARTED call_if 0, OldaleTown_EventScript_14DD92 checkflag 132 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index 494f109fe..d46831902 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -26,7 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer - checkflag 2049 + checkflag SYS_POKEDEX_GET goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/scripts/maps/PacifidlogTown.inc index c7cfb08df..085d083d8 100644 --- a/data/scripts/maps/PacifidlogTown.inc +++ b/data/scripts/maps/PacifidlogTown.inc @@ -4,7 +4,7 @@ PacifidlogTown_MapScripts:: @ 814E8EE .byte 0 PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9 - setflag 2069 + setflag FLAG_VISITED_PACIFIDLOG_TOWN end PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index b4548ddce..45cdce991 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -4,7 +4,7 @@ PetalburgCity_MapScripts:: @ 814B70C .byte 0 PetalburgCity_MapScript1_14B717:: @ 814B717 - setflag 2070 + setflag FLAG_VISITED_PETALBURG_CITY compare 0x4057, 0 call_if 1, PetalburgCity_EventScript_14B731 compare 0x4057, 2 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 6c92316d6..f5a6fcc3f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -48,7 +48,7 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B call_if 1, PetalburgCity_Gym_EventScript_15453B compare 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 - checkflag 2052 + checkflag SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_15454B end @@ -356,7 +356,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag 169 goto_if 0, PetalburgCity_Gym_EventScript_154A2C - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release @@ -399,7 +399,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A805, 4 setflag 1217 setvar 0x4085, 7 - setflag 2059 + setflag BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 setflag 913 clearflag 912 @@ -1034,14 +1034,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall - checkflag 2059 + checkflag BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall - checkflag 2059 + checkflag BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 86c22fa40..122e723a1 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -217,7 +217,7 @@ Route101_EventScript_14EA76:: @ 814EA76 Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer - setflag 2048 + setflag SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 651f2afb4..6e151447e 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -19,7 +19,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 Route104_EventScript_14EEAE:: @ 814EEAE checkflag 127 goto_if 0, Route104_EventScript_14EEC4 - checkflag 2057 + checkflag BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 clearflag 906 return diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 904d39f05..8ef2ee8bc 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -6,7 +6,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag 2108 checkflag 127 goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - checkflag 2057 + checkflag BADGE03_GET goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 setflag FLAG_TEMP_1 end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index c60bc366e..8fd9d3ea5 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -28,7 +28,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 - setflag 2091 + setflag SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -55,7 +55,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left lockall setvar 0x40a9, 0 - clearflag 2091 + clearflag SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index cf18a8e36..1ca98817c 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -13,7 +13,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B specialvar RESULT, GetPlayerAvatarBike compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 - setflag 2091 + setflag SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -32,7 +32,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall - clearflag 2091 + clearflag SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 7d2c77645..bd4867c60 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -63,37 +63,37 @@ Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C - checkflag 2057 + checkflag BADGE03_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 - checkflag 2058 + checkflag BADGE04_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 - checkflag 2059 + checkflag BADGE05_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A - checkflag 2060 + checkflag BADGE06_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 - checkflag 2061 + checkflag BADGE07_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E - checkflag 2062 + checkflag BADGE08_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 - checkflag 2052 + checkflag SYS_GAME_CLEAR call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index e4334647c..9be44af5a 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -11,7 +11,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 faceplayer checkflag 131 goto_if_eq Route114_LanettesHouse_EventScript_15C28F - setflag 2123 + setflag SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE givedecoration 99 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 08853ed32..ec47cbd79 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -4,7 +4,7 @@ Route119_MapScripts:: @ 8151167 .byte 0 Route119_MapScript1_151172:: @ 8151172 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, Route119_EventScript_15117C end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 868d00324..b2765e977 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -5,7 +5,7 @@ Route120_MapScripts:: @ 815160E .byte 0 Route120_MapScript1_15161E:: @ 815161E - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, Route120_EventScript_151628 end @@ -227,9 +227,9 @@ Route120_EventScript_15189D:: @ 815189D waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE goto Route120_EventScript_151908 end diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index ffe4cef97..71f58bb57 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 8151DDF .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route124_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 489a7314b..7c4754f4f 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route125_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index 729922681..d480512f8 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 8151FFE .byte 0 Route126_MapScript1_152004:: @ 8152004 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route126_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index 284d1fbd4..e7c6f602f 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -3,7 +3,7 @@ Route127_MapScripts:: @ 815206A .byte 0 Route127_MapScript1_152070:: @ 8152070 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route127_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 615662fc1..5b8ec42e0 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 815211B .byte 0 Route128_MapScript1_152126:: @ 8152126 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 50ad4222b..09f555997 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,7 +3,7 @@ Route131_MapScripts:: @ 815243E .byte 0 Route131_MapScript1_152444:: @ 8152444 - checkflag 2052 + checkflag SYS_GAME_CLEAR call_if 1, Route131_EventScript_15244E end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 3be6be562..6e649de68 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -3,7 +3,7 @@ RustboroCity_MapScripts:: @ 814C372 .byte 0 RustboroCity_MapScript1_14C378:: @ 814C378 - setflag 2073 + setflag FLAG_VISITED_RUSTBORO_CITY call RustboroCity_EventScript_1A0196 call RustboroCity_EventScript_1A014E end @@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag 2055 + checkflag BADGE01_GET goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 6f0152e60..563e8b7a6 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -54,7 +54,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage - setflag 2050 + setflag SYS_POKENAV_GET setflag 188 msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 setflag 894 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index b1bbfb8d8..3a92491f7 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -15,7 +15,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE call RustboroCity_Gym_EventScript_1A02C5 msgbox RustboroCity_Gym_Text_1840D5, 4 setflag 1201 - setflag 2055 + setflag BADGE01_GET setvar 0x405a, 1 addvar 0x4085, 1 setvar 0x8008, 1 @@ -60,14 +60,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall - checkflag 2055 + checkflag BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall - checkflag 2055 + checkflag BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 26cb2321a..1c580202d 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -199,7 +199,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar 0x405e, 1 clearflag 944 clearflag 945 - setflag 2090 + setflag SYS_WEATHER_CTRL setflag 854 setflag 129 setflag 967 diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 5ff94be19..27d44cad1 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -14,7 +14,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB - checkflag 2127 + checkflag SYS_BRAILLE_DIG call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 end @@ -109,7 +109,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall - checkflag 2127 + checkflag SYS_BRAILLE_DIG goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index ab1e1ad7b..1d852f41a 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag - checkflag 2106 + checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 @@ -20,7 +20,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer dodailyevents - checkflag 2143 + checkflag SYS_SHOAL_ITEM call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 @@ -98,5 +98,5 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176 clearflag 957 clearflag 958 clearflag 959 - clearflag 2143 + clearflag SYS_SHOAL_ITEM return diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index ada997023..d10f958fd 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D - checkflag 2106 + checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF @@ -23,7 +23,7 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 checkflag 952 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - checkflag 2106 + checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmaptile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA @@ -32,7 +32,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA checkflag 953 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - checkflag 2106 + checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmaptile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 1dee6e9c4..f22055bc4 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -3,7 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 .byte 0 SkyPillar_Top_MapScript1_15F308:: @ 815F308 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, SkyPillar_Top_EventScript_15F312 end @@ -20,9 +20,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 delay 40 waitpokecry setflag 773 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 129b6c447..63f7eca53 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -17,7 +17,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C end SlateportCity_EventScript_14BA5C:: @ 814BA5C - setflag 2071 + setflag FLAG_VISITED_SLATEPORT_CITY setvar 0x4086, 0 setflag 803 return @@ -199,9 +199,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BC63 - checkflag 2061 + checkflag BADGE07_GET goto_if_eq SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall @@ -235,7 +235,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 7270aa5d4..ab71c9728 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -7,7 +7,7 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 - checkflag 2052 + checkflag SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_155F85 end @@ -159,7 +159,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release @@ -268,7 +268,7 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208 SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer - checkflag 2061 + checkflag BADGE07_GET goto_if_eq SlateportCity_Harbor_EventScript_15626F checkflag 271 goto_if_eq SlateportCity_Harbor_EventScript_156265 @@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 9fe7f1f1a..2e43128de 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -3,9 +3,9 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 - checkflag 2061 + checkflag BADGE07_GET goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C checkflag 149 goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index b907e7da3..de86ce969 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -34,10 +34,10 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB return SootopolisCity_MapScript1_14D10D:: @ 814D10D - setflag 2077 + setflag FLAG_VISITED_SOOTOPOLIS_CITY checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, SootopolisCity_EventScript_14D159 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, SootopolisCity_EventScript_14D123 end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 29b62402f..44a8684ab 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -89,7 +89,7 @@ SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D checkflag 172 goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 - checkflag 2060 + checkflag BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release @@ -101,7 +101,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D call SootopolisCity_Gym_1F_EventScript_1A02C5 msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag 1236 - setflag 2062 + setflag BADGE08_GET setvar 0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 @@ -137,14 +137,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall - checkflag 2062 + checkflag BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall - checkflag 2062 + checkflag BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 4ee0d0ec3..da0fcf2cd 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 8160AD6 .byte 0 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC - setflag 2121 + setflag FLAG_UNLOCK_SOUTHERN_ISLAND end SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index bcb316f96..8d6ed8ddc 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -4,7 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 .byte 0 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, SouthernIsland_Interior_EventScript_160B68 end @@ -46,7 +46,7 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 checkflag 206 goto_if_eq SouthernIsland_Interior_EventScript_160C08 - checkflag 2131 + checkflag SYS_HAS_EON_TICKET goto_if 0, SouthernIsland_Interior_EventScript_160C08 setflag 206 special SpawnCameraDummy @@ -66,10 +66,10 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag 911 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartSouthernIslandBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE releaseall end diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index 3e8f02302..d2f0251f7 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -3,7 +3,7 @@ VerdanturfTown_MapScripts:: @ 814E854 .byte 0 VerdanturfTown_MapScript1_14E85A:: @ 814E85A - setflag 2068 + setflag FLAG_VISITED_VERDANTURF_TOWN setvar 0x4086, 0 setflag 801 end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 465c61d1a..b174e67f3 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -84,7 +84,7 @@ dont_write_lyrics: SpeakToHipster: lock faceplayer - setflag 2054 + setflag SYS_HIPSTER_MEET msgbox gTextHipster_TheyCallMeTheHipster, 4 special ScrSpecial_GetHipsterSpokenFlag compare RESULT, FALSE diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index df097fc19..f94d3cf9d 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,7 +1,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 lock faceplayer - checkflag 2053 + checkflag SYS_CHAT_USED goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4 goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D @@ -97,11 +97,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D end PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77 - checkflag 2059 + checkflag BADGE05_GET goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - checkflag 2124 + checkflag SYS_EXDATA_ENABLE goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - setflag 2124 + setflag SYS_EXDATA_ENABLE msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3 release end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 0bf59d0b9..c8cc4cd21 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -222,7 +222,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4 fadedefaultbgm special TurnOffTVScreen - setflag 2096 + setflag SYS_TV_HOME delay 35 return @@ -256,7 +256,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 compare 0x408c, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - checkflag 2059 + checkflag BADGE05_GET goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 425f42a85..28932e02a 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -7,9 +7,9 @@ Event_TV:: @ 81A6E72 goto_if_eq EventScript_1A6F01 compare RESULT, 1 goto_if_eq EventScript_1A6F0B - checkflag 2098 + checkflag SYS_TV_START goto_if 0, EventScript_1A6EF1 - checkflag 2097 + checkflag SYS_TV_WATCH goto_if_eq EventScript_1A6EF1 specialvar RESULT, IsTVShowInSearchOfTrainersAiring compare RESULT, 1 @@ -49,7 +49,7 @@ EventScript_1A6F0B: msgbox UnknownString_8172C50, 4 .endif special InitRoamer - clearflag 2141 + clearflag SYS_TV_LATI setflag 255 special TurnOffTVScreen releaseall @@ -66,7 +66,7 @@ EventScript_1A6F21: EventScript_1A6F37: special TurnOffTVScreen - setflag 2097 + setflag SYS_TV_WATCH releaseall end -- cgit v1.2.3 From 24a90b9acb243bf5c24a797a2a300a23613813d5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 19:12:33 -0800 Subject: Label script flags up to flag 199. --- data/event_scripts.s | 40 +++++------ data/scripts/contest_hall.inc | 4 +- data/scripts/day_care.inc | 4 +- data/scripts/magma_chimney.inc | 2 +- data/scripts/maps/DewfordTown.inc | 6 +- data/scripts/maps/DewfordTown_Gym.inc | 4 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 4 +- data/scripts/maps/FortreeCity_House1.inc | 4 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 4 +- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 12 ++-- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 20 +++--- .../maps/LittlerootTown_BrendansHouse_2F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 2 +- data/scripts/maps/MauvilleCity_Gym.inc | 4 +- data/scripts/maps/MossdeepCity_Gym.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 4 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 4 +- data/scripts/maps/MtChimney.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 2 +- data/scripts/maps/OldaleTown.inc | 6 +- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- data/scripts/maps/PetalburgCity_Gym.inc | 4 +- data/scripts/maps/PetalburgCity_WallysHouse.inc | 14 ++-- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/Route104.inc | 6 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 10 +-- .../maps/Route104_PrettyPetalFlowerShop.inc | 6 +- data/scripts/maps/Route109.inc | 2 +- data/scripts/maps/Route109_SeashoreHouse.inc | 8 +-- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 80 +++++++++++----------- data/scripts/maps/Route114_LanettesHouse.inc | 8 +-- data/scripts/maps/Route116.inc | 6 +- data/scripts/maps/Route116_TunnelersRestHouse.inc | 2 +- data/scripts/maps/Route117.inc | 2 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/RustboroCity.inc | 12 ++-- data/scripts/maps/RustboroCity_CuttersHouse.inc | 4 +- data/scripts/maps/RustboroCity_DevonCorp_1F.inc | 18 ++--- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 2 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 +- data/scripts/maps/RustboroCity_Gym.inc | 4 +- data/scripts/maps/RustboroCity_House1.inc | 4 +- data/scripts/maps/RusturfTunnel.inc | 4 +- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/SlateportCity.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 2 +- .../maps/SlateportCity_SternsShipyard_1F.inc | 6 +- data/scripts/maps/SootopolisCity.inc | 4 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 4 +- data/scripts/maps/SootopolisCity_House1.inc | 4 +- data/scripts/maps/SootopolisCity_Mart.inc | 4 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 4 +- data/scripts/maps/VerdanturfTown.inc | 4 +- data/scripts/maps/VerdanturfTown_WandasHouse.inc | 12 ++-- data/scripts/maps/VictoryRoad_1F.inc | 4 +- data/scripts/players_house.inc | 4 +- 65 files changed, 212 insertions(+), 212 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 97a7d3533..d355bff97 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1307,7 +1307,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70 checkflag 298 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A - checkflag 123 + checkflag FLAG_RECEIVED_HM08 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E return @@ -1402,7 +1402,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC checkflag 1217 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC @@ -2269,7 +2269,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 clearflag 808 clearflag 984 setvar 0x409a, 6 - setflag 199 + setflag FLAG_RUSTURF_TUNNEL_OPENED return EventScript_1A0457: @ unreferenced? @@ -3723,7 +3723,7 @@ EventScript_1A2DB8: closemessage playse 9 setvar 0x4097, 0 - setflag 173 + setflag FLAG_SECRET_BASE_UNKNOWN_1 special sub_80BB8CC special sub_80BBAF0 setvar 0x8004, 0 @@ -3764,14 +3764,14 @@ gUnknown_081A2E14:: @ 81A2E14 special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 - clearflag 173 + clearflag FLAG_SECRET_BASE_UNKNOWN_1 special sub_80BBAF0 setvar 0x4089, 0 waitstate end EventScript_1A2E38: - setflag 173 + setflag FLAG_SECRET_BASE_UNKNOWN_1 special sub_80BBAF0 setvar 0x4089, 0 waitstate @@ -3841,20 +3841,20 @@ EventScript_1A2F3A:: LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D - setflag 174 - setflag 175 - setflag 176 - setflag 177 - setflag 178 - setflag 179 - setflag 180 - setflag 181 - setflag 182 - setflag 183 - setflag 184 - setflag 185 - setflag 186 - setflag 187 + setflag FLAG_SECRET_BASE_UNKNOWN_2 + setflag FLAG_SECRET_BASE_UNKNOWN_3 + setflag FLAG_SECRET_BASE_UNKNOWN_4 + setflag FLAG_SECRET_BASE_UNKNOWN_5 + setflag FLAG_SECRET_BASE_UNKNOWN_6 + setflag FLAG_SECRET_BASE_UNKNOWN_7 + setflag FLAG_SECRET_BASE_UNKNOWN_8 + setflag FLAG_SECRET_BASE_UNKNOWN_9 + setflag FLAG_SECRET_BASE_UNKNOWN_10 + setflag FLAG_SECRET_BASE_UNKNOWN_11 + setflag FLAG_SECRET_BASE_UNKNOWN_12 + setflag FLAG_SECRET_BASE_UNKNOWN_13 + setflag FLAG_SECRET_BASE_UNKNOWN_14 + setflag FLAG_SECRET_BASE_UNKNOWN_15 return LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 68fd92ac0..6c2678072 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -40,11 +40,11 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 end FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 - checkflag 150 + checkflag FLAG_RECEIVED_CONTEST_PASS goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44 msgbox FallarborTown_ContestLobby_Text_1A6583, 4 giveitem ITEM_CONTEST_PASS - setflag 150 + setflag FLAG_RECEIVED_CONTEST_PASS setflag FLAG_TEMP_1 msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 goto FallarborTown_ContestLobby_EventScript_1A4F8F diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 22d99f2a4..a09e47810 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -21,7 +21,7 @@ Route117_EventScript_1B2262:: @ 81B2262 compare RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 - clearflag 134 + clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare release end @@ -42,7 +42,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 waitbutton msgbox Route117_Text_1B27CD, 4 special GiveEggFromDaycare - clearflag 134 + clearflag FLAG_PENDING_DAYCARE_EGG release end diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index f13b319f4..586bbf3c5 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -85,7 +85,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB call_if 1, MtChimney_EventScript_1B2D9E removeobject 1 setflag 927 - setflag 139 + setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY clearflag 928 setflag 942 releaseall diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index bea4fc475..e08a108c6 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -9,7 +9,7 @@ DewfordTown_MapScript1_14DFFE:: @ 814DFFE DewfordTown_EventScript_14E002:: @ 814E002 lock faceplayer - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 waitmessage @@ -176,9 +176,9 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 clearflag 744 setflag 743 hideobject 4, 0, 11 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS call_if 0, DewfordTown_EventScript_14E281 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage copyvar 0x4096, 0x8008 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 17b000711..83dd7e78e 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -100,7 +100,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151 DewfordTown_Gym_EventScript_153152:: @ 8153152 trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 - checkflag 166 + checkflag FLAG_RECEIVED_TM08 goto_if 0, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release @@ -127,7 +127,7 @@ DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 - setflag 166 + setflag FLAG_RECEIVED_TM08 release end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 286f01a93..1a4bbc114 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -12,7 +12,7 @@ FallarborTown_MapScript1_14E7E6:: @ 814E7E6 FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 8e4b8bda3..dcfe7705a 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -60,7 +60,7 @@ FallarborTown_House1_EventScript_153C5E:: @ 8153C5E faceplayer checkflag 229 goto_if_eq FallarborTown_House1_EventScript_153C86 - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_House1_EventScript_153C7C msgbox FallarborTown_House1_Text_177A2B, 4 release diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 1e2d3c4f3..abcb20c25 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -17,7 +17,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 - checkflag 170 + checkflag FLAG_RECEIVED_TM40 goto_if 0, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release @@ -40,7 +40,7 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 - setflag 170 + setflag FLAG_RECEIVED_TM40 release end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 7b7ef0b2e..9ce96effe 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -4,7 +4,7 @@ FortreeCity_House1_MapScripts:: @ 8157E12 FortreeCity_House1_EventScript_157E13:: @ 8157E13 lock faceplayer - checkflag 155 + checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED goto_if_eq FortreeCity_House1_EventScript_157EAD setvar 0x8008, 1 copyvar 0x8004, 0x8008 @@ -30,7 +30,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 waitstate getspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 - setflag 155 + setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 070276e58..dc61a77bf 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -5,9 +5,9 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA lock faceplayer msgbox GraniteCave_StevensRoom_Text_194AE5, 4 - setvar 0x8004, 274 + setvar 0x8004, ITEM_LETTER call GraniteCave_StevensRoom_EventScript_1A067F - setflag 189 + setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem ITEM_TM47 compare RESULT, 0 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 6af7731e1..dde0b0ebd 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -5,7 +5,7 @@ LavaridgeTown_MapScripts:: @ 814E4A3 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE setflag FLAG_VISITED_LAVARIDGE_TOWN - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 06cf57265..40c1b6ea9 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -70,7 +70,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 - checkflag 168 + checkflag FLAG_RECEIVED_TM50 goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release @@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 - setflag 168 + setflag FLAG_RECEIVED_TM50 release end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index f2769ce3e..f0e515f13 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -126,23 +126,23 @@ LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA return LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27 - setflag 160 + setflag FLAG_COOL_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B - setflag 161 + setflag FLAG_BEAUTY_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F - setflag 162 + setflag FLAG_CUTE_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33 - setflag 163 + setflag FLAG_SMART_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37 - setflag 164 + setflag FLAG_TOUGH_PAINTING_MADE return LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B @@ -707,7 +707,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E end LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027 - checkflag 150 + checkflag FLAG_RECEIVED_CONTEST_PASS goto_if 0, LilycoveCity_ContestLobby_EventScript_159039 msgbox LilycoveCity_ContestLobby_Text_188DDA, 2 end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index a4599f14a..585b1e79b 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -4,31 +4,31 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 - checkflag 160 + checkflag FLAG_COOL_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 - checkflag 161 + checkflag FLAG_BEAUTY_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 - checkflag 162 + checkflag FLAG_CUTE_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 - checkflag 163 + checkflag FLAG_SMART_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 - checkflag 164 + checkflag FLAG_TOUGH_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D end @@ -146,35 +146,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D lockall - checkflag 162 + checkflag FLAG_CUTE_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 lockall - checkflag 164 + checkflag FLAG_TOUGH_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 lockall - checkflag 160 + checkflag FLAG_COOL_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 lockall - checkflag 161 + checkflag FLAG_BEAUTY_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 lockall - checkflag 163 + checkflag FLAG_SMART_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 8ff7f8b81..8f3b07312 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -4,7 +4,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare 0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 100787ccf..56727a3c1 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -135,7 +135,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB lock faceplayer - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag 301 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 68bdf0fcb..c0a403117 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -4,7 +4,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare 0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index f778b1eff..407a1141d 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -158,7 +158,7 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B removeobject 7 clearflag 806 clearflag 809 - setflag 190 + setflag FLAG_DEFEATED_WALLY_MAUVILLE releaseall end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 43c60dc31..9b47bf493 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -69,7 +69,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB - checkflag 167 + checkflag FLAG_RECEIVED_TM34 goto_if 0, MauvilleCity_Gym_EventScript_15661D compare 0x40ba, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 @@ -100,7 +100,7 @@ MauvilleCity_Gym_EventScript_15661D:: @ 815661D compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 - setflag 167 + setflag FLAG_RECEIVED_TM34 release end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index ea79a03c3..9c32e989c 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -50,7 +50,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 - checkflag 171 + checkflag FLAG_RECEIVED_TM04 goto_if 0, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release @@ -76,7 +76,7 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 - setflag 171 + setflag FLAG_RECEIVED_TM04 release end diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 8f9bf4dc5..63054a60c 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -4,14 +4,14 @@ MossdeepCity_House3_MapScripts:: @ 815A971 MossdeepCity_House3_EventScript_15A972:: @ 815A972 lock faceplayer - checkflag 152 + checkflag FLAG_RECEIVED_SUPER_ROD goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 compare RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem ITEM_SUPER_ROD - setflag 152 + setflag FLAG_RECEIVED_SUPER_ROD msgbox MossdeepCity_House3_Text_18D9E3, 4 release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 260cb4b6e..165742145 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -32,13 +32,13 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 lock faceplayer - checkflag 192 + checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem ITEM_SUN_STONE compare RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B - setflag 192 + setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 release end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index e0d6aa69f..ce24f2afd 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -40,7 +40,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 giveitem ITEM_HM08 - setflag 123 + setflag FLAG_RECEIVED_HM08 setflag 302 msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 closemessage @@ -126,5 +126,5 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 giveitem ITEM_HM08, 1, 1 - setflag 123 + setflag FLAG_RECEIVED_HM08 end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d54976844..0a3570d6d 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -406,7 +406,7 @@ MtChimney_EventScript_15D174:: @ 815D174 MtChimney_EventScript_15D17D:: @ 815D17D lockall - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if 0, MtChimney_EventScript_15D1D0 checkflag FLAG_RECEIVED_METEORITE goto_if_eq MtChimney_EventScript_15D1C6 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 1b128aef6..e0870e18a 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -173,7 +173,7 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 goto_if_eq MtPyre_Summit_EventScript_15D6C4 checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq MtPyre_Summit_EventScript_15D64A - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if_eq MtPyre_Summit_EventScript_15D6BA .ifdef SAPPHIRE msgbox UnknownString_81B54BE, 4 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index b9b712937..92120e362 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -7,7 +7,7 @@ OldaleTown_MapScript1_14DD68:: @ 814DD68 setflag FLAG_VISITED_OLDALE_TOWN checkflag FLAG_ADVENTURE_STARTED call_if 0, OldaleTown_EventScript_14DD92 - checkflag 132 + checkflag FLAG_RECEIVED_POTION_OLDALE call_if 0, OldaleTown_EventScript_14DD9E checkflag FLAG_ADVENTURE_STARTED call_if 1, OldaleTown_EventScript_14DD8C @@ -38,7 +38,7 @@ OldaleTown_EventScript_14DDB3:: @ 814DDB3 OldaleTown_EventScript_14DDBC:: @ 814DDBC lock faceplayer - checkflag 132 + checkflag FLAG_RECEIVED_POTION_OLDALE goto_if_eq OldaleTown_EventScript_14DE79 checkflag FLAG_TEMP_1 goto_if_eq OldaleTown_EventScript_14DE79 @@ -79,7 +79,7 @@ OldaleTown_EventScript_14DE4C:: @ 814DE4C compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 - setflag 132 + setflag FLAG_RECEIVED_POTION_OLDALE fadedefaultbgm release end diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 28b9dbd80..a2e033a24 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -4,7 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 815429D PacifidlogTown_House3_EventScript_15429E:: @ 815429E lock faceplayer - checkflag 154 + checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar 0x8008, 2 copyvar 0x8004, 0x8008 @@ -30,7 +30,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E waitstate getspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 - setflag 154 + setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index f5a6fcc3f..19addd4b4 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -354,7 +354,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 - checkflag 169 + checkflag FLAG_RECEIVED_TM42 goto_if 0, PetalburgCity_Gym_EventScript_154A2C checkflag SYS_GAME_CLEAR goto_if_eq PetalburgCity_Gym_EventScript_154B69 @@ -415,7 +415,7 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42 compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B - setflag 169 + setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closemessage diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index d8e95d8c6..282e064de 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -4,21 +4,21 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3 PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 checkflag 1217 goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 - checkflag 135 + checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B msgbox PetalburgCity_WallysHouse_Text_179805, 4 - setflag 135 + setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_154431 goto PetalburgCity_WallysHouse_EventScript_154406 end @@ -26,7 +26,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 msgbox PetalburgCity_WallysHouse_Text_179996, 4 giveitem ITEM_HM03 - setflag 122 + setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_179B14, 4 release end @@ -49,7 +49,7 @@ PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 lock faceplayer - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D checkflag 1217 goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index ff0ccce30..9af5c1bdc 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -120,7 +120,7 @@ Route103_EventScript_14ED46:: @ 814ED46 setvar 0x4062, 1 setvar 0x4084, 4 clearflag 889 - setflag 130 + setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar 0x40c7, 1 clearflag 979 savebgm 0 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 6e151447e..02cad5688 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -17,7 +17,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 end Route104_EventScript_14EEAE:: @ 814EEAE - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_EventScript_14EEC4 checkflag BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 @@ -158,9 +158,9 @@ Route104_EventScript_14EFD5:: @ 814EFD5 resetobjectpriority 2, 0, 11 moveobjectoffscreen 2 setvar 0x408e, 0 - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_EventScript_14F08B - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq Route104_EventScript_14F095 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index a4c360bc0..aabc03439 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -6,7 +6,7 @@ Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag 2109 compare 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 end @@ -24,17 +24,17 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB lock faceplayer - checkflag 147 + checkflag FLAG_MR_BRINEY_SAILING_INTRO call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E goto Route104_MrBrineysHouse_EventScript_15BD32 end Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E - setflag 147 + setflag FLAG_MR_BRINEY_SAILING_INTRO msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 compare RESULT, 0 diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 8ef2ee8bc..66173b0cc 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -4,7 +4,7 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag 2108 - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 checkflag BADGE03_GET goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 @@ -21,9 +21,9 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B checkflag FLAG_TEMP_1 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A - setflag 127 + setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 compare RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 9f0ef8c8d..0c5419af6 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -271,7 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D Route109_EventScript_14F680:: @ 814F680 lock faceplayer - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, Route109_EventScript_14F691 goto Route109_EventScript_14F6AF end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 50278c024..d365fa925 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -9,9 +9,9 @@ Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 lock faceplayer - checkflag 140 + checkflag FLAG_RECEIVED_6_SODA_POP goto_if_eq Route109_SeashoreHouse_EventScript_160E36 - checkflag 141 + checkflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS goto_if_eq Route109_SeashoreHouse_EventScript_160E08 checkflag FLAG_TEMP_2 goto_if_eq Route109_SeashoreHouse_EventScript_160DFE @@ -30,7 +30,7 @@ Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 giveitem ITEM_SODA_POP, 6 compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C - setflag 140 + setflag FLAG_RECEIVED_6_SODA_POP release end @@ -100,7 +100,7 @@ Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 goto_if 0, Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_SIMON goto_if 0, Route109_SeashoreHouse_EventScript_160F29 - setflag 141 + setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 1841b025f..6756cd055 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -10,15 +10,15 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 end Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1 return @@ -75,11 +75,11 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 compare 0x40b6, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E - clearflag 194 - clearflag 195 - clearflag 196 - clearflag 197 - clearflag 198 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 end Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E @@ -121,125 +121,125 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall delay 32 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView playse 36 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9 end Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall delay 32 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView playse 36 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3 end Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall delay 32 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView playse 36 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD end Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall delay 32 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView playse 36 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7 end Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall delay 32 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView playse 36 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1 end Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 - setflag 194 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end Route110_TrickHousePuzzle7_EventScript_1633A9:: @ 81633A9 - clearflag 194 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end Route110_TrickHousePuzzle7_EventScript_1633AE:: @ 81633AE - setflag 195 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end Route110_TrickHousePuzzle7_EventScript_1633B3:: @ 81633B3 - clearflag 195 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end Route110_TrickHousePuzzle7_EventScript_1633B8:: @ 81633B8 - setflag 196 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end Route110_TrickHousePuzzle7_EventScript_1633BD:: @ 81633BD - clearflag 196 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end Route110_TrickHousePuzzle7_EventScript_1633C2:: @ 81633C2 - setflag 197 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end Route110_TrickHousePuzzle7_EventScript_1633C7:: @ 81633C7 - clearflag 197 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end Route110_TrickHousePuzzle7_EventScript_1633CC:: @ 81633CC - setflag 198 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 - clearflag 198 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index 9be44af5a..3f5bbd909 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -9,18 +9,18 @@ Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E Route114_LanettesHouse_EventScript_15C262:: @ 815C262 lock faceplayer - checkflag 131 + checkflag FLAG_RECEIVED_DOLL_LANETTE goto_if_eq Route114_LanettesHouse_EventScript_15C28F setflag SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE - givedecoration 99 + givedecoration DECOR_LOTAD_DOLL .else - givedecoration 100 + givedecoration DECOR_SEEDOT_DOLL .endif compare RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE - setflag 131 + setflag FLAG_RECEIVED_DOLL_LANETTE release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index beb01e083..4853efdb3 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -3,7 +3,7 @@ Route116_MapScripts:: @ 8150A31 .byte 0 Route116_MapScript1_150A37:: @ 8150A37 - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS call_if 1, Route116_EventScript_150A41 end @@ -14,9 +14,9 @@ Route116_EventScript_150A41:: @ 8150A41 Route116_EventScript_150A49:: @ 8150A49 lock faceplayer - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq Route116_EventScript_150A67 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq Route116_EventScript_150A71 msgbox Route116_Text_1703CF, 4 release diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index 10991c38c..16f35b1f2 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -17,7 +17,7 @@ Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F msgbox Route116_TunnelersRestHouse_Text_193135, 4 release diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 40affd3fd..44c4c156c 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -7,7 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40 end Route117_EventScript_150D46:: @ 8150D46 - checkflag 134 + checkflag FLAG_PENDING_DAYCARE_EGG goto_if 0, Route117_EventScript_150D56 setobjectxyperm 3, 47, 6 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index ac64904a2..09bab727a 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -63,7 +63,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A waitfanfare waitmessage givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 - setflag 151 + setflag FLAG_RECEIVED_CASTFORM msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 release end @@ -87,7 +87,7 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock faceplayer - checkflag 151 + checkflag FLAG_RECEIVED_CASTFORM goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 6e649de68..76134aa43 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -11,7 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378 RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release @@ -50,7 +50,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release @@ -179,7 +179,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 removeobject 9 setobjectxyperm 9, 30, 10 clearflag 732 - setflag 142 + setflag FLAG_DEVON_GOODS_STOLEN setvar 0x405a, 2 setvar 0x409a, 2 setvar 0x406f, 1 @@ -326,7 +326,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release @@ -371,7 +371,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 call_if 1, RustboroCity_EventScript_14C6E9 compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 - setflag 159 + setflag FLAG_UNKNOWN_9F setvar 0x405a, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 @@ -473,7 +473,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closemessage - setflag 144 + setflag FLAG_RETURNED_DEVON_GOODS setflag 732 setvar 0x405a, 5 delay 30 diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index 3e98746f3..77f2ee0a4 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -4,11 +4,11 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26 RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 lock faceplayer - checkflag 137 + checkflag FLAG_RECEIVED_HM01 goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 giveitem ITEM_HM01 - setflag 137 + setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index 48d8aaf9f..f9e902763 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 .byte 0 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416 end @@ -15,9 +15,9 @@ RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440 msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4 release @@ -36,11 +36,11 @@ RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4 release @@ -59,11 +59,11 @@ RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485 RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6 - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index f40c1b87b..c17a1ef68 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -41,7 +41,7 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 faceplayer compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 563e8b7a6..23277711e 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 waitfanfare waitmessage setflag SYS_POKENAV_GET - setflag 188 + setflag FLAG_RECEIVED_POKENAV msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 setflag 894 clearflag 807 @@ -148,7 +148,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B faceplayer checkflag 272 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closemessage diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 3a92491f7..816098829 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -3,7 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE - checkflag 165 + checkflag FLAG_RECEIVED_TM39 goto_if 0, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release @@ -29,7 +29,7 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39 compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B - setflag 165 + setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_184170, 4 release end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index b983617e0..53a845648 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -4,7 +4,7 @@ RustboroCity_House1_MapScripts:: @ 8157C7C RustboroCity_House1_EventScript_157C7D:: @ 8157C7D lock faceplayer - checkflag 153 + checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED goto_if_eq RustboroCity_House1_EventScript_157D13 setvar 0x8008, 0 copyvar 0x8004, 0x8008 @@ -29,7 +29,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D special sub_804E174 waitstate msgbox RustboroCity_House1_Text_184F6B, 4 - setflag 153 + setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED release end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index ff21ff1ff..002071f2d 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -341,8 +341,8 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA waitmovement 0 removeobject 5 removeobject 7 - clearflag 142 - setflag 143 + clearflag FLAG_DEVON_GOODS_STOLEN + setflag FLAG_RECOVERED_DEVON_GOODS setvar 0x405a, 4 setvar 0x4090, 1 setflag 891 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 1c580202d..d38459c1c 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -201,7 +201,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA clearflag 945 setflag SYS_WEATHER_CTRL setflag 854 - setflag 129 + setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag 967 setvar 0x40c6, 1 setvar 0x40a2, 1 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 63f7eca53..b94a0ffd3 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -182,7 +182,7 @@ SlateportCity_EventScript_14BC0A:: @ 814BC0A SlateportCity_EventScript_14BC14:: @ 814BC14 lock faceplayer - checkflag 148 + checkflag FLAG_DOCK_REJECTED_DEVON_GOODS goto_if_eq SlateportCity_EventScript_14BC29 msgbox SlateportCity_Text_164BBF, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 1ee8ff39b..2776dd084 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -57,7 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D end SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index e379c633d..a8411e067 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -87,7 +87,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 playse 9 removeobject 1 setflag 900 - setflag 149 + setflag FLAG_DELIVERED_DEVON_GOODS clearflag 947 setflag 949 release diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 2e43128de..7b2ae0d67 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -7,9 +7,9 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 checkflag BADGE07_GET goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF - checkflag 148 + checkflag FLAG_DOCK_REJECTED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 @@ -18,7 +18,7 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 - setflag 148 + setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag 882 releaseall end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index de86ce969..c0229dc9c 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -5,9 +5,9 @@ SootopolisCity_MapScripts:: @ 814D07D .byte 0 SootopolisCity_MapScript1_14D08D:: @ 814D08D - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 0, SootopolisCity_EventScript_14D0A0 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 1, SootopolisCity_EventScript_14D0B1 end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 44a8684ab..24c333bee 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -87,7 +87,7 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D - checkflag 172 + checkflag FLAG_RECEIVED_TM03 goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 checkflag BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A @@ -112,7 +112,7 @@ SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 - setflag 172 + setflag FLAG_RECEIVED_TM03 release end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 4877d6d6e..9a7b63c82 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -4,11 +4,11 @@ SootopolisCity_House1_MapScripts:: @ 815B29A SootopolisCity_House1_EventScript_15B29B:: @ 815B29B lock faceplayer - checkflag 121 + checkflag FLAG_RECEIVED_TM31 goto_if_eq SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 giveitem ITEM_TM31 - setflag 121 + setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_18FA03, 4 release end diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index 52ccf6b2b..115ed0453 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -31,7 +31,7 @@ SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B268 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_Mart_EventScript_15B268 msgbox SootopolisCity_Mart_Text_18F8D7, 4 release @@ -47,7 +47,7 @@ SootopolisCity_Mart_EventScript_15B272:: @ 815B272 faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B290 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_Mart_EventScript_15B290 msgbox SootopolisCity_Mart_Text_18F96B, 4 release diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index e36d0ed7b..8bbb06575 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -19,7 +19,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4 release @@ -35,7 +35,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4 release diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index ce2de5124..9970d0490 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -6,7 +6,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE setflag 2119 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB end @@ -15,7 +15,7 @@ Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB end Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9 end diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index d2f0251f7..babbd8cce 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -11,7 +11,7 @@ VerdanturfTown_MapScript1_14E85A:: @ 814E85A VerdanturfTown_EventScript_14E866:: @ 814E866 lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 applymovement 2, VerdanturfTown_Movement_1A083D @@ -37,7 +37,7 @@ VerdanturfTown_EventScript_14E8A2:: @ 814E8A2 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_EventScript_14E8C0 msgbox VerdanturfTown_Text_16CD4D, 4 release diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index fad64292b..0dd9aed7c 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -4,10 +4,10 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B lock faceplayer - checkflag 193 + checkflag FLAG_WALLY_SPEECH goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73 msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4 - setflag 193 + setflag FLAG_WALLY_SPEECH release end @@ -19,7 +19,7 @@ VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73 VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 checkflag 1213 goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B @@ -46,7 +46,7 @@ VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 faceplayer checkflag 1213 goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 - checkflag 190 + checkflag FLAG_DEFEATED_WALLY_MAUVILLE goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 release @@ -65,11 +65,11 @@ VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0 VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 checkflag 1213 goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4 release diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index fe775d793..e92cdcc82 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -3,7 +3,7 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 .byte 0 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD call_if 1, VictoryRoad_1F_EventScript_15DE93 end @@ -43,7 +43,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 msgbox VictoryRoad_1F_Text_197967, 4 clearflag 858 moveobjectoffscreen 4 - setflag 126 + setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD setvar 0x40c3, 1 releaseall end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index c8cc4cd21..eab06c8ee 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -274,14 +274,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33 end LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D - checkflag 133 + checkflag FLAG_RECEIVED_AMULET_COIN goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 giveitem ITEM_AMULET_COIN compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 - setflag 133 + setflag FLAG_RECEIVED_AMULET_COIN release end -- cgit v1.2.3 From c9f38d22060841ac59e56c3f498427f53bc28569 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 3 Dec 2017 12:32:57 -0800 Subject: Label scripts flags up to flag 256. --- data/event_scripts.s | 6 ++-- data/scripts/magma_chimney.inc | 6 ++-- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 8 +++--- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 32 +++++++++++----------- data/scripts/maps/BattleTower_Lobby.inc | 20 +++++++------- data/scripts/maps/DewfordTown_Hall.inc | 4 +-- data/scripts/maps/FallarborTown_House1.inc | 6 ++-- data/scripts/maps/FortreeCity_House4.inc | 10 +++---- data/scripts/maps/LavaridgeTown.inc | 4 +-- data/scripts/maps/LavaridgeTown_HerbShop.inc | 4 +-- data/scripts/maps/LilycoveCity.inc | 4 +-- data/scripts/maps/LilycoveCity_Harbor.inc | 2 +- data/scripts/maps/LilycoveCity_House2.inc | 4 +-- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 6 ++-- data/scripts/maps/MauvilleCity.inc | 10 +++---- data/scripts/maps/MauvilleCity_GameCorner.inc | 30 ++++++++++---------- data/scripts/maps/MeteorFalls_1F_1R.inc | 4 +-- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 2 +- data/scripts/maps/Route104.inc | 4 +-- data/scripts/maps/Route104_Prototype.inc | 8 +++--- data/scripts/maps/Route105.inc | 2 +- data/scripts/maps/Route111.inc | 2 +- data/scripts/maps/Route114.inc | 4 +-- data/scripts/maps/Route116.inc | 2 +- data/scripts/maps/Route118.inc | 4 +-- data/scripts/maps/Route120.inc | 2 +- data/scripts/maps/Route123.inc | 4 +-- data/scripts/maps/Route123_BerryMastersHouse.inc | 20 +++++++------- .../maps/Route124_DivingTreasureHuntersHouse.inc | 4 +-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 2 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 4 +-- data/scripts/maps/SSTidalCorridor.inc | 4 +-- data/scripts/maps/SealedChamber_InnerRoom.inc | 4 +-- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 30 ++++++++++---------- data/scripts/maps/SootopolisCity_House6.inc | 8 +++--- data/scripts/maps/SouthernIsland_Interior.inc | 4 +-- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 4 +-- data/scripts/tv.inc | 2 +- 39 files changed, 141 insertions(+), 141 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index d355bff97..066c29477 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1303,7 +1303,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 special sub_810FAA0 checkflag 291 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62 - checkflag 255 + checkflag FLAG_LATIOS_OR_LATIAS_ROAMING call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70 checkflag 298 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A @@ -1326,7 +1326,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62 return EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70 - setflag 2141 + setflag SYS_TV_LATI return S_WhiteOut:: @ 819FC74 @@ -1336,7 +1336,7 @@ S_WhiteOut:: @ 819FC74 end EventScript_19FC84: - checkflag 221 + checkflag FLAG_RECEIVED_GO_GOGGLES goto_if_eq Route101_EventScript_1A14DC checkflag 1213 goto_if 0, Route101_EventScript_1A14DC diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 586bbf3c5..adc865e73 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -1,14 +1,14 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 lock faceplayer - checkflag 219 + checkflag FLAG_EVIL_LEADER_PLEASE_STOP call_if 0, MtChimney_EventScript_1B2CB9 - checkflag 219 + checkflag FLAG_EVIL_LEADER_PLEASE_STOP call_if 1, MtChimney_EventScript_1B2CC2 closemessage applymovement 1, MtChimney_Movement_1A083D waitmovement 0 - setflag 219 + setflag FLAG_EVIL_LEADER_PLEASE_STOP release end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index de3ba5442..1bc38a099 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -8,9 +8,9 @@ AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 - checkflag 239 + checkflag FLAG_USED_STORAGE_KEY call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6 - checkflag 239 + checkflag FLAG_USED_STORAGE_KEY call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0 end @@ -28,7 +28,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 lockall - checkflag 239 + checkflag FLAG_USED_STORAGE_KEY goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 compare RESULT, 0 @@ -36,7 +36,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse 21 removeitem ITEM_STORAGE_KEY, 1 - setflag 239 + setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_15E9C0 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index e6c143091..b09a6e5f1 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -8,21 +8,21 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A - checkflag 240 + checkflag FLAG_USED_ROOM_1_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB - checkflag 241 + checkflag FLAG_USED_ROOM_2_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 - checkflag 242 + checkflag FLAG_USED_ROOM_4_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF - checkflag 243 + checkflag FLAG_USED_ROOM_6_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 - checkflag 240 + checkflag FLAG_USED_ROOM_1_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 - checkflag 241 + checkflag FLAG_USED_ROOM_2_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD - checkflag 242 + checkflag FLAG_USED_ROOM_4_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 - checkflag 243 + checkflag FLAG_USED_ROOM_6_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 end @@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 lockall - checkflag 240 + checkflag FLAG_USED_ROOM_1_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 compare RESULT, 0 @@ -68,7 +68,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 removeitem ITEM_ROOM_1_KEY, 1 - setflag 240 + setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 special DrawWholeMapView releaseall @@ -76,7 +76,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A lockall - checkflag 241 + checkflag FLAG_USED_ROOM_2_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 compare RESULT, 0 @@ -84,7 +84,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 removeitem ITEM_ROOM_2_KEY, 1 - setflag 241 + setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD special DrawWholeMapView releaseall @@ -92,7 +92,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 lockall - checkflag 242 + checkflag FLAG_USED_ROOM_4_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 compare RESULT, 0 @@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 removeitem ITEM_ROOM_4_KEY, 1 - setflag 242 + setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 special DrawWholeMapView releaseall @@ -108,7 +108,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 lockall - checkflag 243 + checkflag FLAG_USED_ROOM_6_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 compare RESULT, 0 @@ -116,7 +116,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 removeitem ITEM_ROOM_6_KEY, 1 - setflag 243 + setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 5a0e6105c..59f698c5f 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -13,9 +13,9 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar 0x8004, 10 special sub_8135668 - checkflag 238 + checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 - checkflag 237 + checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD specialvar 0x8007, sub_810F404 compare 0x8007, 50 @@ -387,16 +387,16 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727 BattleTower_Lobby_EventScript_160733:: @ 8160733 lock faceplayer - checkflag 238 + checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1607C5 - checkflag 237 + checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 - setvar 0x8008, 42 - givedecoration 42 + setvar 0x8008, DECOR_SILVER_SHIELD + givedecoration DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF - setflag 237 + setflag FLAG_RECEIVED_SILVER_SHIELD msgbox BattleTower_Lobby_Text_19ABAA, 4 release end @@ -406,11 +406,11 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 - setvar 0x8008, 43 - givedecoration 43 + setvar 0x8008, DECOR_GOLD_SHIELD + givedecoration DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF - setflag 238 + setflag FLAG_RECEIVED_GOLD_SHIELD msgbox BattleTower_Lobby_Text_19ABAA, 4 release end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index ea4016147..3c0565678 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -252,13 +252,13 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - checkflag 230 + checkflag FLAG_RECEIVED_TM36 goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem ITEM_TM36 compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B - setflag 230 + setflag FLAG_RECEIVED_TM36 release end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index dcfe7705a..6c7509508 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -8,7 +8,7 @@ FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4 FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 lock faceplayer - checkflag 229 + checkflag FLAG_RECEIVED_TM27 goto_if_eq FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 compare RESULT, 1 @@ -30,7 +30,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 call FallarborTown_House1_EventScript_1A067F - setflag 229 + setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_177910, 4 release end @@ -58,7 +58,7 @@ FallarborTown_House1_EventScript_153C54:: @ 8153C54 FallarborTown_House1_EventScript_153C5E:: @ 8153C5E lock faceplayer - checkflag 229 + checkflag FLAG_RECEIVED_TM27 goto_if_eq FallarborTown_House1_EventScript_153C86 checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_House1_EventScript_153C7C diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index b261e14fb..efccf20fc 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -7,15 +7,15 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F FortreeCity_House4_EventScript_158188:: @ 8158188 lockall - checkflag 223 + checkflag FLAG_RECEIVED_MENTAL_HERB goto_if_eq FortreeCity_House4_EventScript_158204 - checkflag 224 + checkflag FLAG_WINGULL_DELIVERED_MAIL goto_if_eq FortreeCity_House4_EventScript_1581D6 - checkflag 222 + checkflag FLAG_WINGULL_SENT_ON_ERRAND goto_if_eq FortreeCity_House4_EventScript_1581C2 msgbox FortreeCity_House4_Text_186835, 4 closemessage - setflag 222 + setflag FLAG_WINGULL_SENT_ON_ERRAND clearflag 934 applymovement 3, FortreeCity_House4_Movement_158218 waitmovement 0 @@ -37,7 +37,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 giveitem ITEM_MENTAL_HERB compare RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B - setflag 223 + setflag FLAG_RECEIVED_MENTAL_HERB releaseall end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index dde0b0ebd..f2526b3c1 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -84,7 +84,7 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB msgbox LavaridgeTown_Text_16BDA4, 4 giveitem ITEM_GO_GOGGLES - setflag 221 + setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16BE7D, 4 goto LavaridgeTown_EventScript_14E5F5 end @@ -92,7 +92,7 @@ LavaridgeTown_EventScript_14E5AB:: @ 814E5AB LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 msgbox LavaridgeTown_Text_16BF92, 4 giveitem ITEM_GO_GOGGLES - setflag 221 + setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16C020, 4 goto LavaridgeTown_EventScript_14E5F5 end diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index 5ec6731d4..c5e033422 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -28,13 +28,13 @@ LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 lock faceplayer - checkflag 254 + checkflag FLAG_RECEIVED_CHARCOAL goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem ITEM_CHARCOAL compare RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B - setflag 254 + setflag FLAG_RECEIVED_CHARCOAL release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index ed07b2171..4c22a4883 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -211,7 +211,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC LilycoveCity_EventScript_14CCE5:: @ 814CCE5 lockall - checkflag 218 + checkflag FLAG_MET_WAILMER_TRAINER goto_if_eq LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 applymovement LAST_TALKED, LilycoveCity_Movement_1A0839 @@ -219,7 +219,7 @@ LilycoveCity_EventScript_14CCE5:: @ 814CCE5 msgbox LilycoveCity_Text_168675, 4 applymovement LAST_TALKED, LilycoveCity_Movement_1A083D waitmovement 0 - setflag 218 + setflag FLAG_MET_WAILMER_TRAINER releaseall end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index ae62caea7..69e2e6766 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -108,7 +108,7 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE checkflag SYS_GAME_CLEAR goto_if 0, LilycoveCity_Harbor_EventScript_1598BA - checkflag 206 + checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq LilycoveCity_Harbor_EventScript_1598BA checkflag SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_1598BA diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index d3399f5ac..bbca8aa6d 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -4,13 +4,13 @@ LilycoveCity_House2_MapScripts:: @ 8159BA2 LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 lock faceplayer - checkflag 234 + checkflag FLAG_RECEIVED_TM44 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem ITEM_TM44 compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B - setflag 234 + setflag FLAG_RECEIVED_TM44 msgbox LilycoveCity_House2_Text_18B883, 4 release end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 585b1e79b..db9855211 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -96,7 +96,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall - checkflag 236 + checkflag FLAG_RECEIVED_GLASS_ORNAMENT goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 specialvar 0x8004, sub_80C4D50 switch 0x8004 @@ -124,10 +124,10 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 - givedecoration 44 + givedecoration DECOR_GLASS_ORNAMENT compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 - setflag 236 + setflag FLAG_RECEIVED_GLASS_ORNAMENT closemessage releaseall end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 407a1141d..3889f55a6 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -8,7 +8,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 setflag SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 - checkflag 209 + checkflag FLAG_RECEIVED_TM24 call_if 1, MauvilleCity_EventScript_14C053 end @@ -284,15 +284,15 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8 MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock faceplayer - checkflag 209 + checkflag FLAG_RECEIVED_TM24 goto_if_eq MauvilleCity_EventScript_14C368 compare 0x40ba, 2 goto_if_eq MauvilleCity_EventScript_14C33C - checkflag 208 + checkflag FLAG_RECEIVED_BASEMENT_KEY goto_if_eq MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 giveitem ITEM_BASEMENT_KEY - setflag 208 + setflag FLAG_RECEIVED_BASEMENT_KEY msgbox MauvilleCity_Text_166331, 4 release end @@ -307,7 +307,7 @@ MauvilleCity_EventScript_14C33C:: @ 814C33C giveitem ITEM_TM24 compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B - setflag 209 + setflag FLAG_RECEIVED_TM24 msgbox MauvilleCity_Text_166488, 4 release end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 2e0231287..646546dc7 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -389,7 +389,7 @@ MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 lock faceplayer - checkflag 226 + checkflag FLAG_RECEIVED_STARTER_DOLL goto_if_eq MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 compare RESULT, 0 @@ -401,35 +401,35 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 end MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB - getdecorname 1, 88 - checkdecor 88 + getdecorname 1, DECOR_TREECKO_DOLL + checkdecor DECOR_TREECKO_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration 88 - setflag 226 + givedecoration DECOR_TREECKO_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 - getdecorname 1, 89 - checkdecor 89 + getdecorname 1, DECOR_TORCHIC_DOLL + checkdecor DECOR_TORCHIC_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration 89 - setflag 226 + givedecoration DECOR_TORCHIC_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F - getdecorname 1, 90 - checkdecor 90 + getdecorname 1, DECOR_MUDKIP_DOLL + checkdecor DECOR_MUDKIP_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration 90 - setflag 226 + givedecoration DECOR_MUDKIP_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end @@ -460,12 +460,12 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C end MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C - checkflag 225 + checkflag FLAG_RECEIVED_20_COINS goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA checkcoins 16385 compare 0x4001, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA - setflag 225 + setflag FLAG_RECEIVED_20_COINS givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 playse 95 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 06abbc8f6..06774d400 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -215,9 +215,9 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock faceplayer - checkflag 244 + checkflag FLAG_MET_PROF_COSMO goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E - setflag 244 + setflag FLAG_MET_PROF_COSMO msgbox MeteorFalls_1F_1R_Text_1937EB, 4 release end diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index f7f66b843..f66f7e6f1 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -17,7 +17,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B msgbox MossdeepCity_House2_Text_18D61E, 4 waitpokecry closemessage - setflag 224 + setflag FLAG_WINGULL_DELIVERED_MAIL clearflag 933 compare FACING, 2 call_if 1, MossdeepCity_House2_EventScript_15A8AE diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e0870e18a..d71c5478f 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -64,7 +64,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 msgbox MtPyre_Summit_Text_1B5FE6, 4 .endif giveitem ITEM_RED_OR_BLUE_ORB - setflag 212 + setflag FLAG_RECEIVED_RED_OR_BLUE_ORB releaseall end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 02cad5688..b9c0deb63 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -31,13 +31,13 @@ Route104_EventScript_14EEC4:: @ 814EEC4 Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer - checkflag 246 + checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 246 + setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 msgbox Route104_Text_1C5665, 4 release end diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index 3c218747a..b3b256d79 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -16,9 +16,9 @@ Route104_Prototype_EventScript_160C4B:: @ 8160C4B goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_MIKE_1 goto_if 0, Route104_Prototype_EventScript_160C99 - setflag 215 + setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 - checkflag 216 + checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 goto_if_eq Route104_Prototype_EventScript_160CFB release end @@ -43,9 +43,9 @@ Route104_Prototype_EventScript_160CA3:: @ 8160CA3 goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_MIKE_1 goto_if 0, Route104_Prototype_EventScript_160CF1 - setflag 216 + setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 - checkflag 215 + checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 goto_if_eq Route104_Prototype_EventScript_160CFB release end diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 1182dae7e..de7188aae 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -3,7 +3,7 @@ Route105_MapScripts:: @ 814F298 .byte 0 Route105_MapScript1_14F29E:: @ 814F29E - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route105_EventScript_14F2A8 end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 545e62921..343d666b2 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -4,7 +4,7 @@ Route111_MapScripts:: @ 814FF91 .byte 0 Route111_MapScript1_14FF9C:: @ 814FF9C - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route111_EventScript_14FFA6 end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 0730db23a..a3056c8ff 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -27,13 +27,13 @@ Route114_EventScript_150778:: @ 8150778 Route114_EventScript_150782:: @ 8150782 lock faceplayer - checkflag 231 + checkflag FLAG_RECEIVED_TM05 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B - setflag 231 + setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1701C5, 4 release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 4853efdb3..003bcc397 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -58,7 +58,7 @@ Route116_EventScript_150A94:: @ 8150A94 call_if 1, Route116_EventScript_150AF9 removeobject LAST_TALKED clearflag 949 - setflag 256 + setflag FLAG_RECEIVED_REPEAT_BALL release end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index b96346f15..bf34b5426 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -9,7 +9,7 @@ Route118_MapScript1_150F2E:: @ 8150F2E Route118_EventScript_150F34:: @ 8150F34 lock faceplayer - checkflag 227 + checkflag FLAG_RECEIVED_GOOD_ROD goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 compare RESULT, 1 @@ -21,7 +21,7 @@ Route118_EventScript_150F34:: @ 8150F34 Route118_EventScript_150F5E:: @ 8150F5E msgbox Route118_Text_170F46, 4 giveitem ITEM_GOOD_ROD - setflag 227 + setflag FLAG_RECEIVED_GOOD_ROD msgbox Route118_Text_170F7E, 4 release end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index b2765e977..2bb43fc90 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -50,7 +50,7 @@ Route120_EventScript_151682:: @ 8151682 return Route120_MapScript1_151686:: @ 8151686 - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route120_EventScript_1516A2 checkflag 285 call_if 1, Route120_EventScript_1516B5 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 14c5a2dba..9ad0220bd 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -9,7 +9,7 @@ Route123_MapScript1_151C59:: @ 8151C59 Route123_EventScript_151C5D:: @ 8151C5D lock faceplayer - checkflag 232 + checkflag FLAG_RECEIVED_TM19 goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty @@ -19,7 +19,7 @@ Route123_EventScript_151C5D:: @ 8151C5D giveitem ITEM_TM19 compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B - setflag 232 + setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_171E34, 4 release end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 64888759d..f9544d62e 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -86,57 +86,57 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 end Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E - checkflag 248 + checkflag FLAG_RECEIVED_SPELON_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_SPELON_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 248 + setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F - checkflag 249 + checkflag FLAG_RECEIVED_PAMTRE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_PAMTRE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 249 + setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 - checkflag 250 + checkflag FLAG_RECEIVED_WATMEL_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_WATMEL_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 250 + setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 - checkflag 251 + checkflag FLAG_RECEIVED_DURIN_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_DURIN_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 251 + setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 - checkflag 252 + checkflag FLAG_RECEIVED_BELUE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_BELUE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 252 + setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 7421e94e0..2f6f1b1e1 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -9,10 +9,10 @@ Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00 Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 lock faceplayer - checkflag 217 + checkflag FLAG_MET_DIVING_TREASURE_HUNTER goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 - setflag 217 + setflag FLAG_MET_DIVING_TREASURE_HUNTER goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 23277711e..3756b5c72 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -181,7 +181,7 @@ RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 lock faceplayer - checkflag 256 + checkflag FLAG_RECEIVED_REPEAT_BALL goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5 msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4 release diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 0dfec5cfa..5be59b14e 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -8,13 +8,13 @@ RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97 RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 lock faceplayer - checkflag 213 + checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem ITEM_PREMIER_BALL compare RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B - setflag 213 + setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO release end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 59ab89112..8c28628ea 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -163,7 +163,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B SSTidalCorridor_EventScript_15FE60:: @ 815FE60 lock faceplayer - checkflag 247 + checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto_if_eq SSTidalCorridor_EventScript_15FE7A call SSTidalCorridor_EventScript_15FE84 msgbox SSTidalCorridor_Text_199203, 4 @@ -192,7 +192,7 @@ SSTidalCorridor_EventScript_15FE84:: @ 815FE84 goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_ANETTE goto_if 0, SSTidalCorridor_EventScript_15FED5 - setflag 247 + setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 526ada367..a0c6314cc 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -6,7 +6,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 braillemessage SealedChamber_InnerRoom_Braille_1C53C1 waitbutton erasebox 0, 0, 29, 19 - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord compare RESULT, 0 @@ -31,7 +31,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 msgbox SealedChamber_InnerRoom_Text_1A138B, 4 closemessage fadeinbgm 0 - setflag 228 + setflag FLAG_REGI_DOORS_OPENED releaseall end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 4195ad43a..ea2acf374 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -23,15 +23,15 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 setvar 0x4002, 0 - checkflag 204 + checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 203 + checkflag FLAG_RECEIVED_GREEN_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 202 + checkflag FLAG_RECEIVED_PINK_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 201 + checkflag FLAG_RECEIVED_BLUE_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 200 + checkflag FLAG_RECEIVED_RED_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 compare 0x4002, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D @@ -49,15 +49,15 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 setvar 0x4001, 0 - checkflag 204 + checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE - checkflag 203 + checkflag FLAG_RECEIVED_GREEN_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7 - checkflag 202 + checkflag FLAG_RECEIVED_PINK_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0 - checkflag 201 + checkflag FLAG_RECEIVED_BLUE_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 - checkflag 200 + checkflag FLAG_RECEIVED_RED_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 getfirstpartypokename 0 switch 0x4001 @@ -88,7 +88,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 200 + setflag FLAG_RECEIVED_RED_SCARF giveitem ITEM_RED_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4 release @@ -99,7 +99,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 201 + setflag FLAG_RECEIVED_BLUE_SCARF giveitem ITEM_BLUE_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4 release @@ -110,7 +110,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 202 + setflag FLAG_RECEIVED_PINK_SCARF giveitem ITEM_PINK_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4 release @@ -121,7 +121,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 203 + setflag FLAG_RECEIVED_GREEN_SCARF giveitem ITEM_GREEN_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4 release @@ -132,7 +132,7 @@ SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 204 + setflag FLAG_RECEIVED_YELLOW_SCARF giveitem ITEM_YELLOW_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index a0fdc5ca4..1adf05991 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -4,16 +4,16 @@ SootopolisCity_House6_MapScripts:: @ 815B385 SootopolisCity_House6_EventScript_15B386:: @ 815B386 lock faceplayer - checkflag 245 + checkflag FLAG_RECEIVED_WAILMER_DOLL goto_if_eq SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, 5 compare RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 - givedecoration 117 + givedecoration DECOR_WAILMER_DOLL compare RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 - setflag 245 + setflag FLAG_RECEIVED_WAILMER_DOLL release end @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD end SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 - getdecorname 1, 117 + getdecorname 1, DECOR_WAILMER_DOLL msgbox SootopolisCity_House6_Text_1A0CEF, 4 msgbox SootopolisCity_House6_Text_18FF28, 4 release diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 8d6ed8ddc..0ff474138 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -44,11 +44,11 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B end SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 - checkflag 206 + checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq SouthernIsland_Interior_EventScript_160C08 checkflag SYS_HAS_EON_TICKET goto_if 0, SouthernIsland_Interior_EventScript_160C08 - setflag 206 + setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS special SpawnCameraDummy applymovement 127, SouthernIsland_Interior_Movement_160C12 waitmovement 0 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 67554d26b..9726038d4 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -101,13 +101,13 @@ VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 lock faceplayer - checkflag 235 + checkflag FLAG_RECEIVED_TM45 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem ITEM_TM45 compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B - setflag 235 + setflag FLAG_RECEIVED_TM45 release end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 28932e02a..dc026c062 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -50,7 +50,7 @@ EventScript_1A6F0B: .endif special InitRoamer clearflag SYS_TV_LATI - setflag 255 + setflag FLAG_LATIOS_OR_LATIAS_ROAMING special TurnOffTVScreen releaseall end -- cgit v1.2.3 From 503bd8e491eefea7e26d6882674487f9a9765297 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 3 Dec 2017 13:20:55 -0800 Subject: Label script flags up to flag 288. --- data/event_scripts.s | 6 +++--- data/scripts/contest_hall.inc | 2 +- data/scripts/maps/DewfordTown.inc | 4 ++-- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 6 +++--- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 4 ++-- data/scripts/maps/LilycoveCity.inc | 12 ++++++------ data/scripts/maps/LittlerootTown.inc | 2 +- data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 6 +++--- data/scripts/maps/MauvilleCity_House2.inc | 4 ++-- data/scripts/maps/MossdeepCity.inc | 4 ++-- data/scripts/maps/MtPyre_1F.inc | 4 ++-- data/scripts/maps/MtPyre_Summit.inc | 4 ++-- data/scripts/maps/Route104.inc | 8 ++++---- data/scripts/maps/Route109.inc | 4 ++-- data/scripts/maps/Route111_WinstrateFamilysHouse.inc | 4 ++-- data/scripts/maps/Route114_FossilManiacsHouse.inc | 4 ++-- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 2 +- data/scripts/maps/Route116.inc | 4 ++-- data/scripts/maps/Route120.inc | 6 +++--- data/scripts/maps/RustboroCity.inc | 6 +++--- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 6 +++--- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 ++-- data/scripts/maps/RustboroCity_Mart.inc | 4 ++-- data/scripts/maps/RustboroCity_PokemonSchool.inc | 4 ++-- data/scripts/maps/SSTidalCorridor.inc | 4 ++-- data/scripts/maps/SSTidalRooms.inc | 4 ++-- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 4 ++-- data/scripts/maps/SlateportCity_ContestHall.inc | 4 ++-- data/scripts/maps/SlateportCity_Harbor.inc | 4 ++-- data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc | 2 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 4 ++-- 35 files changed, 74 insertions(+), 74 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 066c29477..b2414502f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -409,7 +409,7 @@ gUnknown_0815F36C:: @ 815F36C EventScript_15F384: message UnknownString_81A3A87 waitmessage - checkflag 268 + checkflag FLAG_SECRET_BASE_UNKNOWN_16 goto_if_eq EventScript_15F3A0 goto EventScript_15F3E2 end @@ -1460,7 +1460,7 @@ do_heal_party:: @ 819FD7C applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty - checkflag 273 + checkflag FLAG_POKERUS_EXPLAINED goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1490,7 +1490,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA message gText_NurseJoy_Pokerus waitmessage - setflag 273 + setflag FLAG_POKERUS_EXPLAINED return OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 6c2678072..6d6ceb30e 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1042,7 +1042,7 @@ LinkContestRoom1_EventScript_1A5C41:: @ 81A5C41 return LinkContestRoom1_EventScript_1A5C42:: @ 81A5C42 - setflag 270 + setflag FLAG_CONTEST_SKETCH_CREATED return LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index e08a108c6..b8da349f3 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -74,7 +74,7 @@ DewfordTown_EventScript_14E0BD:: @ 814E0BD DewfordTown_EventScript_14E0C6:: @ 814E0C6 lock faceplayer - checkflag 257 + checkflag FLAG_RECEIVED_OLD_ROD goto_if_eq DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, 5 compare RESULT, 1 @@ -86,7 +86,7 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 DewfordTown_EventScript_14E0F0:: @ 814E0F0 msgbox DewfordTown_Text_16B6A8, 4 giveitem ITEM_OLD_ROD - setflag 257 + setflag FLAG_RECEIVED_OLD_ROD msgbox DewfordTown_Text_16B6F9, 4 release end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 7e26476fa..934e5a06c 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B sethealplace 20 setflag SYS_POKEMON_LEAGUE_FLY - checkflag 263 + checkflag FLAG_ENTERED_ELITE_FOUR call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B end @@ -47,7 +47,7 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall - checkflag 263 + checkflag FLAG_ENTERED_ELITE_FOUR goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy 0x4000, 0x4001 compare 0x4000, 11 @@ -71,7 +71,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 closemessage moveobjectoffscreen 3 moveobjectoffscreen 4 - setflag 263 + setflag FLAG_ENTERED_ELITE_FOUR releaseall end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 1a4bbc114..f6c62fbcb 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -6,7 +6,7 @@ FallarborTown_MapScript1_14E7E6:: @ 814E7E6 setflag FLAG_VISITED_FALLARBOR_TOWN setvar 0x4086, 0 setflag 800 - clearflag 270 + clearflag FLAG_CONTEST_SKETCH_CREATED end FallarborTown_EventScript_14E7F5:: @ 814E7F5 diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index da19b96a7..b483b0259 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E end FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 - checkflag 270 + checkflag FLAG_CONTEST_SKETCH_CREATED goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9 msgbox FallarborTown_ContestLobby_Text_177246, 2 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index f2526b3c1..4948c17b3 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -272,7 +272,7 @@ LavaridgeTown_EventScript_14E751:: @ 814E751 LavaridgeTown_EventScript_14E75A:: @ 814E75A lock faceplayer - checkflag 266 + checkflag FLAG_RECEIVED_LAVARIDGE_EGG goto_if_eq LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, 5 compare RESULT, 0 @@ -281,7 +281,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A compare RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 - setflag 266 + setflag FLAG_RECEIVED_LAVARIDGE_EGG playfanfare 370 message LavaridgeTown_Text_16C2EA waitfanfare diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 4c22a4883..0b5886131 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -256,9 +256,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 LilycoveCity_EventScript_14CD60:: @ 814CD60 playbgm 415, 1 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CDB0 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CDB9 compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 @@ -278,7 +278,7 @@ LilycoveCity_EventScript_14CDB9:: @ 814CDB9 return LilycoveCity_EventScript_14CDC2:: @ 814CDC2 - setflag 286 + setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE msgbox LilycoveCity_Text_167AEB, 4 savebgm 0 fadedefaultbgm @@ -287,9 +287,9 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 LilycoveCity_EventScript_14CDD3:: @ 814CDD3 playbgm 421, 1 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CE23 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CE2C compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 @@ -309,7 +309,7 @@ LilycoveCity_EventScript_14CE2C:: @ 814CE2C return LilycoveCity_EventScript_14CE35:: @ 814CE35 - setflag 286 + setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE msgbox LilycoveCity_Text_16802C, 4 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 7d604d7f5..f0847e740 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -872,7 +872,7 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38 message LittlerootTown_Text_16AA32 waitfanfare waitmessage - setflag 274 + setflag FLAG_RECEIVED_RUNNING_SHOES msgbox LittlerootTown_Text_16AA5C, 4 msgbox LittlerootTown_Text_16AB10, 4 closemessage diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index a478270b0..731e6fb5f 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B compare 0x4092, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 - checkflag 274 + checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 56727a3c1..a58d16dd5 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 compare 0x4092, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E - checkflag 274 + checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 3889f55a6..0bc64765a 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -67,7 +67,7 @@ MauvilleCity_EventScript_14C0BA:: @ 814C0BA MauvilleCity_EventScript_14C0C4:: @ 814C0C4 lock faceplayer - checkflag 284 + checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE goto_if_eq MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 closemessage @@ -86,7 +86,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4 MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall - checkflag 284 + checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE goto_if_eq MauvilleCity_EventScript_14C292 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 @@ -177,7 +177,7 @@ MauvilleCity_EventScript_14C23C:: @ 814C23C return MauvilleCity_EventScript_14C285:: @ 814C285 - setflag 284 + setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE msgbox MauvilleCity_Text_165DE8, 4 release end diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index a500a246e..7104ebee7 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -4,7 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 81572BF MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 lock faceplayer - checkflag 258 + checkflag FLAG_RECEIVED_COIN_CASE goto_if_eq MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 @@ -30,7 +30,7 @@ MauvilleCity_House2_EventScript_15731B:: @ 815731B msgbox MauvilleCity_House2_Text_182515, 4 removeitem ITEM_HARBOR_MAIL, 1 giveitem ITEM_COIN_CASE - setflag 258 + setflag FLAG_RECEIVED_COIN_CASE goto MauvilleCity_House2_EventScript_15733D end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 998b850aa..71b572ba2 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -68,7 +68,7 @@ MossdeepCity_EventScript_14D011:: @ 814D011 MossdeepCity_EventScript_14D027:: @ 814D027 lock faceplayer - checkflag 276 + checkflag FLAG_RECEIVED_KINGS_ROCK goto_if_eq MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, 5 compare RESULT, 0 @@ -77,7 +77,7 @@ MossdeepCity_EventScript_14D027:: @ 814D027 giveitem ITEM_KINGS_ROCK compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B - setflag 276 + setflag FLAG_RECEIVED_KINGS_ROCK release end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 026d54bfe..5d6e42874 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -4,13 +4,13 @@ MtPyre_1F_MapScripts:: @ 815D322 MtPyre_1F_EventScript_15D323:: @ 815D323 lock faceplayer - checkflag 282 + checkflag FLAG_RECEIVED_CLEANSE_TAG goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem ITEM_CLEANSE_TAG compare RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B - setflag 282 + setflag FLAG_RECEIVED_CLEANSE_TAG release end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index d71c5478f..e9456ae13 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -169,7 +169,7 @@ MtPyre_Summit_EventScript_15D61A:: @ 815D61A MtPyre_Summit_EventScript_15D623:: @ 815D623 lock faceplayer - checkflag 259 + checkflag FLAG_RETURNED_RED_OR_BLUE_ORB goto_if_eq MtPyre_Summit_EventScript_15D6C4 checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq MtPyre_Summit_EventScript_15D64A @@ -210,7 +210,7 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 .else msgbox MtPyre_Summit_Text_1B639C, 4 .endif - setflag 259 + setflag FLAG_RETURNED_RED_OR_BLUE_ORB release end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b9c0deb63..20044f020 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -50,13 +50,13 @@ Route104_EventScript_14EEFF:: @ 814EEFF Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer - checkflag 279 + checkflag FLAG_RECEIVED_WHITE_HERB goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 279 + setflag FLAG_RECEIVED_WHITE_HERB release end @@ -104,13 +104,13 @@ Route104_EventScript_14EF8A:: @ 814EF8A Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer - checkflag 262 + checkflag FLAG_RECEIVED_TM09 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 262 + setflag FLAG_RECEIVED_TM09 release end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 0c5419af6..f4838a211 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -328,7 +328,7 @@ Route109_EventScript_14F725:: @ 814F725 lock faceplayer special GetPlayerBigGuyGirlString - checkflag 280 + checkflag FLAG_RECEIVED_SOFT_SAND goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem ITEM_SOFT_SAND @@ -337,7 +337,7 @@ Route109_EventScript_14F725:: @ 814F725 closemessage applymovement LAST_TALKED, Route109_Movement_1A083D waitmovement 0 - setflag 280 + setflag FLAG_RECEIVED_SOFT_SAND release end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index acd145dc3..9896af5ae 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -13,13 +13,13 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer setvar 0x8008, 3 - checkflag 277 + checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem ITEM_MACHO_BRACE compare RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B - setflag 277 + setflag FLAG_RECEIVED_MACHO_BRACE goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index b217f24c4..3cdd40d51 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -9,13 +9,13 @@ Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 lock faceplayer - checkflag 261 + checkflag FLAG_RECEIVED_TM28 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem ITEM_TM28 compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B - setflag 261 + setflag FLAG_RECEIVED_TM28 release end diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 13843f758..2ce9c1bfa 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -4,7 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 815C20E Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F lock faceplayer - checkflag 267 + checkflag FLAG_RECEIVED_FOSSIL_MON goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 compare RESULT, 1 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 003bcc397..c9e33288b 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -35,14 +35,14 @@ Route116_EventScript_150A71:: @ 8150A71 Route116_EventScript_150A7B:: @ 8150A7B lock faceplayer - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq Route116_EventScript_150B04 msgbox Route116_Text_1705AE, 4 goto Route116_EventScript_150A94 end Route116_EventScript_150A94:: @ 8150A94 - setflag 287 + setflag FLAG_MET_DEVON_EMPLOYEE giveitem ITEM_REPEAT_BALL compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 2bb43fc90..c6937170e 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -52,9 +52,9 @@ Route120_EventScript_151682:: @ 8151682 Route120_MapScript1_151686:: @ 8151686 checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route120_EventScript_1516A2 - checkflag 285 + checkflag FLAG_RECEIVED_DEVON_SCOPE call_if 1, Route120_EventScript_1516B5 - checkflag 285 + checkflag FLAG_RECEIVED_DEVON_SCOPE call_if 0, Route120_EventScript_1516DA end @@ -239,7 +239,7 @@ Route120_EventScript_151908:: @ 8151908 waitmovement 0 msgbox Route120_Text_171A40, 4 giveitem ITEM_DEVON_SCOPE - setflag 285 + setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_171B0E, 4 closemessage applymovement 31, Route120_Movement_1A0845 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 76134aa43..8708bde71 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -549,7 +549,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8 RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer - checkflag 288 + checkflag FLAG_MET_RIVAL_RUSTBORO goto_if_eq RustboroCity_EventScript_14C917 checkplayergender compare RESULT, 0 @@ -559,13 +559,13 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA end RustboroCity_EventScript_14C8FD:: @ 814C8FD - setflag 288 + setflag FLAG_MET_RIVAL_RUSTBORO msgbox RustboroCity_Text_1670A7, 4 release end RustboroCity_EventScript_14C90A:: @ 814C90A - setflag 288 + setflag FLAG_MET_RIVAL_RUSTBORO msgbox RustboroCity_Text_167213, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index c17a1ef68..097fee3fb 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -25,7 +25,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 faceplayer compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4 release @@ -139,7 +139,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 - setflag 267 + setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare @@ -159,7 +159,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 - setflag 267 + setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 3756b5c72..0cd4a36a8 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -146,7 +146,7 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock faceplayer - checkflag 272 + checkflag FLAG_RECEIVED_EXP_SHARE goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 @@ -162,7 +162,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 giveitem ITEM_EXP_SHARE compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B - setflag 272 + setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc index cb722a6af..69f977e79 100644 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ b/data/scripts/maps/RustboroCity_Mart.inc @@ -6,9 +6,9 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 faceplayer message RustboroCity_Mart_Text_1A0BE4 waitmessage - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if 0, RustboroCity_Mart_EventScript_157BEF - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq RustboroCity_Mart_EventScript_157C18 end diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 73b364f5e..9fd77bd6b 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -77,7 +77,7 @@ RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5 RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE lock faceplayer - checkflag 275 + checkflag FLAG_RECEIVED_QUICK_CLAW goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 compare FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E @@ -90,7 +90,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE closemessage applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmovement 0 - setflag 275 + setflag FLAG_RECEIVED_QUICK_CLAW release end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 8c28628ea..18018316a 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -124,7 +124,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 sethealplace 8 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag 260 + checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate @@ -134,7 +134,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 SSTidalCorridor_EventScript_15FE17:: @ 815FE17 sethealplace 4 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag 260 + checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index c7cd4447d..0a48ae453 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -4,13 +4,13 @@ SSTidalRooms_MapScripts:: @ 815FF05 SSTidalRooms_EventScript_15FF06:: @ 815FF06 lock faceplayer - checkflag 260 + checkflag FLAG_RECEIVED_TM49 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem ITEM_TM49 compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B - setflag 260 + setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_199C1A, 4 release end diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index db5779efe..9f4908cf6 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -36,13 +36,13 @@ ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445 ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F lock faceplayer - checkflag 283 + checkflag FLAG_RECEIVED_FOCUS_BAND goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem ITEM_FOCUS_BAND compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B - setflag 283 + setflag FLAG_RECEIVED_FOCUS_BAND release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index f8070f1a1..220ca3374 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -12,13 +12,13 @@ SlateportCity_ContestHall_EventScript_155555:: @ 8155555 SlateportCity_ContestHall_EventScript_15555E:: @ 815555E lock faceplayer - checkflag 265 + checkflag FLAG_RECEIVED_TM41 goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem ITEM_TM41 compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B - setflag 265 + setflag FLAG_RECEIVED_TM41 msgbox SlateportCity_ContestHall_Text_17CE28, 4 release end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index ab71c9728..2486099ef 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -270,7 +270,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 faceplayer checkflag BADGE07_GET goto_if_eq SlateportCity_Harbor_EventScript_15626F - checkflag 271 + checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq SlateportCity_Harbor_EventScript_156258 @@ -289,7 +289,7 @@ SlateportCity_Harbor_EventScript_15624E:: @ 815624E end SlateportCity_Harbor_EventScript_156258:: @ 8156258 - setflag 271 + setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE msgbox SlateportCity_Harbor_Text_17FF35, 4 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 2776dd084..be5f5a8ff 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -167,7 +167,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A giveitem ITEM_TM46 compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 - setflag 269 + setflag FLAG_RECEIVED_TM46 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closemessage compare FACING, 2 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index ea2acf374..7f3c331bd 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -196,7 +196,7 @@ SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 lock faceplayer - checkflag 278 + checkflag FLAG_RECEIVED_SOOTHE_BELL goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialvar RESULT, GetLeadMonFriendshipScore @@ -215,7 +215,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A giveitem ITEM_SOOTHE_BELL compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B - setflag 278 + setflag FLAG_RECEIVED_SOOTHE_BELL release end -- cgit v1.2.3 From dde446225f01bab79119a5ad9413d7e779ce4b4b Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 3 Dec 2017 15:57:11 -0800 Subject: More script flags --- data/event_scripts.s | 6 +++--- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 2 +- data/scripts/maps/DewfordTown_House2.inc | 4 ++-- data/scripts/maps/FortreeCity.inc | 4 ++-- data/scripts/maps/LilycoveCity.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 8 ++++---- data/scripts/maps/MossdeepCity_StevensHouse.inc | 6 +++--- data/scripts/maps/PacifidlogTown_House2.inc | 16 ++++++++-------- data/scripts/maps/PetalburgCity_Mart.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 4 ++-- data/scripts/maps/Route120.inc | 4 ++-- data/scripts/maps/SlateportCity_Harbor.inc | 4 ++-- data/scripts/players_house.inc | 2 +- 15 files changed, 34 insertions(+), 34 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index b2414502f..c5c5e25c2 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1301,11 +1301,11 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 clearflag 860 clearflag 861 special sub_810FAA0 - checkflag 291 + checkflag FLAG_RECEIVED_SS_TICKET call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62 checkflag FLAG_LATIOS_OR_LATIAS_ROAMING call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70 - checkflag 298 + checkflag FLAG_RECEIVED_BELDUM call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A checkflag FLAG_RECEIVED_HM08 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E @@ -1802,7 +1802,7 @@ LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB clearflag 781 - setflag 296 + setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return DewfordTown_EventScript_1A0102:: @ 81A0102 diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index eb912028a..2bec8ac39 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -4,7 +4,7 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4 AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 lock faceplayer - checkflag 294 + checkflag FLAG_EXCHANGED_SCANNER goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 compare RESULT, 1 diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index befe47404..29ae58a22 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -4,13 +4,13 @@ DewfordTown_House2_MapScripts:: @ 81535DB DewfordTown_House2_EventScript_1535DC:: @ 81535DC lock faceplayer - checkflag 289 + checkflag FLAG_RECEIVED_SILK_SCARF goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem ITEM_SILK_SCARF compare RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B - setflag 289 + setflag FLAG_RECEIVED_SILK_SCARF release end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index ae0f53f5e..dd947d0e5 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -18,7 +18,7 @@ FortreeCity_EventScript_14C955:: @ 814C955 FortreeCity_EventScript_14C95E:: @ 814C95E lock faceplayer - checkflag 295 + checkflag FLAG_KECLEON_FLED_FORTREE goto_if_eq FortreeCity_EventScript_14C973 msgbox FortreeCity_Text_1675C2, 4 release @@ -82,7 +82,7 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 applymovement LAST_TALKED, FortreeCity_Movement_14CA13 waitmovement 0 removeobject LAST_TALKED - setflag 295 + setflag FLAG_KECLEON_FLED_FORTREE release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 0b5886131..7ffffad78 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -422,6 +422,6 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B waitfieldeffect 30 savebgm 0 fadedefaultbgm - setflag 292 + setflag FLAG_MET_RIVAL_LILYCOVE release end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index f0847e740..54e2bd042 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -22,7 +22,7 @@ LittlerootTown_MapScript1_14D514:: @ 814D514 end LittlerootTown_EventScript_14D563:: @ 814D563 - setflag 301 + setflag FLAG_RIVAL_LEFT_FOR_ROUTE103 return LittlerootTown_EventScript_14D567:: @ 814D567 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index a58d16dd5..d65e943fd 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -137,7 +137,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB faceplayer checkflag FLAG_DEFEATED_RIVAL_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 - checkflag 301 + checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 compare 0x408d, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index c0a403117..020c39eac 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -30,7 +30,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall - checkflag 292 + checkflag FLAG_MET_RIVAL_LILYCOVE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkplayergender compare RESULT, 0 @@ -117,18 +117,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED - setflag 293 + setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall end LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB - checkflag 293 + checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4 return LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED - checkflag 293 + checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08 msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4 return diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index ce24f2afd..5b2f281da 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -41,7 +41,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 giveitem ITEM_HM08 setflag FLAG_RECEIVED_HM08 - setflag 302 + setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 closemessage delay 20 @@ -89,7 +89,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag 968 - setflag 298 + setflag FLAG_RECEIVED_BELDUM releaseall end @@ -113,7 +113,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02 lockall - checkflag 302 + checkflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16 msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4 releaseall diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index e04a8caae..942f5626b 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -6,13 +6,13 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 faceplayer dodailyevents call PacifidlogTown_House2_EventScript_1541B4 - checkflag 299 + checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if_eq PacifidlogTown_House2_EventScript_154254 - checkflag 300 + checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER call_if 1, PacifidlogTown_House2_EventScript_1541CE - checkflag 300 + checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER call_if 0, PacifidlogTown_House2_EventScript_1541D7 - setflag 300 + setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_1541EC @@ -23,7 +23,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 - checkflag 299 + checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if 0, PacifidlogTown_House2_EventScript_1A14DC specialvar RESULT, sub_810F908 compare RESULT, 0 @@ -40,7 +40,7 @@ PacifidlogTown_House2_EventScript_1541D7:: @ 81541D7 return PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 - clearflag 299 + clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK return PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC @@ -48,7 +48,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC giveitem ITEM_TM27 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B - setflag 299 + setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 release @@ -64,7 +64,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 giveitem ITEM_TM21 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B - setflag 299 + setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 release diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc index e4186eaae..66e247323 100644 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ b/data/scripts/maps/PetalburgCity_Mart.inc @@ -6,7 +6,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 faceplayer message PetalburgCity_Mart_Text_1A0BE4 waitmessage - checkflag 296 + checkflag FLAG_PETALBURG_MART_EXPANDED_ITEMS goto_if_eq PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 msgbox PetalburgCity_Mart_Text_1A0C02, 4 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 0b0c72f70..c38d4d559 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -241,13 +241,13 @@ PetalburgWoods_EventScript_15CED3:: @ 815CED3 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC lock faceplayer - checkflag 297 + checkflag FLAG_RECEIVED_MIRACLE_SEED goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem ITEM_MIRACLE_SEED compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B - setflag 297 + setflag FLAG_RECEIVED_MIRACLE_SEED release end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index c6937170e..54f2d98a8 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -184,7 +184,7 @@ Route120_EventScript_15184A:: @ 815184A Route120_EventScript_151853:: @ 8151853 lock faceplayer - checkflag 290 + checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 goto_if_eq Route120_EventScript_151884 msgbox Route120_Text_171827, 5 compare RESULT, 0 @@ -194,7 +194,7 @@ Route120_EventScript_151853:: @ 8151853 Route120_EventScript_151877:: @ 8151877 msgbox Route120_Text_17193D, 4 - setflag 290 + setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 release end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 2486099ef..daa6b1e7c 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -340,7 +340,7 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 - setflag 294 + setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 end @@ -353,7 +353,7 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 - setflag 294 + setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index eab06c8ee..b27f98675 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -398,7 +398,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse 8 removeobject 0x8009 - setflag 291 + setflag FLAG_RECEIVED_SS_TICKET setvar 0x4082, 4 setvar 0x408c, 4 releaseall -- cgit v1.2.3 From 861bd9292da04e083214f493ac064596fec397b9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 3 Dec 2017 16:44:29 -0800 Subject: Use decoration flag constants --- data/event_scripts.s | 36 +++++++++++----------- .../events/LittlerootTown_BrendansHouse_2F.inc | 24 +++++++-------- data/maps/events/LittlerootTown_MaysHouse_2F.inc | 24 +++++++-------- data/maps/events/SecretBase_BlueCave1.inc | 30 +++++++++--------- data/maps/events/SecretBase_BlueCave2.inc | 30 +++++++++--------- data/maps/events/SecretBase_BlueCave3.inc | 30 +++++++++--------- data/maps/events/SecretBase_BlueCave4.inc | 30 +++++++++--------- data/maps/events/SecretBase_BrownCave1.inc | 30 +++++++++--------- data/maps/events/SecretBase_BrownCave2.inc | 30 +++++++++--------- data/maps/events/SecretBase_BrownCave3.inc | 30 +++++++++--------- data/maps/events/SecretBase_BrownCave4.inc | 30 +++++++++--------- data/maps/events/SecretBase_RedCave1.inc | 30 +++++++++--------- data/maps/events/SecretBase_RedCave2.inc | 30 +++++++++--------- data/maps/events/SecretBase_RedCave3.inc | 30 +++++++++--------- data/maps/events/SecretBase_RedCave4.inc | 30 +++++++++--------- data/maps/events/SecretBase_Shrub1.inc | 30 +++++++++--------- data/maps/events/SecretBase_Shrub2.inc | 30 +++++++++--------- data/maps/events/SecretBase_Shrub3.inc | 30 +++++++++--------- data/maps/events/SecretBase_Shrub4.inc | 30 +++++++++--------- data/maps/events/SecretBase_Tree1.inc | 30 +++++++++--------- data/maps/events/SecretBase_Tree2.inc | 30 +++++++++--------- data/maps/events/SecretBase_Tree3.inc | 30 +++++++++--------- data/maps/events/SecretBase_Tree4.inc | 30 +++++++++--------- data/maps/events/SecretBase_YellowCave1.inc | 30 +++++++++--------- data/maps/events/SecretBase_YellowCave2.inc | 30 +++++++++--------- data/maps/events/SecretBase_YellowCave3.inc | 30 +++++++++--------- data/maps/events/SecretBase_YellowCave4.inc | 30 +++++++++--------- 27 files changed, 402 insertions(+), 402 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index c5c5e25c2..5b01fd85f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -409,7 +409,7 @@ gUnknown_0815F36C:: @ 815F36C EventScript_15F384: message UnknownString_81A3A87 waitmessage - checkflag FLAG_SECRET_BASE_UNKNOWN_16 + checkflag FLAG_DECORATION_16 goto_if_eq EventScript_15F3A0 goto EventScript_15F3E2 end @@ -3723,7 +3723,7 @@ EventScript_1A2DB8: closemessage playse 9 setvar 0x4097, 0 - setflag FLAG_SECRET_BASE_UNKNOWN_1 + setflag FLAG_DECORATION_1 special sub_80BB8CC special sub_80BBAF0 setvar 0x8004, 0 @@ -3764,14 +3764,14 @@ gUnknown_081A2E14:: @ 81A2E14 special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 - clearflag FLAG_SECRET_BASE_UNKNOWN_1 + clearflag FLAG_DECORATION_1 special sub_80BBAF0 setvar 0x4089, 0 waitstate end EventScript_1A2E38: - setflag FLAG_SECRET_BASE_UNKNOWN_1 + setflag FLAG_DECORATION_1 special sub_80BBAF0 setvar 0x4089, 0 waitstate @@ -3841,20 +3841,20 @@ EventScript_1A2F3A:: LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D - setflag FLAG_SECRET_BASE_UNKNOWN_2 - setflag FLAG_SECRET_BASE_UNKNOWN_3 - setflag FLAG_SECRET_BASE_UNKNOWN_4 - setflag FLAG_SECRET_BASE_UNKNOWN_5 - setflag FLAG_SECRET_BASE_UNKNOWN_6 - setflag FLAG_SECRET_BASE_UNKNOWN_7 - setflag FLAG_SECRET_BASE_UNKNOWN_8 - setflag FLAG_SECRET_BASE_UNKNOWN_9 - setflag FLAG_SECRET_BASE_UNKNOWN_10 - setflag FLAG_SECRET_BASE_UNKNOWN_11 - setflag FLAG_SECRET_BASE_UNKNOWN_12 - setflag FLAG_SECRET_BASE_UNKNOWN_13 - setflag FLAG_SECRET_BASE_UNKNOWN_14 - setflag FLAG_SECRET_BASE_UNKNOWN_15 + setflag FLAG_DECORATION_2 + setflag FLAG_DECORATION_3 + setflag FLAG_DECORATION_4 + setflag FLAG_DECORATION_5 + setflag FLAG_DECORATION_6 + setflag FLAG_DECORATION_7 + setflag FLAG_DECORATION_8 + setflag FLAG_DECORATION_9 + setflag FLAG_DECORATION_10 + setflag FLAG_DECORATION_11 + setflag FLAG_DECORATION_12 + setflag FLAG_DECORATION_13 + setflag FLAG_DECORATION_14 + setflag FLAG_DECORATION_15 return LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index ac77a80f9..2f7d6688d 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -1,17 +1,17 @@ LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728 object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, 760, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index ef2ea416a..ee4f6e1ec 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -1,17 +1,17 @@ LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978 object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, 722, 0, 0 - object_event 2, 240, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 2, 240, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, 849, 0, 0 diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index 53d359f53..1ef513e65 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave1_MapObjects:: @ 838F18C - object_event 1, 255, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave1_MapWarps:: @ 838F2F4 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index ee1d5ddd0..2a2fdb421 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave2_MapObjects:: @ 838FAA4 - object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave2_MapWarps:: @ 838FC0C warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index 453937fc6..8fc65ad54 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave3_MapObjects:: @ 83903BC - object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave3_MapWarps:: @ 8390524 warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index 28cfa89a3..497123d44 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave4_MapObjects:: @ 8390CD4 - object_event 1, 255, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave4_MapWarps:: @ 8390E3C warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index 10adecc59..2db31b4d2 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave1_MapObjects:: @ 838F008 - object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave1_MapWarps:: @ 838F170 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index 098499878..72fb53a86 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave2_MapObjects:: @ 838F920 - object_event 1, 255, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave2_MapWarps:: @ 838FA88 warp_def 1, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 34167d50b..2b320d6bb 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave3_MapObjects:: @ 8390238 - object_event 1, 255, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave3_MapWarps:: @ 83903A0 warp_def 11, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index c1e884155..26b0f2537 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave4_MapObjects:: @ 8390B50 - object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave4_MapWarps:: @ 8390CB8 warp_def 2, 8, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index b9700b06f..733d4d808 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -1,19 +1,19 @@ SecretBase_RedCave1_MapObjects:: @ 838EE84 - object_event 1, 255, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave1_MapWarps:: @ 838EFEC warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index b13f03a74..84fcd52f0 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -1,19 +1,19 @@ SecretBase_RedCave2_MapObjects:: @ 838F79C - object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave2_MapWarps:: @ 838F904 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index 209979af3..f129a82fb 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -1,19 +1,19 @@ SecretBase_RedCave3_MapObjects:: @ 83900B4 - object_event 1, 255, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave3_MapWarps:: @ 839021C warp_def 3, 6, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index 93b552df0..97e71648e 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -1,19 +1,19 @@ SecretBase_RedCave4_MapObjects:: @ 83909CC - object_event 1, 255, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave4_MapWarps:: @ 8390B34 warp_def 2, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 4f3fc1011..7727f5efb 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -1,19 +1,19 @@ SecretBase_Shrub1_MapObjects:: @ 838F618 - object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub1_MapWarps:: @ 838F780 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 43d752db7..32b495b05 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -1,19 +1,19 @@ SecretBase_Shrub2_MapObjects:: @ 838FF30 - object_event 1, 255, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub2_MapWarps:: @ 8390098 warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index 80bc2a787..173305a86 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -1,19 +1,19 @@ SecretBase_Shrub3_MapObjects:: @ 8390848 - object_event 1, 255, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub3_MapWarps:: @ 83909B0 warp_def 6, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index 1e72213d8..1920bbd08 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -1,19 +1,19 @@ SecretBase_Shrub4_MapObjects:: @ 8391160 - object_event 1, 255, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub4_MapWarps:: @ 83912C8 warp_def 11, 8, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index a7e0ff822..a43b1ad76 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -1,19 +1,19 @@ SecretBase_Tree1_MapObjects:: @ 838F494 - object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree1_MapWarps:: @ 838F5FC warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index 3d58e58a5..aa0ef4b7d 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -1,19 +1,19 @@ SecretBase_Tree2_MapObjects:: @ 838FDAC - object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree2_MapWarps:: @ 838FF14 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index 18f2e0329..69414c222 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -1,19 +1,19 @@ SecretBase_Tree3_MapObjects:: @ 83906C4 - object_event 1, 255, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree3_MapWarps:: @ 839082C warp_def 8, 6, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index c4e1fc225..3ea6c57ea 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -1,19 +1,19 @@ SecretBase_Tree4_MapObjects:: @ 8390FDC - object_event 1, 255, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree4_MapWarps:: @ 8391144 warp_def 7, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 5ae83e9a8..12fd311e3 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave1_MapObjects:: @ 838F310 - object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave1_MapWarps:: @ 838F478 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index d2dab3900..5e3abde63 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave2_MapObjects:: @ 838FC28 - object_event 1, 255, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave2_MapWarps:: @ 838FD90 warp_def 12, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index ef6c9a406..3a139d2d9 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave3_MapObjects:: @ 8390540 - object_event 1, 255, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave3_MapWarps:: @ 83906A8 warp_def 5, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index 9ef977a9a..5812a25e0 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave4_MapObjects:: @ 8390E58 - object_event 1, 255, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, 173, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + object_event 1, 255, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave4_MapWarps:: @ 8390FC0 warp_def 6, 12, 0, 126, MAP_NONE -- cgit v1.2.3 From 8dd25bcad09064f0b3314a71a62ad22f91b42bb3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 4 Dec 2017 20:48:25 -0800 Subject: Start using constants for hide-show flags --- data/event_scripts.s | 24 +++++++++++----------- .../events/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/maps/events/LittlerootTown_MaysHouse_1F.inc | 2 +- data/maps/events/LittlerootTown_MaysHouse_2F.inc | 2 +- .../events/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/maps/events/MossdeepCity_StevensHouse.inc | 2 +- data/maps/events/PetalburgCity.inc | 4 ++-- data/maps/events/PetalburgWoods.inc | 4 ++-- data/maps/events/Route101.inc | 4 ++-- data/maps/events/Route103.inc | 2 +- data/maps/events/RustboroCity.inc | 4 ++-- data/maps/events/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 6 +++--- data/scripts/maps/Route101.inc | 6 +++--- data/scripts/maps/RustboroCity.inc | 4 ++-- 17 files changed, 37 insertions(+), 37 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 5b01fd85f..59e7fef09 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1159,12 +1159,12 @@ gUnknown_0819FA81:: @ 819FA81 setflag 769 setflag 770 setflag 771 - setflag 721 + setflag FLAG_HIDE_BIRCH_IN_LAB setflag 889 - setflag 726 + setflag FLAG_HIDE_WALLY_PETALBURG setflag 867 - setflag 731 - setflag 732 + setflag FLAG_HIDE_GRUNT_RUSTBORO + setflag FLAG_HIDE_DEVON_RUSTBORO setflag 814 setflag 868 setflag 739 @@ -1175,7 +1175,7 @@ gUnknown_0819FA81:: @ 819FA81 setflag 743 setflag 744 setflag 906 - setflag 737 + setflag FLAG_UNKNOWN_2E1 setflag 747 setflag 748 setflag 749 @@ -1190,7 +1190,7 @@ gUnknown_0819FA81:: @ 819FA81 setflag 781 setflag 782 setflag 783 - setflag 734 + setflag FLAG_HIDE_NORMAN_LITTLEROOT setflag 849 setflag 789 setflag 790 @@ -1283,7 +1283,7 @@ gUnknown_0819FA81:: @ 819FA81 setflag 950 setflag 968 setflag 1133 - setflag 727 + setflag FLAG_HIDE_STEVENS_LETTER setflag 979 setflag 751 setflag 991 @@ -1295,7 +1295,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 call EverGrandeCity_HallOfFame_EventScript_19FD09 setflag 869 clearflag 950 - clearflag 727 + clearflag FLAG_HIDE_STEVENS_LETTER setvar 0x40c6, 1 clearflag 751 clearflag 860 @@ -1322,7 +1322,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62 setvar 0x4082, 3 setvar 0x408c, 3 - clearflag 734 + clearflag FLAG_HIDE_NORMAN_LITTLEROOT return EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70 @@ -2167,7 +2167,7 @@ Route103_EventScript_1A02F4:: @ 81A02F4 return Route101_EventScript_1A0358:: @ 81A0358 - clearflag 721 + clearflag FLAG_HIDE_BIRCH_IN_LAB clearflag 896 setflag 897 setflag 898 @@ -2175,7 +2175,7 @@ Route101_EventScript_1A0358:: @ 81A0358 Route101_EventScript_1A0365:: @ 81A0365 clearflag 897 - setflag 721 + setflag FLAG_HIDE_BIRCH_IN_LAB setflag 896 setflag 898 return @@ -2183,7 +2183,7 @@ Route101_EventScript_1A0365:: @ 81A0365 Route101_EventScript_1A0372:: @ 81A0372 clearflag 898 setflag 897 - setflag 721 + setflag FLAG_HIDE_BIRCH_IN_LAB setflag 896 return diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index cf0d27876..8f6ab7059 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -3,7 +3,7 @@ LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674 object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, 755, 0, 0 object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, 754, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, 784, 0, 0 - object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0 + object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index 875022b3b..700885519 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -3,7 +3,7 @@ LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4 object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, 754, 0, 0 object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, 755, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, 785, 0, 0 - object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0 + object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index ee4f6e1ec..e620bdb8f 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -1,5 +1,5 @@ LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978 - object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, 722, 0, 0 + object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS, 0, 0 object_event 2, 240, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 object_event 3, 241, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 object_event 4, 242, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index 9a69cfafd..024d1fb3f 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -1,6 +1,6 @@ LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, 721, 0, 0 + object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0 object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, 889, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index 0aef37766..bab321ff7 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -2,7 +2,7 @@ MossdeepCity_StevensHouse_MapObjects:: @ 838AA44 object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, 967, 0, 0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, 968, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, 1133, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, 727, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER, 0, 0 MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 3b6329587..2732bc93c 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -1,6 +1,6 @@ PetalburgCity_MapObjects:: @ 837F5F0 - object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, 728, 0, 0 - object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 726, 0, 0 + object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1, 0, 0 + object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0, 0, 0 object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0 object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 811, 0, 0 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index be298246d..5a2885be5 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,8 +1,8 @@ PetalburgWoods_MapObjects:: @ 838C14C object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 - object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0 + object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, 1055, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, 1058, 0, 0 diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index bad4e3ba9..f44f105b6 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -1,7 +1,7 @@ Route101_MapObjects:: @ 83810BC object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 16, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA64, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, 720, 0, 0 - object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, 700, 0, 0 + object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 0, 0 + object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0 object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, 750, 0, 0 object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, 897, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, 991, 0, 0 diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index d108c2d46..0ecfedf38 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -1,6 +1,6 @@ Route103_MapObjects:: @ 8381300 object_event 1, MAP_OBJ_GFX_MAN_4, 0, 49, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route103_EventScript_14ED82, 0, 0, 0 - object_event 2, 240, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, 723, 0, 0 + object_event 2, 240, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 71, 0, 10, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route103_EventScript_14ED94, 0, 0, 0 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index f42fd059c..6daf6bcf6 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -7,8 +7,8 @@ RustboroCity_MapObjects:: @ 837FD14 object_event 6, MAP_OBJ_GFX_MAN_4, 0, 26, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3BA, 0, 0, 0 object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 24, 0, 51, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0, 0, 0 object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 0, 51, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, 732, 0, 0 - object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 731, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO, 0, 0 + object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0 object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, 1041, 0, 0 object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 414ab7e07..a6d3ed424 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -5,7 +5,7 @@ SeafloorCavern_Room9_MapObjects:: @ 838D620 object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0 object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, 1090, 0, 0 - object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 733, 0, 0 + object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGENDARY_MON_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 737bacf71..036523bf1 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -41,7 +41,7 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68 setflag 758 setflag 761 setflag 785 - setflag 722 + setflag FLAG_HIDE_MAY_UPSTAIRS setvar 0x4082, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 7ffffad78..b8c6b26f5 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -355,7 +355,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 call_if 1, LilycoveCity_EventScript_14CEEE compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 - clearflag 722 + clearflag FLAG_HIDE_MAY_UPSTAIRS clearflag 849 goto LilycoveCity_EventScript_14CF6B end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 19addd4b4..47601a964 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -86,7 +86,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C waitmovement 0 playse 9 removeobject 10 - setflag 726 + setflag FLAG_HIDE_WALLY_PETALBURG delay 30 applymovement 255, PetalburgCity_Gym_Movement_1A0841 waitmovement 0 @@ -205,10 +205,10 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 - setflag 728 + setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 setvar 0x4085, 1 setvar 0x4057, 2 - clearflag 726 + clearflag FLAG_HIDE_WALLY_PETALBURG clearflag 866 setflag 889 special InitBirchState diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 122e723a1..c9a364c80 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -230,9 +230,9 @@ Route101_EventScript_14EA7F:: @ 814EA7F waitmovement 0 msgbox Route101_Text_16D191, 4 special ScrSpecial_HealPlayerParty - setflag 720 - clearflag 721 - setflag 700 + setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA + clearflag FLAG_HIDE_BIRCH_IN_LAB + setflag FLAG_HIDE_BIRCH_STARTERS_BAG setvar 0x4084, 2 setvar 0x4060, 3 clearflag 0x4000 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 8708bde71..358a946a6 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -178,7 +178,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 waitmovement 0 removeobject 9 setobjectxyperm 9, 30, 10 - clearflag 732 + clearflag FLAG_HIDE_DEVON_RUSTBORO setflag FLAG_DEVON_GOODS_STOLEN setvar 0x405a, 2 setvar 0x409a, 2 @@ -474,7 +474,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D msgbox RustboroCity_Text_16707F, 4 closemessage setflag FLAG_RETURNED_DEVON_GOODS - setflag 732 + setflag FLAG_HIDE_DEVON_RUSTBORO setvar 0x405a, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 -- cgit v1.2.3 From 65207e03662c639970ef19b372c21b8e28b6f097 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 9 Dec 2017 14:43:21 -0800 Subject: Label all flags up to 901 --- data/event_scripts.s | 286 ++++++++++----------- data/maps/events/AquaHideout_1F.inc | 4 +- data/maps/events/BattleTower_BattleRoom.inc | 2 +- data/maps/events/CaveOfOrigin_B4F.inc | 2 +- data/maps/events/DewfordTown.inc | 4 +- data/maps/events/FallarborTown_ContestLobby.inc | 2 +- .../maps/events/FallarborTown_PokemonCenter_1F.inc | 2 +- data/maps/events/GraniteCave_StevensRoom.inc | 2 +- data/maps/events/LilycoveCity.inc | 10 +- data/maps/events/LilycoveCity_ContestLobby.inc | 6 +- data/maps/events/LilycoveCity_Harbor.inc | 2 +- .../maps/events/LilycoveCity_LilycoveMuseum_1F.inc | 10 +- .../maps/events/LilycoveCity_LilycoveMuseum_2F.inc | 6 +- .../events/LilycoveCity_PokemonTrainerFanClub.inc | 8 +- data/maps/events/LittlerootTown.inc | 8 +- .../events/LittlerootTown_BrendansHouse_1F.inc | 8 +- .../events/LittlerootTown_BrendansHouse_2F.inc | 4 +- data/maps/events/LittlerootTown_MaysHouse_1F.inc | 8 +- data/maps/events/LittlerootTown_MaysHouse_2F.inc | 4 +- .../events/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/maps/events/MagmaHideout_1F.inc | 4 +- data/maps/events/MauvilleCity.inc | 4 +- data/maps/events/MtChimney.inc | 10 +- data/maps/events/PetalburgCity.inc | 4 +- data/maps/events/PetalburgCity_Gym.inc | 6 +- data/maps/events/Route101.inc | 4 +- data/maps/events/Route103.inc | 2 +- data/maps/events/Route104.inc | 4 +- data/maps/events/Route104_MrBrineysHouse.inc | 4 +- data/maps/events/Route109.inc | 4 +- data/maps/events/Route110.inc | 10 +- data/maps/events/Route110_TrickHouseEnd.inc | 2 +- data/maps/events/Route110_TrickHouseEntrance.inc | 2 +- data/maps/events/Route111.inc | 16 +- data/maps/events/Route112.inc | 4 +- data/maps/events/Route114_LanettesHouse.inc | 2 +- data/maps/events/Route116.inc | 6 +- data/maps/events/Route118.inc | 8 +- data/maps/events/Route119.inc | 6 +- data/maps/events/Route119_WeatherInstitute_1F.inc | 8 +- data/maps/events/Route119_WeatherInstitute_2F.inc | 10 +- data/maps/events/Route120.inc | 4 +- data/maps/events/Route128.inc | 2 +- data/maps/events/RustboroCity.inc | 2 +- data/maps/events/RusturfTunnel.inc | 8 +- data/maps/events/SeafloorCavern_Room9.inc | 12 +- data/maps/events/SkyPillar_Top.inc | 2 +- data/maps/events/SlateportCity.inc | 22 +- data/maps/events/SlateportCity_ContestLobby.inc | 2 +- data/maps/events/SlateportCity_Harbor.inc | 10 +- .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 12 +- .../maps/events/SlateportCity_OceanicMuseum_2F.inc | 8 +- .../events/SlateportCity_SternsShipyard_1F.inc | 2 +- data/maps/events/SootopolisCity.inc | 20 +- data/maps/events/SootopolisCity_Gym_1F.inc | 2 +- data/maps/events/VerdanturfTown_ContestLobby.inc | 2 +- data/maps/events/VerdanturfTown_WandasHouse.inc | 6 +- data/maps/events/VictoryRoad_1F.inc | 4 +- data/scripts/gabby_and_ty.inc | 20 +- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 10 +- data/scripts/maps/DewfordTown.inc | 14 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 2 +- data/scripts/maps/FallarborTown.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 14 +- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 6 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 16 +- data/scripts/maps/LittlerootTown.inc | 10 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 4 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 4 +- data/scripts/maps/PetalburgCity_Gym.inc | 4 +- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/Route104.inc | 6 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 8 +- data/scripts/maps/Route109.inc | 6 +- data/scripts/maps/Route111.inc | 8 +- data/scripts/maps/Route119.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/RustboroCity.inc | 10 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 10 +- data/scripts/maps/RusturfTunnel.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 16 +- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SlateportCity.inc | 10 +- data/scripts/maps/SlateportCity_Harbor.inc | 6 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 4 +- .../maps/SlateportCity_SternsShipyard_1F.inc | 2 +- data/scripts/maps/VerdanturfTown.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 4 +- data/scripts/players_house.inc | 4 +- 96 files changed, 425 insertions(+), 425 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 59e7fef09..38bc34845 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1156,108 +1156,108 @@ Event_ResetBerryTrees: @ 19F940 gUnknown_0819FA81:: @ 819FA81 setflag FLAG_LINK_CONTEST_ROOM_POKEBALL - setflag 769 - setflag 770 - setflag 771 + setflag FLAG_HIDE_VICTORIA_WINSTRATE + setflag FLAG_HIDE_VIVI_WINSTRATE + setflag FLAG_HIDE_VICKI_WINSTRATE setflag FLAG_HIDE_BIRCH_IN_LAB - setflag 889 + setflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_HIDE_WALLY_PETALBURG - setflag 867 + setflag FLAG_UNKNOWN_363 setflag FLAG_HIDE_GRUNT_RUSTBORO setflag FLAG_HIDE_DEVON_RUSTBORO - setflag 814 - setflag 868 - setflag 739 - setflag 881 - setflag 738 - setflag 740 - setflag 741 - setflag 743 - setflag 744 + setflag FLAG_HIDE_RIVAL_RUSTBORO + setflag FLAG_HIDE_FAT_MAN_LITTLEROOT + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 setflag 906 setflag FLAG_UNKNOWN_2E1 - setflag 747 - setflag 748 - setflag 749 - setflag 756 - setflag 774 - setflag 895 - setflag 776 - setflag 777 - setflag 778 - setflag 779 - setflag 780 - setflag 781 - setflag 782 - setflag 783 + setflag FLAG_UNKNOWN_2EB + setflag FLAG_UNKNOWN_2EC + setflag FLAG_UNKNOWN_2ED + setflag FLAG_UNKNOWN_2F4 + setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 + setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN + setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER + setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + setflag FLAG_HIDE_PETALBURG_GYM_GUIDE + setflag FLAG_UNKNOWN_30E + setflag FLAG_UNKNOWN_30F setflag FLAG_HIDE_NORMAN_LITTLEROOT - setflag 849 - setflag 789 - setflag 790 - setflag 791 - setflag 792 - setflag 797 - setflag 798 - setflag 799 - setflag 901 + setflag FLAG_HIDE_MAY_PICHU_DOLL + setflag FLAG_HIDE_FANCLUB_OLD_LADY + setflag FLAG_HIDE_FANCLUB_BOY + setflag FLAG_HIDE_FANCLUB_LITTLE_BOY + setflag FLAG_HIDE_FANCLUB_LADY + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 setflag 902 setflag 903 setflag 904 - setflag 800 - setflag 801 - setflag 803 - setflag 802 - setflag 806 - setflag 808 - setflag 809 + setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR + setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF + setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT + setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE + setflag FLAG_HIDE_WALLY_WANDAS_HOUSE + setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE + setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE setflag 984 - setflag 811 - setflag 812 - setflag 866 - setflag 815 - setflag 816 - setflag 869 - setflag 823 - setflag 828 - setflag 829 - setflag 831 - setflag 859 - setflag 841 - setflag 843 - setflag 844 - setflag 847 - setflag 845 - setflag 846 - setflag 860 - setflag 861 - setflag 835 - setflag 840 - setflag 848 - setflag 851 - setflag 855 - setflag 856 + setflag FLAG_HIDE_WALLY_FATHER_PETALBURG + setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG + setflag FLAG_HIDE_WALLY_PETALBURG_GYM + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS + setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD + setflag FLAG_UNKNOWN_337 + setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN + setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR + setflag FLAG_UNKNOWN_34B + setflag FLAG_UNKNOWN_34C + setflag FLAG_UNKNOWN_34F + setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR + setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR + setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT + setflag FLAG_HIDE_STERN_SLATEPORT + setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + setflag FLAG_HIDE_RIVAL_ROUTE119 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 setflag 973 - setflag 870 - setflag 872 - setflag 877 - setflag 879 - setflag 891 - setflag 880 - setflag 878 - setflag 807 + setflag FLAG_HIDE_LANETTE + setflag FLAG_HIDE_TRICKMASTER_ENTRANCE + setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE + setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL + setflag FLAG_HIDE_BRINEY_ROUTE116 + setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL setflag 983 - setflag 886 - setflag 884 - setflag 885 + setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F + setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F + setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F setflag 961 - setflag 888 + setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT setflag 941 - setflag 752 - setflag 757 - setflag 892 - setflag 896 - setflag 897 - setflag 898 + setflag FLAG_HIDE_MOM_LITTLEROOT + setflag FLAG_HIDE_MOM_UPSTAIRS + setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + setflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE101 + setflag FLAG_HIDE_BIRCH_ROUTE103 setflag 909 setflag 910 setflag 911 @@ -1274,18 +1274,18 @@ gUnknown_0819FA81:: @ 819FA81 setflag 939 setflag 940 setflag 928 - setflag 834 + setflag FLAG_HIDE_STEVEN_ROUTE128 setflag 944 setflag 945 setflag 947 setflag 948 - setflag 858 + setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD setflag 950 setflag 968 setflag 1133 setflag FLAG_HIDE_STEVENS_LETTER setflag 979 - setflag 751 + setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD setflag 991 call Event_ResetBerryTrees end @@ -1293,13 +1293,13 @@ gUnknown_0819FA81:: @ 819FA81 EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 clearflag 925 call EverGrandeCity_HallOfFame_EventScript_19FD09 - setflag 869 + setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag 950 clearflag FLAG_HIDE_STEVENS_LETTER setvar 0x40c6, 1 - clearflag 751 - clearflag 860 - clearflag 861 + clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD + clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR special sub_810FAA0 checkflag FLAG_RECEIVED_SS_TICKET call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62 @@ -1354,35 +1354,35 @@ gUnknown_0819FC9F:: @ 819FC9F end EventScript_19FCC1: - setflag 740 - setflag 743 - setflag 741 - setflag 744 - clearflag 742 - clearflag 739 - clearflag 881 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE end EventScript_19FCD7: - setflag 741 - setflag 744 - setflag 738 - setflag 742 - setflag 739 - setflag 881 - clearflag 740 - clearflag 743 + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD end EventScript_19FCF0: - setflag 738 - setflag 742 - setflag 739 - setflag 881 - setflag 740 - setflag 743 - clearflag 741 - clearflag 744 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 end EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09 @@ -1406,11 +1406,11 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC checkflag 1217 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag 742 + checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49 - checkflag 740 + checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F - checkflag 741 + checkflag FLAG_HIDE_MR_BRINEY_ROUTE109 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55 return @@ -1801,7 +1801,7 @@ DewfordTown_Gym_EventScript_1A00FB:: @ 81A00FB LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB - clearflag 781 + clearflag FLAG_HIDE_PETALBURG_GYM_GUIDE setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return @@ -2168,23 +2168,23 @@ Route103_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A0358:: @ 81A0358 clearflag FLAG_HIDE_BIRCH_IN_LAB - clearflag 896 - setflag 897 - setflag 898 + clearflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE101 + setflag FLAG_HIDE_BIRCH_ROUTE103 return Route101_EventScript_1A0365:: @ 81A0365 - clearflag 897 + clearflag FLAG_HIDE_BIRCH_ROUTE101 setflag FLAG_HIDE_BIRCH_IN_LAB - setflag 896 - setflag 898 + setflag FLAG_UNKNOWN_BIRCH_380 + setflag FLAG_HIDE_BIRCH_ROUTE103 return Route101_EventScript_1A0372:: @ 81A0372 - clearflag 898 - setflag 897 + clearflag FLAG_HIDE_BIRCH_ROUTE103 + setflag FLAG_HIDE_BIRCH_ROUTE101 setflag FLAG_HIDE_BIRCH_IN_LAB - setflag 896 + setflag FLAG_UNKNOWN_BIRCH_380 return LittlerootTown_ProfessorBirchsLab_EventScript_1A037F:: @ 81A037F @@ -2252,21 +2252,21 @@ SlateportCity_Harbor_Movement_1A041C:: @ 81A041C step_end PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 - setflag 740 - setflag 743 - setflag 741 - setflag 744 - setflag 738 - setflag 742 - setflag 739 - setflag 881 + setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + setflag FLAG_HIDE_MR_BRINEY_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE setvar 0x4096, 0 return RusturfTunnel_EventScript_1A0442:: @ 81A0442 removeobject 1 removeobject 10 - clearflag 808 + clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE clearflag 984 setvar 0x409a, 6 setflag FLAG_RUSTURF_TUNNEL_OPENED @@ -4644,19 +4644,19 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 end FallarborTown_ContestLobby_EventScript_1AE1EE:: @ 81AE1EE - clearflag 800 + clearflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR return FallarborTown_ContestLobby_EventScript_1AE1F2:: @ 81AE1F2 - clearflag 801 + clearflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF return FallarborTown_ContestLobby_EventScript_1AE1F6:: @ 81AE1F6 - clearflag 803 + clearflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return FallarborTown_ContestLobby_EventScript_1AE1FA:: @ 81AE1FA - clearflag 802 + clearflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE return FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index 0c8ed6773..e46a06c93 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -1,6 +1,6 @@ AquaHideout_1F_MapObjects:: @ 838CD0C - object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, 821, 0, 0 - object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, 822, 0, 0 + object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 + object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, 924, 0, 0 AquaHideout_1F_MapWarps:: @ 838CD54 diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc index 2f7a46a05..c1b2ad55e 100644 --- a/data/maps/events/BattleTower_BattleRoom.inc +++ b/data/maps/events/BattleTower_BattleRoom.inc @@ -1,5 +1,5 @@ BattleTower_BattleRoom_MapObjects:: @ 8391DAC - object_event 1, 240, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 888, 0, 0 + object_event 1, 240, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 0, 0 object_event 2, MAP_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleTower_BattleRoom_MapWarps:: @ 8391DDC diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index 35dc61fe8..672604d3e 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B4F_MapObjects:: @ 838D880 - object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 825, 0, 0 + object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0 CaveOfOrigin_B4F_MapWarps:: @ 838D898 warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 47a200874..8ca6fa7a1 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -1,8 +1,8 @@ DewfordTown_MapObjects:: @ 8380B88 object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, 740, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, 0, 0 object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 12, 0, 14, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, 743, 0, 0 + object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD, 0, 0 object_event 5, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0, 0, 0 DewfordTown_MapWarps:: @ 8380C00 diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/events/FallarborTown_ContestLobby.inc index d34bc68d1..811461c02 100644 --- a/data/maps/events/FallarborTown_ContestLobby.inc +++ b/data/maps/events/FallarborTown_ContestLobby.inc @@ -3,7 +3,7 @@ FallarborTown_ContestLobby_MapObjects:: @ 83866F0 object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 2, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0, 0, 0 object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0, 0, 0 object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, 800, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR, 0, 0 object_event 6, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0, 0, 0 FallarborTown_ContestLobby_MapWarps:: @ 8386780 diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index e537f497d..ff2278e29 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_1F_MapObjects:: @ 8386860 object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0, 0, 0 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0, 0, 0 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, 871, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR, 0, 0 FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc index 121ae31cd..efab4fa71 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom_MapObjects:: @ 838C118 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, 833, 0, 0 + object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE, 0, 0 GraniteCave_StevensRoom_MapWarps:: @ 838C130 warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index 5dd100302..490a9c64c 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -8,12 +8,12 @@ LilycoveCity_MapObjects:: @ 838016C object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 35, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0, 0, 0 object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 34, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0, 0, 0 object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 57, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0, 0, 0 - object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, 852, 0, 0 + object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, 1042, 0, 0 - object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, 852, 0, 0 - object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, 852, 0, 0 - object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, 852, 0, 0 - object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, 852, 0, 0 + object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 50, 0, 7, 0, 5, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CB74, 0, 0, 0 object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, 971, 0, 0 diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index b0ea1e677..ccbc645b2 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -2,14 +2,14 @@ LilycoveCity_ContestLobby_MapObjects:: @ 838984C object_event 1, MAP_OBJ_GFX_TEALA, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0, 0, 0 object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0, 0, 0 object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 17, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 774, 0, 0 + object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1, 0, 0 object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0, 0, 0 object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 3, 0, 10, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0, 0, 0 object_event 7, MAP_OBJ_GFX_ARTIST, 0, 20, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, 802, 0, 0 + object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE, 0, 0 object_event 9, MAP_OBJ_GFX_BOY_1, 0, 18, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0, 0, 0 object_event 10, MAP_OBJ_GFX_GIRL_1, 0, 19, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 895, 0, 0 + object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST, 0, 0 object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0, 0, 0 object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0, 0, 0 object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 7, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0, 0, 0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index fa651e557..e830d26e7 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -1,6 +1,6 @@ LilycoveCity_Harbor_MapObjects:: @ 8389F94 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, 908, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 861, 0, 0 + object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR, 0, 0 object_event 3, MAP_OBJ_GFX_SAILOR, 0, 3, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 909, 0, 0 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index 900cba08f..1ee241c5c 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -1,14 +1,14 @@ LilycoveCity_LilycoveMuseum_1F_MapObjects:: @ 8389564 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 5, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, 775, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, 0, 0 object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0, 0, 0 object_event 4, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 10, 0, 3, 5, 2, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0, 0, 0 object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, 776, 0, 0 - object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, 779, 0, 0 - object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, 780, 0, 0 - object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, 778, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY, 0, 0 + object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER, 0, 0 + object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 + object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN, 0, 0 LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index 372007d1f..83077f069 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -1,8 +1,8 @@ LilycoveCity_LilycoveMuseum_2F_MapObjects:: @ 8389740 object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, 777, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, 780, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, 780, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index a710e1f5e..59e8e03a3 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -3,10 +3,10 @@ LilycoveCity_PokemonTrainerFanClub_MapObjects:: @ 8389EB0 object_event 2, MAP_OBJ_GFX_MAN_5, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0, 0, 0 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, 791, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, 790, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, 792, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, 789, 0, 0 + object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY, 0, 0 + object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY, 0, 0 LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index b31b06b61..23debe434 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -1,10 +1,10 @@ LittlerootTown_MapObjects:: @ 83808FC object_event 1, MAP_OBJ_GFX_LITTLE_BOY_3, 0, 16, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6DF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, 868, 0, 0 + object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_2, 0, 14, 0, 17, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6D6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, 752, 0, 0 - object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 761, 0, 0 - object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 762, 0, 0 + object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT, 0, 0 + object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN, 0, 0 + object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY, 0, 0 LittlerootTown_MapWarps:: @ 838098C warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index 8f6ab7059..bb3d3b195 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -1,8 +1,8 @@ LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674 - object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, 758, 0, 0 - object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, 755, 0, 0 - object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, 754, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, 784, 0, 0 + object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS, 0, 0 + object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0 + object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM, 0, 0 object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index 2f7d6688d..b7367b1d0 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -1,5 +1,5 @@ LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728 - object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, 760, 0, 0 + object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS, 0, 0 object_event 2, 240, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 object_event 3, 241, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 object_event 4, 242, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 @@ -12,7 +12,7 @@ LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728 object_event 11, 249, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 object_event 12, 250, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 object_event 13, 251, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 + object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index 700885519..27a0efbed 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -1,8 +1,8 @@ LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4 - object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, 759, 0, 0 - object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, 754, 0, 0 - object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, 755, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, 785, 0, 0 + object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS, 0, 0 + object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0 + object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM, 0, 0 object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index e620bdb8f..fbec5e0e7 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -12,8 +12,8 @@ LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978 object_event 11, 249, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 object_event 12, 250, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 object_event 13, 251, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 - object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, 849, 0, 0 + object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 + object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL, 0, 0 LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index 024d1fb3f..fbe8df720 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -1,7 +1,7 @@ LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0 object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0 - object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, 889, 0, 0 + object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index acd337496..2a41a962f 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -1,6 +1,6 @@ MagmaHideout_1F_MapObjects:: @ 838E9BC - object_event 1, 241, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, 821, 0, 0 - object_event 2, 241, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, 822, 0, 0 + object_event 1, 241, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 + object_event 2, 241, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 object_event 3, 241, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0 MagmaHideout_1F_MapWarps:: @ 838EA04 diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index 4b5b2f17a..8044b95fc 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -4,8 +4,8 @@ MauvilleCity_MapObjects:: @ 837FB90 object_event 3, MAP_OBJ_GFX_MANIAC, 0, 14, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 18, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0, 0, 0 object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 17, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, 804, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, 805, 0, 0 + object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE, 0, 0 + object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 0, 0 object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, 912, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, 1116, 0, 0 diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index acab0d36b..cebd8df28 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -7,7 +7,7 @@ MtChimney_MapObjects:: @ 838C330 object_event 6, 244, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, 927, 0, 0 object_event 7, 244, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, 927, 0, 0 object_event 8, 244, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, 927, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, 877, 0, 0 + object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 object_event 10, 241, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, 926, 0, 0 object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 @@ -23,10 +23,10 @@ MtChimney_MapObjects:: @ 838C330 object_event 22, 241, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, 926, 0, 0 object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, 877, 0, 0 - object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, 877, 0, 0 - object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, 877, 0, 0 - object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, 877, 0, 0 + object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 MtChimney_MapWarps:: @ 838C5D0 warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 2732bc93c..3253c212c 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -3,8 +3,8 @@ PetalburgCity_MapObjects:: @ 837F5F0 object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0, 0, 0 object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 811, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 812, 0, 0 + object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, 1039, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, 1040, 0, 0 object_event 9, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0 diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index 2b09951ee..781de130d 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -1,5 +1,5 @@ PetalburgCity_Gym_MapObjects:: @ 8387168 - object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, 772, 0, 0 + object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM, 0, 0 object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 94, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EE6, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 81, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154DF6, 0, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 42, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E32, 0, 0, 0 @@ -7,8 +7,8 @@ PetalburgCity_Gym_MapObjects:: @ 8387168 object_event 6, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 68, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E6E, 0, 0, 0 object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 16, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F5E, 0, 0, 0 object_event 8, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EAA, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, 781, 0, 0 - object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 866, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE, 0, 0 + object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM, 0, 0 PetalburgCity_Gym_MapWarps:: @ 8387258 warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index f44f105b6..ae2370546 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -2,8 +2,8 @@ Route101_MapObjects:: @ 83810BC object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 16, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA64, 0, 0, 0 object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 0, 0 object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0 - object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, 750, 0, 0 - object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, 897, 0, 0 + object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 0, 0 + object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, 991, 0, 0 Route101_MapCoordEvents:: @ 838114C diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index 0ecfedf38..e94ee3e75 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -9,7 +9,7 @@ Route103_MapObjects:: @ 8381300 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, 898, 0, 0 + object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103, 0, 0 object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0 object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0 object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index 7176521cc..d46f1c4e5 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -5,8 +5,8 @@ Route104_MapObjects:: @ 8381488 object_event 4, MAP_OBJ_GFX_BOY_1, 0, 27, 0, 63, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route104_EventScript_14EF81, 0, 0, 0 object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 30, 0, 50, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF8A, 0, 0, 0 object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 28, 0, 74, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 742, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 738, 0, 0 + object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, 0, 0 + object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104, 0, 0 object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0 diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index f04195c9b..d77b2977a 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -1,6 +1,6 @@ Route104_MrBrineysHouse_MapObjects:: @ 838B654 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, 739, 0, 0 - object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, 881, 0, 0 + object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE, 0, 0 + object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE, 0, 0 Route104_MrBrineysHouse_MapWarps:: @ 838B684 warp_def 5, 8, 0, 0, MAP_ROUTE104 diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index 3156a5cb3..76c676dbb 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -1,6 +1,6 @@ Route109_MapObjects:: @ 8381AFC - object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 744, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, 741, 0, 0 + object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109, 0, 0 object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 12, 0, 36, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7AD, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 25, 0, 42, 0, 3, 15, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7C4, 0, 0, 0 object_event 5, MAP_OBJ_GFX_SAILOR, 0, 19, 0, 19, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F7DB, 0, 0, 0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 5c94ac7bc..b78f2abc9 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -20,11 +20,11 @@ Route110_MapObjects:: @ 8381D58 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, 1007, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, 1006, 0, 0 object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0 - object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, 900, 0, 0 - object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, 900, 0, 0 - object_event 24, 241, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, 900, 0, 0 - object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, 900, 0, 0 - object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 900, 0, 0 + object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 24, 241, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 0, 78, 0, 4, 51, 23, 0, 1, 0, 2, 0, Route110_EventScript_14FB11, 0, 0, 0 object_event 28, 240, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, 919, 0, 0 object_event 29, 243, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 922, 0, 0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index bedc6357d..8c3cf7e11 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEnd_MapObjects:: @ 83921D0 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, 899, 0, 0 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END, 0, 0 Route110_TrickHouseEnd_MapWarps:: @ 83921E8 warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index 59e329d98..9f6e305cc 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance_MapObjects:: @ 8392140 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, 872, 0, 0 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE, 0, 0 Route110_TrickHouseEntrance_MapWarps:: @ 8392158 warp_def 5, 7, 3, 1, MAP_ROUTE110 diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index e502ae821..6eb13f7f3 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -1,8 +1,8 @@ Route111_MapObjects:: @ 83821A0 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, 768, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 769, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, 770, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 771, 0, 0 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE, 0, 0 + object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE, 0, 0 object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0 object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0 object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0 @@ -11,16 +11,16 @@ Route111_MapObjects:: @ 83821A0 object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0 object_event 11, MAP_OBJ_GFX_CAMPER, 0, 21, 0, 47, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route111_EventScript_1503D5, 0, 0, 0 object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, 796, 0, 0 - object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, 796, 0, 0 + object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0 + object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0 object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0 object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, 799, 0, 0 - object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, 799, 0, 0 + object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0 + object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0 object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, 903, 0, 0 object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0 object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index 50b300bc9..e29769d77 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -1,10 +1,10 @@ Route112_MapObjects:: @ 8382818 - object_event 1, 241, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, 819, 0, 0 + object_event 1, 241, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 object_event 2, MAP_OBJ_GFX_HIKER, 0, 24, 0, 34, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route112_EventScript_150549, 0, 0, 0 object_event 3, MAP_OBJ_GFX_CAMPER, 0, 29, 0, 49, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route112_EventScript_15059E, 0, 0, 0 object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0 object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0 - object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, 819, 0, 0 + object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index 40ff30536..3c14720a6 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -1,5 +1,5 @@ Route114_LanettesHouse_MapObjects:: @ 838B92C - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, 870, 0, 0 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE, 0, 0 Route114_LanettesHouse_MapWarps:: @ 838B944 warp_def 5, 7, 0, 2, MAP_ROUTE114 diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 32bd1ea57..290a6c25f 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -9,7 +9,7 @@ Route116_MapObjects:: @ 8383170 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, 891, 0, 0 + object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116, 0, 0 object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0 object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 @@ -19,8 +19,8 @@ Route116_MapObjects:: @ 8383170 object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 31, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C90, 0, 0, 0 object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, 947, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, 1001, 0, 0 - object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, 894, 0, 0 - object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, 813, 0, 0 + object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 0, 0 + object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0 Route116_MapWarps:: @ 8383380 warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 371b935a7..bc13e0cc1 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -3,11 +3,11 @@ Route118_MapObjects:: @ 8383684 object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, 797, 0, 0 - object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, 797, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0 + object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0 object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 12, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route118_EventScript_150F93, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, 901, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, 901, 0, 0 + object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0 + object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0 object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0 object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0 object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 491f5b469..213e79015 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -14,15 +14,15 @@ Route119_MapObjects:: @ 8383914 object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 49, 0, 3, 58, 0, 0, 1, 0, 3, 0, Route119_EventScript_151580, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 50, 0, 4, 10, 0, 0, 1, 0, 3, 0, Route119_EventScript_15153B, 0, 0, 0 object_event 15, MAP_OBJ_GFX_MAN_6, 0, 8, 0, 62, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route119_EventScript_151552, 0, 0, 0 - object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 851, 0, 0 + object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0 object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, 1024, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, 1025, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, 1026, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, 1027, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, 1028, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, 1029, 0, 0 - object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, 890, 0, 0 - object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, 890, 0, 0 + object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, 923, 0, 0 object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0 object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index 58c20fc6e..920439340 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -1,8 +1,8 @@ Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0 - object_event 1, 241, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, 890, 0, 0 - object_event 2, 242, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, 890, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, 892, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, 892, 0, 0 + object_event 1, 241, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 2, 242, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0 Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index b78eb76d6..4a2db97f1 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -1,10 +1,10 @@ Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94 - object_event 1, 241, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, 890, 0, 0 - object_event 2, 241, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, 890, 0, 0 - object_event 3, 242, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, 890, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 1, 241, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 2, 241, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 3, 242, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 6, 0, 3, 1, 18, 0, 0, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 0463d441d..42ad1f238 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -15,8 +15,8 @@ Route120_MapObjects:: @ 8383F30 object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 36, 0, 45, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route120_EventScript_151A1F, 0, 0, 0 object_event 15, MAP_OBJ_GFX_MANIAC, 0, 19, 0, 80, 0, 5, 15, 0, 0, 1, 0, 3, 0, Route120_EventScript_151A36, 0, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, 1030, 0, 0 - object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, 798, 0, 0 - object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, 798, 0, 0 + object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120, 0, 0 + object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120, 0, 0 object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0 object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0 object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc index 74f99d02c..464481503 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -1,7 +1,7 @@ Route128_MapObjects:: @ 83850D0 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 77, 0, 24, 0, 1, 48, 85, 0, 1, 0, 3, 0, Route128_EventScript_1522A4, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 34, 0, 1, 28, 5, 0, 1, 0, 7, 0, Route128_EventScript_1522E2, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 834, 0, 0 + object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128, 0, 0 object_event 4, 246, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 944, 0, 0 object_event 5, 247, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 945, 0, 0 object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 63, 0, 28, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route128_EventScript_15234E, 0, 0, 0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 6daf6bcf6..f44bf28d5 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -12,7 +12,7 @@ RustboroCity_MapObjects:: @ 837FD14 object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, 1041, 0, 0 object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0 - object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, 814, 0, 0 + object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0 RustboroCity_MapWarps:: @ 837FE64 warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 4779473d8..f32fa3568 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,11 +1,11 @@ RusturfTunnel_MapObjects:: @ 838BD2C - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, 807, 0, 0 + object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0 object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 931, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 879, 0, 0 - object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, 878, 0, 0 - object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, 880, 0, 0 + object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0 + object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0 + object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0 object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, 932, 0, 0 object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0 object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index a6d3ed424..4c1ffb86f 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -1,11 +1,11 @@ SeafloorCavern_Room9_MapObjects:: @ 838D620 - object_event 1, 248, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 859, 0, 0 - object_event 2, 246, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 828, 0, 0 - object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 829, 0, 0 - object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0 - object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0 + object_event 1, 248, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0 + object_event 2, 246, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0 + object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0 + object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, 1090, 0, 0 - object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGENDARY_MON_SEAFLOOR_CAVERN, 0, 0 + object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index e7ef67860..5d5fc52d4 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -1,5 +1,5 @@ SkyPillar_Top_MapObjects:: @ 838EE50 - object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, 773, 0, 0 + object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA, 0, 0 SkyPillar_Top_MapWarps:: @ 838EE68 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index 35416b72d..a0e0f330f 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -3,13 +3,13 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 2, MAP_OBJ_GFX_MAN_1, 0, 35, 0, 27, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_4, 0, 15, 0, 13, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBB5, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 26, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0, 0, 0 - object_event 5, 240, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, 882, 0, 0 + object_event 5, 240, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 object_event 6, MAP_OBJ_GFX_COOK, 0, 5, 0, 43, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0, 0, 0 object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 20, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB60, 0, 0, 0 object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 42, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB81, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, 835, 0, 0 - object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, 835, 0, 0 - object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, 840, 0, 0 + object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0 + object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0 + object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT, 0, 0 object_event 12, MAP_OBJ_GFX_SAILOR, 0, 35, 0, 36, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0, 0, 0 object_event 13, MAP_OBJ_GFX_SAILOR, 0, 28, 0, 46, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0, 0, 0 object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 50, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCF4, 0, 0, 0 @@ -17,19 +17,19 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 16, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD06, 0, 0, 0 object_event 17, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 24, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCB8, 0, 0, 0 object_event 18, MAP_OBJ_GFX_WOMAN_7, 0, 15, 0, 31, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0, 0, 0 - object_event 19, 241, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, 882, 0, 0 - object_event 20, 241, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, 882, 0, 0 + object_event 19, 241, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 20, 241, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 38, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0, 0, 0 object_event 22, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 5, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0, 0, 0 object_event 23, MAP_OBJ_GFX_MAN_6, 0, 34, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 47, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0, 0, 0 object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, 948, 0, 0 object_event 26, MAP_OBJ_GFX_MAN_3, 0, 5, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAB6, 0, 0, 0 - object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, 882, 0, 0 - object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, 882, 0, 0 - object_event 29, 241, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, 882, 0, 0 - object_event 30, 241, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, 882, 0, 0 - object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, 882, 0, 0 + object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 29, 241, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 30, 241, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 SlateportCity_MapWarps:: @ 837FA94 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/events/SlateportCity_ContestLobby.inc index 09e6c23fb..0c701e0ca 100644 --- a/data/maps/events/SlateportCity_ContestLobby.inc +++ b/data/maps/events/SlateportCity_ContestLobby.inc @@ -3,7 +3,7 @@ SlateportCity_ContestLobby_MapObjects:: @ 8387788 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0, 0, 0 object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, 803, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0, 0, 0 object_event 7, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0, 0, 0 object_event 8, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0, 0, 0 diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index c2f2d5afb..b05d7b861 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -2,11 +2,11 @@ SlateportCity_Harbor_MapObjects:: @ 8387F30 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, 905, 0, 0 object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, 905, 0, 0 object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, 905, 0, 0 - object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, 841, 0, 0 - object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 860, 0, 0 - object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 845, 0, 0 - object_event 7, 246, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 846, 0, 0 - object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 848, 0, 0 + object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0 + object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0 + object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0 + object_event 7, 246, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0 + object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR, 0, 0 SlateportCity_Harbor_MapWarps:: @ 8387FF0 warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index ede07b801..a8866bdc5 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -1,12 +1,12 @@ SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 - object_event 2, 241, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, 883, 0, 0 - object_event 3, 241, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, 883, 0, 0 - object_event 4, 241, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, 883, 0, 0 - object_event 5, 240, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, 883, 0, 0 - object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, 883, 0, 0 + object_event 2, 241, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 3, 241, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 4, 241, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 5, 240, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 - object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, 883, 0, 0 + object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, 961, 0, 0 object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, 961, 0, 0 object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, 961, 0, 0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index 67d7a6b18..0194c4004 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -1,8 +1,8 @@ SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, 887, 0, 0 - object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 886, 0, 0 - object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 884, 0, 0 - object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 885, 0, 0 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F, 0, 0 + object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0 + object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0 + object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, 961, 0, 0 object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, 961, 0, 0 object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, 961, 0, 0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index 8999b6887..a20a2f1b6 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -2,7 +2,7 @@ SlateportCity_SternsShipyard_1F_MapObjects:: @ 8387698 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0, 0, 0 object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, 869, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD, 0, 0 SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index ed78d9136..19fd9b3c9 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -1,15 +1,15 @@ SootopolisCity_MapObjects:: @ 8380608 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, 855, 0, 0 - object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, 856, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, 854, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, 854, 0, 0 - object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, 816, 0, 0 - object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, 854, 0, 0 - object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, 854, 0, 0 - object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, 854, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, 854, 0, 0 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1, 0, 0 + object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS, 0, 0 + object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, 973, 0, 0 - object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, 854, 0, 0 + object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 SootopolisCity_MapWarps:: @ 8380710 warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index 6145c4afc..4e655191d 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -1,5 +1,5 @@ SootopolisCity_Gym_1F_MapObjects:: @ 838ACF0 - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, 815, 0, 0 + object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0, 0, 0 SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/events/VerdanturfTown_ContestLobby.inc index 2fe386421..465bb2fde 100644 --- a/data/maps/events/VerdanturfTown_ContestLobby.inc +++ b/data/maps/events/VerdanturfTown_ContestLobby.inc @@ -3,7 +3,7 @@ VerdanturfTown_ContestLobby_MapObjects:: @ 8386A00 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0, 0, 0 object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 14, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0, 0, 0 object_event 4, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, 801, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_3, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0, 0, 0 VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index daa90d499..3753a78aa 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -1,7 +1,7 @@ VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC - object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, 806, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, 808, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, 809, 0, 0 + object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE, 0, 0 + object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0, 0, 0 object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, 984, 0, 0 diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index 1d64e4f3a..cffb058b6 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -2,10 +2,10 @@ VictoryRoad_1F_MapObjects:: @ 838D8E4 object_event 1, MAP_OBJ_GFX_MAN_4, 0, 33, 0, 22, 0, 3, 8, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF6F, 0, 0, 0 object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 6, 0, 15, 0, 4, 9, 0, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_15DF9D, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 27, 0, 34, 0, 3, 18, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF86, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, 858, 0, 0 + object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, 1084, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, 1085, 0, 0 - object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, 751, 0, 0 + object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD, 0, 0 VictoryRoad_1F_MapWarps:: @ 838D98C warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 7d13f1cc6..1e335cdfa 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -60,43 +60,43 @@ Route111_EventScript_1AE3D7:: @ 81AE3D7 return Route111_EventScript_1AE3E2:: @ 81AE3E2 - setflag 796 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 return Route111_EventScript_1AE3E6:: @ 81AE3E6 - clearflag 796 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 return Route111_EventScript_1AE3EA:: @ 81AE3EA - setflag 797 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 return Route111_EventScript_1AE3EE:: @ 81AE3EE - clearflag 797 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 return Route111_EventScript_1AE3F2:: @ 81AE3F2 - setflag 798 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120 return Route111_EventScript_1AE3F6:: @ 81AE3F6 - clearflag 798 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120 return Route111_EventScript_1AE3FA:: @ 81AE3FA - setflag 799 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 return Route111_EventScript_1AE3FE:: @ 81AE3FE - clearflag 799 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 return Route111_EventScript_1AE402:: @ 81AE402 - setflag 901 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 return Route111_EventScript_1AE406:: @ 81AE406 - clearflag 901 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 return Route111_EventScript_1AE40A:: @ 81AE40A diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index c0437d804..a587fcc92 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -65,7 +65,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - setflag 852 + setflag FLAG_HIDE_GRUNTS_LILYCOVE release end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index c0a88a880..d0d19e4b9 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -68,13 +68,13 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 specialvar RESULT, sub_810E300 compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 - setflag 816 - setflag 855 - setflag 856 - clearflag 815 + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM setvar 0x409b, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED - clearflag 854 + clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS clearflag SYS_WEATHER_CTRL setvar 0x40b9, 2 clearflag 916 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index b8da349f3..3d3240e81 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -135,10 +135,10 @@ DewfordTown_EventScript_14E151:: @ 814E151 applymovement 255, DewfordTown_Movement_14E405 waitmovement 0 showobject 255, 0, 19 - clearflag 739 - clearflag 881 - clearflag 742 - setflag 743 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobject 4, 0, 11 setvar 0x408e, 2 resetobjectpriority 255, 0, 11 @@ -171,10 +171,10 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 setobjectpriority 2, 0, 24, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 - clearflag 741 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 addobject 1 - clearflag 744 - setflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobject 4, 0, 11 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 0, DewfordTown_EventScript_14E281 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index b13c930cf..ae3cbd4ad 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -136,7 +136,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 waitmovement 0 - setflag 781 + setflag FLAG_HIDE_PETALBURG_GYM_GUIDE warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index f6c62fbcb..70f3cbc3b 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -5,7 +5,7 @@ FallarborTown_MapScripts:: @ 814E7E0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 setflag FLAG_VISITED_FALLARBOR_TOWN setvar 0x4086, 0 - setflag 800 + setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR clearflag FLAG_CONTEST_SKETCH_CREATED end diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 5b1f1c948..1e50c2fd6 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -48,7 +48,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 playse 18 removeobject 4 - clearflag 870 + clearflag FLAG_HIDE_LANETTE release end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 036523bf1..6cf2d630b 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -26,10 +26,10 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 InsideOfTruck_EventScript_15FC45:: @ 815FC45 sethealplace 1 setvar 0x4092, 1 - setflag 759 - setflag 762 - setflag 784 - setflag 760 + setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS + setflag FLAG_HIDE_MOVING_TRUCK_MAY + setflag FLAG_HIDE_BRENDAN_MOM + setflag FLAG_HIDE_BRENDAN_UPSTAIRS setvar 0x408c, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall @@ -38,9 +38,9 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 InsideOfTruck_EventScript_15FC68:: @ 815FC68 sethealplace 2 setvar 0x4092, 2 - setflag 758 - setflag 761 - setflag 785 + setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS + setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN + setflag FLAG_HIDE_MAY_MOM setflag FLAG_HIDE_MAY_UPSTAIRS setvar 0x4082, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 4948c17b3..29b5ef2b9 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -19,7 +19,7 @@ LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 return LavaridgeTown_EventScript_14E4DF:: @ 814E4DF - clearflag 877 + clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE return LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 40c1b6ea9..f6c34484e 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -88,7 +88,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 - setflag 806 + setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar 0x4053, 1 goto LavaridgeTown_Gym_1F_EventScript_1537A7 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b8c6b26f5..29a8497ed 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -6,7 +6,7 @@ LilycoveCity_MapScripts:: @ 814CA15 LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar 0x4086, 0 - setflag 802 + setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE checkflag SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 @@ -356,7 +356,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 clearflag FLAG_HIDE_MAY_UPSTAIRS - clearflag 849 + clearflag FLAG_HIDE_MAY_PICHU_DOLL goto LilycoveCity_EventScript_14CF6B end @@ -392,7 +392,7 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 call_if 1, LilycoveCity_EventScript_14CF47 compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CF50 - clearflag 760 + clearflag FLAG_HIDE_BRENDAN_UPSTAIRS goto LilycoveCity_EventScript_14CF6B end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index f0e515f13..7546fe41b 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -13,7 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 .2byte 0 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 - checkflag 775 + checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 setvar 0x4099, 0 end @@ -97,23 +97,23 @@ LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 return LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6 - clearflag 776 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY return LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA - clearflag 777 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL return LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE - clearflag 778 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN return LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2 - clearflag 779 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER return LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6 - clearflag 780 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS return LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA @@ -188,7 +188,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 step_end LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B - checkflag 775 + checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A setvar 0x4099, 0 end @@ -583,7 +583,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 end LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 - setflag 775 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar 0x4094, 0x1 additem ITEM_CONTEST_PASS, 1 setvar 0x800b, 8 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 54e2bd042..117aa5579 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -52,7 +52,7 @@ LittlerootTown_EventScript_14D59A:: @ 814D59A return LittlerootTown_EventScript_14D5A6:: @ 814D5A6 - clearflag 752 + clearflag FLAG_HIDE_MOM_LITTLEROOT setobjectmovementtype 4, 8 checkplayergender compare RESULT, 0 @@ -80,7 +80,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF setvar 0x8004, 5 setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B - setflag 761 + setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall @@ -91,7 +91,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D setvar 0x8004, 14 setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B - setflag 762 + setflag FLAG_HIDE_MOVING_TRUCK_MAY warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall @@ -122,12 +122,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD waitmovement 0 - setflag 752 + setflag FLAG_HIDE_MOM_LITTLEROOT setvar 0x4092, 3 hideobject 255, 0, 0 closedoor 0x8004, 0x8005 waitdooranim - clearflag 868 + clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT clearflag 0x4000 return diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 8e7a0854d..868e4f06e 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A lock faceplayer - checkflag 896 + checkflag FLAG_UNKNOWN_BIRCH_380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F compare 0x4084, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 0bc64765a..451219edb 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -156,8 +156,8 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 MauvilleCity_EventScript_14C22B:: @ 814C22B removeobject 6 removeobject 7 - clearflag 806 - clearflag 809 + clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE + clearflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE setflag FLAG_DEFEATED_WALLY_MAUVILLE releaseall end diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 06774d400..7ce6e3704 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -77,7 +77,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C removeobject 7 removeobject 8 removeobject 9 - setflag 819 + setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR setvar 0x40bf, 1 releaseall end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 9c32e989c..231865942 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -63,7 +63,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 msgbox MossdeepCity_Gym_Text_18D128, 4 setflag 1229 setflag BADGE07_GET - clearflag 869 + clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag 915 setvar 0x8008, 7 call MossdeepCity_Gym_EventScript_1A01C0 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e9456ae13..fd90210ca 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -71,8 +71,8 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 MtPyre_Summit_EventScript_15D57A:: @ 815D57A setflag FLAG_MT_PYRE_ORB_STOLEN setvar 0x4058, 1 - clearflag 840 - clearflag 835 + clearflag FLAG_HIDE_STERN_SLATEPORT + clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT setvar 0x40a0, 1 setvar 0x40b9, 1 return diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 47601a964..61476b085 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -209,8 +209,8 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 setvar 0x4085, 1 setvar 0x4057, 2 clearflag FLAG_HIDE_WALLY_PETALBURG - clearflag 866 - setflag 889 + clearflag FLAG_HIDE_WALLY_PETALBURG_GYM + setflag FLAG_HIDE_RIVAL_BIRCH_LAB special InitBirchState warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 9af5c1bdc..23ed60f9a 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -119,7 +119,7 @@ Route103_EventScript_14ED46:: @ 814ED46 removeobject 2 setvar 0x4062, 1 setvar 0x4084, 4 - clearflag 889 + clearflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar 0x40c7, 1 clearflag 979 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 20044f020..ac8a48353 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -145,13 +145,13 @@ Route104_EventScript_14EFD5:: @ 814EFD5 setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, 0, 11, 0 - clearflag 740 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN applymovement 2, Route104_Movement_14F16F waitmovement 0 addobject 4 - clearflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD call Route104_EventScript_1A02EF - setflag 742 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobject 7, 0, 19 copyvar 0x4096, 0x8008 resetobjectpriority 255, 0, 19 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index aabc03439..3d775ccfe 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -11,7 +11,7 @@ Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 end Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 - setflag 814 + setflag FLAG_HIDE_RIVAL_RUSTBORO return Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 @@ -80,9 +80,9 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB msgbox Route104_MrBrineysHouse_Text_191BFD, 4 call Route104_MrBrineysHouse_EventScript_1A010C setvar 0x408e, 1 - clearflag 738 - setflag 739 - setflag 881 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index f4838a211..1277168e0 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -43,14 +43,14 @@ Route109_EventScript_14F548:: @ 814F548 applymovement 255, Route109_Movement_14F670 waitmovement 0 addobject 4 - clearflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, 0, 11, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 - clearflag 740 - setflag 744 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 hideobject 1, 0, 24 msgbox Route109_Text_16B4B5, 4 closemessage diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 343d666b2..7d9c8aaaa 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -40,10 +40,10 @@ Route111_EventScript_15000C:: @ 815000C return Route111_EventScript_15000D:: @ 815000D - clearflag 768 - setflag 769 - setflag 770 - setflag 771 + clearflag FLAG_HIDE_VICTOR_WINSTRATE + setflag FLAG_HIDE_VICTORIA_WINSTRATE + setflag FLAG_HIDE_VIVI_WINSTRATE + setflag FLAG_HIDE_VICKI_WINSTRATE cleartrainerflag OPPONENT_VICTOR cleartrainerflag OPPONENT_VICTORIA cleartrainerflag OPPONENT_VIVI diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index ec47cbd79..5454fa946 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -33,8 +33,8 @@ Route119_MapScript1_15119B:: @ 815119B end Route119_EventScript_1511B9:: @ 81511B9 - setflag 893 - clearflag 892 + setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F setvar 0x40b3, 2 return diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 09bab727a..4ee12fe93 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -39,10 +39,10 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 closemessage setvar 0x40b3, 1 - clearflag 893 + clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F fadedefaultbgm fadescreen 1 - setflag 890 + setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE removeobject 1 removeobject 2 removeobject 3 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 358a946a6..ffe133906 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -183,11 +183,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 setvar 0x405a, 2 setvar 0x409a, 2 setvar 0x406f, 1 - clearflag 891 - clearflag 880 - clearflag 878 - setflag 739 - setflag 881 + clearflag FLAG_HIDE_BRINEY_ROUTE116 + clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE releaseall end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 0cd4a36a8..eca55c118 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -57,13 +57,13 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 setflag SYS_POKENAV_GET setflag FLAG_RECEIVED_POKENAV msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 - setflag 894 - clearflag 807 + setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 + clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL clearflag 983 - clearflag 739 - clearflag 881 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE setvar 0x4096, 1 - clearflag 814 + clearflag FLAG_HIDE_RIVAL_RUSTBORO setvar 0x408f, 1 releaseall end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 002071f2d..04364b661 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -345,7 +345,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA setflag FLAG_RECOVERED_DEVON_GOODS setvar 0x405a, 4 setvar 0x4090, 1 - setflag 891 + setflag FLAG_HIDE_BRINEY_ROUTE116 release end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index d38459c1c..9131dcdb3 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -192,23 +192,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4ECA, 4 .endif setvar 0x407b, 1 - clearflag 855 - clearflag 856 - clearflag 816 + clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS clearflag 973 setvar 0x405e, 1 clearflag 944 clearflag 945 setflag SYS_WEATHER_CTRL - setflag 854 + setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag 967 setvar 0x40c6, 1 setvar 0x40a2, 1 - setflag 828 - setflag 829 - setflag 831 - setflag 859 + setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN setflag 946 warp MAP_ROUTE128, 255, 38, 22 waitstate diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index f22055bc4..b278fcfc2 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -19,7 +19,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 playpokecry SPECIES_RAYQUAZA, 2 delay 40 waitpokecry - setflag 773 + setflag FLAG_HIDE_RAYQUAZA setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle waitstate diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index b94a0ffd3..567dd779b 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -19,7 +19,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C SlateportCity_EventScript_14BA5C:: @ 814BA5C setflag FLAG_VISITED_SLATEPORT_CITY setvar 0x4086, 0 - setflag 803 + setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return SlateportCity_EventScript_14BA68:: @ 814BA68 @@ -533,10 +533,10 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 255, SlateportCity_Movement_14C008 waitmovement 0 removeobject 11 - clearflag 841 - clearflag 848 - clearflag 845 - clearflag 846 + clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR + clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR setvar 0x4058, 2 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index daa6b1e7c..2e042b1e5 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -12,7 +12,7 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 end SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 - clearflag 860 + clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR return SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 @@ -73,8 +73,8 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage - setflag 821 - setflag 822 + setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT moveobjectoffscreen 4 setobjectmovementtype 4, 10 releaseall diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index a8411e067..db65a51db 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -74,7 +74,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 removeobject 4 fadescreen 0 delay 30 - setflag 883 + setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 @@ -86,7 +86,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmovement 0 playse 9 removeobject 1 - setflag 900 + setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS clearflag 947 setflag 949 diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 7b2ae0d67..73d63fe06 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -19,7 +19,7 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 setflag FLAG_DOCK_REJECTED_DEVON_GOODS - setflag 882 + setflag FLAG_HIDE_EVIL_TEAM_SLATEPORT releaseall end diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index babbd8cce..b9e9b85a5 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -5,7 +5,7 @@ VerdanturfTown_MapScripts:: @ 814E854 VerdanturfTown_MapScript1_14E85A:: @ 814E85A setflag FLAG_VISITED_VERDANTURF_TOWN setvar 0x4086, 0 - setflag 801 + setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF end VerdanturfTown_EventScript_14E866:: @ 814E866 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index e92cdcc82..7e48d3d90 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -8,7 +8,7 @@ VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 end VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 - setflag 858 + setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD return VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 @@ -41,7 +41,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 msgbox VictoryRoad_1F_Text_19782B, 4 trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 - clearflag 858 + clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD setvar 0x40c3, 1 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index b27f98675..5ff45e25a 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -66,8 +66,8 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB delay 30 setvar 0x4092, 6 setflag FLAG_SET_WALL_CLOCK - setflag 754 - setflag 755 + setflag FLAG_HIDE_MACHOKE_MOVER_1 + setflag FLAG_HIDE_MACHOKE_MOVER_2 checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 -- cgit v1.2.3 From 58bf5392b36bc3a5c3559f218aff9f751dd90a64 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 10 Dec 2017 15:41:21 -0800 Subject: Label flags up to 973 --- data/event_scripts.s | 70 +++++++++++----------- data/maps/events/AncientTomb.inc | 2 +- data/maps/events/AquaHideout_1F.inc | 2 +- data/maps/events/AquaHideout_B1F.inc | 6 +- data/maps/events/AquaHideout_B2F.inc | 8 +-- data/maps/events/BattleTower_Lobby.inc | 4 +- data/maps/events/DesertRuins.inc | 2 +- data/maps/events/DewfordTown_Hall.inc | 2 +- data/maps/events/EverGrandeCity_ChampionsRoom.inc | 4 +- data/maps/events/FallarborTown.inc | 2 +- data/maps/events/FallarborTown_House1.inc | 2 +- data/maps/events/FortreeCity.inc | 2 +- data/maps/events/FortreeCity_House4.inc | 2 +- data/maps/events/IslandCave.inc | 2 +- data/maps/events/LavaridgeTown.inc | 4 +- data/maps/events/LilycoveCity.inc | 2 +- data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc | 12 ++-- .../events/LilycoveCity_DepartmentStoreRooftop.inc | 2 +- data/maps/events/LilycoveCity_Harbor.inc | 4 +- data/maps/events/MagmaHideout_B2F.inc | 8 +-- data/maps/events/MauvilleCity.inc | 2 +- data/maps/events/MauvilleCity_Gym.inc | 2 +- data/maps/events/MeteorFalls_1F_1R.inc | 12 ++-- data/maps/events/MossdeepCity_House2.inc | 2 +- data/maps/events/MossdeepCity_StevensHouse.inc | 4 +- data/maps/events/MtChimney.inc | 46 +++++++------- data/maps/events/MtPyre_Summit.inc | 8 +-- data/maps/events/Route104.inc | 2 +- data/maps/events/Route110.inc | 4 +- data/maps/events/Route111.inc | 10 ++-- data/maps/events/Route116.inc | 2 +- data/maps/events/Route118.inc | 6 +- data/maps/events/Route119.inc | 2 +- data/maps/events/Route120.inc | 12 ++-- data/maps/events/Route121.inc | 6 +- data/maps/events/Route128.inc | 4 +- data/maps/events/RustboroCity_DevonCorp_3F.inc | 2 +- data/maps/events/RusturfTunnel.inc | 4 +- data/maps/events/SSTidalCorridor.inc | 4 +- data/maps/events/SSTidalRooms.inc | 2 +- data/maps/events/SeafloorCavern_Room1.inc | 4 +- data/maps/events/SeafloorCavern_Room3.inc | 2 +- data/maps/events/SeafloorCavern_Room4.inc | 2 +- data/maps/events/SlateportCity.inc | 2 +- data/maps/events/SlateportCity_Harbor.inc | 6 +- .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 12 ++-- data/maps/events/SootopolisCity.inc | 2 +- data/maps/events/SouthernIsland_Interior.inc | 4 +- data/scripts/gabby_and_ty.inc | 16 ++--- data/scripts/magma_chimney.inc | 8 +-- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 6 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 4 +- data/scripts/maps/MauvilleCity.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 4 +- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 4 +- data/scripts/maps/PetalburgCity_Gym.inc | 6 +- data/scripts/maps/Route104.inc | 4 +- data/scripts/maps/Route111.inc | 8 +-- data/scripts/maps/Route116.inc | 2 +- data/scripts/maps/SSTidalCorridor.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 8 +-- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 16 ++--- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 36 +++++------ data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 6 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 6 +- data/scripts/maps/SlateportCity_Harbor.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 4 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 4 +- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- data/scripts/secret_power_tm.inc | 2 +- 78 files changed, 242 insertions(+), 242 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 38bc34845..a84a2dd12 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1174,7 +1174,7 @@ gUnknown_0819FA81:: @ 819FA81 setflag FLAG_HIDE_MR_BRINEY_ROUTE109 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 - setflag 906 + setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE setflag FLAG_UNKNOWN_2E1 setflag FLAG_UNKNOWN_2EB setflag FLAG_UNKNOWN_2EC @@ -1197,12 +1197,12 @@ gUnknown_0819FA81:: @ 819FA81 setflag FLAG_HIDE_FANCLUB_LITTLE_BOY setflag FLAG_HIDE_FANCLUB_LADY setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 - setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 - setflag 902 - setflag 903 - setflag 904 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT @@ -1249,39 +1249,39 @@ gUnknown_0819FA81:: @ 819FA81 setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F - setflag 961 + setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT - setflag 941 + setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER setflag FLAG_HIDE_MOM_LITTLEROOT setflag FLAG_HIDE_MOM_UPSTAIRS setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F setflag FLAG_UNKNOWN_BIRCH_380 setflag FLAG_HIDE_BIRCH_ROUTE101 setflag FLAG_HIDE_BIRCH_ROUTE103 - setflag 909 - setflag 910 - setflag 911 - setflag 915 - setflag 912 - setflag 920 - setflag 921 - setflag 922 - setflag 923 - setflag 925 - setflag 929 - setflag 930 - setflag 934 - setflag 939 - setflag 940 - setflag 928 + setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE + setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING + setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY + setflag FLAG_UNKNOWN_393 + setflag FLAG_HIDE_WATTSON_MAUVILLE + setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM + setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM + setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110 + setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE + setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + setflag FLAG_HIDE_RIVAL_LAVARIDGE_1 + setflag FLAG_HIDE_RIVAL_LAVARIDGE_2 + setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE + setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL + setflag FLAG_HIDE_PROF_COSMO_FALLARBOR setflag FLAG_HIDE_STEVEN_ROUTE128 - setflag 944 - setflag 945 - setflag 947 - setflag 948 + setflag FLAG_HIDE_EVIL_LEADER_ROUTE128 + setflag FLAG_HIDE_OTHER_LEADER_ROUTE128 + setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 + setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD - setflag 950 - setflag 968 + setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL + setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag 1133 setflag FLAG_HIDE_STEVENS_LETTER setflag 979 @@ -1291,10 +1291,10 @@ gUnknown_0819FA81:: @ 819FA81 end EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 - clearflag 925 + clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE call EverGrandeCity_HallOfFame_EventScript_19FD09 setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD - clearflag 950 + clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL clearflag FLAG_HIDE_STEVENS_LETTER setvar 0x40c6, 1 clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD @@ -1312,7 +1312,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 return EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A - clearflag 968 + clearflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE return EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E @@ -1340,7 +1340,7 @@ EventScript_19FC84: goto_if_eq Route101_EventScript_1A14DC checkflag 1213 goto_if 0, Route101_EventScript_1A14DC - clearflag 929 + clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1 setvar 0x4053, 2 return @@ -4740,11 +4740,11 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED special sub_80BF2C4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F - clearflag 918 + clearflag FLAG_HIDE_REPORTER_BATTLE_TOWER return BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F - setflag 918 + setflag FLAG_HIDE_REPORTER_BATTLE_TOWER return .include "data/scripts/gabby_and_ty.inc" diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc index ebe2147b6..0aa15569e 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -1,5 +1,5 @@ AncientTomb_MapObjects:: @ 838E6DC - object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, 937, 0, 0 + object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL, 0, 0 AncientTomb_MapWarps:: @ 838E6F4 warp_def 8, 29, 3, 0, MAP_ROUTE120 diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index e46a06c93..ff3212aa9 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -1,7 +1,7 @@ AquaHideout_1F_MapObjects:: @ 838CD0C object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 - object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, 924, 0, 0 + object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 AquaHideout_1F_MapWarps:: @ 838CD54 warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index 723586d41..c3bc7c96b 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -1,8 +1,8 @@ AquaHideout_B1F_MapObjects:: @ 838CD80 - object_event 1, 241, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, 924, 0, 0 - object_event 2, 241, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, 924, 0, 0 + object_event 1, 241, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, 241, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, 1071, 0, 0 - object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, 924, 0, 0 + object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, 1124, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, 977, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, 1132, 0, 0 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index 570348b57..96fc25023 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -1,9 +1,9 @@ AquaHideout_B2F_MapObjects:: @ 838CF1C - object_event 1, 241, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, 924, 0, 0 - object_event 2, 241, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, 924, 0, 0 + object_event 1, 241, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, 241, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, 1072, 0, 0 - object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, 943, 0, 0 - object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, 924, 0, 0 + object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 + object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 AquaHideout_B2F_MapWarps:: @ 838CF94 warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/events/BattleTower_Lobby.inc index b0a0bf435..a4abdac87 100644 --- a/data/maps/events/BattleTower_Lobby.inc +++ b/data/maps/events/BattleTower_Lobby.inc @@ -3,8 +3,8 @@ BattleTower_Lobby_MapObjects:: @ 8391C8C object_event 2, MAP_OBJ_GFX_MAN_5, 0, 12, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160715, 0, 0, 0 object_event 4, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16071E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, 918, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, 941, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER, 0, 0 BattleTower_Lobby_MapWarps:: @ 8391D1C warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index fed9dd8f2..ada0e0be5 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -1,5 +1,5 @@ DesertRuins_MapObjects:: @ 838BEBC - object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, 935, 0, 0 + object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK, 0, 0 DesertRuins_MapWarps:: @ 838BED4 warp_def 8, 29, 3, 1, MAP_ROUTE111 diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc index dc05cb15e..56f7feb18 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -7,7 +7,7 @@ DewfordTown_Hall_MapObjects:: @ 8386088 object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 14, 0, 7, 0, 0, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0, 0, 0 object_event 7, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0, 0, 0 object_event 8, MAP_OBJ_GFX_PSYCHIC_M, 0, 15, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, 940, 0, 0 + object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL, 0, 0 DewfordTown_Hall_MapWarps:: @ 8386160 warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index 867456c4f..c0e672813 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_MapObjects:: @ 838B334 object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 240, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 920, 0, 0 - object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 921, 0, 0 + object_event 2, 240, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, 0, 0 + object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM, 0, 0 EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index 57d59dac9..755f205bc 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -2,7 +2,7 @@ FallarborTown_MapObjects:: @ 8380E04 object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 11, 0, 3, 8, 16, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E814, 0, 0, 0 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 9, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0, 0, 0 object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 15, 0, 3, 3, 17, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E81D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, 907, 0, 0 + object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR, 0, 0 FallarborTown_MapWarps:: @ 8380E64 warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index 256b8a339..e3104fb1d 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -1,5 +1,5 @@ FallarborTown_House1_MapObjects:: @ 8386970 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, 928, 0, 0 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR, 0, 0 object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0, 0, 0 FallarborTown_House1_MapWarps:: @ 83869A0 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc index c25f6f6ed..4c80997f9 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -5,7 +5,7 @@ FortreeCity_MapObjects:: @ 8380020 object_event 4, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 14, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_5, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, 969, 0, 0 + object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE, 0, 0 FortreeCity_MapWarps:: @ 83800C8 warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc index 38bdacf44..0a5f81b6c 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -1,7 +1,7 @@ FortreeCity_House4_MapObjects:: @ 8389308 object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15817F, 0, 0, 0 object_event 2, MAP_OBJ_GFX_BOY_3, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, 933, 0, 0 + object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE, 0, 0 FortreeCity_House4_MapWarps:: @ 8389350 warp_def 3, 5, 0, 6, MAP_FORTREE_CITY diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc index 372097a07..94fbce914 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -1,5 +1,5 @@ IslandCave_MapObjects:: @ 838E674 - object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, 936, 0, 0 + object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE, 0, 0 IslandCave_MapWarps:: @ 838E68C warp_def 8, 29, 3, 0, MAP_ROUTE105 diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index 406abd6dc..1c63eb83e 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -5,8 +5,8 @@ LavaridgeTown_MapObjects:: @ 8380C78 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 0, 13, 0, 3, 3, 32, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E736, 0, 0, 0 object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 0, 4, 0, 3, 18, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0, 0, 0 object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 0, 4, 0, 3, 17, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0, 0, 0 - object_event 7, 243, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 930, 0, 0 - object_event 8, 240, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, 929, 0, 0 + object_event 7, 243, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2, 0, 0 + object_event 8, 240, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1, 0, 0 object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E75A, 0, 0, 0 LavaridgeTown_MapWarps:: @ 8380D50 diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index 490a9c64c..56680d83c 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -15,7 +15,7 @@ LilycoveCity_MapObjects:: @ 838016C object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 50, 0, 7, 0, 5, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CB74, 0, 0, 0 - object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, 971, 0, 0 + object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART, 0, 0 LilycoveCity_MapWarps:: @ 8380304 warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc index 5398693c7..32c1181de 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -1,10 +1,10 @@ LilycoveCity_CoveLilyMotel_2F_MapObjects:: @ 83894B8 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, 925, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, 925, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, 925, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, 925, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, 925, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, 925, 0, 0 + object_event 1, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 5, MAP_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc index 363800ad2..c5f094b3f 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -1,7 +1,7 @@ LilycoveCity_DepartmentStoreRooftop_MapObjects:: @ 838A5A8 object_event 1, MAP_OBJ_GFX_MAN_2, 0, 4, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, 962, 0, 0 + object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART, 0, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index e830d26e7..3f7c592d1 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -1,8 +1,8 @@ LilycoveCity_Harbor_MapObjects:: @ 8389F94 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, 908, 0, 0 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE, 0, 0 object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR, 0, 0 object_event 3, MAP_OBJ_GFX_SAILOR, 0, 3, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 909, 0, 0 + object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE, 0, 0 LilycoveCity_Harbor_MapWarps:: @ 8389FF4 warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc index eb6340758..72b380091 100644 --- a/data/maps/events/MagmaHideout_B2F.inc +++ b/data/maps/events/MagmaHideout_B2F.inc @@ -1,8 +1,8 @@ MagmaHideout_B2F_MapObjects:: @ 838EBE4 - object_event 1, 241, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, 924, 0, 0 - object_event 2, 241, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, 924, 0, 0 - object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, 943, 0, 0 - object_event 4, 242, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, 924, 0, 0 + object_event 1, 241, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, 241, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 + object_event 4, 242, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, 1127, 0, 0 MagmaHideout_B2F_MapWarps:: @ 838EC5C diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index 8044b95fc..e1aa1c92a 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -6,7 +6,7 @@ MauvilleCity_MapObjects:: @ 837FB90 object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 17, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0, 0, 0 object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE, 0, 0 object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 0, 0 - object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, 912, 0, 0 + object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, 1116, 0, 0 MauvilleCity_MapWarps:: @ 837FC68 diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index 0987f3389..d30c6b275 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -1,5 +1,5 @@ MauvilleCity_Gym_MapObjects:: @ 838821C - object_event 1, MAP_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, 913, 0, 0 + object_event 1, MAP_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566FD, 0, 0, 0 object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_15672B, 0, 0, 0 object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_156714, 0, 0, 0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index 41be1c60b..a9d9e23ce 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -3,12 +3,12 @@ MeteorFalls_1F_1R_MapObjects:: @ 838BACC object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, 1046, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, 1045, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, 1047, 0, 0 - object_event 5, 241, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 6, 241, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 7, 247, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 8, 244, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 9, 244, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, 942, 0, 0 + object_event 5, 241, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 + object_event 6, 241, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 + object_event 7, 247, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 8, 244, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 9, 244, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS, 0, 0 MeteorFalls_1F_1R_MapWarps:: @ 838BBBC warp_def 27, 18, 4, 0, MAP_ROUTE114 diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc index a932ce465..6752007d7 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -1,7 +1,7 @@ MossdeepCity_House2_MapObjects:: @ 838A808 object_event 1, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0, 0, 0 object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, 934, 0, 0 + object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE, 0, 0 MossdeepCity_House2_MapWarps:: @ 838A850 warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index bab321ff7..2c499c583 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -1,6 +1,6 @@ MossdeepCity_StevensHouse_MapObjects:: @ 838AA44 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, 967, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, 968, 0, 0 + object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, 1133, 0, 0 object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER, 0, 0 diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index cebd8df28..7bc90433c 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -1,28 +1,28 @@ MtChimney_MapObjects:: @ 838C330 - object_event 1, 247, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, 927, 0, 0 - object_event 2, 246, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, 926, 0, 0 - object_event 3, 241, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, 926, 0, 0 - object_event 4, 241, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, 926, 0, 0 - object_event 5, 241, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, 926, 0, 0 - object_event 6, 244, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, 927, 0, 0 - object_event 7, 244, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, 927, 0, 0 - object_event 8, 244, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, 927, 0, 0 + object_event 1, 247, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 2, 246, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 3, 241, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 4, 241, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 5, 241, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 6, 244, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 7, 244, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 8, 244, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 - object_event 10, 241, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, 926, 0, 0 - object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 - object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 13, 241, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, 926, 0, 0 - object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 16, 241, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, 926, 0, 0 - object_event 17, 241, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, 926, 0, 0 - object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 - object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 - object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 - object_event 22, 241, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, 926, 0, 0 - object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 - object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 + object_event 10, 241, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 13, 241, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 16, 241, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 17, 241, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 22, 241, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 360c0c21e..21217ac8f 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -1,10 +1,10 @@ MtPyre_Summit_MapObjects:: @ 838CBD8 object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 22, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0, 0, 0 - object_event 2, 246, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 916, 0, 0 + object_event 2, 246, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT, 0, 0 object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 23, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0, 0, 0 - object_event 4, 241, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, 917, 0, 0 - object_event 5, 241, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, 917, 0, 0 - object_event 6, 241, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, 917, 0, 0 + object_event 4, 241, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 + object_event 5, 241, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 + object_event 6, 241, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 MtPyre_Summit_MapWarps:: @ 838CC68 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index d46f1c4e5..1205c6681 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -20,7 +20,7 @@ Route104_MapObjects:: @ 8381488 object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, 1002, 0, 0 - object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, 906, 0, 0 + object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE, 0, 0 object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0 object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F279, 0, 0, 0 object_event 25, MAP_OBJ_GFX_BOY_4, 0, 11, 0, 44, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F1DE, 0, 0, 0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index b78f2abc9..a4e425955 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -26,8 +26,8 @@ Route110_MapObjects:: @ 8381D58 object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 0, 78, 0, 4, 51, 23, 0, 1, 0, 2, 0, Route110_EventScript_14FB11, 0, 0, 0 - object_event 28, 240, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, 919, 0, 0 - object_event 29, 243, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 922, 0, 0 + object_event 28, 240, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110, 0, 0 + object_event 29, 243, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110, 0, 0 object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 33, 0, 69, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FC10, 0, 0, 0 object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 73, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route110_EventScript_14FBD2, 0, 0, 0 diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index 6eb13f7f3..25a3b822a 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -21,8 +21,8 @@ Route111_MapObjects:: @ 83821A0 object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0 object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0 object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0 - object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, 903, 0, 0 - object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0 + object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0 + object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0 object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0 object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0 object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 @@ -31,9 +31,9 @@ Route111_MapObjects:: @ 83821A0 object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0 object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 11, 0, 12, 0, 3, 7, 4, 0, 1, 0, 4, 0, Route111_EventScript_1504C4, 0, 0, 0 object_event 32, MAP_OBJ_GFX_MAN_4, 0, 9, 0, 27, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_150486, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, 960, 0, 0 - object_event 34, MAP_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, 963, 0, 0 - object_event 35, MAP_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, 964, 0, 0 + object_event 33, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN, 0, 0 + object_event 34, MAP_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL, 0, 0 + object_event 35, MAP_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL, 0, 0 object_event 36, MAP_OBJ_GFX_MAN_5, 0, 20, 0, 114, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_15039E, 0, 0, 0 Route111_MapWarps:: @ 8382500 diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 290a6c25f..17d9908fd 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -17,7 +17,7 @@ Route116_MapObjects:: @ 8383170 object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0 object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 31, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C90, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, 947, 0, 0 + object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, 1001, 0, 0 object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 0, 0 object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index bc13e0cc1..1a37f67fa 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -8,8 +8,8 @@ Route118_MapObjects:: @ 8383684 object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 12, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route118_EventScript_150F93, 0, 0, 0 object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0 object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0 - object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0 - object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0 + object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0 + object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0 object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0 object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0 @@ -17,7 +17,7 @@ Route118_MapObjects:: @ 8383684 object_event 16, MAP_OBJ_GFX_MAN_6, 0, 56, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route118_EventScript_151150, 0, 0, 0 object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 39, 0, 15, 0, 3, 1, 0, 0, 1, 0, 2, 0, Route118_EventScript_1510CD, 0, 0, 0 object_event 18, MAP_OBJ_GFX_MAN_6, 0, 17, 0, 11, 0, 3, 15, 17, 0, 1, 0, 3, 0, Route118_EventScript_1510FB, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 966, 0, 0 + object_event 19, MAP_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, 1121, 0, 0 Route118_MapCoordEvents:: @ 8383864 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 213e79015..49c4928aa 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -23,7 +23,7 @@ Route119_MapObjects:: @ 8383914 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, 1029, 0, 0 object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, 923, 0, 0 + object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 0, 0 object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0 object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0 object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 42ad1f238..e5dc045dc 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -15,10 +15,10 @@ Route120_MapObjects:: @ 8383F30 object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 36, 0, 45, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route120_EventScript_151A1F, 0, 0, 0 object_event 15, MAP_OBJ_GFX_MANIAC, 0, 19, 0, 80, 0, 5, 15, 0, 0, 1, 0, 3, 0, Route120_EventScript_151A36, 0, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, 1030, 0, 0 - object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120, 0, 0 - object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120, 0, 0 - object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0 - object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0 + object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0 + object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0 + object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0 + object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0 object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0 object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0 @@ -28,8 +28,8 @@ Route120_MapObjects:: @ 8383F30 object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 18, 0, 34, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route120_EventScript_151AB9, 0, 0, 0 object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, 1108, 0, 0 object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0 - object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, 970, 0, 0 - object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, 972, 0, 0 + object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1, 0, 0 + object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120, 0, 0 object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index 6aa848633..8889f4712 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -10,9 +10,9 @@ Route121_MapObjects:: @ 8384504 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0 object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0 - object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 + object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0 diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc index 464481503..1f86907bd 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -2,8 +2,8 @@ Route128_MapObjects:: @ 83850D0 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 77, 0, 24, 0, 1, 48, 85, 0, 1, 0, 3, 0, Route128_EventScript_1522A4, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 34, 0, 1, 28, 5, 0, 1, 0, 7, 0, Route128_EventScript_1522E2, 0, 0, 0 object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128, 0, 0 - object_event 4, 246, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 944, 0, 0 - object_event 5, 247, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 945, 0, 0 + object_event 4, 246, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128, 0, 0 + object_event 5, 247, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128, 0, 0 object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 63, 0, 28, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route128_EventScript_15234E, 0, 0, 0 object_event 7, MAP_OBJ_GFX_MAN_4, 0, 24, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, Route128_EventScript_152337, 0, 0, 0 object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 47, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route128_EventScript_152320, 0, 0, 0 diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc index 8e2aef57b..41f37c7b1 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc @@ -1,6 +1,6 @@ RustboroCity_DevonCorp_3F_MapObjects:: @ 838891C object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 17, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, 949, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F, 0, 0 object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 15, 0, 5, 0, 3, 76, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0 RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index f32fa3568..049b66beb 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,12 +1,12 @@ RusturfTunnel_MapObjects:: @ 838BD2C object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0 - object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 931, 0, 0 + object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0 object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0 object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, 932, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 0, 0 object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0 object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc index 94b84a968..9ca3db288 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -1,8 +1,8 @@ SSTidalCorridor_MapObjects:: @ 83916F8 object_event 1, MAP_OBJ_GFX_SAILOR, 0, 1, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SAILOR, 0, 16, 0, 7, 0, 3, 3, 32, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FE60, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, 950, 0, 0 - object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, 950, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0 + object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0 SSTidalCorridor_MapWarps:: @ 8391758 warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc index 82758cc57..af5fdbfa4 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -6,7 +6,7 @@ SSTidalRooms_MapObjects:: @ 839189C object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFBD, 0, 0, 0 object_event 6, MAP_OBJ_GFX_BOY_4, 0, 22, 0, 11, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FFD8, 0, 0, 0 object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 15, 0, 6, 0, 3, 9, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFEF, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, 951, 0, 0 + object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL, 0, 0 SSTidalRooms_MapWarps:: @ 839195C warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 4fc97414e..b86a61cb8 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -2,8 +2,8 @@ SeafloorCavern_Room1_MapObjects:: @ 838D0B8 object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 - object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, 946, 0, 0 - object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0 + object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room1_MapWarps:: @ 838D130 warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index 83f80b3e4..a78848955 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room3_MapObjects:: @ 838D268 object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 - object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0 + object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room3_MapWarps:: @ 838D358 warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index 26016edf3..565bcfcae 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room4_MapObjects:: @ 838D384 - object_event 1, 241, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, 946, 0, 0 + object_event 1, 241, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room4_MapWarps:: @ 838D39C warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index a0e0f330f..adb85b96f 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -23,7 +23,7 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 22, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 5, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0, 0, 0 object_event 23, MAP_OBJ_GFX_MAN_6, 0, 34, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 47, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, 948, 0, 0 + object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT, 0, 0 object_event 26, MAP_OBJ_GFX_MAN_3, 0, 5, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAB6, 0, 0, 0 object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index b05d7b861..801f16779 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -1,7 +1,7 @@ SlateportCity_Harbor_MapObjects:: @ 8387F30 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, 905, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, 905, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, 905, 0, 0 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0 + object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0 + object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0 object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0 object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0 object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index a8866bdc5..a4c92861d 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -7,12 +7,12 @@ SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38 object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 - object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, 961, 0, 0 - object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, 961, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, 961, 0, 0 - object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, 961, 0, 0 - object_event 13, 241, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, 965, 0, 0 - object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, 961, 0, 0 + object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 13, 241, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM, 0, 0 + object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index 19fd9b3c9..3bbd87f0b 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -8,7 +8,7 @@ SootopolisCity_MapObjects:: @ 8380608 object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 - object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, 973, 0, 0 + object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS, 0, 0 object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 SootopolisCity_MapWarps:: @ 8380710 diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index c2990f0da..bab1d1baf 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_MapObjects:: @ 8391E60 - object_event 1, 240, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 910, 0, 0 - object_event 2, 241, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 911, 0, 0 + object_event 1, 240, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING, 0, 0 + object_event 2, 241, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY, 0, 0 SouthernIsland_Interior_MapWarps:: @ 8391E90 warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 1e335cdfa..a3d79d09e 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -76,11 +76,11 @@ Route111_EventScript_1AE3EE:: @ 81AE3EE return Route111_EventScript_1AE3F2:: @ 81AE3F2 - setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 return Route111_EventScript_1AE3F6:: @ 81AE3F6 - clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 return Route111_EventScript_1AE3FA:: @ 81AE3FA @@ -100,27 +100,27 @@ Route111_EventScript_1AE406:: @ 81AE406 return Route111_EventScript_1AE40A:: @ 81AE40A - setflag 902 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 return Route111_EventScript_1AE40E:: @ 81AE40E - clearflag 902 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 return Route111_EventScript_1AE412:: @ 81AE412 - setflag 903 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 return Route111_EventScript_1AE416:: @ 81AE416 - clearflag 903 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 return Route111_EventScript_1AE41A:: @ 81AE41A - setflag 904 + setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 return Route111_EventScript_1AE41E:: @ 81AE41E - clearflag 904 + clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 return Route111_EventScript_1AE422:: @ 81AE422 diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index adc865e73..d104b52d4 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -63,7 +63,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB removeobject 2 removeobject 3 removeobject 22 - setflag 926 + setflag FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY fadescreen 0 setobjectxyperm 1, 10, 12 addobject 1 @@ -84,10 +84,10 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB compare FACING, 2 call_if 1, MtChimney_EventScript_1B2D9E removeobject 1 - setflag 927 + setflag FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - clearflag 928 - setflag 942 + clearflag FLAG_HIDE_PROF_COSMO_FALLARBOR + setflag FLAG_HIDE_PROF_COSMO_METEOR_FALLS releaseall end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 36df2cb3f..7d2003598 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -62,7 +62,7 @@ AncientTomb_EventScript_15F050:: @ 815F050 delay 40 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE - setflag 937 + setflag FLAG_HIDE_REGISTEEL setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 59f698c5f..2186c8534 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -20,7 +20,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C specialvar 0x8007, sub_810F404 compare 0x8007, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 - clearflag 941 + clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return @@ -28,12 +28,12 @@ BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialvar 0x8007, sub_810F404 compare 0x8007, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 - clearflag 941 + clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return BattleTower_Lobby_EventScript_1602E4:: @ 81602E4 - setflag 941 + setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER return BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 1f3c0f105..608b0d892 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -5,7 +5,7 @@ BattleTower_Outside_MapScripts:: @ 8160156 BattleTower_Outside_MapScript1_16015C:: @ 816015C setflag FLAG_UNLOCK_BATTLE_TOWER setvar 0x40bc, 0 - setflag 918 + setflag FLAG_HIDE_REPORTER_BATTLE_TOWER end BattleTower_Outside_EventScript_160168:: @ 8160168 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index d0d19e4b9..b7711b1ad 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -77,7 +77,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS clearflag SYS_WEATHER_CTRL setvar 0x40b9, 2 - clearflag 916 + clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT releaseall end diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 3ca08a6de..29f48b95c 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -62,7 +62,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 delay 40 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE - setflag 935 + setflag FLAG_HIDE_REGIROCK setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index efccf20fc..23a96af51 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -16,7 +16,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 msgbox FortreeCity_House4_Text_186835, 4 closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND - clearflag 934 + clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE applymovement 3, FortreeCity_House4_Movement_158218 waitmovement 0 removeobject 3 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 4b72b166c..7d6ecae1b 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -82,7 +82,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D delay 40 waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE - setflag 936 + setflag FLAG_HIDE_REGICE setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 29914a9b5..7078a83ca 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -11,11 +11,11 @@ LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F - clearflag 962 + clearflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART return LilycoveCity_DepartmentStoreRooftop_EventScript_15A163:: @ 815A163 - setflag 962 + setflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART return LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 451219edb..1109acc81 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -4,7 +4,7 @@ MauvilleCity_MapScripts:: @ 814C032 MauvilleCity_MapScript1_14C038:: @ 814C038 setflag FLAG_VISITED_MAUVILLE_CITY - clearflag 961 + clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS setflag SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 @@ -13,8 +13,8 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 end MauvilleCity_EventScript_14C053:: @ 814C053 - clearflag 913 - setflag 912 + clearflag FLAG_HIDE_WATTSON_MAUVILLE_GYM + setflag FLAG_HIDE_WATTSON_MAUVILLE return MauvilleCity_EventScript_14C05A:: @ 814C05A diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 231865942..de83fcb96 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -64,10 +64,10 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setflag 1229 setflag BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD - clearflag 915 + clearflag FLAG_UNKNOWN_393 setvar 0x8008, 7 call MossdeepCity_Gym_EventScript_1A01C0 - clearflag 905 + clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR goto MossdeepCity_Gym_EventScript_15A5C6 end diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index f66f7e6f1..f90fc9350 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -18,7 +18,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B waitpokecry closemessage setflag FLAG_WINGULL_DELIVERED_MAIL - clearflag 933 + clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE compare FACING, 2 call_if 1, MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 5b2f281da..345e75fa1 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -88,7 +88,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 - setflag 968 + setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag FLAG_RECEIVED_BELDUM releaseall end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index fd90210ca..47a842b56 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -47,8 +47,8 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 removeobject 4 removeobject 5 removeobject 6 - setflag 916 - setflag 917 + setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT + setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 61476b085..543c82135 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -401,11 +401,11 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 setvar 0x4085, 7 setflag BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 - setflag 913 - clearflag 912 + setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM + clearflag FLAG_HIDE_WATTSON_MAUVILLE setvar 0x8008, 5 call PetalburgCity_Gym_EventScript_1A01C0 - clearflag 940 + clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL call PetalburgCity_Gym_EventScript_1544ED special DrawWholeMapView goto PetalburgCity_Gym_EventScript_154A2C diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index ac8a48353..9595d00ab 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -21,11 +21,11 @@ Route104_EventScript_14EEAE:: @ 814EEAE goto_if 0, Route104_EventScript_14EEC4 checkflag BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 - clearflag 906 + clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return Route104_EventScript_14EEC4:: @ 814EEC4 - setflag 906 + setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return Route104_EventScript_14EEC8:: @ 814EEC8 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 7d9c8aaaa..6f310881a 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -56,8 +56,8 @@ Route111_EventScript_150023:: @ 8150023 goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL closemessage - setflag 963 - setflag 964 + setflag FLAG_HIDE_ROOT_FOSSIL + setflag FLAG_HIDE_CLAW_FOSSIL removeobject 34 delay 30 applymovement 35, Route111_Movement_1500AF @@ -78,8 +78,8 @@ Route111_EventScript_150069:: @ 8150069 goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL closemessage - setflag 964 - setflag 963 + setflag FLAG_HIDE_CLAW_FOSSIL + setflag FLAG_HIDE_ROOT_FOSSIL removeobject 35 delay 30 applymovement 34, Route111_Movement_1500AF diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index c9e33288b..34c685196 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -57,7 +57,7 @@ Route116_EventScript_150A94:: @ 8150A94 compare FACING, 4 call_if 1, Route116_EventScript_150AF9 removeobject LAST_TALKED - clearflag 949 + clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F setflag FLAG_RECEIVED_REPEAT_BALL release end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 18018316a..18cff8320 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -142,7 +142,7 @@ SSTidalCorridor_EventScript_15FE17:: @ 815FE17 end SSTidalCorridor_EventScript_15FE36:: @ 815FE36 - setflag 951 + setflag FLAG_HIDE_TM_49_GIVER_SS_TIDAL return SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 9131dcdb3..fa19ee504 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -197,19 +197,19 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS clearflag 973 setvar 0x405e, 1 - clearflag 944 - clearflag 945 + clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 + clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 setflag SYS_WEATHER_CTRL setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - setflag 967 + setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE setvar 0x40c6, 1 setvar 0x40a2, 1 setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN - setflag 946 + setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN warp MAP_ROUTE128, 255, 38, 22 waitstate releaseall diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 1d852f41a..4bf77de75 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -90,13 +90,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E16C:: @ 815E16C end ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176 - clearflag 952 - clearflag 953 - clearflag 954 - clearflag 955 - clearflag 956 - clearflag 957 - clearflag 958 - clearflag 959 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_1 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_2 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_3 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_4 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 clearflag SYS_SHOAL_ITEM return diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index d10f958fd..0be4b106c 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -21,7 +21,7 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 end ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 - checkflag 952 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA @@ -30,7 +30,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA - checkflag 953 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB @@ -39,28 +39,28 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB - checkflag 956 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 setmaptile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 - checkflag 957 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B setmaptile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B - checkflag 958 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 setmaptile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 - checkflag 959 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 setmaptile 16, 13, 857, 1 return @@ -70,14 +70,14 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall - checkflag 956 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 20, 859, 0 special DrawWholeMapView - setflag 956 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 releaseall end @@ -88,53 +88,53 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall - checkflag 957 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 10, 859, 0 special DrawWholeMapView - setflag 957 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 releaseall end ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall - checkflag 958 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 6, 9, 859, 0 special DrawWholeMapView - setflag 958 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 releaseall end ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall - checkflag 959 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 16, 13, 859, 0 special DrawWholeMapView - setflag 959 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 releaseall end ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall - checkflag 952 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 31, 8, 858, 0 special DrawWholeMapView - setflag 952 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_1 releaseall end @@ -145,13 +145,13 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall - checkflag 953 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 14, 26, 858, 0 special DrawWholeMapView - setflag 953 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_2 releaseall end diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index 9f4908cf6..adf7d5d9e 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 end ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF - checkflag 955 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 setmaptile 18, 2, 856, 1 return @@ -17,14 +17,14 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall - checkflag 955 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmaptile 18, 2, 858, 0 special DrawWholeMapView - setflag 955 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_4 releaseall end diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index bffb7bd49..d6858bc15 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D end ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 - checkflag 954 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 setmaptile 11, 11, 856, 1 return @@ -17,14 +17,14 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall - checkflag 954 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmaptile 11, 11, 858, 0 special DrawWholeMapView - setflag 954 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_3 releaseall end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 2e042b1e5..7f642c611 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -19,7 +19,7 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 savebgm BGM_EVIL_TEAM setobjectxyperm 4, 12, 13 setobjectmovementtype 4, 9 - setflag 905 + setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR return SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index be5f5a8ff..0cb7b397e 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -179,7 +179,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmovement 0 - setflag 965 + setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM playse 9 removeobject 13 release @@ -188,7 +188,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmovement 0 - setflag 965 + setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM playse 9 removeobject 13 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index db65a51db..7fcd0fff1 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -88,8 +88,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 removeobject 1 setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS - clearflag 947 - setflag 949 + clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 + setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F release end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 0ff474138..8a978cc7d 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -65,7 +65,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 delay 50 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW - setflag 911 + setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartSouthernIslandBattle waitstate diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 743308b43..f5506bfec 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -15,7 +15,7 @@ Route111_EventScript_1A3877:: @ 81A3877 msgbox Route111_Text_1A35C5, 4 closemessage setflag FLAG_RECEIVED_SECRET_POWER - clearflag 948 + clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT compare FACING, 3 call_if 1, Route111_EventScript_1A38C3 compare FACING, 4 -- cgit v1.2.3 From 8d346b1baba8296f1a795b9add8f8f5ca5108d9f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 14 Dec 2017 20:10:36 -0800 Subject: A few more flags --- data/event_scripts.s | 6 +++--- data/maps/events/AquaHideout_B1F.inc | 4 ++-- data/maps/events/MagmaHideout_B1F.inc | 4 ++-- data/maps/events/NewMauville_Inside.inc | 6 +++--- data/scripts/maps/NewMauville_Inside.inc | 6 +++--- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index a84a2dd12..f703eb327 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1236,7 +1236,7 @@ gUnknown_0819FA81:: @ 819FA81 setflag FLAG_HIDE_RIVAL_ROUTE119 setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 - setflag 973 + setflag FLAG_HIDE_STEVEN_SOOTOPOLIS setflag FLAG_HIDE_LANETTE setflag FLAG_HIDE_TRICKMASTER_ENTRANCE setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE @@ -2359,7 +2359,7 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD playpokecry SPECIES_ELECTRODE, 2 delay 40 waitpokecry - setflag 977 + setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT setflag 2145 dowildbattle clearflag 2145 @@ -2375,7 +2375,7 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B playpokecry SPECIES_ELECTRODE, 2 delay 40 waitpokecry - setflag 978 + setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT setflag 2145 dowildbattle clearflag 2145 diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index c3bc7c96b..f3f9e8288 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -4,9 +4,9 @@ AquaHideout_B1F_MapObjects:: @ 838CD80 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, 1071, 0, 0 object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, 1124, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, 977, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, 1132, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, 978, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0 AquaHideout_B1F_MapWarps:: @ 838CE40 warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc index db457bb45..597c40b39 100644 --- a/data/maps/events/MagmaHideout_B1F.inc +++ b/data/maps/events/MagmaHideout_B1F.inc @@ -4,9 +4,9 @@ MagmaHideout_B1F_MapObjects:: @ 838EA28 object_event 3, 242, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, 1125, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, 1126, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, 977, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, 1134, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, 978, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0 MagmaHideout_B1F_MapWarps:: @ 838EAE8 warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index 826e6a089..978842032 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -4,9 +4,9 @@ NewMauville_Inside_MapObjects:: @ 838DF08 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, 1110, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, 1122, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, 1123, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, 974, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, 975, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, 976, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE, 0, 0 NewMauville_Inside_MapWarps:: @ 838DFC8 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 62b8f4d59..1b55cde28 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -169,7 +169,7 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry - setflag 974 + setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE setflag SYS_CTRL_OBJ_DELETE dowildbattle clearflag SYS_CTRL_OBJ_DELETE @@ -184,7 +184,7 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry - setflag 975 + setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE setflag SYS_CTRL_OBJ_DELETE dowildbattle clearflag SYS_CTRL_OBJ_DELETE @@ -199,7 +199,7 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry - setflag 976 + setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE setflag SYS_CTRL_OBJ_DELETE dowildbattle clearflag SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index fa19ee504..b66d4245d 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -195,7 +195,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS - clearflag 973 + clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS setvar 0x405e, 1 clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 -- cgit v1.2.3 From 03c75cfd9cfe896ab5ac78edf746fc1c1b24ef75 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 15 Dec 2017 10:49:58 -0800 Subject: Finish all regular hide-show flags --- data/event_scripts.s | 24 +++++++++++----------- data/maps/events/OldaleTown.inc | 2 +- data/maps/events/Route101.inc | 2 +- data/maps/events/Route119.inc | 4 ++-- data/maps/events/Route120.inc | 12 +++++------ data/maps/events/RusturfTunnel.inc | 2 +- .../maps/events/SlateportCity_OceanicMuseum_2F.inc | 6 +++--- data/maps/events/Underwater_SeafloorCavern.inc | 8 ++++---- data/maps/events/VerdanturfTown_WandasHouse.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 2 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 2 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 2 +- 15 files changed, 37 insertions(+), 37 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index f703eb327..ca7b99d21 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1210,7 +1210,7 @@ gUnknown_0819FA81:: @ 819FA81 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE - setflag 984 + setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE setflag FLAG_HIDE_WALLY_FATHER_PETALBURG setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG setflag FLAG_HIDE_WALLY_PETALBURG_GYM @@ -1245,7 +1245,7 @@ gUnknown_0819FA81:: @ 819FA81 setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL - setflag 983 + setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F @@ -1284,9 +1284,9 @@ gUnknown_0819FA81:: @ 819FA81 setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag 1133 setflag FLAG_HIDE_STEVENS_LETTER - setflag 979 + setflag FLAG_HIDE_RIVAL_OLDALE_TOWN setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD - setflag 991 + setflag FLAG_HIDE_BOY_ROUTE101 call Event_ResetBerryTrees end @@ -2267,7 +2267,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 removeobject 1 removeobject 10 clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE - clearflag 984 + clearflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE setvar 0x409a, 6 setflag FLAG_RUSTURF_TUNNEL_OPENED return @@ -2480,31 +2480,31 @@ Route119_EventScript_1A05C3:: @ 81A05C3 end Route119_EventScript_1A0646:: @ 81A0646 - setflag 982 + setflag FLAG_HIDE_KECLEON_ROUTE120_3 return Route119_EventScript_1A064A:: @ 81A064A - setflag 985 + setflag FLAG_HIDE_KECLEON_ROUTE120_4 return Route119_EventScript_1A064E:: @ 81A064E - setflag 986 + setflag FLAG_HIDE_KECLEON_ROUTE120_5 return Route119_EventScript_1A0652:: @ 81A0652 - setflag 987 + setflag FLAG_HIDE_KECLEON_ROUTE120_6 return Route119_EventScript_1A0656:: @ 81A0656 - setflag 988 + setflag FLAG_HIDE_KECLEON_ROUTE120_7 return Route119_EventScript_1A065A:: @ 81A065A - setflag 989 + setflag FLAG_HIDE_KECLEON_ROUTE119_1 return Route119_EventScript_1A065E:: @ 81A065E - setflag 990 + setflag FLAG_HIDE_KECLEON_ROUTE119_2 return FortreeCity_Movement_1A0662:: @ 81A0662 diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index 3b5fc9150..828ffc986 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -2,7 +2,7 @@ OldaleTown_MapObjects:: @ 8380A78 object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 16, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 13, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0, 0, 0 - object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, 979, 0, 0 + object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0 OldaleTown_MapWarps:: @ 8380AD8 warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index ae2370546..a527ada51 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -4,7 +4,7 @@ Route101_MapObjects:: @ 83810BC object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0 object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 0, 0 object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, 991, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0 Route101_MapCoordEvents:: @ 838114C coord_event 10, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 49c4928aa..a5c62e632 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -33,8 +33,8 @@ Route119_MapObjects:: @ 8383914 object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0 object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0 object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route119_EventScript_151597, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, 989, 0, 0 - object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, 990, 0, 0 + object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1, 0, 0 + object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2, 0, 0 object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 104, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route119_EventScript_1515AE, 0, 0, 0 Route119_MapWarps:: @ 8383C8C diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index e5dc045dc..f85276971 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -34,12 +34,12 @@ Route120_MapObjects:: @ 8383F30 object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0 object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0 - object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0 - object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, 982, 0, 0 - object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, 985, 0, 0 - object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, 986, 0, 0 - object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, 988, 0, 0 - object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, 987, 0, 0 + object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2, 0, 0 + object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3, 0, 0 + object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4, 0, 0 + object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5, 0, 0 + object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7, 0, 0 + object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6, 0, 0 Route120_MapWarps:: @ 8384308 warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 049b66beb..3d3cfc1af 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -8,7 +8,7 @@ RusturfTunnel_MapObjects:: @ 838BD2C object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0 object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 0, 0 object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0 + object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL, 0, 0 RusturfTunnel_MapWarps:: @ 838BE1C warp_def 4, 10, 3, 0, MAP_ROUTE116 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index 0194c4004..911d8e7e2 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -3,9 +3,9 @@ SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70 object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0 object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0 object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, 961, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, 961, 0, 0 - object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, 961, 0, 0 + object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc index 1dff571c3..fa8c12c65 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -1,8 +1,8 @@ Underwater_SeafloorCavern_MapObjects:: @ 838D018 - object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 - object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 - object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 - object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 + object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 + object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 + object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 + object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 Underwater_SeafloorCavern_MapWarps:: @ 838D078 warp_def 6, 7, 0, 0, MAP_UNDERWATER4 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index 3753a78aa..26c178a87 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -3,7 +3,7 @@ VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, 984, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE, 0, 0 VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 117aa5579..07f6581c2 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -27,7 +27,7 @@ LittlerootTown_EventScript_14D563:: @ 814D563 LittlerootTown_EventScript_14D567:: @ 814D567 setvar 0x40c7, 2 - setflag 979 + setflag FLAG_HIDE_RIVAL_OLDALE_TOWN return LittlerootTown_EventScript_14D570:: @ 814D570 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 868e4f06e..871025f55 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -52,7 +52,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4 - clearflag 991 + clearflag FLAG_HIDE_BOY_ROUTE101 setvar 0x4084, 3 releaseall end diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 92120e362..64928f840 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -279,7 +279,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 waitmovement 0 removeobject 4 setvar 0x40c7, 2 - setflag 979 + setflag FLAG_HIDE_RIVAL_OLDALE_TOWN releaseall end diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 23ed60f9a..ee9decedc 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -122,7 +122,7 @@ Route103_EventScript_14ED46:: @ 814ED46 clearflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar 0x40c7, 1 - clearflag 979 + clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN savebgm 0 fadedefaultbgm releaseall diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index eca55c118..68039aac6 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -59,7 +59,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL - clearflag 983 + clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE setvar 0x4096, 1 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 9970d0490..e2b60f22e 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -11,7 +11,7 @@ Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE end Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB - setflag 980 + setflag FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION end Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF -- cgit v1.2.3 From 0a634a60c938b91635af51c1a991a0f45578b313 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 15 Dec 2017 11:46:10 -0800 Subject: Label item flags --- data/event_scripts.s | 4 ++-- data/maps/events/AbandonedShip_CaptainsOffice.inc | 2 +- data/maps/events/AbandonedShip_HiddenFloorRooms.inc | 8 ++++---- data/maps/events/AbandonedShip_Room_B1F.inc | 2 +- data/maps/events/AbandonedShip_Rooms2_1F.inc | 2 +- data/maps/events/AbandonedShip_Rooms2_B1F.inc | 2 +- data/maps/events/AbandonedShip_Rooms_1F.inc | 2 +- data/maps/events/AbandonedShip_Rooms_B1F.inc | 2 +- data/maps/events/AquaHideout_B1F.inc | 6 +++--- data/maps/events/AquaHideout_B2F.inc | 2 +- data/maps/events/CaveOfOrigin_B3F.inc | 2 +- data/maps/events/FieryPath.inc | 4 ++-- data/maps/events/GraniteCave_1F.inc | 2 +- data/maps/events/GraniteCave_B1F.inc | 2 +- data/maps/events/GraniteCave_B2F.inc | 4 ++-- data/maps/events/JaggedPass.inc | 2 +- data/maps/events/LilycoveCity.inc | 2 +- data/maps/events/MagmaHideout_B1F.inc | 6 +++--- data/maps/events/MagmaHideout_B2F.inc | 2 +- data/maps/events/MauvilleCity.inc | 2 +- data/maps/events/MeteorFalls_1F_1R.inc | 8 ++++---- data/maps/events/MeteorFalls_B1F_2R.inc | 2 +- data/maps/events/MossdeepCity.inc | 2 +- data/maps/events/MossdeepCity_StevensHouse.inc | 2 +- data/maps/events/MtPyre_2F.inc | 2 +- data/maps/events/MtPyre_3F.inc | 2 +- data/maps/events/MtPyre_4F.inc | 2 +- data/maps/events/MtPyre_5F.inc | 2 +- data/maps/events/MtPyre_6F.inc | 2 +- data/maps/events/MtPyre_Exterior.inc | 4 ++-- data/maps/events/NewMauville_Inside.inc | 10 +++++----- data/maps/events/PetalburgCity.inc | 4 ++-- data/maps/events/PetalburgWoods.inc | 8 ++++---- data/maps/events/Route102.inc | 2 +- data/maps/events/Route103.inc | 2 +- data/maps/events/Route104.inc | 8 ++++---- data/maps/events/Route105.inc | 2 +- data/maps/events/Route106.inc | 2 +- data/maps/events/Route109.inc | 2 +- data/maps/events/Route110.inc | 4 ++-- data/maps/events/Route110_TrickHousePuzzle1.inc | 2 +- data/maps/events/Route110_TrickHousePuzzle2.inc | 4 ++-- data/maps/events/Route110_TrickHousePuzzle3.inc | 4 ++-- data/maps/events/Route110_TrickHousePuzzle4.inc | 2 +- data/maps/events/Route110_TrickHousePuzzle6.inc | 2 +- data/maps/events/Route110_TrickHousePuzzle7.inc | 2 +- data/maps/events/Route110_TrickHousePuzzle8.inc | 2 +- data/maps/events/Route111.inc | 6 +++--- data/maps/events/Route112.inc | 2 +- data/maps/events/Route113.inc | 4 ++-- data/maps/events/Route114.inc | 4 ++-- data/maps/events/Route115.inc | 8 ++++---- data/maps/events/Route116.inc | 8 ++++---- data/maps/events/Route117.inc | 4 ++-- data/maps/events/Route118.inc | 2 +- data/maps/events/Route119.inc | 14 +++++++------- data/maps/events/Route120.inc | 8 ++++---- data/maps/events/Route121.inc | 2 +- data/maps/events/Route123.inc | 8 ++++---- data/maps/events/Route124.inc | 6 +++--- data/maps/events/Route126.inc | 2 +- data/maps/events/Route127.inc | 4 ++-- data/maps/events/Route132.inc | 2 +- data/maps/events/Route133.inc | 4 ++-- data/maps/events/RustboroCity.inc | 2 +- data/maps/events/RusturfTunnel.inc | 4 ++-- data/maps/events/SafariZone_Northeast.inc | 2 +- data/maps/events/SafariZone_Northwest.inc | 2 +- data/maps/events/SafariZone_Southwest.inc | 2 +- data/maps/events/ScorchedSlab.inc | 2 +- data/maps/events/SeafloorCavern_Room9.inc | 2 +- data/maps/events/ShoalCave_LowTideEntranceRoom.inc | 2 +- data/maps/events/ShoalCave_LowTideIceRoom.inc | 4 ++-- data/maps/events/ShoalCave_LowTideInnerRoom.inc | 2 +- data/maps/events/ShoalCave_LowTideStairsRoom.inc | 2 +- data/maps/events/VictoryRoad_1F.inc | 4 ++-- data/maps/events/VictoryRoad_B1F.inc | 4 ++-- data/maps/events/VictoryRoad_B2F.inc | 2 +- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 2 +- 79 files changed, 138 insertions(+), 138 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index ca7b99d21..df79de3d1 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1282,7 +1282,7 @@ gUnknown_0819FA81:: @ 819FA81 setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE - setflag 1133 + setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1 setflag FLAG_HIDE_STEVENS_LETTER setflag FLAG_HIDE_RIVAL_OLDALE_TOWN setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD @@ -1316,7 +1316,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A return EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E - clearflag 1133 + clearflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1 return EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62 diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index e33de80a9..72740dc29 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -1,6 +1,6 @@ AbandonedShip_CaptainsOffice_MapObjects:: @ 838E45C object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, 1100, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1, 0, 0 AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index 46c8eb47a..2e6bb9a3f 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -1,8 +1,8 @@ AbandonedShip_HiddenFloorRooms_MapObjects:: @ 838E540 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, 1077, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, 1078, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, 1102, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, 1101, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3, 0, 0 AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc index d60f9ec94..22739c99f 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F_MapObjects:: @ 838E3AC - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, 1098, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1, 0, 0 AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc index 34de5e0af..d68dd776d 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -1,7 +1,7 @@ AbandonedShip_Rooms2_1F_MapObjects:: @ 838E3E8 object_event 1, MAP_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0, 0, 0 object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, 1099, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1, 0, 0 AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc index ece0138dd..8f21e82c4 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms2_B1F_MapObjects:: @ 838E324 object_event 1, MAP_OBJ_GFX_CAMPER, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, 1097, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1, 0, 0 AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc index e41bce58c..8eaae1853 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_1F_MapObjects:: @ 838E1C4 object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, 1095, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1, 0, 0 AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc index 455a439cb..cb9ce260f 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_B1F_MapObjects:: @ 838E2C8 object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 25, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, 1096, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1, 0, 0 AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index f3f9e8288..3f4d8e4ec 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -1,11 +1,11 @@ AquaHideout_B1F_MapObjects:: @ 838CD80 object_event 1, 241, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 2, 241, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, 1071, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1, 0, 0 object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, 1124, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, 1132, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0 AquaHideout_B1F_MapWarps:: @ 838CE40 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index 96fc25023..c4b0abc78 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -1,7 +1,7 @@ AquaHideout_B2F_MapObjects:: @ 838CF1C object_event 1, 241, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 2, 241, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, 1072, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1, 0, 0 object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc index 8eb114b74..2561dee6a 100644 --- a/data/maps/events/CaveOfOrigin_B3F.inc +++ b/data/maps/events/CaveOfOrigin_B3F.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B3F_MapObjects:: @ 838D814 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, 1059, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1, 0, 0 CaveOfOrigin_B3F_MapWarps:: @ 838D82C warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index 7c618a4e7..575f92bd5 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -1,12 +1,12 @@ FieryPath_MapObjects:: @ 838C718 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, 1091, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1, 0, 0 object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2, 0, 0 FieryPath_MapWarps:: @ 838C7D8 warp_def 26, 36, 3, 4, MAP_ROUTE112 diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc index 1728858fb..ade38322f 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -1,6 +1,6 @@ GraniteCave_1F_MapObjects:: @ 838BF24 object_event 1, MAP_OBJ_GFX_HIKER, 0, 36, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, 1050, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1, 0, 0 GraniteCave_1F_MapWarps:: @ 838BF54 warp_def 37, 12, 3, 0, MAP_ROUTE106 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc index bc0cc5dfc..e50fd09af 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -1,5 +1,5 @@ GraniteCave_B1F_MapObjects:: @ 838BF88 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, 1051, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1, 0, 0 GraniteCave_B1F_MapWarps:: @ 838BFA0 warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index f662d175c..c8a7c5554 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -1,6 +1,6 @@ GraniteCave_B2F_MapObjects:: @ 838BFEC - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, 1053, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, 1054, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2, 0, 0 object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index dfcc6cbac..654cbb9ae 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -1,7 +1,7 @@ JaggedPass_MapObjects:: @ 838C61C object_event 1, MAP_OBJ_GFX_HIKER, 0, 8, 0, 18, 0, 3, 8, 0, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D285, 0, 0, 0 object_event 2, MAP_OBJ_GFX_CAMPER, 0, 16, 0, 22, 0, 3, 14, 0, 0, 1, 0, 2, 0, JaggedPass_EventScript_15D2DA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, 1070, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1, 0, 0 object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 13, 0, 35, 0, 3, 15, 17, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D29C, 0, 0, 0 JaggedPass_MapWarps:: @ 838C67C diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index 56680d83c..8e53d3544 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -9,7 +9,7 @@ LilycoveCity_MapObjects:: @ 838016C object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 34, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0, 0, 0 object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 57, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0, 0, 0 object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, 1042, 0, 0 + object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1, 0, 0 object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc index 597c40b39..3ed63b847 100644 --- a/data/maps/events/MagmaHideout_B1F.inc +++ b/data/maps/events/MagmaHideout_B1F.inc @@ -2,10 +2,10 @@ MagmaHideout_B1F_MapObjects:: @ 838EA28 object_event 1, 241, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0 object_event 2, 241, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0 object_event 3, 242, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, 1125, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, 1126, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, 1134, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0 MagmaHideout_B1F_MapWarps:: @ 838EAE8 diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc index 72b380091..16ac562b5 100644 --- a/data/maps/events/MagmaHideout_B2F.inc +++ b/data/maps/events/MagmaHideout_B2F.inc @@ -3,7 +3,7 @@ MagmaHideout_B2F_MapObjects:: @ 838EBE4 object_event 2, 241, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 object_event 4, 242, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, 1127, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1, 0, 0 MagmaHideout_B2F_MapWarps:: @ 838EC5C warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index e1aa1c92a..fee44bb1e 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -7,7 +7,7 @@ MauvilleCity_MapObjects:: @ 837FB90 object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE, 0, 0 object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 0, 0 object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, 1116, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1, 0, 0 MauvilleCity_MapWarps:: @ 837FC68 warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index a9d9e23ce..abccfa283 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -1,8 +1,8 @@ MeteorFalls_1F_1R_MapObjects:: @ 838BACC - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, 1044, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, 1046, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, 1045, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, 1047, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4, 0, 0 object_event 5, 241, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 object_event 6, 241, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 object_event 7, 247, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc index d892b1ac0..13e39d682 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R_MapObjects:: @ 838BCF8 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, 1080, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1, 0, 0 MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index a8162d215..a5b4fa74a 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -4,7 +4,7 @@ MossdeepCity_MapObjects:: @ 838042C object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 32, 0, 12, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFAE, 0, 0, 0 object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 26, 0, 21, 0, 5, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC0, 0, 0, 0 object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 45, 0, 18, 0, 7, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, 1043, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1, 0, 0 object_event 7, MAP_OBJ_GFX_MAN_1, 0, 53, 0, 5, 0, 7, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0, 0, 0 object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 56, 0, 21, 0, 7, 10, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFDB, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BOY_2, 0, 23, 0, 13, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D027, 0, 0, 0 diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index 2c499c583..1428a7d8a 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -1,7 +1,7 @@ MossdeepCity_StevensHouse_MapObjects:: @ 838AA44 object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE, 0, 0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, 1133, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1, 0, 0 object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER, 0, 0 MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc index 1d776173d..16e1d98b0 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -1,6 +1,6 @@ MtPyre_2F_MapObjects:: @ 838C888 object_event 1, MAP_OBJ_GFX_MANIAC, 0, 6, 0, 6, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_2F_EventScript_15D39B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, 1129, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 5, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D389, 0, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D392, 0, 0, 0 object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3CD, 0, 0, 0 diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc index 0cccd1bb2..818d61533 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -1,7 +1,7 @@ MtPyre_3F_MapObjects:: @ 838C954 object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 1, 0, 4, 0, 3, 18, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D3E9, 0, 0, 0 object_event 2, MAP_OBJ_GFX_LASS, 0, 12, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D400, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, 1120, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1, 0, 0 MtPyre_3F_MapWarps:: @ 838C99C warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc index bc6cc02eb..4b954a45e 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -1,6 +1,6 @@ MtPyre_4F_MapObjects:: @ 838C9E0 object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 7, 0, 3, 24, 17, 0, 1, 0, 2, 0, MtPyre_4F_EventScript_15D418, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, 1130, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1, 0, 0 MtPyre_4F_MapWarps:: @ 838CA10 warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc index 340274836..9043c95de 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -1,6 +1,6 @@ MtPyre_5F_MapObjects:: @ 838CA54 object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 3, 0, 7, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_5F_EventScript_15D430, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, 1052, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1, 0, 0 MtPyre_5F_MapWarps:: @ 838CA84 warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc index e0d12d296..67597ff58 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -1,6 +1,6 @@ MtPyre_6F_MapObjects:: @ 838CAC0 object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 6, 0, 3, 0, 3, 23, 17, 0, 1, 0, 2, 0, MtPyre_6F_EventScript_15D448, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, 1089, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1, 0, 0 MtPyre_6F_MapWarps:: @ 838CAF0 warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index 044ff7fb5..71cb2095a 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -1,6 +1,6 @@ MtPyre_Exterior_MapObjects:: @ 838CB14 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, 1073, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, 1074, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2, 0, 0 MtPyre_Exterior_MapWarps:: @ 838CB44 warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index 978842032..a3b7ffbe2 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -1,9 +1,9 @@ NewMauville_Inside_MapObjects:: @ 838DF08 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, 1075, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, 1076, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, 1110, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, 1122, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, 1123, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE, 0, 0 diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 3253c212c..739cbf905 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -5,8 +5,8 @@ PetalburgCity_MapObjects:: @ 837F5F0 object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0 object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG, 0, 0 object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, 1039, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, 1040, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2, 0, 0 object_event 9, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0 PetalburgCity_MapWarps:: @ 837F6C8 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 5a2885be5..e80b33c13 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -3,14 +3,14 @@ PetalburgWoods_MapObjects:: @ 838C14C object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, 1055, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, 1058, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3, 0, 0 object_event 8, MAP_OBJ_GFX_BOY_2, 0, 15, 0, 19, 0, 3, 3, 33, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CECA, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 7, 0, 32, 0, 3, 22, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF27, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 4, 0, 14, 0, 3, 20, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF3E, 0, 0, 0 object_event 11, MAP_OBJ_GFX_BOY_3, 0, 30, 0, 34, 0, 3, 2, 18, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CED3, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, 1117, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4, 0, 0 object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CEDC, 0, 0, 0 PetalburgWoods_MapWarps:: @ 838C284 diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc index 7ffa0e191..2736c7a61 100644 --- a/data/maps/events/Route102.inc +++ b/data/maps/events/Route102.inc @@ -4,7 +4,7 @@ Route102_MapObjects:: @ 83811FC object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 25, 0, 15, 0, 3, 7, 0, 0, 1, 0, 2, 0, Route102_EventScript_14EB3C, 0, 0, 0 object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0 object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, 1000, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1, 0, 0 object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0 diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index e94ee3e75..580e8a91b 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -11,7 +11,7 @@ Route103_MapObjects:: @ 8381300 object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0 object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103, 0, 0 object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0 + object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1, 0, 0 object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index 1205c6681..f7034ff26 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -19,17 +19,17 @@ Route104_MapObjects:: @ 8381488 object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0 object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, 1002, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1, 0, 0 object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE, 0, 0 object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0 object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F279, 0, 0, 0 object_event 25, MAP_OBJ_GFX_BOY_4, 0, 11, 0, 44, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F1DE, 0, 0, 0 object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 25, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F21C, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, 1057, 0, 0 + object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2, 0, 0 object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, 1115, 0, 0 + object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3, 0, 0 object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 - object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, 1135, 0, 0 + object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4, 0, 0 object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0 Route104_MapWarps:: @ 8381788 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index 7cf684e55..45c0866e3 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -3,7 +3,7 @@ Route105_MapObjects:: @ 8381854 object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 10, 0, 44, 0, 1, 27, 7, 0, 1, 0, 3, 0, Route105_EventScript_14F2E9, 0, 0, 0 object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 26, 0, 36, 0, 1, 25, 112, 0, 1, 0, 3, 0, Route105_EventScript_14F300, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 19, 0, 9, 0, 1, 24, 80, 0, 1, 0, 3, 0, Route105_EventScript_14F317, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, 1003, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1, 0, 0 object_event 6, MAP_OBJ_GFX_HIKER, 0, 12, 0, 51, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route105_EventScript_14F2BB, 0, 0, 0 Route105_MapWarps:: @ 83818E4 diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc index 6af8d92fa..991e12f74 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -3,7 +3,7 @@ Route106_MapObjects:: @ 838190C object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 5, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F34F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 51, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route106_EventScript_14F366, 0, 0, 0 object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 65, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F3A4, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, 1004, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1, 0, 0 Route106_MapWarps:: @ 8381984 warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index 76c676dbb..5924bc0d2 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -8,7 +8,7 @@ Route109_MapObjects:: @ 8381AFC object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 21, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F809, 0, 0, 0 object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 8, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F847, 0, 0, 0 object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F705, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, 1005, 0, 0 + object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1, 0, 0 object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 29, 0, 32, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F89C, 0, 0, 0 object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 31, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F885, 0, 0, 0 object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 15, 0, 52, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route109_EventScript_14F8B3, 0, 0, 0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index a4e425955..91531dbe5 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -17,8 +17,8 @@ Route110_MapObjects:: @ 8381D58 object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0 object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0 object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, 1007, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, 1006, 0, 0 + object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1, 0, 0 object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0 object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 2a778ed3e..61ae942ee 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -16,7 +16,7 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B, 0, 0 object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D, 0, 0 object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, 1060, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1, 0, 0 object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F, 0, 0 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index f92097eec..264465641 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -2,8 +2,8 @@ Route110_TrickHousePuzzle2_MapObjects:: @ 839245C object_event 1, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle2_EventScript_161E78, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 0, 10, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle2_EventScript_161E8F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 9, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle2_EventScript_161EA6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, 1062, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, 1061, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1, 0, 0 Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index f002c0871..5c360ac6c 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -6,8 +6,8 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, 1064, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, 1063, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1, 0, 0 object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index e95e63b85..6c630a082 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -2,7 +2,7 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 12, 0, 8, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_16276B, 0, 0, 0 object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, 1065, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1, 0, 0 object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc index ad7c26e44..f01d5783d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -2,7 +2,7 @@ Route110_TrickHousePuzzle6_MapObjects:: @ 8392A2C object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_163107, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_6, 0, 14, 0, 12, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_16311E, 0, 0, 0 object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route110_TrickHousePuzzle6_EventScript_163135, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, 1067, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1, 0, 0 Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index f666b4640..5beae5e18 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -2,7 +2,7 @@ Route110_TrickHousePuzzle7_MapObjects:: @ 8392AC4 object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle7_EventScript_1633D6, 0, 0, 0 object_event 2, MAP_OBJ_GFX_LASS, 0, 14, 0, 3, 0, 3, 7, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_163404, 0, 0, 0 object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 9, 0, 10, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_1633ED, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, 1068, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1, 0, 0 Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc index 0caa0e68d..2df410599 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -2,7 +2,7 @@ Route110_TrickHousePuzzle8_MapObjects:: @ 8392BA8 object_event 1, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 21, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163439, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 11, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163467, 0, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle8_EventScript_163450, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, 1069, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1, 0, 0 Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index 25a3b822a..b282c7a8d 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -16,15 +16,15 @@ Route111_MapObjects:: @ 83821A0 object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1, 0, 0 object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0 object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0 object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0 object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0 object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0 - object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0 - object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0 + object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2, 0, 0 + object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3, 0, 0 object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0 object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index e29769d77..c739f9d0b 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -10,7 +10,7 @@ Route112_MapObjects:: @ 8382818 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1, 0, 0 Route112_MapWarps:: @ 8382938 warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index 4e9bd98b5..dec48e2e1 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -4,8 +4,8 @@ Route113_MapObjects:: @ 83829A0 object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 62, 0, 8, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route113_EventScript_15063B, 0, 0, 0 object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 21, 0, 11, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route113_EventScript_150652, 0, 0, 0 object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 51, 0, 11, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route113_EventScript_150669, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, 1012, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, 1013, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2, 0, 0 object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 3, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506A7, 0, 0, 0 object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506E5, 0, 0, 0 object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_1506FC, 0, 0, 0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index d14f27737..0e4097651 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -7,8 +7,8 @@ Route114_MapObjects:: @ 8382C48 object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0 object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, 1014, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, 1015, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1, 0, 0 + object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2, 0, 0 object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0 object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index 6edb62e78..83c7e97b8 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -8,13 +8,13 @@ Route115_MapObjects:: @ 8382F2C object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0 object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, 1016, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, 1017, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, 1018, 0, 0 + object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1, 0, 0 + object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3, 0, 0 object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0 object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0 object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0 + object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4, 0, 0 Route115_MapWarps:: @ 83830AC warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 17d9908fd..77262f4c1 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -5,20 +5,20 @@ Route116_MapObjects:: @ 8383170 object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, 1019, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116, 0, 0 object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0 object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 - object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, 1021, 0, 0 + object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4, 0, 0 object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0 object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 31, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C90, 0, 0, 0 object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, 1001, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1, 0, 0 object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 0, 0 object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index 9f5c35207..90f3e1f8f 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -12,9 +12,9 @@ Route117_MapObjects:: @ 8383440 object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0 object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0 object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, 1022, 0, 0 + object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1, 0, 0 object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, 1023, 0, 0 + object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2, 0, 0 object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0 object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0 object_event 19, MAP_OBJ_GFX_LASS, 0, 46, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150EE2, 0, 0, 0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 1a37f67fa..2faff5e7d 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -18,7 +18,7 @@ Route118_MapObjects:: @ 8383684 object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 39, 0, 15, 0, 3, 1, 0, 0, 1, 0, 2, 0, Route118_EventScript_1510CD, 0, 0, 0 object_event 18, MAP_OBJ_GFX_MAN_6, 0, 17, 0, 11, 0, 3, 15, 17, 0, 1, 0, 3, 0, Route118_EventScript_1510FB, 0, 0, 0 object_event 19, MAP_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, 1121, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1, 0, 0 Route118_MapCoordEvents:: @ 8383864 coord_event 43, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FAE diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index a5c62e632..506256be0 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -15,12 +15,12 @@ Route119_MapObjects:: @ 8383914 object_event 14, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 50, 0, 4, 10, 0, 0, 1, 0, 3, 0, Route119_EventScript_15153B, 0, 0, 0 object_event 15, MAP_OBJ_GFX_MAN_6, 0, 8, 0, 62, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route119_EventScript_151552, 0, 0, 0 object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0 - object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, 1024, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, 1025, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, 1026, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, 1027, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, 1028, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, 1029, 0, 0 + object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2, 0, 0 + object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5, 0, 0 + object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6, 0, 0 object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 0, 0 @@ -30,7 +30,7 @@ Route119_MapObjects:: @ 8383914 object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0 object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0 object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0 + object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7, 0, 0 object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0 object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route119_EventScript_151597, 0, 0, 0 object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1, 0, 0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index f85276971..4ddfe4978 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -14,20 +14,20 @@ Route120_MapObjects:: @ 8383F30 object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0 object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 36, 0, 45, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route120_EventScript_151A1F, 0, 0, 0 object_event 15, MAP_OBJ_GFX_MANIAC, 0, 19, 0, 80, 0, 5, 15, 0, 0, 1, 0, 3, 0, Route120_EventScript_151A36, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, 1030, 0, 0 + object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1, 0, 0 object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0 object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0 object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0 object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0 object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0 + object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2, 0, 0 object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0 object_event 25, MAP_OBJ_GFX_HIKER, 0, 9, 0, 60, 0, 3, 21, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A8B, 0, 0, 0 object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 16, 0, 6, 0, 3, 23, 0, 0, 1, 0, 4, 0, Route120_EventScript_151AA2, 0, 0, 0 object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 18, 0, 34, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route120_EventScript_151AB9, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, 1108, 0, 0 - object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0 + object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4, 0, 0 + object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3, 0, 0 object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1, 0, 0 object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120, 0, 0 object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index 8889f4712..b97f956c2 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -19,7 +19,7 @@ Route121_MapObjects:: @ 8384504 object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0 object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, 1103, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1, 0, 0 object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 Route121_MapWarps:: @ 8384714 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index db9e8baed..ff4f066b8 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -19,8 +19,8 @@ Route123_MapObjects:: @ 83847F8 object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, 1032, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, 1033, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1, 0, 0 + object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2, 0, 0 object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0 object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0 object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0 @@ -31,8 +31,8 @@ Route123_MapObjects:: @ 83847F8 object_event 30, MAP_OBJ_GFX_PSYCHIC_M, 0, 138, 0, 12, 0, 3, 9, 0, 0, 1, 0, 6, 0, Route123_EventScript_151D16, 0, 0, 0 object_event 31, MAP_OBJ_GFX_LASS, 0, 50, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route123_EventScript_151D54, 0, 0, 0 object_event 32, MAP_OBJ_GFX_HEX_MANIAC, 0, 87, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route123_EventScript_151DC8, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, 1104, 0, 0 - object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, 1109, 0, 0 + object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3, 0, 0 + object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4, 0, 0 Route123_MapWarps:: @ 8384B28 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc index 7001c5928..eb92f81a4 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -4,9 +4,9 @@ Route124_MapObjects:: @ 8384D10 object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 14, 0, 27, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route124_EventScript_151E26, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 49, 0, 45, 0, 1, 24, 134, 0, 1, 0, 3, 0, Route124_EventScript_151E64, 0, 0, 0 object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 60, 0, 74, 0, 1, 28, 7, 0, 1, 0, 2, 0, Route124_EventScript_151E7B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, 1092, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, 1093, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, 1066, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1, 0, 0 object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151E92, 0, 0, 0 object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151ED8, 0, 0, 0 diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc index 50d1dca52..a8855c41f 100644 --- a/data/maps/events/Route126.inc +++ b/data/maps/events/Route126.inc @@ -3,7 +3,7 @@ Route126_MapObjects:: @ 8384F1C object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 33, 0, 63, 0, 1, 28, 9, 0, 1, 0, 3, 0, Route126_EventScript_152025, 0, 0, 0 object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 49, 0, 1, 7, 0, 0, 1, 0, 3, 0, Route126_EventScript_15203C, 0, 0, 0 object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 64, 0, 44, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route126_EventScript_152053, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, 1105, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1, 0, 0 Route126_MapEvents:: @ 8384F94 map_events Route126_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc index b3744194e..d71b15c74 100644 --- a/data/maps/events/Route127.inc +++ b/data/maps/events/Route127.inc @@ -1,8 +1,8 @@ Route127_MapObjects:: @ 8384FA8 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 18, 0, 68, 0, 1, 14, 0, 0, 1, 0, 2, 0, Route127_EventScript_15207A, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 44, 0, 1, 21, 0, 0, 1, 0, 4, 0, Route127_EventScript_152091, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, 1034, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, 1035, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2, 0, 0 object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 53, 0, 13, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520A8, 0, 0, 0 object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 52, 0, 25, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520D6, 0, 0, 0 object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 64, 0, 19, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520BF, 0, 0, 0 diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc index b19e96363..97fc3d5db 100644 --- a/data/maps/events/Route132.inc +++ b/data/maps/events/Route132.inc @@ -1,7 +1,7 @@ Route132_MapObjects:: @ 8385344 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 3, 0, 1, 46, 51, 0, 1, 0, 2, 0, Route132_EventScript_1524E5, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 41, 0, 16, 0, 1, 49, 68, 0, 1, 0, 2, 0, Route132_EventScript_1524FC, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, 1036, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1, 0, 0 object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 46, 0, 28, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route132_EventScript_15252A, 0, 0, 0 object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 9, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route132_EventScript_152513, 0, 0, 0 diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc index 1461293e8..3d73ef1c9 100644 --- a/data/maps/events/Route133.inc +++ b/data/maps/events/Route133.inc @@ -2,8 +2,8 @@ Route133_MapObjects:: @ 83853D0 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 6, 0, 4, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route133_EventScript_152542, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152570, 0, 0, 0 object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 69, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152559, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, 1037, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, 1038, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2, 0, 0 object_event 6, MAP_OBJ_GFX_MAN_6, 0, 37, 0, 16, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route133_EventScript_15259E, 0, 0, 0 object_event 7, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route133_EventScript_152587, 0, 0, 0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index f44bf28d5..c16bfcdb0 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -10,7 +10,7 @@ RustboroCity_MapObjects:: @ 837FD14 object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO, 0, 0 object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0 object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, 1041, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1, 0, 0 object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0 object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0 diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 3d3cfc1af..4c25d2131 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,8 +1,8 @@ RusturfTunnel_MapObjects:: @ 838BD2C object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0 object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0 object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0 object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0 diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc index 6fe5843fb..68c32e585 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/events/SafariZone_Northeast.inc @@ -7,7 +7,7 @@ SafariZone_Northeast_MapObjects:: @ 8391A2C object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, 1119, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1, 0, 0 SafariZone_Northeast_MapEvents:: @ 8391B04 map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc index 0a1846b29..e2cabbd38 100644 --- a/data/maps/events/SafariZone_Northwest.inc +++ b/data/maps/events/SafariZone_Northwest.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_MapObjects:: @ 83919E8 object_event 1, MAP_OBJ_GFX_MAN_1, 0, 8, 0, 8, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, 1094, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1, 0, 0 SafariZone_Northwest_MapEvents:: @ 8391A18 map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index db8420a33..2beec82ae 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -1,6 +1,6 @@ SafariZone_Southwest_MapObjects:: @ 8391B18 object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, 1131, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST, 0, 0 SafariZone_Southwest_MapWarps:: @ 8391B48 warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc index 9ba2d3098..1a4f4d92d 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -1,5 +1,5 @@ ScorchedSlab_MapObjects:: @ 838E988 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, 1079, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1, 0, 0 ScorchedSlab_MapWarps:: @ 838E9A0 warp_def 7, 16, 1, 1, MAP_ROUTE120 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 4c1ffb86f..77719389b 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -4,7 +4,7 @@ SeafloorCavern_Room9_MapObjects:: @ 838D620 object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0 object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, 1090, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1, 0, 0 object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room9_MapWarps:: @ 838D6C8 diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc index 33e8b8c6c..8d38fb3ee 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideEntranceRoom_MapObjects:: @ 838DCDC - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, 1081, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1, 0, 0 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 18, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0, 0, 0 ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc index 7573a7040..6e1b36d08 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideIceRoom_MapObjects:: @ 838EDE0 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, 1112, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, 1113, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2, 0, 0 ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc index 43a108e66..c699b5e11 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom_MapObjects:: @ 838DD40 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, 1082, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1, 0, 0 ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc index 68f933e2b..f4027a22f 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideStairsRoom_MapObjects:: @ 838DDF4 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, 1083, 0, 0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1, 0, 0 ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index cffb058b6..593f2df02 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -3,8 +3,8 @@ VictoryRoad_1F_MapObjects:: @ 838D8E4 object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 6, 0, 15, 0, 4, 9, 0, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_15DF9D, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_4, 0, 27, 0, 34, 0, 3, 18, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF86, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, 1084, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, 1085, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2, 0, 0 object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD, 0, 0 VictoryRoad_1F_MapWarps:: @ 838D98C diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index 575744050..0c30a96fa 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -16,8 +16,8 @@ VictoryRoad_B1F_MapObjects:: @ 838DA04 object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0 object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0 object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1, 0, 0 + object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2, 0, 0 VictoryRoad_B1F_MapWarps:: @ 838DBCC warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index 9ef5d819b..e9d549f04 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -3,7 +3,7 @@ VictoryRoad_B2F_MapObjects:: @ 838DC18 object_event 2, MAP_OBJ_GFX_MAN_4, 0, 43, 0, 14, 0, 3, 7, 17, 0, 1, 0, 4, 0, VictoryRoad_B2F_EventScript_15E012, 0, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 2, 0, 17, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E029, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 35, 0, 22, 0, 3, 9, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E040, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, 1088, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1, 0, 0 VictoryRoad_B2F_MapWarps:: @ 838DC90 warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index 2bec8ac39..2430ba4af 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -9,7 +9,7 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 - checkflag 1078 + checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4 release -- cgit v1.2.3 From b14cdde8bd4afda2b0b73bb72b3cffc6961a5790 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 15 Dec 2017 14:59:25 -0800 Subject: Label landmark and daily flags. --- data/event_scripts.s | 28 +++++++++++----------- data/pokedex_area_screen.s | 4 ++-- data/scripts/maps/AbandonedShip_Deck.inc | 2 +- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/DewfordTown_Gym.inc | 4 ++-- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 6 ++--- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 6 ++--- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 6 ++--- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 6 ++--- data/scripts/maps/FieryPath.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 4 ++-- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 4 ++-- data/scripts/maps/LilycoveCity.inc | 6 ++--- .../maps/LilycoveCity_DepartmentStore_1F.inc | 4 ++-- data/scripts/maps/MauvilleCity_Gym.inc | 12 +++++----- data/scripts/maps/MossdeepCity_Gym.inc | 4 ++-- data/scripts/maps/NewMauville_Entrance.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 18 +++++++------- data/scripts/maps/PetalburgCity_WallysHouse.inc | 4 ++-- data/scripts/maps/Route104_MrBrineysHouse.inc | 2 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 8 +++---- data/scripts/maps/Route109_SeashoreHouse.inc | 2 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 2 +- data/scripts/maps/Route111.inc | 6 ++--- data/scripts/maps/Route111_OldLadysRestStop.inc | 2 +- data/scripts/maps/Route113_GlassWorkshop.inc | 2 +- data/scripts/maps/Route114.inc | 4 ++-- data/scripts/maps/Route114_FossilManiacsHouse.inc | 2 +- data/scripts/maps/Route114_LanettesHouse.inc | 2 +- data/scripts/maps/Route116_TunnelersRestHouse.inc | 2 +- data/scripts/maps/Route117_PokemonDayCare.inc | 2 +- data/scripts/maps/Route120.inc | 14 +++++------ data/scripts/maps/Route123_BerryMastersHouse.inc | 12 +++++----- .../maps/Route124_DivingTreasureHuntersHouse.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 4 ++-- data/scripts/maps/ScorchedSlab.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 2 +- data/scripts/maps/SkyPillar_Entrance.inc | 2 +- data/scripts/maps/SootopolisCity.inc | 8 +++---- data/scripts/maps/SootopolisCity_Gym_1F.inc | 4 ++-- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 2 +- data/scripts/maps/VerdanturfTown_WandasHouse.inc | 6 ++--- data/scripts/pokeblocks.inc | 8 +++---- 47 files changed, 117 insertions(+), 117 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index df79de3d1..0a250d570 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1338,7 +1338,7 @@ S_WhiteOut:: @ 819FC74 EventScript_19FC84: checkflag FLAG_RECEIVED_GO_GOGGLES goto_if_eq Route101_EventScript_1A14DC - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if 0, Route101_EventScript_1A14DC clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1 setvar 0x4053, 2 @@ -1386,10 +1386,10 @@ EventScript_19FCF0: end EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09 - clearflag 1245 - clearflag 1246 - clearflag 1247 - clearflag 1248 + clearflag FLAG_DEFEATED_ELITE_4_SYDNEY + clearflag FLAG_DEFEATED_ELITE_4_PHOEBE + clearflag FLAG_DEFEATED_ELITE_4_GLACIA + clearflag FLAG_DEFEATED_ELITE_4_DRAKE setvar 0x409c, 0 return @@ -1404,7 +1404,7 @@ SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B checkflag FLAG_RECEIVED_POKENAV goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49 @@ -1717,9 +1717,9 @@ EventScript_1A0070: EventScript_1A0085: playse 2 - checkflag 2123 + checkflag SYS_PC_LANETTE call_if 0, EventScript_1A00AC - checkflag 2123 + checkflag SYS_PC_LANETTE call_if 1, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 special ShowPokemonStorageSystem @@ -2360,9 +2360,9 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD delay 40 waitpokecry setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end @@ -2376,9 +2376,9 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B delay 40 waitpokecry setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end @@ -2473,9 +2473,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3 call_if 1, Route119_EventScript_1A065A compare 0x8004, 7 call_if 1, Route119_EventScript_1A065E - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s index 0734a44d7..0d15169d0 100644 --- a/data/pokedex_area_screen.s +++ b/data/pokedex_area_screen.s @@ -20,8 +20,8 @@ gUnknown_083F856E:: @ 83F856E .align 1 gUnknown_083F857A:: @ 83F857A - .2byte 85, 2142 - .2byte 68, 2119 + .2byte 85, 2142 @ FLAG_LANDMARK_SKY_PILLAR + .2byte 68, 2119 @ FLAG_LANDMARK_SEAFLOOR_CAVERN .2byte 88, 0 @ XXX: what is this? diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/scripts/maps/AbandonedShip_Deck.inc index 49f837744..68d872f01 100644 --- a/data/scripts/maps/AbandonedShip_Deck.inc +++ b/data/scripts/maps/AbandonedShip_Deck.inc @@ -3,5 +3,5 @@ AbandonedShip_Deck_MapScripts:: @ 815E95A .byte 0 AbandonedShip_Deck_MapScript1_15E960:: @ 815E960 - setflag 2110 + setflag FLAG_LANDMARK_ABANDONED_SHIP end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 7d2003598..d28ce7fcc 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -14,7 +14,7 @@ AncientTomb_EventScript_15EFD8:: @ 815EFD8 return AncientTomb_MapScript1_15EFDC:: @ 815EFDC - setflag 2137 + setflag FLAG_LANDMARK_ANCIENT_TOMB end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 608b0d892..1a254f7df 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -3,7 +3,7 @@ BattleTower_Outside_MapScripts:: @ 8160156 .byte 0 BattleTower_Outside_MapScript1_16015C:: @ 816015C - setflag FLAG_UNLOCK_BATTLE_TOWER + setflag FLAG_LANDMARK_BATTLE_TOWER setvar 0x40bc, 0 setflag FLAG_HIDE_REPORTER_BATTLE_TOWER end diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 29f48b95c..228ca21ac 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -28,7 +28,7 @@ DesertRuins_EventScript_15CB1B:: @ 815CB1B return DesertRuins_MapScript1_15CB52:: @ 815CB52 - setflag 2134 + setflag FLAG_LANDMARK_DESERT_RUINS end DesertRuins_EventScript_15CB56:: @ 815CB56 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 83dd7e78e..5a4e56857 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -112,7 +112,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 waitmessage call DewfordTown_Gym_EventScript_1A02C5 msgbox DewfordTown_Gym_Text_1752E6, 4 - setflag 1204 + setflag FLAG_DEFEATED_DEWFORD_GYM setflag BADGE02_GET addvar 0x4085, 1 compare 0x4085, 6 @@ -164,7 +164,7 @@ DewfordTown_Gym_EventScript_153238:: @ 8153238 DewfordTown_Gym_EventScript_15323F:: @ 815323F lock faceplayer - checkflag 1204 + checkflag FLAG_DEFEATED_DEWFORD_GYM goto_if_eq DewfordTown_Gym_EventScript_153254 msgbox DewfordTown_Gym_Text_174D98, 4 release diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 3d3d56ff9..f7088e821 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 end EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 - checkflag 1248 + checkflag FLAG_DEFEATED_ELITE_4_DRAKE call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 compare 0x409c, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E @@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer - checkflag 1248 + checkflag FLAG_DEFEATED_ELITE_4_DRAKE goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm 450, 0 msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 @@ -57,7 +57,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 setvar 0x8004, 0 special sub_810FF60 - setflag 1248 + setflag FLAG_DEFEATED_ELITE_4_DRAKE call EverGrandeCity_DrakesRoom_EventScript_1A0693 msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4 release diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 07f6e8877..be9e7a897 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C end EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 - checkflag 1247 + checkflag FLAG_DEFEATED_ELITE_4_GLACIA call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE compare 0x409c, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 @@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer - checkflag 1247 + checkflag FLAG_DEFEATED_ELITE_4_GLACIA goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm 450, 0 msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 @@ -55,7 +55,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1 end EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB - setflag 1247 + setflag FLAG_DEFEATED_ELITE_4_GLACIA call EverGrandeCity_GlaciasRoom_EventScript_1A0693 msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4 release diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index b7c1618ba..5ffa16d37 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 end EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F - checkflag 1246 + checkflag FLAG_DEFEATED_ELITE_4_PHOEBE call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 compare 0x409c, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A @@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer - checkflag 1246 + checkflag FLAG_DEFEATED_ELITE_4_PHOEBE goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm 450, 0 msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 @@ -55,7 +55,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657 end EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661 - setflag 1246 + setflag FLAG_DEFEATED_ELITE_4_PHOEBE call EverGrandeCity_PhoebesRoom_EventScript_1A0693 msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4 release diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index daca98176..6e958aeed 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F .byte 0 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F - checkflag 1245 + checkflag FLAG_DEFEATED_ELITE_4_SYDNEY call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 compare 0x409c, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A @@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer - checkflag 1245 + checkflag FLAG_DEFEATED_ELITE_4_SYDNEY goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm 450, 0 msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 @@ -56,7 +56,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD end EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7 - setflag 1245 + setflag FLAG_DEFEATED_ELITE_4_SYDNEY call EverGrandeCity_SidneysRoom_EventScript_1A0693 msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4 release diff --git a/data/scripts/maps/FieryPath.inc b/data/scripts/maps/FieryPath.inc index bd984ad20..f0bd22071 100644 --- a/data/scripts/maps/FieryPath.inc +++ b/data/scripts/maps/FieryPath.inc @@ -3,5 +3,5 @@ FieryPath_MapScripts:: @ 815D318 .byte 0 FieryPath_MapScript1_15D31E:: @ 815D31E - setflag 2122 + setflag FLAG_LANDMARK_FIERY_PATH end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index abcb20c25..883274f29 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -28,7 +28,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 waitmessage call FortreeCity_Gym_EventScript_1A02C5 msgbox FortreeCity_Gym_Text_185E73, 4 - setflag 1225 + setflag FLAG_DEFEATED_FORTREE_GYM setflag BADGE06_GET setvar 0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 @@ -67,7 +67,7 @@ FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE lock faceplayer - checkflag 1225 + checkflag FLAG_DEFEATED_FORTREE_GYM goto_if_eq FortreeCity_Gym_EventScript_157FD3 msgbox FortreeCity_Gym_Text_18589C, 4 release diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 7d6ecae1b..fe8934fbd 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -28,7 +28,7 @@ IslandCave_EventScript_15EEDE:: @ 815EEDE return IslandCave_MapScript1_15EF15:: @ 815EF15 - setflag 2133 + setflag FLAG_LANDMARK_ISLAND_CAVE end S_OpenRegiceChamber:: @ 815EF19 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index f6c34484e..01b1dd08e 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -81,7 +81,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 waitmessage call LavaridgeTown_Gym_1F_EventScript_1A02C5 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 - setflag 1213 + setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag BADGE04_GET addvar 0x4085, 1 compare 0x4085, 6 @@ -135,7 +135,7 @@ LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859 lock faceplayer - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E msgbox LavaridgeTown_Gym_1F_Text_176312, 4 release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 29a8497ed..4ae27e827 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -64,15 +64,15 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 lock faceplayer dodailyevents - checkflag 2255 + checkflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE goto_if_eq LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 - addvar RESULT, 133 + addvar RESULT, ITEM_CHERI_BERRY giveitem RESULT compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B - setflag 2255 + setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE msgbox LilycoveCity_Text_1C5B1D, 4 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 7acd29523..cfcca25fb 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -11,12 +11,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E dodailyevents compare 0x4045, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 - checkflag 2250 + checkflag FLAG_DAILY_PICKED_LOTTO_TICKET goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 - setflag 2250 + setflag FLAG_DAILY_PICKED_LOTTO_TICKET message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waitmessage special RetrieveLotteryNumber diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 9b47bf493..142477ed5 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -3,7 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 .byte 0 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1565A7 switch 0x4093 case 0, MauvilleCity_Gym_EventScript_156491 @@ -82,7 +82,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB waitmessage call MauvilleCity_Gym_EventScript_1A02C5 msgbox MauvilleCity_Gym_Text_180DDA, 4 - setflag 1208 + setflag FLAG_DEFEATED_MAUVILLE_GYM setflag BADGE03_GET addvar 0x4085, 1 compare 0x4085, 6 @@ -111,7 +111,7 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641 MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA @@ -122,7 +122,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA @@ -133,7 +133,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA @@ -191,7 +191,7 @@ MauvilleCity_Gym_EventScript_15672B:: @ 815672B MauvilleCity_Gym_EventScript_156742:: @ 8156742 lock faceplayer - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_156757 msgbox MauvilleCity_Gym_Text_180815, 4 release diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index de83fcb96..66ff840ed 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -61,7 +61,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 waitmessage call MossdeepCity_Gym_EventScript_1A02C5 msgbox MossdeepCity_Gym_Text_18D128, 4 - setflag 1229 + setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 @@ -210,7 +210,7 @@ MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8 lock faceplayer - checkflag 1229 + checkflag FLAG_DEFEATED_MOSSDEEP_GYM goto_if_eq MossdeepCity_Gym_EventScript_15A7ED msgbox MossdeepCity_Gym_Text_18C7E3, 4 release diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 6429ff2f9..1234f5653 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -18,7 +18,7 @@ NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 return NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 - setflag 2112 + setflag FLAG_LANDMARK_NEW_MAUVILLE end NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 543c82135..07c6f8026 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -397,7 +397,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 waitmessage call PetalburgCity_Gym_EventScript_1A02C5 msgbox PetalburgCity_Gym_Text_17A805, 4 - setflag 1217 + setflag FLAG_DEFEATED_PETALBURG_GYM setvar 0x4085, 7 setflag BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 @@ -765,7 +765,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -801,7 +801,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -819,7 +819,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -837,7 +837,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -855,7 +855,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -873,7 +873,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end @@ -1021,7 +1021,7 @@ PetalburgCity_Gym_EventScript_155187:: @ 8155187 PetalburgCity_Gym_EventScript_15518B:: @ 815518B lock faceplayer - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_1551A0 msgbox PetalburgCity_Gym_Text_17AB96, 4 release diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index 282e064de..110b798b7 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -8,7 +8,7 @@ PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B @@ -51,7 +51,7 @@ PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 faceplayer checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 msgbox PetalburgCity_WallysHouse_Text_179C2C, 4 release diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 3d775ccfe..9369f7573 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -3,7 +3,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 .byte 0 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 - setflag 2109 + setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag FLAG_RECEIVED_POKENAV diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 66173b0cc..bce884555 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -3,7 +3,7 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 .byte 0 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA - setflag 2108 + setflag FLAG_LANDMARK_FLOWER_SHOP checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 checkflag BADGE03_GET @@ -90,15 +90,15 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA lock faceplayer dodailyevents - checkflag 2256 + checkflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 - addvar RESULT, 133 + addvar RESULT, ITEM_CHERI_BERRY giveitem RESULT compare RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B - setflag 2256 + setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 release end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index d365fa925..f60413d81 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -3,7 +3,7 @@ Route109_SeashoreHouse_MapScripts:: @ 8160DCA .byte 0 Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 - setflag 2111 + setflag FLAG_LANDMARK_SEASHORE_HOUSE end Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index bd4867c60..6424aff45 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B .byte 0 Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B - setflag 2114 + setflag FLAG_LANDMARK_TRICK_HOUSE compare 0x40b5, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE compare 0x40c1, 1 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 6f310881a..3e089e354 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -121,13 +121,13 @@ Route111_EventScript_1500C5:: @ 81500C5 lock faceplayer dodailyevents - checkflag 2252 + checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem ITEM_RAZZ_BERRY compare RESULT, 0 goto_if_eq Route111_EventScript_1A029B - setflag 2252 + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 special GetPlayerBigGuyGirlString msgbox Route111_Text_1C5781, 4 release @@ -236,7 +236,7 @@ Route111_EventScript_1501C9:: @ 81501C9 Route111_EventScript_1501D1:: @ 81501D1 lock faceplayer - setflag 2115 + setflag FLAG_LANDMARK_WINSTRATE_FAMILY msgbox Route111_Text_16F705, 5 compare RESULT, 1 goto_if_eq Route111_EventScript_1501F3 diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index 5576a44ff..c0fb6f489 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -3,7 +3,7 @@ Route111_OldLadysRestStop_MapScripts:: @ 815BFD1 .byte 0 Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7 - setflag 2113 + setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP end Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index d0b608339..078ac1006 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -3,7 +3,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A .byte 0 Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 - setflag 2116 + setflag FLAG_LANDMARK_GLASS_WORKSHOP compare 0x40be, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index a3056c8ff..3d1da2014 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,7 +5,7 @@ Route114_EventScript_150733:: @ 8150733 lock faceplayer dodailyevents - checkflag 2251 + checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 goto_if_eq Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 @@ -14,7 +14,7 @@ Route114_EventScript_150733:: @ 8150733 giveitem RESULT compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B - setflag 2251 + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 msgbox Route114_Text_1C5861, 4 release end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 3cdd40d51..abf9ac883 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -3,7 +3,7 @@ Route114_FossilManiacsHouse_MapScripts:: @ 815C1B9 .byte 0 Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF - setflag 2135 + setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE end Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index 3f5bbd909..b24cc9da2 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -3,7 +3,7 @@ Route114_LanettesHouse_MapScripts:: @ 815C258 .byte 0 Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E - setflag 2117 + setflag FLAG_LANDMARK_LANETTES_HOUSE end Route114_LanettesHouse_EventScript_15C262:: @ 815C262 diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index 16f35b1f2..24091c4ac 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -3,7 +3,7 @@ Route116_TunnelersRestHouse_MapScripts:: @ 815C2DE .byte 0 Route116_TunnelersRestHouse_MapScript1_15C2E4:: @ 815C2E4 - setflag 2138 + setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE end Route116_TunnelersRestHouse_EventScript_15C2E8:: @ 815C2E8 diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/scripts/maps/Route117_PokemonDayCare.inc index 2a3ee79e1..9ad740b4e 100644 --- a/data/scripts/maps/Route117_PokemonDayCare.inc +++ b/data/scripts/maps/Route117_PokemonDayCare.inc @@ -3,5 +3,5 @@ Route117_PokemonDayCare_MapScripts:: @ 815C319 .byte 0 Route117_PokemonDayCare_MapScript1_15C31F:: @ 815C31F - setflag 2118 + setflag FLAG_LANDMARK_POKEMON_DAYCARE end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 54f2d98a8..045fcbb43 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -113,7 +113,7 @@ Route120_EventScript_151739:: @ 8151739 lock faceplayer dodailyevents - checkflag 2254 + checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 compare RESULT, 1 @@ -135,27 +135,27 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar 0x8004, 143 + setvar 0x8004, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar 0x8004, 144 + setvar 0x8004, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar 0x8004, 145 + setvar 0x8004, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar 0x8004, 146 + setvar 0x8004, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar 0x8004, 147 + setvar 0x8004, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end @@ -163,7 +163,7 @@ Route120_EventScript_151813:: @ 8151813 giveitem 0x8004 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B - setflag 2254 + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 msgbox Route120_Text_1C5A0B, 4 release end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index f9544d62e..dab303345 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -3,14 +3,14 @@ Route123_BerryMastersHouse_MapScripts:: @ 81639DF .byte 0 Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5 - setflag 2147 + setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE end Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 lock faceplayer dodailyevents - checkflag 2253 + checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 random 10 @@ -19,7 +19,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 giveitem RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 2253 + setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 random 10 addvar RESULT, 20 @@ -40,7 +40,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 lock faceplayer dodailyevents - checkflag 2257 + checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 setvar 0x8004, 13 @@ -77,7 +77,7 @@ Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4 random 10 - addvar RESULT, 133 + addvar RESULT, ITEM_CHERI_BERRY giveitem RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B @@ -146,7 +146,7 @@ Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13 end Route123_BerryMastersHouse_EventScript_163C1D:: @ 8163C1D - setflag 2257 + setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE msgbox Route123_BerryMastersHouse_Text_1C5E59, 4 release end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 2f6f1b1e1..55f3141fd 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -3,7 +3,7 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8163DFA .byte 0 Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00 - setflag 2139 + setflag FLAG_LANDMARK_HUNTERS_HOUSE end Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 816098829..e384014eb 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -14,7 +14,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE waitmessage call RustboroCity_Gym_EventScript_1A02C5 msgbox RustboroCity_Gym_Text_1840D5, 4 - setflag 1201 + setflag FLAG_DEFEATED_RUSTBORO_GYM setflag BADGE01_GET setvar 0x405a, 1 addvar 0x4085, 1 @@ -47,7 +47,7 @@ RustboroCity_Gym_EventScript_157977:: @ 8157977 RustboroCity_Gym_EventScript_15798E:: @ 815798E lock faceplayer - checkflag 1201 + checkflag FLAG_DEFEATED_RUSTBORO_GYM goto_if_eq RustboroCity_Gym_EventScript_1579A3 msgbox RustboroCity_Gym_Text_183A4B, 4 release diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/scripts/maps/ScorchedSlab.inc index 112289083..f0ed9c005 100644 --- a/data/scripts/maps/ScorchedSlab.inc +++ b/data/scripts/maps/ScorchedSlab.inc @@ -3,5 +3,5 @@ ScorchedSlab_MapScripts:: @ 815F29D .byte 0 ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3 - setflag 2136 + setflag FLAG_LANDMARK_SCORCHED_SLAB end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 27d44cad1..f9f081a8b 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -10,7 +10,7 @@ SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 end SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 - setflag 2140 + setflag FLAG_LANDMARK_SEALED_CHAMBER end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/scripts/maps/SkyPillar_Entrance.inc index 7a3927332..ab991d845 100644 --- a/data/scripts/maps/SkyPillar_Entrance.inc +++ b/data/scripts/maps/SkyPillar_Entrance.inc @@ -3,5 +3,5 @@ SkyPillar_Entrance_MapScripts:: @ 815F2BD .byte 0 SkyPillar_Entrance_MapScript1_15F2C3:: @ 815F2C3 - setflag 2142 + setflag FLAG_LANDMARK_SKY_PILLAR end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index c0229dc9c..ea64e9d29 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -92,16 +92,16 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F faceplayer dodailyevents special GetPlayerBigGuyGirlString - checkflag 2258 + checkflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS goto_if_eq SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 random 10 addvar RESULT, 20 - addvar RESULT, 133 + addvar RESULT, ITEM_CHERI_BERRY giveitem RESULT compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B - setflag 2258 + setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS msgbox SootopolisCity_Text_1C64D0, 4 random 2 compare RESULT, 0 @@ -142,7 +142,7 @@ SootopolisCity_EventScript_14D25E:: @ 814D25E SootopolisCity_EventScript_14D268:: @ 814D268 lock faceplayer - checkflag 1236 + checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM goto_if_eq SootopolisCity_EventScript_14D27D msgbox SootopolisCity_Text_16A4D6, 4 release diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 24c333bee..f3daa8c7f 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -100,7 +100,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D waitmessage call SootopolisCity_Gym_1F_EventScript_1A02C5 msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 - setflag 1236 + setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag BADGE08_GET setvar 0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 @@ -124,7 +124,7 @@ SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084 lock faceplayer - checkflag 1236 + checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099 msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4 release diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index da0fcf2cd..81c50559e 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 8160AD6 .byte 0 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC - setflag FLAG_UNLOCK_SOUTHERN_ISLAND + setflag FLAG_LANDMARK_SOUTHERN_ISLAND end SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index e2b60f22e..665cbf4af 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E .byte 0 Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE - setflag 2119 + setflag FLAG_LANDMARK_SEAFLOOR_CAVERN checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB end diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index 0dd9aed7c..205a4315c 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -21,7 +21,7 @@ VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D faceplayer checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B msgbox VerdanturfTown_WandasHouse_Text_17859A, 4 release @@ -44,7 +44,7 @@ VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 lock faceplayer - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 checkflag FLAG_DEFEATED_WALLY_MAUVILLE goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 @@ -67,7 +67,7 @@ VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA faceplayer checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 6fe754097..6934ffe57 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -76,7 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 dodailyevents - checkflag 2241 + checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end @@ -107,7 +107,7 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 msgbox FallarborTown_ContestLobby_Text_1B704A, 4 giveitem ITEM_PECHA_BERRY - setflag 2241 + setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto FallarborTown_ContestLobby_EventScript_1B76EF end @@ -162,7 +162,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 dodailyevents - checkflag 2241 + checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 end @@ -175,7 +175,7 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800 msgbox FallarborTown_ContestLobby_Text_1B74B4, 4 giveitem ITEM_PECHA_BERRY - setflag 2241 + setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR msgbox FallarborTown_ContestLobby_Text_1B753A, 4 release end -- cgit v1.2.3 From e212655df1491cbf28675b77ec63eca73edf5f56 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 17 Dec 2017 15:19:32 -0500 Subject: Decompile data: bard_music --- data/bard_music.inc | 14412 -------------------------------------------------- data/bard_music.s | 240 - 2 files changed, 14652 deletions(-) delete mode 100644 data/bard_music.inc delete mode 100644 data/bard_music.s (limited to 'data') diff --git a/data/bard_music.inc b/data/bard_music.inc deleted file mode 100644 index 87f9ecf46..000000000 --- a/data/bard_music.inc +++ /dev/null @@ -1,14412 +0,0 @@ - .align 2 -BardMusic_POKEMON: @ 84171C4 -@ ARMALDO - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEAUTIFLY - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEDITITE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEAKING - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TORCHIC - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ANORITH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ABSOL - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SURSKIT - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MASQUERAIN - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GEODUDE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ILLUMISE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKARMORY - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKITTY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DELCATTY - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWELLOW - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GLALIE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KYOGRE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MACHAMP - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PINSIR - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KECLEON - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHUPPET - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SILCOON - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BRELOOM - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHROOMISH - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CARVANHA - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TREECKO - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WINGULL - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GYARADOS - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NINETALES - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIRAFARIG - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KIRLIA - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BELLOSSOM - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KINGDRA - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GLOOM - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAWILE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GROUDON - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MIGHTYENA - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CROBAT - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ABRA - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLAKING - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WURMPLE - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGIKARP - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGNEMITE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TORKOAL - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MACHOKE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GULPIN - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ARON - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PSYDUCK - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LAIRON - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHISMUR - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NUZLEAF - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PHANPY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHELGON - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOLDUCK - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOLBAT - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOLEM - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRAVELER - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GARDEVOIR - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RHYDON - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RHYHORN - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOREBYSS - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CORSOLA - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CACNEA - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DUSCLOPS - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHARPEDO - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ZANGOOSE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SANDSHREW - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SANDSLASH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEADRA - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RELICANTH - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ZIGZAGOON - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CRAWDAUNT - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SCEPTILE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GROVYLE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BANETTE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JIRACHI - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STARMIE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ZUBAT - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TAILLOW - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WYNAUT - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WOBBUFFET - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOLROCK - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHIFTRY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HORSEA - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BAGON - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEEDOT - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPHEAL - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BELDUM - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEDICHAM - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHINCHOU - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHIMECHO - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALTARIA - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWABLU - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NINCADA - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DEOXYS - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NINJASK - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DODUO - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DODRIO - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KOFFING - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TENTACRUEL - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DUSTOX - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOUDRED - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOLDEEN - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BARBOACH - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEALEO - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WALREIN - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TROPIUS - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DONPHAN - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NUMEL - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ODDISH - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRAPINCH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLAKOTH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHISCASH - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHEDINJA - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MARSHTOMP - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NATU - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ XATU - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLAYDOL - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CACTURNE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NOSEPASS - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLAMPERL - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CAMERUPT - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXPLOUD - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BLAZIKEN - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOMBRE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOTAD - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPINDA - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPOINK - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEVIPER - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HARIYAMA - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VOLBEAT - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HUNTAIL - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PIKACHU - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PICHU - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STARYU - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VIBRAVA - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VOLTORB - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FEEBAS - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALAKAZAM - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRUMPIG - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WIGGLYTUFF - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IGGLYBUFF - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLYGON - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PLUSLE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JIGGLYPUFF - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CORPHISH - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRIMER - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUK - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HERACROSS - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PELIPPER - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WAILORD - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WAILMER - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SALAMENCE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AGGRON - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POOCHYENA - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CASTFORM - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MINUN - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGCARGO - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAKUHITA - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLUGMA - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEEZING - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LINOONE - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CASCOON - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MARILL - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AZUMARILL - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWALOT - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ELECTRODE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUDKIP - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MILOTIC - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ METAGROSS - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ METANG - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TENTACOOL - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BALTOY - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SABLEYE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VIGOROTH - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SNORUNT - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CRADILY - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KADABRA - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DUSKULL - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAICHU - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MANECTRIC - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWAMPERT - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ELECTRIKE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LATIAS - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LATIOS - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LUVDISC - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VILEPLUME - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RALTS - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LANTURN - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LILEEP - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LUNATONE - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AZURILL - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LUDICOLO - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGNETON - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REGICE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REGISTEEL - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REGIROCK - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAYQUAZA - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VULPIX - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROSELIA - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COMBUSKEN - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MACHOP - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_TRAINER: @ 84197A4 -@ I CHOOSE YOU - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOTCHA - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRADE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SAPPHIRE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EVOLVE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ENCYCLOPEDIA - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NATURE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CENTER - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EGG - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LINK - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SP. ABILITY - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRAINER - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VERSION - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POKéNAV - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POKéMON - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GET - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POKéDEX - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RUBY - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEVEL - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_STATUS: @ 8419B34 -@ DARK - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STENCH - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THICK FAT - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAIN DISH - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRIZZLE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ARENA TRAP - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ INTIMIDATE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROCK HEAD - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COLOR - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALT. COLOR - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROCK - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEAUTIFUL - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEAUTY - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AIR LOCK - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PSYCHIC - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HYPER CUTTER - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FIGHTING - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHADOW TAG - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMART - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMARTNESS - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPEED BOOST - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COOL - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COOLNESS - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BATTLE ARMOR - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CUTE - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CUTENESS - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STURDY - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUCTION CUPS - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRASS - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLEAR BODY - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TORRENT - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GHOST - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ICE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GUTS - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROUGH SKIN - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHELL ARMOR - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NATURAL CURE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DAMP - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GROUND - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LIMBER - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGNET PULL - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHITE SMOKE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SYNCHRONIZE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OVERGROW - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWIFT SWIM - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SAND STREAM - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SAND VEIL - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KEEN EYE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ INNERFOCUS - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STATIC - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TYPE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOUGH - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOUGHNESS - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHED SKIN - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HUGE POWER - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VOLT ABSORB - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WATER ABSORB - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ELECTRIC - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FORECAST - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SERENE GRACE - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POISON - .byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POISON POINT - .byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRAGON - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRACE - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OBLIVIOUS - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRUANT - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RUN AWAY - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STICKY HOLD - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLOUD NINE - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NORMAL - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STEEL - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ILLUMINATE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EARLY BIRD - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HUSTLE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHINE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLYING - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DROUGHT - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LIGHTNINGROD - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COMPOUNDEYES - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MARVEL SCALE - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WONDER GUARD - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ INSOMNIA - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEVITATE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PLUS - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PRESSURE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LIQUID OOZE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COLOR CHANGE - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOUNDPROOF - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EFFECT SPORE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PKRS - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FIRE - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLAME BODY - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MINUS - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OWN TEMPO - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGMA ARMOR - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WATER - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WATER VEIL - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BUG - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWARM - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CUTE CHARM - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IMMUNITY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BLAZE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PICKUP - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PATTERN - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLASH FIRE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VITAL SPIRIT - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHLOROPHYLL - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PURE POWER - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHIELD DUST - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_BATTLE: @ 841AFA4 -@ MATCH UP - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GO - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NO. 1 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DECIDE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LET ME WIN - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WINS - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WIN - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WON - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IF I WIN - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHEN I WIN - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CAN’T WIN - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CAN WIN - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NO MATCH - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPIRIT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DECIDED - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRUMP CARD - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TAKE THAT - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COME ON - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ATTACK - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SURRENDER - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GUTSY - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TALENT - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STRATEGY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMITE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MATCH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VICTORY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OFFENSIVE - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SENSE - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VERSUS - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FIGHTS - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POWER - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHALLENGE - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STRONG - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOO STRONG - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GO EASY - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FOE - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GENIUS - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEGEND - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ESCAPE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AIM - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BATTLE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FIGHT - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RESUSCITATE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POINTS - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SERIOUS - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIVE UP - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOSS - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IF I LOSE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOST - .byte 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOSE - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GUARD - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PARTNER - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REJECT - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ACCEPT - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ INVINCIBLE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RECEIVED - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EASY - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEAK - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOO WEAK - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PUSHOVER - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEADER - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RULE - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MOVE - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_GREETINGS: @ 841BB74 -@ THANKS - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YES - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HERE GOES - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HERE I COME - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HERE IT IS - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YEAH - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WELCOME - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OI - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOW DO - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CONGRATS - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIVE ME - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SORRY - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ APOLOGIZE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FORGIVE - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEY, THERE - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HELLO - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOOD-BYE - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THANK YOU - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ I’VE ARRIVED - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PARDON - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXCUSE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEE YA - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXCUSE ME - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WELL, THEN - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GO AHEAD - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ APPRECIATE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEY? - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHAT’S UP? - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HUH? - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NO - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HI - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YEAH, YEAH - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BYE-BYE - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEET YOU - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMELL - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LISTENING - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOO-HAH - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YAHOO - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YO - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COME OVER - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COUNT ON - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_PEOPLE: @ 841C354 -@ OPPONENT - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ I - .byte 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YOU - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YOURS - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SON - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YOUR - .byte 0x1A, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YOU’RE - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YOU’VE - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MOTHER - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRANDFATHER - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UNCLE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FATHER - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BOY - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ADULT - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BROTHER - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SISTER - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRANDMOTHER - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AUNT - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PARENT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAN - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ME - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIRL - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BABE - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FAMILY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HER - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HIM - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PLACE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DAUGHTER - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HIS - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HE’S - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AREN’T - .byte 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SIBLINGS - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KID - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHILDREN - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MR. - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MRS. - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MYSELF - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ I WAS - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TO ME - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MY - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ I AM - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ I’VE - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHO - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOMEONE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHO WAS - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TO WHOM - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHOSE - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHO IS - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IT’S - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LADY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FRIEND - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALLY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PERSON - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DUDE - .byte 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THEY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THEY WERE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TO THEM - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THEIR - .byte 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THEY’RE - .byte 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THEY’VE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEEN - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TO US - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OUR - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WE’RE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RIVAL - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WE’VE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WOMAN - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHE WAS - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TO HER - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HER’S - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHE IS - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOME - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_VOICES: @ 841D164 -@ ! - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ !! - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ?! - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ? - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ … - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ …! - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ……… - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ - - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ - - - - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UH-OH - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WAAAH - .byte 0x1B, 0x05, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AHAHA - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OH? - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NOPE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ URGH - .byte 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HMM - .byte 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHOAH - .byte 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WROOOAAR! - .byte 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WOW - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIGGLE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SIGH - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UNBELIEVABLE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CRIES - .byte 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AGREE - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EH? - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CRY - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EHEHE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OI, OI, OI - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OH, YEAH - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OH - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OOPS - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHOCKED - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EEK - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRAAAH - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GWAHAHAHA - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WAY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TCH - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEHE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAH - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YUP - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAHAHA - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AIYEEH - .byte 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HIYAH - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FUFUFU - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOL - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SNORT - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HUMPH - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEHEHE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEH - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOHOHO - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UH-HUH - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OH, DEAR - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ARRGH - .byte 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUFUFU - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MMM - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OH-KAY - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OKAY - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LALALA - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YAY - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AWW - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WOWEE - .byte 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GWAH - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WAHAHAHA - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_SPEECH: @ 841DD34 -@ LISTEN - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NOT VERY - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEAN - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LIE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LAY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RECOMMEND - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NITWIT - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ QUITE - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FROM - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FEELING - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BUT - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOWEVER - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CASE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THE - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MISS - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOW - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HIT - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ENOUGH - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ A LOT - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ A LITTLE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ABSOLUTELY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AND - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ONLY - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AROUND - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PROBABLY - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IF - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VERY - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ A TINY BIT - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WILD - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THAT’S - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JUST - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EVEN SO, - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUST BE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NATURALLY - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FOR NOW, - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UNDERSTOOD - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JOKING - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ READY - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOMETHING - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOMEHOW - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALTHOUGH - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALSO - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PERFECT - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AS MUCH AS - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REALLY - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRULY - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SERIOUSLY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOTALLY - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UNTIL - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AS IF - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MOOD - .byte 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RATHER - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AWFULLY - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MODE - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MORE - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOO LATE - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FINALLY - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ANY - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ INSTEAD - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FANTASTIC - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_ENDINGS: @ 841E874 -@ WILL - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WILL BE HERE - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OR - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TIMES - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WONDER - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IS IT? - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BE - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIMME - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COULD - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LIKELY TO - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WOULD - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IS - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ISN’T IT? - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LET’S - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OTHER - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ARE - .byte 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WAS - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WERE - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THOSE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ISN’T - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WON’T - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CAN’T - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CAN - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DON’T - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DO - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DOES - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHOM - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHICH - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WASN’T - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEREN’T - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAVE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAVEN’T - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ A - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AN - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NOT - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THERE - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OK? - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SO - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAYBE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ABOUT - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OVER - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IT - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALL - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FOR - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ON - .byte 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OFF - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AS - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TO - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WITH - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BETTER - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EVER - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SINCE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OF - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BELONGS TO - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AT - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IN - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OUT - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOO - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LIKE - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DID - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DIDN’T - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DOESN’T - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WITHOUT - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AFTER - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEFORE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHILE - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THAN - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ONCE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ANYWHERE - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_FEELINGS: @ 841F564 -@ MEET - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PLAY - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HURRIED - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOES - .byte 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIDDY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAPPY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAPPINESS - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXCITE - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IMPORTANT - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FUNNY - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOT - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GO HOME - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DISAPPOINTED - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DISAPPOINTS - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SAD - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRY - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRIES - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEARS - .byte 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THINK - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEAR - .byte 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WANTS - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MISHEARD - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DISLIKE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ANGRY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ANGER - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SCARY - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LONESOME - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DISAPPOINT - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JOY - .byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GETS - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NEVER - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DARN - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DOWNCAST - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ INCREDIBLE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LIKES - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DISLIKES - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BORING - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CARE - .byte 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CARES - .byte 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALL RIGHT - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ADORE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DISASTER - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ENJOY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ENJOYS - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EAT - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LACKING - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BAD - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HARD - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TERRIBLE - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHOULD - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NICE - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRINK - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SURPRISE - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FEAR - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WANT - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WAIT - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SATISFIED - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RARE - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NEGATIVE - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DONE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DANGER - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DEFEATED - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEAT - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GREAT - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROMANTIC - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ QUESTION - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UNDERSTAND - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UNDERSTANDS - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_CONDITIONS: @ 8420254 -@ HOT - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXISTS - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXCESS - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ APPROVED - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAS - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOOD - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LESS - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MOMENTUM - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOING - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEIRD - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BUSY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOGETHER - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FULL - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ABSENT - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEING - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NEED - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TASTY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKILLED - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NOISY - .byte 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BIG - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LATE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLOSE - .byte 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DOCILE - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AMUSING - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ENTERTAINING - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PERFECTION - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PRETTY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEALTHY - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXCELLENT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UPSIDE DOWN - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COLD - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REFRESHING - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UNAVOIDABLE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUCH - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OVERWHELMING - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FABULOUS - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ELSE - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXPENSIVE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CORRECT - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IMPOSSIBLE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMALL - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DIFFERENT - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TIRED - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKILL - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOP - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NON-STOP - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PREPOSTEROUS - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NONE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NOTHING - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NATURAL - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BECOMES - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LUKEWARM - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FAST - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOW - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AWFUL - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALONE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BORED - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SECRET - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MYSTERY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LACKS - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEST - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOUSY - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MISTAKE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KIND - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WELL - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEAKENED - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SIMPLE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEEMS - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BADLY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_ACTIONS: @ 8420F44 -@ MEETS - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CONCEDE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIVE - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIVES - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PLAYED - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PLAYS - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COLLECT - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WALKING - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WALKS - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SAYS - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WENT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SAID - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WAKE UP - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WAKES UP - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ANGERS - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TEACH - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TEACHES - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PLEASE - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEARN - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHANGE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STORY - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRUST - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LAVISH - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LISTENS - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEARING - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRAINS - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHOOSE - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COME - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CAME - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEARCH - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAKE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CAUSE - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KNOW - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KNOWS - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REFUSE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STORES - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BRAG - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IGNORANT - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THINKS - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BELIEVE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLIDE - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EATS - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ USE - .byte 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ USES - .byte 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ USING - .byte 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COULDN’T - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CAPABLE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DISAPPEAR - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ APPEAR - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THROW - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WORRY - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLEPT - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLEEP - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RELEASE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRINKS - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RUNS - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RUN - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WORKS - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WORKING - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TALKING - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TALK - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SINK - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMACK - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PRETEND - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PRAISE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OVERDO - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHOW - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOOKS - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEES - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEEK - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OWN - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TAKE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALLOW - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FORGET - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FORGETS - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ APPEARS - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FAINT - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FAINTED - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_LIFESTYLE: @ 8421DE4 -@ CHORES - .byte 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOME - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MONEY - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALLOWANCE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BATH - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CONVERSATION - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SCHOOL - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COMMEMORATE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HABIT - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GROUP - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WORD - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STORE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SERVICE - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WORK - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SYSTEM - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRAIN - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLASS - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LESSONS - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ INFORMATION - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LIVING - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TEACHER - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOURNAMENT - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LETTER - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EVENT - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DIGITAL - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TEST - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DEPT. STORE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TELEVISION - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PHONE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ITEM - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NAME - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NEWS - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POPULAR - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PARTY - .byte 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STUDY - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MACHINE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAIL - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MESSAGE - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PROMISE - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DREAM - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KINDERGARTEN - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LIFE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RADIO - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RENTAL - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WORLD - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_HOBBIES: @ 8422654 -@ IDOL - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ANIME - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SONG - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MOVIE - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWEETS - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHAT - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHILD’S PLAY - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOYS - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUSIC - .byte 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CARDS - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHOPPING - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CAMERA - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VIEWING - .byte 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPECTATOR - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOURMET - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GAME - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RPG - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COLLECTION - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COMPLETE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGAZINE - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WALK - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BIKE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOBBY - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPORTS - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOFTWARE - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SONGS - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DIET - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TREASURE - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRAVEL - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DANCE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHANNEL - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAKING - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FISHING - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DATE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DESIGN - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOCOMOTIVE - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PLUSH DOLL - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PC - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLOWERS - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HERO - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NAP - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEROINE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FASHION - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ADVENTURE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BOARD - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BALL - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BOOK - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FESTIVAL - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COMICS - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOLIDAY - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PLANS - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRENDY - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VACATION - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOOK - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_TIME: @ 8423074 -@ FALL - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MORNING - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOMORROW - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LAST - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DAY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOMETIME - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALWAYS - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CURRENT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FOREVER - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DAYS - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ END - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TUESDAY - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YESTERDAY - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TODAY - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FRIDAY - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MONDAY - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LATER - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EARLIER - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ANOTHER - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TIME - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FINISH - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEDNESDAY - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOON - .byte 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ START - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MONTH - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STOP - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NOW - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FINAL - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NEXT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AGE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SATURDAY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUMMER - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUNDAY - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEGINNING - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPRING - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DAYTIME - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WINTER - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DAILY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OLDEN - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALMOST - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NEARLY - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THURSDAY - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NIGHTTIME - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NIGHT - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEEK - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_MISC: @ 84238E4 -@ HIGHS - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOWS - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UM - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REAR - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THINGS - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THING - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BELOW - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ABOVE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BACK - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HIGH - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HERE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ INSIDE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OUTSIDE - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BESIDE - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THIS IS IT! - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THIS - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EVERY - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THESE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THESE WERE - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DOWN - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THAT - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THOSE ARE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THOSE WERE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THAT’S IT! - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AM - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THAT WAS - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FRONT - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UP - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHOICE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FAR - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AWAY - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NEAR - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHERE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHEN - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHAT - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DEEP - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHALLOW - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHY - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CONFUSED - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OPPOSITE - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEFT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RIGHT - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_ADJECTIVES: @ 84240C4 -@ WANDERING - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RICKETY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROCK-SOLID - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HUNGRY - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TIGHT - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TICKLISH - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TWIRLING - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPIRALING - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THIRSTY - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOLLING - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SILKY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SADLY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOPELESS - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ USELESS - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DROOLING - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXCITING - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THICK - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMOOTH - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLIMY - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THIN - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BREAK - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VORACIOUS - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SCATTER - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AWESOME - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WIMPY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WOBBLY - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHAKY - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RIPPED - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHREDDED - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ INCREASING - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YET - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DESTROYED - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FIERY - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOVEY-DOVEY - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAPPILY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ANTICIPATION - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_EVENTS: @ 8424784 -@ APPEAL - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EVENTS - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STAY-AT-HOME - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BERRY - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CONTEST - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MC - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JUDGE - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUPER - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STAGE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HALL OF FAME - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EVOLUTION - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HYPER - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BATTLE TOWER - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEADERS - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BATTLE ROOM - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HIDDEN - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SECRET BASE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BLEND - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POKEBLOCK - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MASTER - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RANK - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RIBBON - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_MOVE_1: @ 8424BA4 -@ THUNDERBOLT - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IRON_TAIL - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ICE_BALL - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YAWN - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOVELY_KISS - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NIGHTMARE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MORNING_SUN - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VITAL_THROW - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DIG - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THRASH - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWEET_SCENT - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHARM - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAIN_DANCE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CONFUSE_RAY - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAIL - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AROMATHERAPY - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BUBBLE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ENCORE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CUT - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAGE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUPER_FANG - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PAIN_SPLIT - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TORMENT - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STRING_SHOT - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWAGGER - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SNORE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEAL_BELL - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SCREECH - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROCK_THROW - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROCK_SMASH - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROCK_SLIDE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEATHER_BALL - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHIRLPOOL - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FAKE_TEARS - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SING - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPITE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AIR_CUTTER - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AEROBLAST - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMOKESCREEN - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PURSUIT - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DOUBLE_SLAP - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MIRROR_MOVE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OVERHEAT - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AURORA_BEAM - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEMENTO - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OCTAZOOKA - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLATTER - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ASTONISH - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WILL_O_WISP - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RETURN - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRUDGE - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STRENGTH - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COUNTER - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLAME_WHEEL - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLAMETHROWER - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ODOR_SLEUTH - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHARPEN - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DOUBLE_TEAM - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GUST - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HARDEN - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DISABLE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAZOR_WIND - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BIDE - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CRUNCH - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BITE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THUNDER - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THUNDER_PUNCH - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ENDEAVOR - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FACADE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KARATE_CHOP - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLAMP - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WITHDRAW - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CONSTRICT - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BRICK_BREAK - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROCK_TOMB - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FOCUS_ENERGY - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FOCUS_PUNCH - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIGA_DRAIN - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REVERSAL - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMELLING_SALT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPORE - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEECH_LIFE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLASH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SILVER_WIND - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ METAL_SOUND - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRASS_WHISTLE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TICKLE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPIDER_WEB - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CRABHAMMER - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAZE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEAN_LOOK - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CROSS_CHOP - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OUTRAGE - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOW_KICK - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ANCIENT_POWER - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SYNTHESIS - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AGILITY - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAPID_SPIN - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ICY_WIND - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MIND_READER - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COSMIC_POWER - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKY_ATTACK - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POWDER_SNOW - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FOLLOW_ME - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ METEOR_MASH - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ENDURE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROLLOUT - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SCARY_FACE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PSYBEAM - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PSYWAVE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PSYCHIC - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HYPNOSIS - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UPROAR - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WATER_SPOUT - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SIGNAL_BEAM - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PSYCH_UP - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUBMISSION - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RECOVER - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EARTHQUAKE - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NATURE_POWER - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LICK - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLAIL - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TAIL_WHIP - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SELF_DESTRUCT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STUN_SPORE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BIND - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHADOW_PUNCH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHADOW_BALL - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHARGE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MIST - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FISSURE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXTREME_SPEED - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXTRASENSORY - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SAFEGUARD - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ABSORB - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKY_UPPERCUT - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKILL_SWAP - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKETCH - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEADBUTT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DOUBLE_EDGE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SANDSTORM - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SAND_ATTACK - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SAND_TOMB - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPARK - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWIFT - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KINESIS - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMOG - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GROWTH - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SACRED_FIRE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHEER_COLD - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOLAR_BEAM - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SONIC_BOOM - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLY - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_MOVE_2: @ 8426854 -@ TACKLE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXPLOSION - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DIVE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FIRE_BLAST - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WATERFALL - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUDDY_WATER - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STOCKPILE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLAM - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TWISTER - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BULLET_SEED - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TWINEEDLE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SOFT_BOILED - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EGG_BOMB - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FAINT_ATTACK - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BARRAGE - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MINIMIZE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEISMIC_TOSS - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUPERSONIC - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TAUNT - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MOONLIGHT - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PECK - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ARM_THRUST - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HORN_ATTACK - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HORN_DRILL - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WING_ATTACK - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AERIAL_ACE - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWORDS_DANCE - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VINE_WHIP - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CONVERSION - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CONVERSION_2 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HELPING_HAND - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IRON_DEFENSE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TELEPORT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THUNDER_SHOCK - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHOCK_WAVE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ QUICK_ATTACK - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWEET_KISS - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THUNDER_WAVE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ZAP_CANNON - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BLOCK - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOWL - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POISON_GAS - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOXIC - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POISON_FANG - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POISON_POWDER - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POISON_STING - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPIKE_CANNON - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ACID_ARMOR - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TAKE_DOWN - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JUMP_KICK - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BOUNCE - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HI_JUMP_KICK - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRI_ATTACK - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRAGON_CLAW - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRICK - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRIPLE_KICK - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRILL_PECK - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUD_SPORT - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUD_SLAP - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ THIEF - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AMNESIA - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NIGHT_SHADE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GROWL - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLACK_OFF - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SURF - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROLE_PLAY - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NEEDLE_ARM - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DOUBLE_KICK - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUNNY_DAY - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEER - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WISH - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FAKE_OUT - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLEEP_TALK - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PAY_DAY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ASSIST - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEAT_WAVE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLEEP_POWDER - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REST - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ INGRAIN - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CONFUSION - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BODY_SLAM - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWALLOW - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CURSE - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HYDRO_PUMP - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HYPER_VOICE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HYPER_BEAM - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUPERPOWER - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STEEL_WING - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPIT_UP - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DYNAMIC_PUNCH - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GUILLOTINE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VICE_GRIP - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KNOCK_OFF - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POUND - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAZOR_LEAF - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BATON_PASS - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PETAL_DANCE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPLASH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BUBBLE_BEAM - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BELLY_DRUM - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BARRIER - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LIGHT_SCREEN - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SCRATCH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HYPER_FANG - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EMBER - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SECRET_POWER - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DIZZY_PUNCH - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BULK_UP - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IMPRISON - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FEATHER_DANCE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WHIRLWIND - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEAT_UP - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BLIZZARD - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STOMP - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLASH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TEETER_DANCE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CRUSH_CLAW - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BLAZE_KICK - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PRESENT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ERUPTION - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLUDGE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLUDGE_BOMB - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GLARE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TRANSFORM - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POISON_TAIL - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROAR - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BONE_RUSH - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CAMOUFLAGE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COVET - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TAIL_GLOW - .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BONE_CLUB - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BONEMERANG - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FIRE_SPIN - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FIRE_PUNCH - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PERISH_SONG - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WRAP - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPIKES - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGNITUDE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGICAL_LEAF - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGIC_COAT - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUD_SHOT - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MACH_PUNCH - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PROTECT - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DEFENSE_CURL - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROLLING_KICK - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUBSTITUTE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DETECT - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PIN_MISSILE - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WATER_SPORT - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WATER_GUN - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MIST_BALL - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WATER_PULSE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FURY_ATTACK - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FURY_SWIPES - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DESTINY_BOND - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FALSE_SWIPE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FORESIGHT - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MIRROR_COAT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FUTURE_SIGHT - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MILK_DRINK - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CALM_MIND - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEGA_DRAIN - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEGA_KICK - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEGA_PUNCH - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEGAHORN - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HIDDEN_POWER - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ METAL_CLAW - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ATTRACT - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MIMIC - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FRUSTRATION - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEECH_SEED - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ METRONOME - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DREAM_EATER - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ACID - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEDITATE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SNATCH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LUSTER_PURGE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEAF_BLADE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RECYCLE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REFLECT - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REFRESH - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REVENGE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRAGON_RAGE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRAGON_BREATH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRAGON_DANCE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ICE_PUNCH - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ICE_BEAM - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FURY_CUTTER - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COMET_PUNCH - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKULL_BASH - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOCK_ON - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ROCK_BLAST - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COTTON_SPORE - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STRUGGLE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_TRENDY_SAYING: @ 8428CB4 -@ KTHX, BYE. - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YES, SIR! - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AVANT GARDE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ COUPLE - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUCH OBLIGED - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YEEHAW! - .byte 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEGA - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ 1-HIT KO! - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DESTINY - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CANCEL - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NEW - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLATTEN - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KIDDING - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOSER - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LOSING - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAPPENING - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HIP AND - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHAKE - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHADY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UPBEAT - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MODERN - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMELL YA - .byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BANG - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KNOCKOUT - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HASSLE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WINNER - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FEVER - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WANNABE - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BABY - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HEART - .byte 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OLD - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YOUNG - .byte 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UGLY - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -BardMusic_POKEMON_2: @ 84292E4 -@ EKANS - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ARBOK - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEAKING - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ARIADOS - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CROCONAW - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UNOWN - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EEVEE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GEODUDE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPINARAK - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PILOSWINE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ONIX - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ARCANINE - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUDOWOODO - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEEPINBELL - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VICTREEBEL - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WOOPER - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SWINUB - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKARMORY - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AIPOM - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ESPEON - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HITMONCHAN - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ELEKID - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ELECTABUZZ - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ENTEI - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FERALIGATR - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FURRET - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OCTILLERY - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PRIMEAPE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SENTRET - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STANTLER - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SPEAROW - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FEAROW - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OMASTAR - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ OMANYTE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GROWLITHE - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MACHAMP - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRAGONITE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PINSIR - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SNORLAX - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KABUTO - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KABUTOPS - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HITMONTOP - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WARTORTLE - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BLASTOISE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FARFETCHD - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CUBONE - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAROWAK - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KANGASKHAN - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUNFLORA - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CATERPIE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GYARADOS - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAPIDASH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NINETALES - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GIRAFARIG - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BELLOSSOM - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KINGDRA - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KINGLER - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GLOOM - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PINECO - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GLIGAR - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KRABBY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRANBULL - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CROBAT - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ABRA - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GENGAR - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TAUROS - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGIKARP - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGNEMITE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GASTLY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HAUNTER - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MACHOKE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KAKUNA - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PSYDUCK - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PHANPY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RATTATA - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOLDUCK - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOLBAT - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOLEM - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRAVELER - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VENONAT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RHYDON - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RHYHORN - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PUPITAR - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CORSOLA - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HITMONLEE - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ZAPDOS - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JOLTEON - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SANDSHREW - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SANDSLASH - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEADRA - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHELLDER - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VAPOREON - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DEWGONG - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUICUNE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STARMIE - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SCYTHER - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ZUBAT - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BEEDRILL - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HYPNO - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DROWZEE - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SQUIRTLE - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CELEBI - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WOBBUFFET - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DUGTRIO - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HORSEA - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXEGGCUTE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHIKORITA - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHINCHOU - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SHUCKLE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DIGLETT - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ REMORAID - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DELIBIRD - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOUNDOUR - .byte 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AMPHAROS - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DODUO - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DODRIO - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMEARGLE - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KOFFING - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TENTACRUEL - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOGETIC - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOGEPI - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GOLDEEN - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ METAPOD - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DONPHAN - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ODDISH - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ EXEGGUTOR - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NIDOKING - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NIDOQUEEN - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NIDORAN_F - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NIDORAN_M - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NIDORINA - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NIDORINO - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEOWTH - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SNEASEL - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POLIWHIRL - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POLITOED - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POLIWRATH - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ POLIWAG - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ QUAGSIRE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NATU - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ XATU - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DUNSPARCE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SEEL - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STEELIX - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TYPHLOSION - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRAGONAIR - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BUTTERFREE - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SCIZOR - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOPPIP - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BLISSEY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PARAS - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PARASECT - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ QWILFISH - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MR_MIME - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TYROGUE - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLOYSTER - .byte 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TYRANITAR - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLEFFA - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEEDLE - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x26, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PIKACHU - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLEFABLE - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PIDGEOT - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PIDGEOTTO - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PICHU - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CLEFAIRY - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHARMANDER - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ STARYU - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CYNDAQUIL - .byte 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SUNKERN - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TEDDIURSA - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VOLTORB - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MOLTRES - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLAREON - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ALAKAZAM - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGMAR - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FORRETRESS - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WIGGLYTUFF - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IVYSAUR - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BULBASAUR - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VENUSAUR - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AERODACTYL - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGBY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ IGGLYBUFF - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ UMBREON - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ARTICUNO - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JIGGLYPUFF - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SNUBBULL - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BAYLEEF - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ GRIMER - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MUK - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HERACROSS - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOUNDOOM - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PERSIAN - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LICKITUNG - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HO_OH - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ HOOTHOOT - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PIDGEY - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PONYTA - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SKIPLOOM - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PORYGON - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ PORYGON2 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGCARGO - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLUGMA - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ QUILAVA - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ BELLSPROUT - .byte 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ WEEZING - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MARILL - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ AZUMARILL - .byte 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ ELECTRODE - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MANKEY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MANTINE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DRATINI - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEW - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEWTWO - .byte 0x2D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MILTANK - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MISDREAVUS - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SMOOCHUM - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MEGANIUM - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ DITTO - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TENTACOOL - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAREEP - .byte 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ FLAAFFY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VENOMOTH - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TANGELA - .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLOWKING - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLOWBRO - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ SLOWPOKE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MURKROW - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ YANMA - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ KADABRA - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LARVITAR - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ NOCTOWL - .byte 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAIKOU - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RAICHU - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHANSEY - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ RATICATE - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LAPRAS - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VILEPLUME - .byte 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LANTURN - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHARMELEON - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ CHARIZARD - .byte 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ URSARING - .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JYNX - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LUGIA - .byte 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MAGNETON - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEDIAN - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ LEDYBA - .byte 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ VULPIX - .byte 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ JUMPLUFF - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ TOTODILE - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -@ MACHOP - .byte 0x2A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .align 2 -gBardMusicTable:: @ 842C1F4 - .4byte BardMusic_POKEMON - .4byte BardMusic_TRAINER - .4byte BardMusic_STATUS - .4byte BardMusic_BATTLE - .4byte BardMusic_GREETINGS - .4byte BardMusic_PEOPLE - .4byte BardMusic_VOICES - .4byte BardMusic_SPEECH - .4byte BardMusic_ENDINGS - .4byte BardMusic_FEELINGS - .4byte BardMusic_CONDITIONS - .4byte BardMusic_ACTIONS - .4byte BardMusic_LIFESTYLE - .4byte BardMusic_HOBBIES - .4byte BardMusic_TIME - .4byte BardMusic_MISC - .4byte BardMusic_ADJECTIVES - .4byte BardMusic_EVENTS - .4byte BardMusic_MOVE_1 - .4byte BardMusic_MOVE_2 - .4byte BardMusic_TRENDY_SAYING - .4byte BardMusic_POKEMON_2 diff --git a/data/bard_music.s b/data/bard_music.s deleted file mode 100644 index 5a13af0da..000000000 --- a/data/bard_music.s +++ /dev/null @@ -1,240 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 1 -Unknown_8416F08: - .2byte -768, 6144 - - .align 1 -Unknown_8416F0C: - .2byte 2304, 6144 - - .align 1 -Unknown_8416F10: - .2byte 256, 6144 - - .align 1 -Unknown_8416F14: - .2byte 1024, 6144 - - .align 1 -Unknown_8416F18: - .2byte 2816, 6144 - - .align 1 -Unknown_8416F1C: - .2byte -768, -256, 6144 - - .align 1 -Unknown_8416F22: - .2byte -768, 512, 6144 - - .align 1 -Unknown_8416F28: - .2byte 512, 1024, 6144 - - .align 1 -Unknown_8416F2E: - .2byte 1536, 2048, 6144 - - .align 1 -Unknown_8416F34: - .2byte 2304, 2048, 6144 - - .align 1 -Unknown_8416F3A: - .2byte -768, -256, -768, 6144 - - .align 1 -Unknown_8416F42: - .2byte 1024, -768, 1024, 6144 - - .align 1 -Unknown_8416F4A: - .2byte 2304, 2048, 1536, 6144 - - .align 1 -Unknown_8416F52: - .2byte 256, 512, 1024, 6144 - - .align 1 -Unknown_8416F5A: - .2byte 1536, 4096, 3328, 6144 - - .align 1 -Unknown_8416F62: - .2byte 1024, 2304, 1024, 2304, 6144 - - .align 1 -Unknown_8416F6C: - .2byte 2304, 1024, 3328, 1024, 6144 - - .align 1 -Unknown_8416F76: - .2byte 256, 512, 1024, 1536, 6144 - - .align 1 -Unknown_8416F80: - .2byte 2048, 1536, 1024, 512, 6144 - - .align 1 -Unknown_8416F8A: - .2byte 3840, 3328, 2816, 2560, 6144 - - .align 1 -Unknown_8416F94: - .2byte -768, -256, 256, 512, 1024, 6144 - - .align 1 -Unknown_8416FA0: - .2byte 2304, 2048, 1536, 1024, 512, 6144 - - .align 1 -Unknown_8416FAC: - .2byte 256, 1024, 2304, 1024, 256, 6144 - - .align 1 -Unknown_8416FB8: - .2byte 2304, 1024, 2304, 1024, -768, 6144 - - .align 1 -Unknown_8416FC4: - .2byte 2816, 2048, 1024, 1024, 1536, 6144 - - .align 1 -Unknown_8416FD0: - .2byte -768, -256, 256, 512, 1024, 1536, 6144 - - .align 1 -Unknown_8416FDE: - .2byte 2048, 1536, 1024, 512, 256, -256, 6144 - - .align 1 -Unknown_8416FEC: - .2byte 256, 512, 1024, 256, 512, 4096, 6144 - - .align 1 -Unknown_8416FFA: - .2byte 1024, -768, 2304, 1024, 2304, 1024, 6144 - - .align 1 -Unknown_8417008: - .2byte 2048, 2304, 2048, 2304, 2048, 2304, 6144 - - .align 1 -Unknown_8417016: - .2byte 512, 256, 512, 256, 512, 1024, 512, 6144 - - .align 1 -Unknown_8417026: - .2byte 256, 256, -256, -256, -768, 1024, -768, 6144 - - .align 1 -Unknown_8417036: - .2byte 2048, 2304, 2816, 3328, 3584, 3328, 2816, 6144 - - .align 1 -Unknown_8417046: - .2byte 2048, 1536, 1024, 512, 3328, 2816, 2304, 6144 - - .align 1 -Unknown_8417056: - .2byte 768, 1024, 1536, 2048, 1792, 2048, 1024, 6144 - - .align 2 -gUnknown_08417068:: @ 8417068 - .4byte Unknown_8416F08 - .4byte Unknown_8416F0C - .4byte Unknown_8416F10 - .4byte Unknown_8416F14 - .4byte Unknown_8416F18 - .4byte Unknown_8416F1C - .4byte Unknown_8416F22 - .4byte Unknown_8416F28 - .4byte Unknown_8416F2E - .4byte Unknown_8416F34 - .4byte Unknown_8416F3A - .4byte Unknown_8416F42 - .4byte Unknown_8416F4A - .4byte Unknown_8416F52 - .4byte Unknown_8416F5A - .4byte Unknown_8416F62 - .4byte Unknown_8416F6C - .4byte Unknown_8416F76 - .4byte Unknown_8416F80 - .4byte Unknown_8416F8A - .4byte Unknown_8416F94 - .4byte Unknown_8416FA0 - .4byte Unknown_8416FAC - .4byte Unknown_8416FB8 - .4byte Unknown_8416FC4 - .4byte Unknown_8416FD0 - .4byte Unknown_8416FDE - .4byte Unknown_8416FEC - .4byte Unknown_8416FFA - .4byte Unknown_8417008 - .4byte Unknown_8417016 - .4byte Unknown_8417026 - .4byte Unknown_8417036 - .4byte Unknown_8417046 - .4byte Unknown_8417056 - - .align 2 -gUnknown_084170F4:: @ 84170F4 - .4byte 9 - .4byte 22 - .4byte 15 - .4byte 16 - .4byte 39 - .4byte 21 - .4byte 9 - .4byte 30 - .4byte 24 - .4byte 15 - .4byte 25 - .4byte 12 - .4byte 22 - .4byte 45 - .4byte 24 - .4byte 15 - .4byte 40 - .4byte 9 - .4byte 21 - .4byte 42 - .4byte 18 - .4byte 9 - .4byte 22 - .4byte 15 - .4byte 27 - .4byte 48 - .4byte 18 - .4byte 27 - .4byte 33 - .4byte 24 - .4byte 25 - .4byte 39 - .4byte 19 - .4byte 16 - .4byte 54 - .4byte 18 - .4byte 9 - .4byte 45 - .4byte 15 - .4byte 12 - .4byte 39 - .4byte 23 - .4byte 5 - .4byte 45 - .4byte 12 - .4byte 21 - .4byte 48 - .4byte 12 - .4byte 21 - .4byte 69 - .4byte 18 - .4byte 15 - -@ 84171C4 - .include "data/bard_music.inc" -- cgit v1.2.3 From 27ca4fb2944e86d71a28b04c7b16126ee6f248b8 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 17 Dec 2017 15:44:49 -0500 Subject: Decompile data: trainer_see --- data/trainer_see.s | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'data') diff --git a/data/trainer_see.s b/data/trainer_see.s index 04a787f0c..7935c693e 100644 --- a/data/trainer_see.s +++ b/data/trainer_see.s @@ -2,41 +2,3 @@ .include "constants/constants.inc" .section .rodata - - .align 2 -gOamData_839B4D8:: @ 839B4D8 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteImageTable_839B4E0:: @ 839B4E0 - obj_frame_tiles gSpriteImage_839B308, 0x80 - obj_frame_tiles gSpriteImage_839B388, 0x80 - - .align 2 -gSpriteImageTable_839B4F0:: @ 839B4F0 - obj_frame_tiles gSpriteImage_839B408, 0x80 - - .align 2 -gSpriteAnim_839B4F8:: @ 839B4F8 - obj_image_anim_frame 0, 60 - obj_image_anim_end - - .align 2 -gSpriteAnim_839B500:: @ 839B500 - obj_image_anim_frame 1, 60 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_839B508:: @ 839B508 - .4byte gSpriteAnim_839B4F8 - .4byte gSpriteAnim_839B500 - - .align 2 -gSpriteTemplate_839B510:: @ 839B510 - spr_template 0xFFFF, 0xFFFF, gOamData_839B4D8, gSpriteAnimTable_839B508, gSpriteImageTable_839B4E0, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably - - .align 2 -gSpriteTemplate_839B528:: @ 839B528 - spr_template 0xFFFF, 4100, gOamData_839B4D8, gSpriteAnimTable_839B508, gSpriteImageTable_839B4F0, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably -- cgit v1.2.3 From 9dd4ff0d9ccc7f4df4239f4654d38292074972e2 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 17 Dec 2017 16:45:31 -0500 Subject: Decompile data: menu_cursor, 1 --- data/menu_cursor.s | 157 ----------------------------------------------------- 1 file changed, 157 deletions(-) (limited to 'data') diff --git a/data/menu_cursor.s b/data/menu_cursor.s index f3c5fe956..522ad496c 100644 --- a/data/menu_cursor.s +++ b/data/menu_cursor.s @@ -3,163 +3,6 @@ .section .rodata - .align 2 -OutlineCursorTiles_00: - .incbin "graphics/interface/outline_cursor_00.4bpp" - - .align 2 -OutlineCursorTiles_01: - .incbin "graphics/interface/outline_cursor_01.4bpp" - - .align 2 -OutlineCursorTiles_02: - .incbin "graphics/interface/outline_cursor_02.4bpp" - - .align 2 -OutlineCursorTiles_03: - .incbin "graphics/interface/outline_cursor_03.4bpp" - - .align 2 -OutlineCursorTiles_04: - .incbin "graphics/interface/outline_cursor_04.4bpp" - - .align 2 -OutlineCursorTiles_05: - .incbin "graphics/interface/outline_cursor_05.4bpp" - - .align 2 -OutlineCursorTiles_06: - .incbin "graphics/interface/outline_cursor_06.4bpp" - - .align 2 -OutlineCursorTiles_07: - .incbin "graphics/interface/outline_cursor_07.4bpp" - - .align 2 -OutlineCursorTiles_08: - .incbin "graphics/interface/outline_cursor_08.4bpp" - - .align 2 -OutlineCursorTiles_09: - .incbin "graphics/interface/outline_cursor_09.4bpp" - - .align 2 -OutlineCursorTiles_10: - .incbin "graphics/interface/outline_cursor_10.4bpp" - - .align 2 -OutlineCursorTiles_11: - .incbin "graphics/interface/outline_cursor_11.4bpp" - - .align 2 -OutlineCursorTiles_12: - .incbin "graphics/interface/outline_cursor_12.4bpp" - - .align 2 -OutlineCursorTiles_13: - .incbin "graphics/interface/outline_cursor_13.4bpp" - - .align 2 -OutlineCursorTiles_14: - .incbin "graphics/interface/outline_cursor_14.4bpp" - - .align 2 -OutlineCursorTiles_15: - .incbin "graphics/interface/outline_cursor_15.4bpp" - - .align 2 -gOamData_842F11C:: @ 842F11C - .2byte 0x8000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gOamData_842F124:: @ 842F124 - .2byte 0x8800 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gOamData_842F12C:: @ 842F12C - .2byte 0x8000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_842F134:: @ 842F134 - obj_image_anim_frame 0, 63 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_842F13C:: @ 842F13C - .4byte gSpriteAnim_842F134 - - .align 2 -gUnknown_0842F140:: @ 842F140 - obj_tiles OutlineCursorTiles_00, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_01, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_02, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_03, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_04, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_05, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_06, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_07, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_08, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_09, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_10, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_11, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_12, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_13, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_14, 0x1C0, 0xFFF0 - obj_tiles OutlineCursorTiles_15, 0x1C0, 0xFFF0 - - .align 2 -gUnknown_0842F1C0:: @ 842F1C0 - obj_tiles OutlineCursorTiles_00, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_01, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_02, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_03, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_04, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_05, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_06, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_07, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_08, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_09, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_10, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_11, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_12, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_13, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_14, 0x1C0, 0xFFF1 - obj_tiles OutlineCursorTiles_15, 0x1C0, 0xFFF1 - - .align 2 -gUnknown_0842F240:: @ 842F240 - obj_pal gUnknown_0203A360, 0xfff0 - - .align 2 -gUnknown_0842F248:: @ 842F248 - obj_pal gUnknown_0203A360, 0xfff1 - - .align 2 -gSpriteTemplate_842F250:: @ 842F250 - spr_template 65520, 65520, gOamData_842F11C, gSpriteAnimTable_842F13C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_842F268:: @ 842F268 - spr_template 65520, 0xFFFF, gOamData_842F11C, gSpriteAnimTable_842F13C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_842F280:: @ 842F280 - spr_template 65520, 0xFFFF, gOamData_842F124, gSpriteAnimTable_842F13C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_842F298:: @ 842F298 - spr_template 65521, 65521, gOamData_842F12C, gSpriteAnimTable_842F13C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_842F2B0:: @ 842F2B0 - spr_template 65521, 0xFFFF, gOamData_842F12C, gSpriteAnimTable_842F13C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - .align 2 gSubspriteTable_842F2C8:: @ 842F2C8 subsprite -1, 0, 0, 0, 8x16 -- cgit v1.2.3 From 72a509b8d9512ba9c5ed42d6a433bb6e0135712d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 17 Dec 2017 21:05:44 -0500 Subject: Decompile data: menu_cursor, 2 --- data/menu_cursor.s | 249 ----------------------------------------------------- 1 file changed, 249 deletions(-) delete mode 100644 data/menu_cursor.s (limited to 'data') diff --git a/data/menu_cursor.s b/data/menu_cursor.s deleted file mode 100644 index 522ad496c..000000000 --- a/data/menu_cursor.s +++ /dev/null @@ -1,249 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSubspriteTable_842F2C8:: @ 842F2C8 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F2D8:: @ 842F2D8 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 2, 8x16 - subsprite 9, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F2F0:: @ 842F2F0 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 2, 8x16 - subsprite 9, 0, 0, 2, 8x16 - subsprite 17, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F310:: @ 842F310 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 25, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F328:: @ 842F328 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 33, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F340:: @ 842F340 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 2, 8x16 - subsprite 9, 0, 0, 6, 32x16 - subsprite 41, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F360:: @ 842F360 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 17, 0, 0, 6, 32x16 - subsprite 49, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F380:: @ 842F380 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 25, 0, 0, 6, 32x16 - subsprite 57, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F3A0:: @ 842F3A0 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 33, 0, 0, 6, 32x16 - subsprite 65, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F3C0:: @ 842F3C0 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 2, 8x16 - subsprite 9, 0, 0, 6, 32x16 - subsprite 41, 0, 0, 6, 32x16 - subsprite 73, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F3E8:: @ 842F3E8 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 33, 0, 0, 6, 32x16 - subsprite 49, 0, 0, 6, 32x16 - subsprite 81, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F410:: @ 842F410 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 33, 0, 0, 6, 32x16 - subsprite 57, 0, 0, 6, 32x16 - subsprite 89, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F438:: @ 842F438 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 33, 0, 0, 6, 32x16 - subsprite 65, 0, 0, 6, 32x16 - subsprite 97, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F460:: @ 842F460 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 2, 8x16 - subsprite 9, 0, 0, 6, 32x16 - subsprite 41, 0, 0, 6, 32x16 - subsprite 73, 0, 0, 6, 32x16 - subsprite 105, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F490:: @ 842F490 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 33, 0, 0, 6, 32x16 - subsprite 65, 0, 0, 6, 32x16 - subsprite 81, 0, 0, 6, 32x16 - subsprite 113, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F4C0:: @ 842F4C0 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 33, 0, 0, 6, 32x16 - subsprite 65, 0, 0, 6, 32x16 - subsprite 89, 0, 0, 6, 32x16 - subsprite 121, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F4F0:: @ 842F4F0 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 6, 32x16 - subsprite 33, 0, 0, 6, 32x16 - subsprite 65, 0, 0, 6, 32x16 - subsprite 97, 0, 0, 6, 32x16 - subsprite 129, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F520:: @ 842F520 - subsprite -1, 0, 0, 0, 8x16 - subsprite 1, 0, 0, 2, 8x16 - subsprite 9, 0, 0, 6, 32x16 - subsprite 41, 0, 0, 6, 32x16 - subsprite 73, 0, 0, 6, 32x16 - subsprite 105, 0, 0, 6, 32x16 - subsprite 137, 0, 0, 4, 8x16 - - .align 2 -gSubspriteTable_842F558:: @ 842F558 - subsprite -1, 0, 0, 0, 8x16 - subsprite 7, 0, 0, 6, 32x16 - subsprite 35, 0, 0, 4, 8x16 - - .align 2 -gUnknown_0842F570:: @ 842F570 - .4byte gSubspriteTable_842F2C8 - .4byte gSubspriteTable_842F2C8 - .4byte gSubspriteTable_842F2D8 - .4byte gSubspriteTable_842F2F0 - .4byte gSubspriteTable_842F310 - .4byte gSubspriteTable_842F328 - .4byte gSubspriteTable_842F340 - .4byte gSubspriteTable_842F360 - .4byte gSubspriteTable_842F380 - .4byte gSubspriteTable_842F3A0 - .4byte gSubspriteTable_842F3C0 - .4byte gSubspriteTable_842F3E8 - .4byte gSubspriteTable_842F410 - .4byte gSubspriteTable_842F438 - .4byte gSubspriteTable_842F460 - .4byte gSubspriteTable_842F490 - .4byte gSubspriteTable_842F4C0 - .4byte gSubspriteTable_842F4F0 - .4byte gSubspriteTable_842F520 - - .align 2 -gUnknown_0842F5BC:: @ 842F5BC - .4byte gSubspriteTable_842F558 - - .align 2 -gSubspriteTables_842F5C0:: @ 842F5C0 - .4byte 1, gMenuCursorSubsprites - .4byte 1, gMenuCursorSubsprites - .4byte 2, gMenuCursorSubsprites - .4byte 3, gMenuCursorSubsprites - .4byte 4, gMenuCursorSubsprites - .4byte 5, gMenuCursorSubsprites - .4byte 6, gMenuCursorSubsprites - .4byte 7, gMenuCursorSubsprites - .4byte 8, gMenuCursorSubsprites - .4byte 9, gMenuCursorSubsprites - .4byte 10, gMenuCursorSubsprites - .4byte 11, gMenuCursorSubsprites - .4byte 12, gMenuCursorSubsprites - .4byte 13, gMenuCursorSubsprites - .4byte 14, gMenuCursorSubsprites - .4byte 15, gMenuCursorSubsprites - .4byte 1, gMenuCursorSubsprites - .4byte 17, gMenuCursorSubsprites - .4byte 18, gMenuCursorSubsprites - .4byte 19, gMenuCursorSubsprites - .4byte 20, gMenuCursorSubsprites - .4byte 21, gMenuCursorSubsprites - .4byte 22, gMenuCursorSubsprites - .4byte 23, gMenuCursorSubsprites - .4byte 24, gMenuCursorSubsprites - .4byte 25, gMenuCursorSubsprites - .4byte 26, gMenuCursorSubsprites - .4byte 27, gMenuCursorSubsprites - .4byte 28, gMenuCursorSubsprites - .4byte 29, gMenuCursorSubsprites - .4byte 30, gMenuCursorSubsprites - .4byte 31, gMenuCursorSubsprites - - .align 2 -gSubspriteTables_842F6C0:: @ 842F6C0 - .4byte 2, gSubspriteTable_842F2C8 - .4byte 2, gSubspriteTable_842F2C8 - .4byte 3, gSubspriteTable_842F2D8 - .4byte 4, gSubspriteTable_842F2F0 - .4byte 3, gSubspriteTable_842F310 - .4byte 3, gSubspriteTable_842F328 - .4byte 4, gSubspriteTable_842F340 - .4byte 4, gSubspriteTable_842F360 - .4byte 4, gSubspriteTable_842F380 - .4byte 4, gSubspriteTable_842F3A0 - .4byte 5, gSubspriteTable_842F3C0 - .4byte 5, gSubspriteTable_842F3E8 - .4byte 5, gSubspriteTable_842F410 - .4byte 5, gSubspriteTable_842F438 - .4byte 6, gSubspriteTable_842F460 - .4byte 6, gSubspriteTable_842F490 - .4byte 6, gSubspriteTable_842F4C0 - .4byte 6, gSubspriteTable_842F4F0 - .4byte 7, gSubspriteTable_842F520 - - .align 2 -gUnknown_0842F758:: @ 842F758 - .4byte 3, gMenuCursorSubsprites - .4byte 0, 2 - .4byte 0, 66 - .4byte 0, 105 - .4byte 0, 34 - - .align 2 -gUnknown_0842F780:: @ 842F780 - .4byte 0, 105 - - .align 2 -gUnknown_0842F788:: @ 842F788 - .4byte 0, 34 - - .align 2 -gUnknown_0842F790:: @ 842F790 - .4byte 0, 66 -- cgit v1.2.3 From fcbcf6f93cf3850bac06c77c49a74c21866ebde8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 17 Dec 2017 21:12:51 -0500 Subject: Decompile data: unknown_debug_menu --- data/unknown_debug_menu.s | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 data/unknown_debug_menu.s (limited to 'data') diff --git a/data/unknown_debug_menu.s b/data/unknown_debug_menu.s deleted file mode 100644 index eaa635fa4..000000000 --- a/data/unknown_debug_menu.s +++ /dev/null @@ -1,32 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -UnknownString_1stRound: - .string "1st round$" -UnknownString_2ndRound: - .string "2nd round$" -UnknownString_3rdRound: - .string "3rd round$" -UnknownString_4thRound: - .string "4th round$" -UnknownString_5thRound: - .string "5th round$" -UnknownString_6thRound: - .string "6th round$" -UnknownString_7thRound: - .string "7th round$" -UnknownString_8thRound: - .string "8th round$" - - .align 2 -gUnknown_0842C29C:: @ 842C29C - .4byte UnknownString_1stRound, sub_814A4B8 - .4byte UnknownString_2ndRound, sub_814A4B8 - .4byte UnknownString_3rdRound, sub_814A4B8 - .4byte UnknownString_4thRound, sub_814A4B8 - .4byte UnknownString_5thRound, sub_814A4B8 - .4byte UnknownString_6thRound, sub_814A4B8 - .4byte UnknownString_7thRound, sub_814A4B8 - .4byte UnknownString_8thRound, sub_814A4B8 -- cgit v1.2.3 From 88716f4c0e053a984eeb4bef92fefa42027dd22a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 17 Dec 2017 20:07:53 -0800 Subject: Use FLAG_ prefix for all flags --- data/event_scripts.s | 40 +++++++++++----------- data/field_move_scripts.inc | 10 +++--- data/scripts/cable_club.inc | 4 +-- data/scripts/contest_hall.inc | 2 +- data/scripts/maps/AncientTomb.inc | 10 +++--- data/scripts/maps/AquaHideout_B1F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 8 ++--- data/scripts/maps/DesertRuins.inc | 10 +++--- data/scripts/maps/DewfordTown_Gym.inc | 6 ++-- data/scripts/maps/EverGrandeCity.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 +-- data/scripts/maps/FortreeCity_Gym.inc | 6 ++-- data/scripts/maps/IslandCave.inc | 14 ++++---- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 6 ++-- data/scripts/maps/LilycoveCity.inc | 20 +++++------ data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 4 +-- data/scripts/maps/LilycoveCity_Harbor.inc | 8 ++--- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 2 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MagmaHideout_B1F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 2 +- data/scripts/maps/MauvilleCity_Gym.inc | 6 ++-- data/scripts/maps/MossdeepCity.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 6 ++-- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 14 ++++---- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 10 +++--- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route104.inc | 2 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 2 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 4 +-- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 4 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 14 ++++---- data/scripts/maps/Route114_LanettesHouse.inc | 2 +- data/scripts/maps/Route119.inc | 2 +- data/scripts/maps/Route120.inc | 6 ++-- data/scripts/maps/Route124.inc | 2 +- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route126.inc | 2 +- data/scripts/maps/Route127.inc | 2 +- data/scripts/maps/Route128.inc | 2 +- data/scripts/maps/Route131.inc | 2 +- data/scripts/maps/RustboroCity.inc | 2 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 6 ++-- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 4 +-- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 6 ++-- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 6 ++-- data/scripts/maps/SkyPillar_Top.inc | 6 ++-- data/scripts/maps/SlateportCity.inc | 6 ++-- data/scripts/maps/SlateportCity_Harbor.inc | 8 ++--- .../maps/SlateportCity_SternsShipyard_1F.inc | 4 +-- data/scripts/maps/SootopolisCity.inc | 2 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 ++--- data/scripts/maps/SouthernIsland_Interior.inc | 8 ++--- data/scripts/mauville_man.inc | 2 +- data/scripts/mystery_event_club.inc | 8 ++--- data/scripts/players_house.inc | 4 +-- data/scripts/tv.inc | 8 ++--- 64 files changed, 177 insertions(+), 177 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 0a250d570..bbeac074c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1326,7 +1326,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62 return EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70 - setflag SYS_TV_LATI + setflag FLAG_SYS_TV_LATI return S_WhiteOut:: @ 819FC74 @@ -1717,9 +1717,9 @@ EventScript_1A0070: EventScript_1A0085: playse 2 - checkflag SYS_PC_LANETTE + checkflag FLAG_SYS_PC_LANETTE call_if 0, EventScript_1A00AC - checkflag SYS_PC_LANETTE + checkflag FLAG_SYS_PC_LANETTE call_if 1, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 special ShowPokemonStorageSystem @@ -1743,7 +1743,7 @@ EventScript_1A00BE: end EventScript_1A00CB: - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_1A00BE playse 2 special AccessHallOfFamePC @@ -2360,9 +2360,9 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD delay 40 waitpokecry setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -2376,9 +2376,9 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B delay 40 waitpokecry setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -2473,9 +2473,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3 call_if 1, Route119_EventScript_1A065A compare 0x8004, 7 call_if 1, Route119_EventScript_1A065E - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -3943,7 +3943,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3086 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 @@ -3978,7 +3978,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 end SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3102 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 @@ -4013,7 +4013,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 end SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A317E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D @@ -4048,7 +4048,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D end SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A31FA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 @@ -4083,7 +4083,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 end SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3276 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 @@ -4118,7 +4118,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 end SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 @@ -4153,7 +4153,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 end SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A336E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D @@ -4188,7 +4188,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D end SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A33EA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 @@ -4223,7 +4223,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 end SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3466 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 @@ -4258,7 +4258,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 end SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 8fcf91616..86b81dd01 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,6 +1,6 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if 0, CannotUseCut checkpokemove MOVE_CUT compare RESULT, 6 @@ -58,7 +58,7 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, CannotUseRockSmash checkpokemove MOVE_ROCK_SMASH compare RESULT, 6 @@ -125,9 +125,9 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET goto_if 0, CannotUseStrength - checkflag SYS_USE_STRENGTH + checkflag FLAG_SYS_USE_STRENGTH goto_if_eq AlreadyUsedStrength checkpokemove 70 compare RESULT, 6 @@ -150,7 +150,7 @@ S_UseStrength:: @ 81B100E end UsedStrength: @ 81B1019 - setflag SYS_USE_STRENGTH + setflag FLAG_SYS_USE_STRENGTH msgbox UsedStrengthText, 3 releaseall end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e3efba4e7..60ce36e43 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -174,7 +174,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 - checkflag SYS_POKEDEX_GET + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 copyvar 0x8007, LAST_TALKED lock @@ -346,7 +346,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC - checkflag SYS_POKEDEX_GET + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 copyvar 0x8007, LAST_TALKED lock diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 6d6ceb30e..bc87b9a4e 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B special sub_80C44C0 incrementgamestat GAME_STAT_RECEIVED_RIBBONS - setflag SYS_RIBBON_GET + setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_1A6D6A, 4 playfanfare 370 diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index d28ce7fcc..268563660 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -5,7 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE .byte 0 AncientTomb_MapScript1_15EFCE:: @ 815EFCE - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, AncientTomb_EventScript_15EFD8 end @@ -18,7 +18,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 - checkflag SYS_BRAILLE_FLY + checkflag FLAG_SYS_BRAILLE_FLY call_if 0, AncientTomb_EventScript_15EFEA end @@ -33,7 +33,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall - checkflag SYS_BRAILLE_FLY + checkflag FLAG_SYS_BRAILLE_FLY goto_if_eq AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E waitbutton @@ -63,9 +63,9 @@ AncientTomb_EventScript_15F050:: @ 815F050 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag FLAG_HIDE_REGISTEEL - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 9498864c3..82d0c10c5 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -4,7 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 .byte 0 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, AquaHideout_B1F_EventScript_15D846 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index b7711b1ad..a2067fe60 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -4,7 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC .byte 0 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 end @@ -61,10 +61,10 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 waitpokecry - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartGroudonKyogreBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar RESULT, sub_810E300 compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 @@ -75,7 +75,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setvar 0x409b, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS - clearflag SYS_WEATHER_CTRL + clearflag FLAG_SYS_WEATHER_CTRL setvar 0x40b9, 2 clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT releaseall diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 228ca21ac..c767dd7e7 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -5,7 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, DesertRuins_EventScript_15CB0D end @@ -14,7 +14,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D return DesertRuins_MapScript1_15CB11:: @ 815CB11 - checkflag SYS_BRAILLE_STRENGTH + checkflag FLAG_SYS_BRAILLE_STRENGTH call_if 0, DesertRuins_EventScript_15CB1B end @@ -33,7 +33,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall - checkflag SYS_BRAILLE_STRENGTH + checkflag FLAG_SYS_BRAILLE_STRENGTH goto_if_eq DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 waitbutton @@ -63,9 +63,9 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag FLAG_HIDE_REGIROCK - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 5a4e56857..cbcb4d5eb 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -113,7 +113,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 call DewfordTown_Gym_EventScript_1A02C5 msgbox DewfordTown_Gym_Text_1752E6, 4 setflag FLAG_DEFEATED_DEWFORD_GYM - setflag BADGE02_GET + setflag FLAG_BADGE02_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB @@ -177,14 +177,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall - checkflag BADGE02_GET + checkflag FLAG_BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall - checkflag BADGE02_GET + checkflag FLAG_BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index c4f9ad315..b4fa64cae 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, EverGrandeCity_EventScript_1A02C1 end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 934e5a06c..a78338808 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B sethealplace 20 - setflag SYS_POKEMON_LEAGUE_FLY + setflag FLAG_SYS_POKEMON_LEAGUE_FLY checkflag FLAG_ENTERED_ELITE_FOUR call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B end @@ -57,7 +57,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage delay 75 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 883274f29..d3f7be155 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -29,7 +29,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 call FortreeCity_Gym_EventScript_1A02C5 msgbox FortreeCity_Gym_Text_185E73, 4 setflag FLAG_DEFEATED_FORTREE_GYM - setflag BADGE06_GET + setflag FLAG_BADGE06_GET setvar 0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E @@ -80,14 +80,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index fe8934fbd..e8489eb8a 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -5,7 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, IslandCave_EventScript_15EED0 end @@ -14,7 +14,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0 return IslandCave_MapScript1_15EED4:: @ 815EED4 - checkflag SYS_BRAILLE_WAIT + checkflag FLAG_SYS_BRAILLE_WAIT call_if 0, IslandCave_EventScript_15EEDE end @@ -40,12 +40,12 @@ S_OpenRegiceChamber:: @ 815EF19 setmaptile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN - setflag SYS_BRAILLE_WAIT + setflag FLAG_SYS_BRAILLE_WAIT end IslandCave_EventScript_15EF59:: @ 815EF59 lockall - checkflag SYS_BRAILLE_WAIT + checkflag FLAG_SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF72 braillemessage IslandCave_Braille_1C54FC special DoBrailleWait @@ -61,7 +61,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemessage IslandCave_Braille_1C54FC - checkflag SYS_BRAILLE_WAIT + checkflag FLAG_SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait waitstate @@ -83,9 +83,9 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag FLAG_HIDE_REGICE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 01b1dd08e..a44368925 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -82,7 +82,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call LavaridgeTown_Gym_1F_EventScript_1A02C5 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 setflag FLAG_DEFEATED_LAVARIDGE_GYM - setflag BADGE04_GET + setflag FLAG_BADGE04_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB @@ -148,14 +148,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 4ae27e827..30f0ff36e 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -7,7 +7,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar 0x4086, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E @@ -30,7 +30,7 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F .endif checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET call_if 1, LilycoveCity_EventScript_14CB2B end @@ -89,7 +89,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release @@ -147,7 +147,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release @@ -186,7 +186,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall @@ -349,7 +349,7 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96 LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE @@ -361,7 +361,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 end LilycoveCity_EventScript_14CEDE:: @ 814CEDE - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET goto_if_eq LilycoveCity_EventScript_14CEE8 return @@ -374,7 +374,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE return LilycoveCity_EventScript_14CEF7:: @ 814CEF7 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -386,7 +386,7 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09 LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 @@ -401,7 +401,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 return LilycoveCity_EventScript_14CF50:: @ 814CF50 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7546fe41b..6a1bc09e8 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -589,7 +589,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 setvar 0x4099, 1 - setflag SYS_RIBBON_GET + setflag FLAG_SYS_RIBBON_GET end LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 62d35662d..3e4caf100 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -3,9 +3,9 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 69e2e6766..7385f8c72 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -16,7 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release @@ -106,11 +106,11 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 end LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, LilycoveCity_Harbor_EventScript_1598BA checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq LilycoveCity_Harbor_EventScript_1598BA - checkflag SYS_HAS_EON_TICKET + checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage @@ -159,7 +159,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 4b9de4d15..d1be7b704 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -21,7 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 07f6581c2..52c52b798 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -861,7 +861,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 LittlerootTown_EventScript_14DD2B:: @ 814DD2B removeobject 4 - setflag SYS_B_DASH + setflag FLAG_SYS_B_DASH setvar 0x4050, 4 release end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 871025f55..f78d30ec2 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -159,7 +159,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage - setflag SYS_POKEDEX_GET + setflag FLAG_SYS_POKEDEX_GET return LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 3042d75dc..6dbdc0461 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -3,7 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 .byte 0 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, MagmaHideout_B1F_EventScript_15F2B8 end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 1109acc81..ae00ca369 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -5,7 +5,7 @@ MauvilleCity_MapScripts:: @ 814C032 MauvilleCity_MapScript1_14C038:: @ 814C038 setflag FLAG_VISITED_MAUVILLE_CITY clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - setflag SYS_TV_START + setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 checkflag FLAG_RECEIVED_TM24 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 142477ed5..d94436973 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -83,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call MauvilleCity_Gym_EventScript_1A02C5 msgbox MauvilleCity_Gym_Text_180DDA, 4 setflag FLAG_DEFEATED_MAUVILLE_GYM - setflag BADGE03_GET + setflag FLAG_BADGE03_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB @@ -204,14 +204,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 71b572ba2..31ed83b2a 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, MossdeepCity_EventScript_1A02C1 end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 66ff840ed..0c27c28f7 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -62,7 +62,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 call MossdeepCity_Gym_EventScript_1A02C5 msgbox MossdeepCity_Gym_Text_18D128, 4 setflag FLAG_DEFEATED_MOSSDEEP_GYM - setflag BADGE07_GET + setflag FLAG_BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 setvar 0x8008, 7 @@ -228,14 +228,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 77953a959..fd400ad16 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -4,7 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 345e75fa1..55ee9ebac 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -5,7 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 .byte 0 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 1b55cde28..aa6cf6310 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -9,7 +9,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F call_if 1, NewMauville_Inside_EventScript_15E5DA compare 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_15E58F end @@ -170,9 +170,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 delay 40 waitpokecry setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -185,9 +185,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E delay 40 waitpokecry setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -200,8 +200,8 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C delay 40 waitpokecry setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index d46831902..69503908a 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -26,7 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer - checkflag SYS_POKEDEX_GET + checkflag FLAG_SYS_POKEDEX_GET goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 07c6f8026..e2967169f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -48,7 +48,7 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B call_if 1, PetalburgCity_Gym_EventScript_15453B compare 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_15454B end @@ -356,7 +356,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag FLAG_RECEIVED_TM42 goto_if 0, PetalburgCity_Gym_EventScript_154A2C - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release @@ -399,7 +399,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A805, 4 setflag FLAG_DEFEATED_PETALBURG_GYM setvar 0x4085, 7 - setflag BADGE05_GET + setflag FLAG_BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE @@ -1034,14 +1034,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index c9a364c80..1810a6495 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -217,7 +217,7 @@ Route101_EventScript_14EA76:: @ 814EA76 Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer - setflag SYS_POKEMON_GET + setflag FLAG_SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 9595d00ab..92f5d5593 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -19,7 +19,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 Route104_EventScript_14EEAE:: @ 814EEAE checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_EventScript_14EEC4 - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index bce884555..07abd21bc 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -6,7 +6,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag FLAG_LANDMARK_FLOWER_SHOP checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 setflag FLAG_TEMP_1 end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 8fd9d3ea5..8e33517ca 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -28,7 +28,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 - setflag SYS_CYCLING_ROAD + setflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -55,7 +55,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left lockall setvar 0x40a9, 0 - clearflag SYS_CYCLING_ROAD + clearflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 1ca98817c..51cab5ddd 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -13,7 +13,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B specialvar RESULT, GetPlayerAvatarBike compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 - setflag SYS_CYCLING_ROAD + setflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -32,7 +32,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall - clearflag SYS_CYCLING_ROAD + clearflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 6424aff45..bf0c36ff3 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -63,37 +63,37 @@ Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index b24cc9da2..87b0f2cd6 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -11,7 +11,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 faceplayer checkflag FLAG_RECEIVED_DOLL_LANETTE goto_if_eq Route114_LanettesHouse_EventScript_15C28F - setflag SYS_PC_LANETTE + setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE givedecoration DECOR_LOTAD_DOLL diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 5454fa946..fb3d75660 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -4,7 +4,7 @@ Route119_MapScripts:: @ 8151167 .byte 0 Route119_MapScript1_151172:: @ 8151172 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, Route119_EventScript_15117C end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 045fcbb43..209291a3a 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -5,7 +5,7 @@ Route120_MapScripts:: @ 815160E .byte 0 Route120_MapScript1_15161E:: @ 815161E - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, Route120_EventScript_151628 end @@ -227,9 +227,9 @@ Route120_EventScript_15189D:: @ 815189D waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE goto Route120_EventScript_151908 end diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 71f58bb57..3e062bfdc 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 8151DDF .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route124_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 7c4754f4f..ea24434e2 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route125_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index d480512f8..a89087994 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 8151FFE .byte 0 Route126_MapScript1_152004:: @ 8152004 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route126_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index e7c6f602f..5fb122821 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -3,7 +3,7 @@ Route127_MapScripts:: @ 815206A .byte 0 Route127_MapScript1_152070:: @ 8152070 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route127_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 5b8ec42e0..b0e295db6 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 815211B .byte 0 Route128_MapScript1_152126:: @ 8152126 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 09f555997..efa26ecd2 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,7 +3,7 @@ Route131_MapScripts:: @ 815243E .byte 0 Route131_MapScript1_152444:: @ 8152444 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 1, Route131_EventScript_15244E end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index ffe133906..7e3a0e191 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 68039aac6..0e9786760 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -54,7 +54,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage - setflag SYS_POKENAV_GET + setflag FLAG_SYS_POKENAV_GET setflag FLAG_RECEIVED_POKENAV msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index e384014eb..427be433d 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -15,7 +15,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE call RustboroCity_Gym_EventScript_1A02C5 msgbox RustboroCity_Gym_Text_1840D5, 4 setflag FLAG_DEFEATED_RUSTBORO_GYM - setflag BADGE01_GET + setflag FLAG_BADGE01_GET setvar 0x405a, 1 addvar 0x4085, 1 setvar 0x8008, 1 @@ -60,14 +60,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index b66d4245d..6a4d9af02 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -199,7 +199,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar 0x405e, 1 clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 - setflag SYS_WEATHER_CTRL + setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index f9f081a8b..7add1e6f3 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -14,7 +14,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB - checkflag SYS_BRAILLE_DIG + checkflag FLAG_SYS_BRAILLE_DIG call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 end @@ -109,7 +109,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall - checkflag SYS_BRAILLE_DIG + checkflag FLAG_SYS_BRAILLE_DIG goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 4bf77de75..fcff20944 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 @@ -20,7 +20,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer dodailyevents - checkflag SYS_SHOAL_ITEM + checkflag FLAG_SYS_SHOAL_ITEM call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 @@ -98,5 +98,5 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176 clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 - clearflag SYS_SHOAL_ITEM + clearflag FLAG_SYS_SHOAL_ITEM return diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 0be4b106c..43dfa8afa 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF @@ -23,7 +23,7 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmaptile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA @@ -32,7 +32,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmaptile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index b278fcfc2..37da10220 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -3,7 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 .byte 0 SkyPillar_Top_MapScript1_15F308:: @ 815F308 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, SkyPillar_Top_EventScript_15F312 end @@ -20,9 +20,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 delay 40 waitpokecry setflag FLAG_HIDE_RAYQUAZA - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 567dd779b..c163685b2 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -199,9 +199,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BC63 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall @@ -235,7 +235,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 7f642c611..ae19d0326 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -7,7 +7,7 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_155F85 end @@ -159,7 +159,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release @@ -268,7 +268,7 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208 SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_Harbor_EventScript_15626F checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE goto_if_eq SlateportCity_Harbor_EventScript_156265 @@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 73d63fe06..46dc8419c 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -3,9 +3,9 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C checkflag FLAG_DELIVERED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index ea64e9d29..748dbe898 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -37,7 +37,7 @@ SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag FLAG_VISITED_SOOTOPOLIS_CITY checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, SootopolisCity_EventScript_14D159 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, SootopolisCity_EventScript_14D123 end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index f3daa8c7f..6f99ba8a5 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -89,7 +89,7 @@ SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D checkflag FLAG_RECEIVED_TM03 goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release @@ -101,7 +101,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D call SootopolisCity_Gym_1F_EventScript_1A02C5 msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag FLAG_DEFEATED_SOOTOPOLIS_GYM - setflag BADGE08_GET + setflag FLAG_BADGE08_GET setvar 0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 @@ -137,14 +137,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 8a978cc7d..0a9ca6b89 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -4,7 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 .byte 0 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, SouthernIsland_Interior_EventScript_160B68 end @@ -46,7 +46,7 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq SouthernIsland_Interior_EventScript_160C08 - checkflag SYS_HAS_EON_TICKET + checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, SouthernIsland_Interior_EventScript_160C08 setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS special SpawnCameraDummy @@ -66,10 +66,10 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartSouthernIslandBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE releaseall end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index b174e67f3..933de6769 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -84,7 +84,7 @@ dont_write_lyrics: SpeakToHipster: lock faceplayer - setflag SYS_HIPSTER_MEET + setflag FLAG_SYS_HIPSTER_MEET msgbox gTextHipster_TheyCallMeTheHipster, 4 special ScrSpecial_GetHipsterSpokenFlag compare RESULT, FALSE diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index f94d3cf9d..d8f628709 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,7 +1,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 lock faceplayer - checkflag SYS_CHAT_USED + checkflag FLAG_SYS_CHAT_USED goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4 goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D @@ -97,11 +97,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D end PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77 - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - checkflag SYS_EXDATA_ENABLE + checkflag FLAG_SYS_EXDATA_ENABLE goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - setflag SYS_EXDATA_ENABLE + setflag FLAG_SYS_EXDATA_ENABLE msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3 release end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 5ff45e25a..a553ae379 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -222,7 +222,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4 fadedefaultbgm special TurnOffTVScreen - setflag SYS_TV_HOME + setflag FLAG_SYS_TV_HOME delay 35 return @@ -256,7 +256,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 compare 0x408c, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index dc026c062..a74eba551 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -7,9 +7,9 @@ Event_TV:: @ 81A6E72 goto_if_eq EventScript_1A6F01 compare RESULT, 1 goto_if_eq EventScript_1A6F0B - checkflag SYS_TV_START + checkflag FLAG_SYS_TV_START goto_if 0, EventScript_1A6EF1 - checkflag SYS_TV_WATCH + checkflag FLAG_SYS_TV_WATCH goto_if_eq EventScript_1A6EF1 specialvar RESULT, IsTVShowInSearchOfTrainersAiring compare RESULT, 1 @@ -49,7 +49,7 @@ EventScript_1A6F0B: msgbox UnknownString_8172C50, 4 .endif special InitRoamer - clearflag SYS_TV_LATI + clearflag FLAG_SYS_TV_LATI setflag FLAG_LATIOS_OR_LATIAS_ROAMING special TurnOffTVScreen releaseall @@ -66,7 +66,7 @@ EventScript_1A6F21: EventScript_1A6F37: special TurnOffTVScreen - setflag SYS_TV_WATCH + setflag FLAG_SYS_TV_WATCH releaseall end -- cgit v1.2.3 From da6cbc139ae400fa9517fa02f01b01854c54220a Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 18 Dec 2017 11:45:21 -0500 Subject: Decompile data: mystery_event_msg --- data/mystery_event_msg.s | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 data/mystery_event_msg.s (limited to 'data') diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s deleted file mode 100644 index 26e6a9e06..000000000 --- a/data/mystery_event_msg.s +++ /dev/null @@ -1,35 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gOtherText_BerryObtainedDadHasIt:: @ 842F798 - .string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$" - -gOtherText_BerryTransformed:: @ 842F7CA - .string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$" - -gOtherText_BerryAlreadyObtained:: @ 842F7F6 - .string "The {STR_VAR_1} BERRY has already been\nobtained.$" - -gOtherText_SpecialRibbonReceived:: @ 842F81E - .string "A special RIBBON was awarded to your\nparty POKéMON.$" - -gOtherText_DexUpgraded:: @ 842F852 - .string "The POKéDEX has been upgraded with\nthe NATIONAL MODE.$" - -gOtherText_RareWordAdded:: @ 842F888 - .string "A rare word has been added.$" - -gOtherText_PokeWasSentOver:: @ 842F8A4 - .string "{STR_VAR_1} was sent over!$" - -gOtherText_PartyIsFull:: @ 842F8B6 - .string "Your party is full.\n{STR_VAR_1} could not be sent over.$" - -gOtherText_NewTrainerInHoenn:: @ 842F8E5 - .string "A new TRAINER has arrived in HOENN.$" - .string "A new adversary has arrived in the\nBATTLE TOWER.$" - -gOtherText_DataCannotUseVersion:: @ 842F93A - .string "This data cannot be used in\nthis version.$" -- cgit v1.2.3 From 408f3cf295e76b61f2c1a442c80d1036bbaa9d28 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 18 Dec 2017 14:55:28 -0500 Subject: Decompile data: intro_credits_graphics --- data/intro_credits_graphics.s | 416 ------------------------------------------ data/trainer_see.s | 4 - 2 files changed, 420 deletions(-) delete mode 100644 data/intro_credits_graphics.s delete mode 100644 data/trainer_see.s (limited to 'data') diff --git a/data/intro_credits_graphics.s b/data/intro_credits_graphics.s deleted file mode 100644 index 8c096e1cd..000000000 --- a/data/intro_credits_graphics.s +++ /dev/null @@ -1,416 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_084121FC:: @ 84121FC - .incbin "graphics/intro/intro2_grass.gbapal" - -gUnknown_0841221C:: @ 841221C - .incbin "graphics/intro/intro2_grass_afternoon.gbapal" - -gUnknown_0841223C:: @ 841223C - .incbin "graphics/intro/intro2_grass_night.gbapal" - - .align 2 -gUnknown_0841225C:: @ 841225C - .incbin "graphics/intro/intro2_grass.4bpp.lz" - - .align 2 -gUnknown_084126DC:: @ 84126DC - .incbin "graphics/intro/intro2_grass_map.bin.lz" - -gUnknown_08412818:: @ 8412818 - .incbin "graphics/intro/8412818.gbapal" - -gUnknown_08412878:: @ 8412878 - .incbin "graphics/intro/8412878.gbapal" - - .align 2 -gUnknown_084128D8:: @ 84128D8 - .incbin "graphics/intro/intro2_bgclouds.4bpp.lz" - - .align 2 -gUnknown_08412EB4:: @ 8412EB4 - .incbin "graphics/intro/intro2_bgclouds_map.bin.lz" - -gUnknown_08413184:: @ 8413184 - .incbin "graphics/intro/intro2_bgclouds.gbapal" - -gUnknown_084131A4:: @ 84131A4 - .incbin "graphics/intro/intro2_bgclouds_afternoon.gbapal" - -gUnknown_084131C4:: @ 84131C4 - .incbin "graphics/intro/intro2_bgclouds2.4bpp.lz" - -gUnknown_08413300:: @ 8413300 - .incbin "graphics/intro/intro2_bgtrees2.gbapal" - -gUnknown_08413320:: @ 8413320 - .incbin "graphics/intro/intro2_bgtrees2_afternoon.gbapal" - - .align 2 -gUnknown_08413340:: @ 8413340 - .incbin "graphics/intro/intro2_bgtrees.4bpp.lz" - - .align 2 -gUnknown_084139C8:: @ 84139C8 - .incbin "graphics/intro/intro2_bgtrees_map.bin.lz" - - .align 2 -gUnknown_08413CCC:: @ 8413CCC - .incbin "graphics/intro/intro2_bgtrees.gbapal" - - .align 2 -gIntro2TreeTiles:: @ 8413CEC - .incbin "graphics/intro/intro2_bgtreessmall.4bpp.lz" - -gUnknown_08413E38:: @ 8413E38 - .incbin "graphics/intro/8413E38.gbapal" - - .align 2 -gUnknown_08413E78:: @ 8413E78 - .incbin "graphics/intro/intro2_bgnight.4bpp.lz" @ only used in credits, coupled with intro because bicycle sequence - - .align 2 -gUnknown_08414064:: @ 8414064 - .incbin "graphics/intro/intro2_bgnight.gbapal" - - .align 2 -gUnknown_08414084:: @ 8414084 - .incbin "graphics/intro/intro2_bgnight_map.bin.lz" - - .align 2 -gIntro2NightTiles:: @ 8414330 - .incbin "graphics/intro/intro2_night.4bpp.lz" - - .align 1 -gIntro2BrendanPalette:: @ 84143B4 - .incbin "graphics/intro/intro2_brendan.gbapal" - - .align 2 -gIntro2BrendanTiles:: @ 84143D4 - .incbin "graphics/intro/intro2_brendan.4bpp.lz" - - .align 1 -gIntro2MayPalette:: @ 8414F70 - .incbin "graphics/intro/intro2_may.gbapal" - - .align 2 -gUnknown_08414F90:: @ 8414F90 - .space 0x1E0 - - .align 2 -gIntro2MayTiles:: @ 8415170 - .incbin "graphics/intro/intro2_may.4bpp.lz" - - .align 2 -gIntro2BicycleTiles:: @ 8415E08 - .incbin "graphics/intro/intro2_bicycle.4bpp.lz" - - .align 1 -gIntro2LatiosPalette:: @ 8416234 - .incbin "graphics/intro/intro2_latios.gbapal" - - .align 2 -gIntro2LatiosTiles:: @ 8416254 - .incbin "graphics/intro/intro2_latios.4bpp.lz" - - .align 1 -gIntro2LatiasPalette:: @ 84166F8 - .incbin "graphics/intro/intro2_latias.gbapal" - - .align 2 -gIntro2LatiasTiles:: @ 8416718 - .incbin "graphics/intro/intro2_latias.4bpp.lz" - - .align 2 -gSpriteTemplate_8416B3C:: @ 8416B3C - spr_template 2000, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_814910C - - .align 2 -gUnknown_08416B54:: @ 8416B54 - obj_tiles gUnknown_084131C4, 0x400, 2000 - null_obj_tiles - - .align 2 -gSpriteAnim_8416B64:: @ 8416B64 - obj_image_anim_frame 0, 30 - obj_image_anim_end - - .align 2 -gSpriteAnim_8416B6C:: @ 8416B6C - obj_image_anim_frame 16, 30 - obj_image_anim_end - - .align 2 -gSpriteAnim_8416B74:: @ 8416B74 - obj_image_anim_frame 20, 30 - obj_image_anim_end - - .align 2 -gSpriteAnim_8416B7C:: @ 8416B7C - obj_image_anim_frame 22, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8416B84:: @ 8416B84 - .4byte gSpriteAnim_8416B64 - .4byte gSpriteAnim_8416B6C - .4byte gSpriteAnim_8416B74 - .4byte gSpriteAnim_8416B7C - -@ array of 8-byte structs - .align 2 -gUnknown_08416B94:: @ 8416B94 - .byte -128, 72, 32, 100 - .2byte 0xC00 - .space 2 - .byte -128, -98, 32, 100 - .2byte 0xC00 - .space 2 - .byte 65, -64, 40, 101 - .2byte 0x800 - .space 2 - .byte 65, 56, 40, 101 - .2byte 0x800 - .space 2 - .byte 18, 100, 44, 102 - .2byte 0x400 - .space 2 - .byte 18, -104, 44, 102 - .2byte 0x400 - .space 2 - .byte 19, 8, 46, 103 - .2byte 0x100 - .space 2 - .byte 19, 56, 46, 103 - .2byte 0x100 - .space 2 - .byte 19, -16, 46, 103 - .2byte 0x100 - .space 2 - - .align 2 -gUnknown_08416BDC:: @ 8416BDC - obj_tiles gIntro2TreeTiles, 0x400, 2000 - null_obj_tiles - - .align 2 -gSpriteAnim_8416BEC:: @ 8416BEC - obj_image_anim_frame 0, 30 - obj_image_anim_end - - .align 2 -gSpriteAnim_8416BF4:: @ 8416BF4 - obj_image_anim_frame 16, 30 - obj_image_anim_end - - .align 2 -gSpriteAnim_8416BFC:: @ 8416BFC - obj_image_anim_frame 24, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8416C04:: @ 8416C04 - .4byte gSpriteAnim_8416BEC - .4byte gSpriteAnim_8416BF4 - .4byte gSpriteAnim_8416BFC - -@ array of 8-byte structs - .align 2 -gUnknown_08416C10:: @ 8416C10 - .byte -128, 16, 88, 100 - .2byte 0x2000 - .space 2 - .byte -128, 80, 88, 100 - .2byte 0x2000 - .space 2 - .byte -128, -112, 88, 100 - .2byte 0x2000 - .space 2 - .byte -128, -48, 88, 100 - .2byte 0x2000 - .space 2 - .byte -95, 40, 88, 101 - .2byte 0x1000 - .space 2 - .byte -95, 104, 88, 101 - .2byte 0x1000 - .space 2 - .byte -95, -88, 88, 101 - .2byte 0x1000 - .space 2 - .byte -95, -24, 88, 101 - .2byte 0x1000 - .space 2 - .byte -94, 56, 88, 102 - .2byte 0x800 - .space 2 - .byte -94, 120, 88, 102 - .2byte 0x800 - .space 2 - .byte -94, -72, 88, 102 - .2byte 0x800 - .space 2 - .byte -94, -8, 88, 102 - .2byte 0x800 - .space 2 - - .align 2 -gUnknown_08416C70:: @ 8416C70 - obj_tiles gIntro2NightTiles, 0x400, 2000 - null_obj_tiles - - .align 2 -gSpriteAnim_8416C80:: @ 8416C80 - obj_image_anim_frame 0, 30 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8416C88:: @ 8416C88 - .4byte gSpriteAnim_8416C80 - -@ array of 8-byte structs - .align 2 -gUnknown_08416C8C:: @ 8416C8C - .byte -128, 24, 88, 100 - .2byte 0x1000 - .space 2 - .byte -128, 64, 88, 100 - .2byte 0x1000 - .space 2 - .byte -128, 104, 88, 100 - .2byte 0x1000 - .space 2 - .byte -128, -112, 88, 100 - .2byte 0x1000 - .space 2 - .byte -128, -72, 88, 100 - .2byte 0x1000 - .space 2 - .byte -128, -32, 88, 100 - .2byte 0x1000 - .space 2 - - .align 2 -gOamData_8416CBC:: @ 8416CBC - .2byte 0x00A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_8416CC4:: @ 8416CC4 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 64, 8 - obj_image_anim_frame 128, 8 - obj_image_anim_frame 192, 8 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_8416CD8:: @ 8416CD8 - .4byte gSpriteAnim_8416CC4 - - .align 2 -gSpriteTemplate_8416CDC:: @ 8416CDC - spr_template 1002, 1002, gOamData_8416CBC, gSpriteAnimTable_8416CD8, NULL, gDummySpriteAffineAnimTable, nullsub_82 - - .align 2 -gSpriteTemplate_8416CF4:: @ 8416CF4 - spr_template 1003, 1003, gOamData_8416CBC, gSpriteAnimTable_8416CD8, NULL, gDummySpriteAffineAnimTable, nullsub_82 - - .align 2 -gOamData_8416D0C:: @ 8416D0C - .2byte 0x40A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_8416D14:: @ 8416D14 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 32, 8 - obj_image_anim_frame 64, 8 - obj_image_anim_frame 96, 8 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_8416D28:: @ 8416D28 - .4byte gSpriteAnim_8416D14 - - .align 2 -gSpriteTemplate_Brendan:: @ 8416D2C - spr_template 1001, 1002, gOamData_8416D0C, gSpriteAnimTable_8416D28, NULL, gDummySpriteAffineAnimTable, sub_81492A0 - - .align 2 -gSpriteTemplate_May:: @ 8416D44 - spr_template 1001, 1003, gOamData_8416D0C, gSpriteAnimTable_8416D28, NULL, gDummySpriteAffineAnimTable, sub_81492A0 - - .align 2 -gOamData_8416D5C:: @ 8416D5C - .2byte 0x00A0 - .2byte 0xC000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_8416D64:: @ 8416D64 - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_8416D6C:: @ 8416D6C - obj_image_anim_frame 64, 16 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8416D74:: @ 8416D74 - .4byte gSpriteAnim_8416D64 - .4byte gSpriteAnim_8416D6C - - .align 2 -gSpriteTemplate_8416D7C:: @ 8416D7C - spr_template 1004, 1004, gOamData_8416D5C, gSpriteAnimTable_8416D74, NULL, gDummySpriteAffineAnimTable, nullsub_83 - - .align 2 -gSpriteTemplate_8416D94:: @ 8416D94 - spr_template 1005, 1005, gOamData_8416D5C, gSpriteAnimTable_8416D74, NULL, gDummySpriteAffineAnimTable, nullsub_83 - - .align 2 -gIntro2BrendanSpriteSheet:: @ 8416DAC - obj_tiles gIntro2BrendanTiles, 0x3800, 1002 - .space 8 - - .align 2 -gIntro2MaySpriteSheet:: @ 8416DBC - obj_tiles gIntro2MayTiles, 0x3800, 1003 - .space 8 - - .align 2 -gIntro2BicycleSpriteSheet:: @ 8416DCC - obj_tiles gIntro2BicycleTiles, 0x1000, 1001 - .space 8 - - .align 2 -gIntro2LatiosSpriteSheet:: @ 8416DDC - obj_tiles gIntro2LatiosTiles, 0x1000, 1004 - .space 8 - - .align 2 -gIntro2LatiasSpriteSheet:: @ 8416DEC - obj_tiles gIntro2LatiasTiles, 0x1000, 1005 - .space 8 - - .align 2 -gIntro2SpritePalettes:: @ 8416DFC - obj_pal gIntro2BrendanPalette, 1002 - obj_pal gIntro2MayPalette, 1003 - obj_pal gIntro2LatiosPalette, 1004 - obj_pal gIntro2LatiasPalette, 1005 - .space 8 - -gUnknown_08416E24:: @ 8416E24 - obj_tiles gIntro2BrendanTiles, 0x2000, 1002 - .space 8 - -gUnknown_08416E34:: @ 8416E34 - obj_tiles gIntro2MayTiles, 0x2000, 1003 - .space 8 diff --git a/data/trainer_see.s b/data/trainer_see.s deleted file mode 100644 index 7935c693e..000000000 --- a/data/trainer_see.s +++ /dev/null @@ -1,4 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata -- cgit v1.2.3 From 3196def6040f9f376881a0be000789e751030089 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Dec 2017 19:16:44 -0500 Subject: Decompile data: naming_screen --- data/naming_screen.s | 169 --------------------------------------------------- 1 file changed, 169 deletions(-) delete mode 100644 data/naming_screen.s (limited to 'data') diff --git a/data/naming_screen.s b/data/naming_screen.s deleted file mode 100644 index 60aba1345..000000000 --- a/data/naming_screen.s +++ /dev/null @@ -1,169 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSubspriteTable_83CE4B0:: @ 83CE4B0 - subsprite -20, -16, 1, 0, 32x8 - subsprite 12, -16, 1, 4, 8x8 - subsprite -20, -8, 1, 5, 32x8 - subsprite 12, -8, 1, 9, 8x8 - subsprite -20, 0, 1, 10, 32x8 - subsprite 12, 0, 1, 14, 8x8 - subsprite -20, 8, 1, 15, 32x8 - subsprite 12, 8, 1, 19, 8x8 - -@ unreferenced - .align 2 -gSubspriteTable_83CE4F0:: @ 83CE4F0 - subsprite -12, -4, 1, 0, 8x8 - subsprite 4, -4, 1, 1, 8x8 - - .align 2 -gSubspriteTable_83CE500:: @ 83CE500 - subsprite -12, -4, 1, 0, 16x8 - subsprite 4, -4, 1, 2, 8x8 - - .align 2 -gSubspriteTable_83CE510:: @ 83CE510 - subsprite -20, -12, 1, 0, 32x8 - subsprite 12, -12, 1, 4, 8x8 - subsprite -20, -4, 1, 5, 32x8 - subsprite 12, -4, 1, 9, 8x8 - subsprite -20, 4, 1, 10, 32x8 - subsprite 12, 4, 1, 14, 8x8 - - .align 2 -gSubspriteTable_83CE540:: @ 83CE540 - subsprite -8, -12, 3, 0, 16x8 - subsprite -8, -4, 3, 2, 16x8 - subsprite -8, 4, 3, 4, 16x8 - - .align 2 -gSubspriteTables_83CE558:: @ 83CE558 - .4byte 8, gSubspriteTable_83CE4B0 - - .align 2 -gSubspriteTables_83CE560:: @ 83CE560 - .4byte 2, gSubspriteTable_83CE500 - .4byte 2, gSubspriteTable_83CE500 - .4byte 2, gSubspriteTable_83CE500 - - .align 2 -gSubspriteTables_83CE578:: @ 83CE578 - .4byte 6, gSubspriteTable_83CE510 - - .align 2 -gSubspriteTables_83CE580:: @ 83CE580 - .4byte 3, gSubspriteTable_83CE540 - - .align 2 -gSpriteImageTable_83CE588:: @ 83CE588 - obj_frame_tiles gSpriteImage_83CE094, 0xc0 - obj_frame_tiles gSpriteImage_83CE154, 0xc0 - - .align 2 -gSpriteAnim_83CE598:: @ 83CE598 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83CE5A0:: @ 83CE5A0 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 8, 8 - obj_image_anim_end - - .align 2 -gSpriteAnim_83CE5AC:: @ 83CE5AC - obj_image_anim_frame 0, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_83CE5B8:: @ 83CE5B8 - .4byte gSpriteAnim_83CE598 - - .align 2 -gSpriteAnimTable_83CE5BC:: @ 83CE5BC - .4byte gSpriteAnim_83CE598 - .4byte gSpriteAnim_83CE5A0 - - .align 2 -gSpriteAnimTable_83CE5C4:: @ 83CE5C4 - .4byte gSpriteAnim_83CE5AC - - .align 2 -gSpriteTemplate_83CE5C8:: @ 83CE5C8 - spr_template 2, 4, gOamData_83CE498, gSpriteAnimTable_83CE5B8, NULL, gDummySpriteAffineAnimTable, sub_80B6B34 - - .align 2 -gSpriteTemplate_83CE5E0:: @ 83CE5E0 - spr_template 3, 1, gOamData_83CE4A8, gSpriteAnimTable_83CE5B8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83CE5F8:: @ 83CE5F8 - spr_template 4, 4, gOamData_83CE498, gSpriteAnimTable_83CE5B8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83CE610:: @ 83CE610 - spr_template 0, 6, gOamData_83CE498, gSpriteAnimTable_83CE5B8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83CE628:: @ 83CE628 - spr_template 1, 6, gOamData_83CE498, gSpriteAnimTable_83CE5B8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83CE640:: @ 83CE640 - spr_template 7, 5, gOamData_83CE4A0, gSpriteAnimTable_83CE5BC, NULL, gDummySpriteAffineAnimTable, sub_80B6998 - - .align 2 -gSpriteTemplate_83CE658:: @ 83CE658 - spr_template 10, 3, gOamData_83CE498, gSpriteAnimTable_83CE5B8, NULL, gDummySpriteAffineAnimTable, sub_80B6D9C - - .align 2 -gSpriteTemplate_83CE670:: @ 83CE670 - spr_template 11, 3, gOamData_83CE498, gSpriteAnimTable_83CE5B8, NULL, gDummySpriteAffineAnimTable, sub_80B6DE8 - - .align 2 -gSpriteTemplate_83CE688:: @ 83CE688 - spr_template 0xFFFF, 0, gOamData_83CE498, gSpriteAnimTable_83CE5C4, gSpriteImageTable_83CE588, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_083CE6A0:: @ 83CE6A0 - obj_tiles gNamingScreenBackButtonTiles, 0x1E0, 0 - obj_tiles gNamingScreenOKButtonTiles, 0x1E0, 1 - obj_tiles gNamingScreenChangeKeyboardBoxTiles, 0x280, 2 - obj_tiles gNamingScreenChangeKeyboardButtonTiles, 0x100, 3 - obj_tiles gNamingScreenLowerTextTiles, 0x60, 4 - obj_tiles gNamingScreenUpperTextTiles, 0x60, 5 - obj_tiles gNamingScreenOthersTextTiles, 0x60, 6 - obj_tiles gNamingScreenCursorTiles, 0x80, 7 - obj_tiles gNamingScreenActiveCursorSmallTiles, 0x80, 8 - obj_tiles gNamingScreenActiveCursorBigTiles, 0x80, 9 - obj_tiles gNamingScreenRightPointingTriangleTiles, 0x20, 10 - obj_tiles gNamingScreenUnderscoreTiles, 0x20, 11 - null_obj_tiles - - .align 2 -gUnknown_083CE708:: @ 83CE708 - obj_pal gNamingScreenPalettes + 0x20 * 0, 0 - obj_pal gNamingScreenPalettes + 0x20 * 1, 1 - obj_pal gNamingScreenPalettes + 0x20 * 2, 2 - obj_pal gNamingScreenPalettes + 0x20 * 3, 3 - obj_pal gNamingScreenPalettes + 0x20 * 4, 4 - obj_pal gNamingScreenPalettes + 0x20 * 5, 5 - obj_pal gNamingScreenPalettes + 0x20 * 4, 6 - null_obj_pal - - .align 2 -gUnknown_083CE748:: @ 83CE748 - .incbin "graphics/naming_screen/lower_keyboard_map.bin" - - .align 2 -gUnknown_083CEBF8:: @ 83CEBF8 - .incbin "graphics/naming_screen/upper_keyboard_map.bin" - - .align 2 -gUnknown_083CF0A8:: @ 83CF0A8 - .incbin "graphics/naming_screen/others_keyboard_map.bin" -- cgit v1.2.3 From 0821fb288faa12712e0b4f4ee468ae13fed0c036 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 18 Dec 2017 20:37:14 -0500 Subject: Decompile data: field_map_obj_helpers --- data/field_map_obj_helpers.s | 93 -------------------------------------------- 1 file changed, 93 deletions(-) delete mode 100644 data/field_map_obj_helpers.s (limited to 'data') diff --git a/data/field_map_obj_helpers.s b/data/field_map_obj_helpers.s deleted file mode 100644 index c2111da0f..000000000 --- a/data/field_map_obj_helpers.s +++ /dev/null @@ -1,93 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -Unknown_83760F0: - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - .4byte Step1 - - .align 2 -Unknown_8376130: - .4byte Step2 - .4byte Step2 - .4byte Step2 - .4byte Step2 - .4byte Step2 - .4byte Step2 - .4byte Step2 - .4byte Step2 - - .align 2 -Unknown_8376150: - .4byte Step2 - .4byte Step3 - .4byte Step3 - .4byte Step2 - .4byte Step3 - .4byte Step3 - - .align 2 -Unknown_8376168: - .4byte Step4 - .4byte Step4 - .4byte Step4 - .4byte Step4 - - .align 2 -Unknown_8376178: - .4byte Step8 - .4byte Step8 - - .align 2 -gUnknown_08376180:: @ 8376180 - .4byte Unknown_83760F0 - .4byte Unknown_8376130 - .4byte Unknown_8376150 - .4byte Unknown_8376168 - .4byte Unknown_8376178 - - .align 1 -gUnknown_08376194:: @ 8376194 - .2byte 16, 8, 6, 4, 2 -Unknown_837619E: - .byte -4, -6, -8, -10, -11, -12, -12, -12, -11, -10, -9, -8, -6, -4, 0, 0 -Unknown_83761AE: - .byte 0, -2, -3, -4, -5, -6, -6, -6, -5, -5, -4, -3, -2, 0, 0, 0 -Unknown_83761BE: - .byte -2, -4, -6, -8, -9, -10, -10, -10, -9, -8, -6, -5, -3, -2, 0, 0 - - .align 2 -gUnknown_083761D0:: @ 83761D0 - .4byte Unknown_837619E - .4byte Unknown_83761AE - .4byte Unknown_83761BE - - .align 1 -gUnknown_083761DC:: @ 83761DC - .2byte 0x10, 0x10, 0x20 - -gUnknown_083761E2:: @ 83761E2 - .byte 0, 0, 1 - - .align 1 -gUnknown_083761E6:: @ 83761E6 - .2byte 0x20, 0x20, 0x40 - -gUnknown_083761EC:: @ 83761EC - .byte 1, 1, 2 -- cgit v1.2.3 From 1e40c9572a59aa1a178ba634a5b130bb7b511a04 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 19 Dec 2017 10:01:24 -0600 Subject: Decompile battle_anim fury_cutter_count --- data/battle_anim_scripts.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index de3d354ce..5e5293e63 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1416,11 +1416,11 @@ Move_FURY_CUTTER: @ 81C914A monbg 1 setalpha 12, 8 panse_19 SE_W013, 63 - createtask sub_80D30AC, 2 + createtask UpdateFuryCutterAnimDirection, 2 jumpvareq 7, 0, _81C91A7 jump _81C91B9 _81C916A: - createtask update_fury_cutter_counter_copy, 2 + createtask UpdateFuryCutterAnimCount, 2 jumpvareq 7, 1, _81C918E jumpvareq 7, 2, _81C91CB jumpvareq 7, 3, _81C91E5 -- cgit v1.2.3 From 48d4388347e885038609766d044b8aaaad38dc5a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 19 Dec 2017 10:26:58 -0600 Subject: Decompile battle_anim rain --- data/battle_anim_80CA710.s | 2 +- data/battle_anim_scripts.s | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index 24881ab7c..ba5d9f533 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -2091,7 +2091,7 @@ gSpriteAnimTable_83D912C:: @ 83D912C .align 2 gSpriteTemplate_83D9130:: @ 83D9130 - spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, sub_80D3184 + spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, SetAnimRaindropCallback .align 2 gSpriteAffineAnim_83D9148:: @ 83D9148 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 5e5293e63..e0d11637d 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -5271,8 +5271,8 @@ Move_RAIN_DANCE: @ 81CE997 panse_19 SE_W240, 192 createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 wait - createtask sub_80D30F0, 2, 0, 3, 120 - createtask sub_80D30F0, 2, 0, 3, 120 + createtask CreateAnimRaindrops, 2, 0, 3, 120 + createtask CreateAnimRaindrops, 2, 0, 3, 120 pause 120 pause 30 wait @@ -10497,8 +10497,8 @@ General_Rain: @ 81D67BB panse_19 SE_W240, 192 createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 wait - createtask sub_80D30F0, 2, 0, 3, 60 - createtask sub_80D30F0, 2, 0, 3, 60 + createtask CreateAnimRaindrops, 2, 0, 3, 60 + createtask CreateAnimRaindrops, 2, 0, 3, 60 pause 50 wait createtask sub_80E2A38, 10, 1921, 2, 4, 0, 0 -- cgit v1.2.3 From a753c44277c050fb24aaf97a8947c7f54e0dacd7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Dec 2017 19:58:17 -0600 Subject: Use event script macro names from pokeemerald --- data/event_scripts.s | 378 ++++++++++----------- data/field_move_scripts.inc | 42 +-- data/item_ball_scripts.inc | 270 +++++++-------- data/script_cmd_table.inc | 86 ++--- data/scripts/berry_tree.inc | 34 +- data/scripts/cable_club.inc | 72 ++-- data/scripts/contest_hall.inc | 18 +- data/scripts/day_care.inc | 12 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 6 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 24 +- .../maps/AbandonedShip_HiddenFloorRooms.inc | 60 ++-- data/scripts/maps/AncientTomb.inc | 20 +- data/scripts/maps/BattleTower_Corridor.inc | 8 +- data/scripts/maps/BattleTower_Lobby.inc | 8 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 10 +- data/scripts/maps/DesertRuins.inc | 20 +- data/scripts/maps/DewfordTown.inc | 32 +- data/scripts/maps/DewfordTown_Gym.inc | 20 +- data/scripts/maps/DewfordTown_Hall.inc | 2 +- data/scripts/maps/DewfordTown_House1.inc | 4 +- data/scripts/maps/DewfordTown_House2.inc | 2 +- data/scripts/maps/DewfordTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 4 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 8 +- .../maps/EverGrandeCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 +- data/scripts/maps/FallarborTown.inc | 4 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 10 +- data/scripts/maps/FallarborTown_House1.inc | 2 +- data/scripts/maps/FallarborTown_House2.inc | 2 +- data/scripts/maps/FallarborTown_Mart.inc | 4 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/FortreeCity.inc | 6 +- data/scripts/maps/FortreeCity_DecorationShop.inc | 4 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 8 +- data/scripts/maps/FortreeCity_House2.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 6 +- data/scripts/maps/FortreeCity_House5.inc | 4 +- data/scripts/maps/FortreeCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/GraniteCave_1F.inc | 2 +- data/scripts/maps/GraniteCave_B1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 12 +- data/scripts/maps/IslandCave.inc | 30 +- data/scripts/maps/JaggedPass.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 6 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 2 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 2 +- data/scripts/maps/LavaridgeTown_House.inc | 4 +- .../maps/LavaridgeTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/LilycoveCity.inc | 68 ++-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 24 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 22 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 10 +- .../maps/LilycoveCity_DepartmentStore_5F.inc | 8 +- data/scripts/maps/LilycoveCity_Harbor.inc | 8 +- data/scripts/maps/LilycoveCity_House1.inc | 4 +- data/scripts/maps/LilycoveCity_House2.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 22 +- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/LittlerootTown.inc | 20 +- .../maps/LittlerootTown_BrendansHouse_1F.inc | 6 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 6 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 6 +- data/scripts/maps/MauvilleCity.inc | 4 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 12 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 62 ++-- data/scripts/maps/MauvilleCity_Gym.inc | 52 +-- data/scripts/maps/MauvilleCity_House1.inc | 2 +- data/scripts/maps/MauvilleCity_House2.inc | 4 +- .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 4 +- data/scripts/maps/MossdeepCity_Gym.inc | 50 +-- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 2 +- data/scripts/maps/MossdeepCity_House4.inc | 4 +- .../scripts/maps/MossdeepCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 12 +- data/scripts/maps/MtChimney.inc | 6 +- data/scripts/maps/MtPyre_1F.inc | 2 +- data/scripts/maps/MtPyre_2F.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 2 +- data/scripts/maps/NewMauville_Entrance.inc | 24 +- data/scripts/maps/NewMauville_Inside.inc | 178 +++++----- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/PacifidlogTown.inc | 2 +- data/scripts/maps/PacifidlogTown_House2.inc | 14 +- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- .../maps/PacifidlogTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/PetalburgCity_Gym.inc | 52 +-- .../maps/PetalburgCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/PetalburgCity_WallysHouse.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 4 +- data/scripts/maps/Route104.inc | 22 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 4 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 6 +- data/scripts/maps/Route105.inc | 4 +- data/scripts/maps/Route109.inc | 22 +- data/scripts/maps/Route109_SeashoreHouse.inc | 4 +- data/scripts/maps/Route110.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 22 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 46 +-- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 16 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 356 +++++++++---------- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 40 +-- data/scripts/maps/Route111.inc | 10 +- .../maps/Route111_WinstrateFamilysHouse.inc | 2 +- data/scripts/maps/Route113.inc | 2 +- data/scripts/maps/Route113_GlassWorkshop.inc | 38 +-- data/scripts/maps/Route114.inc | 8 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 2 +- data/scripts/maps/Route114_LanettesHouse.inc | 4 +- data/scripts/maps/Route116.inc | 2 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 2 +- data/scripts/maps/Route119_House.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/Route120.inc | 30 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/Route123.inc | 2 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 16 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 8 +- data/scripts/maps/Route128.inc | 4 +- data/scripts/maps/RustboroCity.inc | 2 +- data/scripts/maps/RustboroCity_CuttersHouse.inc | 2 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 20 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 +- data/scripts/maps/RustboroCity_Flat2_1F.inc | 4 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 2 +- data/scripts/maps/RustboroCity_House1.inc | 2 +- data/scripts/maps/RustboroCity_House3.inc | 4 +- .../scripts/maps/RustboroCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 14 +- data/scripts/maps/SSTidalCorridor.inc | 8 +- data/scripts/maps/SSTidalRooms.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 6 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 14 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 36 +- data/scripts/maps/SecretBase_YellowCave4.inc | 2 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 6 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 36 +- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 8 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 6 +- data/scripts/maps/SkyPillar_2F.inc | 2 +- data/scripts/maps/SkyPillar_4F.inc | 2 +- data/scripts/maps/SkyPillar_Top.inc | 4 +- data/scripts/maps/SlateportCity.inc | 8 +- data/scripts/maps/SlateportCity_ContestHall.inc | 2 +- data/scripts/maps/SlateportCity_ContestLobby.inc | 12 +- data/scripts/maps/SlateportCity_Harbor.inc | 12 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 2 +- .../maps/SlateportCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 26 +- data/scripts/maps/SootopolisCity.inc | 28 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 16 +- data/scripts/maps/SootopolisCity_House1.inc | 6 +- data/scripts/maps/SootopolisCity_House4.inc | 4 +- data/scripts/maps/SootopolisCity_House6.inc | 4 +- data/scripts/maps/SootopolisCity_House8.inc | 4 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 24 +- data/scripts/maps/Underwater_SealedChamber.inc | 2 +- data/scripts/maps/UnknownMap_25_34.inc | 2 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 12 +- .../maps/VerdanturfTown_FriendshipRatersHouse.inc | 4 +- .../maps/VerdanturfTown_PokemonCenter_1F.inc | 4 +- data/scripts/mauville_man.inc | 2 +- data/scripts/players_house.inc | 12 +- data/scripts/pokeblocks.inc | 4 +- data/scripts/safari_zone.inc | 8 +- data/scripts/secret_power_tm.inc | 2 +- data/scripts/tv.inc | 6 +- 184 files changed, 1567 insertions(+), 1567 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index bbeac074c..3fd344b13 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -401,7 +401,7 @@ gUnknown_0815F36C:: @ 815F36C dofieldeffect 61 waitstate waitmessage - waitbutton + waitbuttonpress playse 5 goto EventScript_15F384 end @@ -462,7 +462,7 @@ gUnknown_0815F43A:: @ 815F43A dofieldeffect 61 waitstate waitmessage - waitbutton + waitbuttonpress playse 5 goto EventScript_15F452 end @@ -901,7 +901,7 @@ Std_2: faceplayer message 0x0 waitmessage - waitbutton + waitbuttonpress release return @@ -909,14 +909,14 @@ Std_3: lockall message 0x0 waitmessage - waitbutton + waitbuttonpress releaseall return Std_4: message 0x0 waitmessage - waitbutton + waitbuttonpress return Std_5: @@ -953,7 +953,7 @@ gUnknown_0819F818:: @ 819F818 goto EventScript_19F8F2 EventScript_19F83F: - ontrainerbattleend + gotopostbattlescript gUnknown_0819F840:: @ 819F840 lock @@ -972,19 +972,19 @@ gUnknown_0819F840:: @ 819F840 EventScript_19F870: special ScrSpecial_ShowTrainerNonBattlingSpeech waitmessage - waitbutton + waitbuttonpress release end EventScript_19F877: - ontrainerbattleend + gotopostbattlescript gUnknown_0819F878:: @ 819F878 applymovement LAST_TALKED, Movement_19F8F0 waitmovement 0 special PlayTrainerEncounterMusic - battlebegin - ontrainerbattleend + trainerbattlebegin + gotopostbattlescript gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 @@ -995,14 +995,14 @@ gUnknown_0819F887:: @ 819F887 special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech waitmessage - waitbutton + waitbuttonpress special ScrSpecial_StartTrainerEyeRematch waitstate releaseall end EventScript_19F8AD: - ontrainerbattleend + gotopostbattlescript gUnknown_0819F8AE:: @ 819F8AE specialvar RESULT, ScrSpecial_GetTrainerEyeRematchFlag @@ -1015,19 +1015,19 @@ gUnknown_0819F8AE:: @ 819F8AE special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech waitmessage - waitbutton + waitbuttonpress special ScrSpecial_StartTrainerEyeRematch waitstate releaseall end EventScript_19F8DD: - ontrainerbattleend + gotopostbattlescript EventScript_19F8DE: special ScrSpecial_ShowTrainerNonBattlingSpeech waitmessage - waitbutton + waitbuttonpress release end @@ -1043,8 +1043,8 @@ Movement_19F8F0:: EventScript_19F8F2: special ScrSpecial_ShowTrainerIntroSpeech waitmessage - waitbutton - battlebegin + waitbuttonpress + trainerbattlebegin specialvar RESULT, ScrSpecial_GetTrainerBattleMode compare RESULT, 0 goto_if_eq EventScript_19F934 @@ -1062,96 +1062,96 @@ EventScript_19F934: end EventScript_19F936: - ontrainerbattleendgoto + gotobeatenscript Std_6:: message 0x0 waitmessage - waitbutton + waitbuttonpress release return Event_ResetBerryTrees: @ 19F940 - plantberrytree 2, 7, 5 - plantberrytree 1, 3, 5 - plantberrytree 11, 7, 5 - plantberrytree 13, 3, 5 - plantberrytree 4, 7, 5 - plantberrytree 76, 1, 5 - plantberrytree 8, 1, 5 - plantberrytree 10, 6, 5 - plantberrytree 25, 20, 5 - plantberrytree 26, 2, 5 - plantberrytree 66, 2, 5 - plantberrytree 67, 20, 5 - plantberrytree 69, 22, 5 - plantberrytree 70, 22, 5 - plantberrytree 71, 22, 5 - plantberrytree 55, 17, 5 - plantberrytree 56, 17, 5 - plantberrytree 5, 1, 5 - plantberrytree 6, 6, 5 - plantberrytree 7, 1, 5 - plantberrytree 16, 18, 5 - plantberrytree 17, 18, 5 - plantberrytree 18, 18, 5 - plantberrytree 29, 19, 5 - plantberrytree 28, 19, 5 - plantberrytree 27, 19, 5 - plantberrytree 24, 4, 5 - plantberrytree 23, 3, 5 - plantberrytree 22, 3, 5 - plantberrytree 21, 4, 5 - plantberrytree 19, 16, 5 - plantberrytree 20, 16, 5 - plantberrytree 80, 7, 5 - plantberrytree 81, 7, 5 - plantberrytree 77, 8, 5 - plantberrytree 78, 8, 5 - plantberrytree 68, 8, 5 - plantberrytree 31, 10, 5 - plantberrytree 33, 10, 5 - plantberrytree 34, 21, 5 - plantberrytree 35, 21, 5 - plantberrytree 36, 21, 5 - plantberrytree 83, 24, 5 - plantberrytree 84, 24, 5 - plantberrytree 85, 10, 5 - plantberrytree 86, 6, 5 - plantberrytree 37, 5, 5 - plantberrytree 38, 5, 5 - plantberrytree 39, 5, 5 - plantberrytree 40, 3, 5 - plantberrytree 41, 3, 5 - plantberrytree 42, 3, 5 - plantberrytree 46, 19, 5 - plantberrytree 45, 20, 5 - plantberrytree 44, 18, 5 - plantberrytree 43, 16, 5 - plantberrytree 47, 8, 5 - plantberrytree 48, 5, 5 - plantberrytree 49, 4, 5 - plantberrytree 50, 2, 5 - plantberrytree 52, 18, 5 - plantberrytree 53, 18, 5 - plantberrytree 62, 6, 5 - plantberrytree 64, 6, 5 - plantberrytree 58, 21, 5 - plantberrytree 59, 21, 5 - plantberrytree 60, 25, 5 - plantberrytree 61, 25, 5 - plantberrytree 79, 23, 5 - plantberrytree 14, 23, 5 - plantberrytree 15, 21, 5 - plantberrytree 30, 21, 5 - plantberrytree 65, 25, 5 - plantberrytree 72, 25, 5 - plantberrytree 73, 23, 5 - plantberrytree 74, 23, 5 - plantberrytree 87, 3, 5 - plantberrytree 88, 10, 5 - plantberrytree 89, 4, 5 - plantberrytree 82, 36, 5 + setberrytree 2, 7, 5 + setberrytree 1, 3, 5 + setberrytree 11, 7, 5 + setberrytree 13, 3, 5 + setberrytree 4, 7, 5 + setberrytree 76, 1, 5 + setberrytree 8, 1, 5 + setberrytree 10, 6, 5 + setberrytree 25, 20, 5 + setberrytree 26, 2, 5 + setberrytree 66, 2, 5 + setberrytree 67, 20, 5 + setberrytree 69, 22, 5 + setberrytree 70, 22, 5 + setberrytree 71, 22, 5 + setberrytree 55, 17, 5 + setberrytree 56, 17, 5 + setberrytree 5, 1, 5 + setberrytree 6, 6, 5 + setberrytree 7, 1, 5 + setberrytree 16, 18, 5 + setberrytree 17, 18, 5 + setberrytree 18, 18, 5 + setberrytree 29, 19, 5 + setberrytree 28, 19, 5 + setberrytree 27, 19, 5 + setberrytree 24, 4, 5 + setberrytree 23, 3, 5 + setberrytree 22, 3, 5 + setberrytree 21, 4, 5 + setberrytree 19, 16, 5 + setberrytree 20, 16, 5 + setberrytree 80, 7, 5 + setberrytree 81, 7, 5 + setberrytree 77, 8, 5 + setberrytree 78, 8, 5 + setberrytree 68, 8, 5 + setberrytree 31, 10, 5 + setberrytree 33, 10, 5 + setberrytree 34, 21, 5 + setberrytree 35, 21, 5 + setberrytree 36, 21, 5 + setberrytree 83, 24, 5 + setberrytree 84, 24, 5 + setberrytree 85, 10, 5 + setberrytree 86, 6, 5 + setberrytree 37, 5, 5 + setberrytree 38, 5, 5 + setberrytree 39, 5, 5 + setberrytree 40, 3, 5 + setberrytree 41, 3, 5 + setberrytree 42, 3, 5 + setberrytree 46, 19, 5 + setberrytree 45, 20, 5 + setberrytree 44, 18, 5 + setberrytree 43, 16, 5 + setberrytree 47, 8, 5 + setberrytree 48, 5, 5 + setberrytree 49, 4, 5 + setberrytree 50, 2, 5 + setberrytree 52, 18, 5 + setberrytree 53, 18, 5 + setberrytree 62, 6, 5 + setberrytree 64, 6, 5 + setberrytree 58, 21, 5 + setberrytree 59, 21, 5 + setberrytree 60, 25, 5 + setberrytree 61, 25, 5 + setberrytree 79, 23, 5 + setberrytree 14, 23, 5 + setberrytree 15, 21, 5 + setberrytree 30, 21, 5 + setberrytree 65, 25, 5 + setberrytree 72, 25, 5 + setberrytree 73, 23, 5 + setberrytree 74, 23, 5 + setberrytree 87, 3, 5 + setberrytree 88, 10, 5 + setberrytree 89, 4, 5 + setberrytree 82, 36, 5 return gUnknown_0819FA81:: @ 819FA81 @@ -1499,13 +1499,13 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 step_end Std_ObtainItem: @ 819FDF7 - additem 0x8000, 0x8001 + giveitem 0x8000, 0x8001 copyvar 0x8007, RESULT call Std_ObtainItem_ return Std_ObtainItem_: @ 819FE07 - getitemname 1, 0x8000 + bufferitemname 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 0x1 @@ -1524,31 +1524,31 @@ GetItem_HandlePocket: end GetItem_HandlePocket_Items: - getstdstring 2, 0xE + bufferstdstring 2, 0xE compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: - getstdstring 2, 0xF + bufferstdstring 2, 0xF compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: - getstdstring 2, 0x10 + bufferstdstring 2, 0x10 compare 0x8007, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: - getstdstring 2, 0x11 + bufferstdstring 2, 0x11 compare 0x8007, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: - getstdstring 2, 0x12 + bufferstdstring 2, 0x12 compare 0x8007, 1 call_if 1, PlayGetItemFanfare return @@ -1574,13 +1574,13 @@ PlayGetTMHMFanfare: return Std_ObtainDecoration: @ 819FEDA - adddecor 0x8000 + givedecoration 0x8000 copyvar 0x8007, RESULT call Std_ObtainDecoration_ return Std_ObtainDecoration_: @ 819FEE8 - getdecorname 1, 0x8000 + bufferdecorationname 1, 0x8000 compare 0x8007, 1 call_if 1, Std_ObtainDecoration_Success compare 0x8007, 0 @@ -1604,9 +1604,9 @@ Std_FindItem: @ 819FF21 lock faceplayer waitse - additem 0x8000, 0x8001 + giveitem 0x8000, 0x8001 copyvar 0x8007, RESULT - getitemname 1, 0x8000 + bufferitemname 1, 0x8000 checkitemtype 0x8000 call GetItem_HandlePocket compare 0x8007, 1 @@ -1633,9 +1633,9 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall waitse - additem 0x8005, 1 + giveitem 0x8005, 1 copyvar 0x8007, RESULT - getitemname 0x1, 0x8005 + bufferitemname 0x1, 0x8005 checkitemtype 0x8005 call GetItem_HandlePocket compare 0x8007, 1 @@ -1677,7 +1677,7 @@ UnusedMixRecordsScript_Yes: @ 819FFFA UnusedMixRecordsScript_Done: @ 81A0000 message UnusedMixRecordsSeeYouAgainText waitmessage - waitbutton + waitbuttonpress release end @@ -1820,11 +1820,11 @@ Route109_EventScript_1A010C:: @ 81A010C return UseSurfScript:: @ 81A0117 - checkpokemove MOVE_SURF + checkpartymove MOVE_SURF compare RESULT, 6 goto_if_eq UseSurfScript_NoMon - getpartypokename 0, RESULT - setfieldeffect 0, RESULT + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT lockall msgbox UseSurfPromptText, 5 compare RESULT, 0 @@ -2208,7 +2208,7 @@ Route101_EventScript_1A03A5:: @ 81A03A5 copyvar 0x8004, 0x8009 special ShowPokedexRatingMessage waitmessage - waitbutton + waitbuttonpress return EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0 @@ -2218,8 +2218,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0 copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 copyvar 0x800a, RESULT - getnumberstring 0, 0x8008 - getnumberstring 1, 0x8009 + buffernumberstring 0, 0x8008 + buffernumberstring 1, 0x8009 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 compare 0x800a, 0 @@ -2228,8 +2228,8 @@ Route101_EventScript_1A03B0:: @ 81A03B0 specialvar RESULT, ScriptGetPokedexInfo copyvar 0x8008, 0x8005 copyvar 0x8009, 0x8006 - getnumberstring 0, 0x8008 - getnumberstring 1, 0x8009 + buffernumberstring 0, 0x8008 + buffernumberstring 1, 0x8009 msgbox Route101_Text_1C4B05, 4 return @@ -2276,7 +2276,7 @@ EventScript_1A0457: @ unreferenced? delay 30 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841 waitmovement 0 - showobject 255, 0, 0 + showobjectat 255, MAP_PETALBURG_CITY delay 30 applymovement 255, Movement_1A047A waitmovement 0 @@ -2294,15 +2294,15 @@ SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare FACING, 3 call_if 1, BattleTower_Outside_EventScript_160B3A delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY call BattleTower_Outside_EventScript_1A040E return CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0 lockall waitse - playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 - waitpokecry + playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 + waitmoncry setvar 0x4005, 1 releaseall end @@ -2356,9 +2356,9 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE waitse - playpokecry SPECIES_ELECTRODE, 2 + playmoncry SPECIES_ELECTRODE, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -2372,9 +2372,9 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE waitse - playpokecry SPECIES_ELECTRODE, 2 + playmoncry SPECIES_ELECTRODE, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -2455,9 +2455,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3 applymovement LAST_TALKED, Route119_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE compare 0x8004, 1 call_if 1, Route119_EventScript_1A0646 @@ -2546,12 +2546,12 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F - getitemname 0, 0x8004 + bufferitemname 0, 0x8004 playfanfare 372 message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare - removeitem 0x8004, 1 + takeitem 0x8004, 1 return EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 @@ -2561,18 +2561,18 @@ EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 waitmovement 0 playse 8 - setmaptile 6, 1, 836, 0 - setmaptile 6, 2, 837, 0 - setmaptile 0, 2, 734, 1 - setmaptile 1, 2, 733, 1 - setmaptile 2, 2, 734, 1 - setmaptile 3, 2, 733, 1 - setmaptile 4, 2, 734, 1 - setmaptile 8, 2, 733, 1 - setmaptile 9, 2, 734, 1 - setmaptile 10, 2, 733, 1 - setmaptile 11, 2, 734, 1 - setmaptile 12, 2, 733, 1 + setmetatile 6, 1, 836, 0 + setmetatile 6, 2, 837, 0 + setmetatile 0, 2, 734, 1 + setmetatile 1, 2, 733, 1 + setmetatile 2, 2, 734, 1 + setmetatile 3, 2, 733, 1 + setmetatile 4, 2, 734, 1 + setmetatile 8, 2, 733, 1 + setmetatile 9, 2, 734, 1 + setmetatile 10, 2, 733, 1 + setmetatile 11, 2, 734, 1 + setmetatile 12, 2, 733, 1 special DrawWholeMapView return @@ -2583,12 +2583,12 @@ EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 waitmovement 0 playse 52 - setmaptile 5, 12, 518, 1 - setmaptile 6, 12, 518, 1 - setmaptile 7, 12, 518, 1 - setmaptile 5, 13, 526, 1 - setmaptile 6, 13, 526, 1 - setmaptile 7, 13, 526, 1 + setmetatile 5, 12, 518, 1 + setmetatile 6, 12, 518, 1 + setmetatile 7, 12, 518, 1 + setmetatile 5, 13, 526, 1 + setmetatile 6, 13, 526, 1 + setmetatile 7, 13, 526, 1 special DrawWholeMapView return @@ -2596,36 +2596,36 @@ EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_GlaciasRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_PhoebesRoom_EventScript_1A0757:: @ 81A0757 EverGrandeCity_SidneysRoom_EventScript_1A0757:: @ 81A0757 - setmaptile 6, 1, 836, 0 - setmaptile 6, 2, 837, 0 - setmaptile 5, 12, 518, 1 - setmaptile 6, 12, 518, 1 - setmaptile 7, 12, 518, 1 - setmaptile 5, 13, 526, 1 - setmaptile 6, 13, 526, 1 - setmaptile 7, 13, 526, 1 - setmaptile 0, 2, 734, 1 - setmaptile 1, 2, 733, 1 - setmaptile 2, 2, 734, 1 - setmaptile 3, 2, 733, 1 - setmaptile 4, 2, 734, 1 - setmaptile 8, 2, 733, 1 - setmaptile 9, 2, 734, 1 - setmaptile 10, 2, 733, 1 - setmaptile 11, 2, 734, 1 - setmaptile 12, 2, 733, 1 + setmetatile 6, 1, 836, 0 + setmetatile 6, 2, 837, 0 + setmetatile 5, 12, 518, 1 + setmetatile 6, 12, 518, 1 + setmetatile 7, 12, 518, 1 + setmetatile 5, 13, 526, 1 + setmetatile 6, 13, 526, 1 + setmetatile 7, 13, 526, 1 + setmetatile 0, 2, 734, 1 + setmetatile 1, 2, 733, 1 + setmetatile 2, 2, 734, 1 + setmetatile 3, 2, 733, 1 + setmetatile 4, 2, 734, 1 + setmetatile 8, 2, 733, 1 + setmetatile 9, 2, 734, 1 + setmetatile 10, 2, 733, 1 + setmetatile 11, 2, 734, 1 + setmetatile 12, 2, 733, 1 return EverGrandeCity_DrakesRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_GlaciasRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_PhoebesRoom_EventScript_1A07FA:: @ 81A07FA EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA - setmaptile 5, 12, 518, 1 - setmaptile 6, 12, 518, 1 - setmaptile 7, 12, 518, 1 - setmaptile 5, 13, 526, 1 - setmaptile 6, 13, 526, 1 - setmaptile 7, 13, 526, 1 + setmetatile 5, 12, 518, 1 + setmetatile 6, 12, 518, 1 + setmetatile 7, 12, 518, 1 + setmetatile 5, 13, 526, 1 + setmetatile 6, 13, 526, 1 + setmetatile 7, 13, 526, 1 return SlateportCity_Movement_1A0831:: @ 81A0831 @@ -3271,7 +3271,7 @@ gUnknown_081A14B8:: @ 81A14B8 EventScript_1A14CA:: message UnknownString_81A1141 waitmessage - waitbutton + waitbuttonpress special sub_8081924 waitstate fadescreen 1 @@ -3609,9 +3609,9 @@ gUnknown_081A2C51:: @ 81A2C51 special sub_80BB63C compare RESULT, 1 goto_if_eq EventScript_1A2E45 - checkpokemove MOVE_SECRET_POWER - setfieldeffect 0, RESULT - getmovename 1, MOVE_SECRET_POWER + checkpartymove MOVE_SECRET_POWER + setfieldeffectargument 0, RESULT + buffermovename 1, MOVE_SECRET_POWER compare 0x8007, 1 goto_if_eq EventScript_1A2CB0 compare 0x8007, 2 @@ -3630,7 +3630,7 @@ EventScript_1A2CB0: lockall compare RESULT, 6 goto_if_eq EventScript_1A2CF1 - getpartypokename 0, RESULT + bufferpartymonnick 0, RESULT msgbox UnknownString_8198F34, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3661,7 +3661,7 @@ EventScript_1A2D08: lockall compare RESULT, 6 goto_if_eq EventScript_1A2D49 - getpartypokename 0, RESULT + bufferpartymonnick 0, RESULT msgbox UnknownString_81A197B, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3692,7 +3692,7 @@ EventScript_1A2D60: lockall compare RESULT, 6 goto_if_eq EventScript_1A2DA1 - getpartypokename 0, RESULT + bufferpartymonnick 0, RESULT msgbox UnknownString_81A1A4B, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A @@ -3778,10 +3778,10 @@ EventScript_1A2E38: end EventScript_1A2E45: - checkpokemove MOVE_SECRET_POWER + checkpartymove MOVE_SECRET_POWER compare RESULT, 6 goto_if_eq EventScript_1A2EF7 - setfieldeffect 0, RESULT + setfieldeffectargument 0, RESULT setorcopyvar 0x8004, RESULT lockall special GetSecretBaseNearbyMapName @@ -3798,8 +3798,8 @@ EventScript_1A2E45: msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A - getpartypokename 0, 0x8004 - getmovename 1, MOVE_SECRET_POWER + bufferpartymonnick 0, 0x8004 + buffermovename 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closemessage closemessage @@ -4773,8 +4773,8 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F .include "data/text/magma_summit.inc" gUnknown_081B694A:: @ 81B694A - animdarklevel 1 - setdarklevel 1 + animateflash 1 + setflashradius 1 end .include "data/scripts/players_house.inc" @@ -4928,7 +4928,7 @@ gUnknown_081C6C02:: @ 81C6C02 @ 81C6C1D lockall braillemessage Underwater_SealedChamber_Braille_1C533D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 86b81dd01..0a0eeaa73 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -2,12 +2,12 @@ S_CuttableTree:: @ 81B0DCC lockall checkflag FLAG_BADGE01_GET goto_if 0, CannotUseCut - checkpokemove MOVE_CUT + checkpartymove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut - setfieldeffect 0, RESULT - getpartypokename 0, RESULT - getmovename 1, MOVE_CUT + setfieldeffectargument 0, RESULT + bufferpartymonnick 0, RESULT + buffermovename 1, MOVE_CUT msgbox UseCutPromptText, 5 compare RESULT, 0 goto_if_eq Cut_ChoseNo @@ -60,12 +60,12 @@ S_BreakableRock:: @ 81B0EB7 lockall checkflag FLAG_BADGE03_GET goto_if 0, CannotUseRockSmash - checkpokemove MOVE_ROCK_SMASH + checkpartymove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash - setfieldeffect 0, RESULT - getpartypokename 0, RESULT - getmovename 1, MOVE_ROCK_SMASH + setfieldeffectargument 0, RESULT + bufferpartymonnick 0, RESULT + buffermovename 1, MOVE_ROCK_SMASH msgbox UseRockSmashPromptText, 5 compare RESULT, 0 goto_if_eq RockSmash_ChoseNo @@ -129,10 +129,10 @@ S_PushableBoulder:: @ 81B0FCB goto_if 0, CannotUseStrength checkflag FLAG_SYS_USE_STRENGTH goto_if_eq AlreadyUsedStrength - checkpokemove 70 + checkpartymove 70 compare RESULT, 6 goto_if_eq CannotUseStrength - setfieldeffect 0, RESULT + setfieldeffectargument 0, RESULT msgbox UseStrengthPromptText, 5 compare RESULT, 0 goto_if_eq Strength_ChoseNo @@ -190,11 +190,11 @@ AlreadyUsedStrengthText: @ 81B1127 S_UseWaterfall:: @ 81B115A lockall - checkpokemove MOVE_WATERFALL + checkpartymove MOVE_WATERFALL compare RESULT, 6 goto_if_eq Waterfall_NoMonKnows - getpartypokename 0, RESULT - setfieldeffect 0, RESULT + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT msgbox UseWaterfallPromptText, 5 compare RESULT, 0 goto_if_eq Waterfall_Done @@ -223,12 +223,12 @@ UsedWaterfallText: @ 81B120D UseDiveScript:: @ 81B1220 lockall - checkpokemove MOVE_DIVE + checkpartymove MOVE_DIVE compare RESULT, 6 goto_if_eq CannotUseDive - getpartypokename 0, RESULT - setfieldeffect 0, RESULT - setfieldeffect 1, 1 + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT + setfieldeffectargument 1, 1 msgbox UseDivePromptText, 5 compare RESULT, 0 goto_if_eq Dive_Done @@ -246,12 +246,12 @@ Dive_Done: @ 81B1267 S_UseDiveUnderwater:: @ 81B1269 lockall - checkpokemove MOVE_DIVE + checkpartymove MOVE_DIVE compare RESULT, 6 goto_if_eq UnderwaterCannotUseDive - getpartypokename 0, RESULT - setfieldeffect 0, RESULT - setfieldeffect 1, 1 + bufferpartymonnick 0, RESULT + setfieldeffectargument 0, RESULT + setfieldeffectargument 1, 1 msgbox UnderwaterUseDivePromptText, 5 compare RESULT, 0 goto_if_eq UnderwaterDive_Done diff --git a/data/item_ball_scripts.inc b/data/item_ball_scripts.inc index ad4386990..aae704ab2 100644 --- a/data/item_ball_scripts.inc +++ b/data/item_ball_scripts.inc @@ -1,539 +1,539 @@ Route102_EventScript_1B1439:: @ 81B1439 - giveitem ITEM_POTION, 1, 1 + giveitem_std ITEM_POTION, 1, 1 end Route103_EventScript_1B1446:: @ 81B1446 - giveitem ITEM_GUARD_SPEC, 1, 1 + giveitem_std ITEM_GUARD_SPEC, 1, 1 end Route104_EventScript_1B1453:: @ 81B1453 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end Route104_EventScript_1B1460:: @ 81B1460 - giveitem ITEM_POKE_BALL, 1, 1 + giveitem_std ITEM_POKE_BALL, 1, 1 end Route104_EventScript_1B146D:: @ 81B146D - giveitem ITEM_X_ACCURACY, 1, 1 + giveitem_std ITEM_X_ACCURACY, 1, 1 end Route104_EventScript_1B147A:: @ 81B147A - giveitem ITEM_POTION, 1, 1 + giveitem_std ITEM_POTION, 1, 1 end Route105_EventScript_1B1487:: @ 81B1487 - giveitem ITEM_IRON, 1, 1 + giveitem_std ITEM_IRON, 1, 1 end Route106_EventScript_1B1494:: @ 81B1494 - giveitem ITEM_PROTEIN, 1, 1 + giveitem_std ITEM_PROTEIN, 1, 1 end Route109_EventScript_1B14A1:: @ 81B14A1 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end Route110_EventScript_1B14AE:: @ 81B14AE - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route110_EventScript_1B14BB:: @ 81B14BB - giveitem ITEM_DIRE_HIT, 1, 1 + giveitem_std ITEM_DIRE_HIT, 1, 1 end Route111_EventScript_1B14C8:: @ 81B14C8 - giveitem ITEM_TM37, 1, 1 + giveitem_std ITEM_TM37, 1, 1 end Route111_EventScript_1B14D5:: @ 81B14D5 - giveitem ITEM_STARDUST, 1, 1 + giveitem_std ITEM_STARDUST, 1, 1 end Route111_EventScript_1B14E2:: @ 81B14E2 - giveitem ITEM_HP_UP, 1, 1 + giveitem_std ITEM_HP_UP, 1, 1 end Route112_EventScript_1B14EF:: @ 81B14EF - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end Route113_EventScript_1B14FC:: @ 81B14FC - giveitem ITEM_MAX_ETHER, 1, 1 + giveitem_std ITEM_MAX_ETHER, 1, 1 end Route113_EventScript_1B1509:: @ 81B1509 - giveitem ITEM_SUPER_REPEL, 1, 1 + giveitem_std ITEM_SUPER_REPEL, 1, 1 end Route114_EventScript_1B1516:: @ 81B1516 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route114_EventScript_1B1523:: @ 81B1523 - giveitem ITEM_PROTEIN, 1, 1 + giveitem_std ITEM_PROTEIN, 1, 1 end Route115_EventScript_1B1530:: @ 81B1530 - giveitem ITEM_SUPER_POTION, 1, 1 + giveitem_std ITEM_SUPER_POTION, 1, 1 end Route115_EventScript_1B153D:: @ 81B153D - giveitem ITEM_TM01, 1, 1 + giveitem_std ITEM_TM01, 1, 1 end Route115_EventScript_1B154A:: @ 81B154A - giveitem ITEM_IRON, 1, 1 + giveitem_std ITEM_IRON, 1, 1 end Route115_EventScript_1B1557:: @ 81B1557 - giveitem ITEM_GREAT_BALL, 1, 1 + giveitem_std ITEM_GREAT_BALL, 1, 1 end Route116_EventScript_1B1564:: @ 81B1564 - giveitem ITEM_X_SPECIAL, 1, 1 + giveitem_std ITEM_X_SPECIAL, 1, 1 end Route116_EventScript_1B1571:: @ 81B1571 - giveitem ITEM_ETHER, 1, 1 + giveitem_std ITEM_ETHER, 1, 1 end Route116_EventScript_1B157E:: @ 81B157E - giveitem ITEM_REPEL, 1, 1 + giveitem_std ITEM_REPEL, 1, 1 end Route116_EventScript_1B158B:: @ 81B158B - giveitem ITEM_HP_UP, 1, 1 + giveitem_std ITEM_HP_UP, 1, 1 end Route117_EventScript_1B1598:: @ 81B1598 - giveitem ITEM_GREAT_BALL, 1, 1 + giveitem_std ITEM_GREAT_BALL, 1, 1 end Route117_EventScript_1B15A5:: @ 81B15A5 - giveitem ITEM_REVIVE, 1, 1 + giveitem_std ITEM_REVIVE, 1, 1 end Route118_EventScript_1B15B2:: @ 81B15B2 - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route119_EventScript_1B15BF:: @ 81B15BF - giveitem ITEM_SUPER_REPEL, 1, 1 + giveitem_std ITEM_SUPER_REPEL, 1, 1 end Route119_EventScript_1B15CC:: @ 81B15CC - giveitem ITEM_ZINC, 1, 1 + giveitem_std ITEM_ZINC, 1, 1 end Route119_EventScript_1B15D9:: @ 81B15D9 - giveitem ITEM_ELIXIR, 1, 1 + giveitem_std ITEM_ELIXIR, 1, 1 end Route119_EventScript_1B15E6:: @ 81B15E6 - giveitem ITEM_LEAF_STONE, 1, 1 + giveitem_std ITEM_LEAF_STONE, 1, 1 end Route119_EventScript_1B15F3:: @ 81B15F3 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route119_EventScript_1B1600:: @ 81B1600 - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route119_EventScript_1B160D:: @ 81B160D - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route120_EventScript_1B161A:: @ 81B161A - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end Route120_EventScript_1B1627:: @ 81B1627 - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end Route120_EventScript_1B1634:: @ 81B1634 - giveitem ITEM_HYPER_POTION, 1, 1 + giveitem_std ITEM_HYPER_POTION, 1, 1 end Route120_EventScript_1B1641:: @ 81B1641 - giveitem ITEM_NEST_BALL, 1, 1 + giveitem_std ITEM_NEST_BALL, 1, 1 end Route121_EventScript_1B164E:: @ 81B164E - giveitem ITEM_CARBOS, 1, 1 + giveitem_std ITEM_CARBOS, 1, 1 end Route123_EventScript_1B165B:: @ 81B165B - giveitem ITEM_CALCIUM, 1, 1 + giveitem_std ITEM_CALCIUM, 1, 1 end Route123_EventScript_1B1668:: @ 81B1668 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route123_EventScript_1B1675:: @ 81B1675 - giveitem ITEM_ULTRA_BALL, 1, 1 + giveitem_std ITEM_ULTRA_BALL, 1, 1 end Route123_EventScript_1B1682:: @ 81B1682 - giveitem ITEM_ELIXIR, 1, 1 + giveitem_std ITEM_ELIXIR, 1, 1 end Route124_EventScript_1B168F:: @ 81B168F - giveitem ITEM_RED_SHARD, 1, 1 + giveitem_std ITEM_RED_SHARD, 1, 1 end Route124_EventScript_1B169C:: @ 81B169C - giveitem ITEM_BLUE_SHARD, 1, 1 + giveitem_std ITEM_BLUE_SHARD, 1, 1 end Route124_EventScript_1B16A9:: @ 81B16A9 - giveitem ITEM_YELLOW_SHARD, 1, 1 + giveitem_std ITEM_YELLOW_SHARD, 1, 1 end Route126_EventScript_1B16B6:: @ 81B16B6 - giveitem ITEM_GREEN_SHARD, 1, 1 + giveitem_std ITEM_GREEN_SHARD, 1, 1 end Route127_EventScript_1B16C3:: @ 81B16C3 - giveitem ITEM_ZINC, 1, 1 + giveitem_std ITEM_ZINC, 1, 1 end Route127_EventScript_1B16D0:: @ 81B16D0 - giveitem ITEM_CARBOS, 1, 1 + giveitem_std ITEM_CARBOS, 1, 1 end Route132_EventScript_1B16DD:: @ 81B16DD - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end Route133_EventScript_1B16EA:: @ 81B16EA - giveitem ITEM_BIG_PEARL, 1, 1 + giveitem_std ITEM_BIG_PEARL, 1, 1 end Route133_EventScript_1B16F7:: @ 81B16F7 - giveitem ITEM_STAR_PIECE, 1, 1 + giveitem_std ITEM_STAR_PIECE, 1, 1 end PetalburgCity_EventScript_1B1704:: @ 81B1704 - giveitem ITEM_MAX_REVIVE, 1, 1 + giveitem_std ITEM_MAX_REVIVE, 1, 1 end PetalburgCity_EventScript_1B1711:: @ 81B1711 - giveitem ITEM_ETHER, 1, 1 + giveitem_std ITEM_ETHER, 1, 1 end MauvilleCity_EventScript_1B171E:: @ 81B171E - giveitem ITEM_X_SPEED, 1, 1 + giveitem_std ITEM_X_SPEED, 1, 1 end RustboroCity_EventScript_1B172B:: @ 81B172B - giveitem ITEM_X_DEFEND, 1, 1 + giveitem_std ITEM_X_DEFEND, 1, 1 end LilycoveCity_EventScript_1B1738:: @ 81B1738 - giveitem ITEM_MAX_REPEL, 1, 1 + giveitem_std ITEM_MAX_REPEL, 1, 1 end MossdeepCity_EventScript_1B1745:: @ 81B1745 - giveitem ITEM_NET_BALL, 1, 1 + giveitem_std ITEM_NET_BALL, 1, 1 end PetalburgWoods_EventScript_1B1752:: @ 81B1752 - giveitem ITEM_X_ATTACK, 1, 1 + giveitem_std ITEM_X_ATTACK, 1, 1 end PetalburgWoods_EventScript_1B175F:: @ 81B175F - giveitem ITEM_GREAT_BALL, 1, 1 + giveitem_std ITEM_GREAT_BALL, 1, 1 end PetalburgWoods_EventScript_1B176C:: @ 81B176C - giveitem ITEM_ETHER, 1, 1 + giveitem_std ITEM_ETHER, 1, 1 end PetalburgWoods_EventScript_1B1779:: @ 81B1779 - giveitem ITEM_PARALYZE_HEAL, 1, 1 + giveitem_std ITEM_PARALYZE_HEAL, 1, 1 end RusturfTunnel_EventScript_1B1786:: @ 81B1786 - giveitem ITEM_POKE_BALL, 1, 1 + giveitem_std ITEM_POKE_BALL, 1, 1 end RusturfTunnel_EventScript_1B1793:: @ 81B1793 - giveitem ITEM_MAX_ETHER, 1, 1 + giveitem_std ITEM_MAX_ETHER, 1, 1 end GraniteCave_1F_EventScript_1B17A0:: @ 81B17A0 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + giveitem_std ITEM_ESCAPE_ROPE, 1, 1 end GraniteCave_B1F_EventScript_1B17AD:: @ 81B17AD - giveitem ITEM_POKE_BALL, 1, 1 + giveitem_std ITEM_POKE_BALL, 1, 1 end GraniteCave_B2F_EventScript_1B17BA:: @ 81B17BA - giveitem ITEM_REPEL, 1, 1 + giveitem_std ITEM_REPEL, 1, 1 end GraniteCave_B2F_EventScript_1B17C7:: @ 81B17C7 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end JaggedPass_EventScript_1B17D4:: @ 81B17D4 - giveitem ITEM_BURN_HEAL, 1, 1 + giveitem_std ITEM_BURN_HEAL, 1, 1 end FieryPath_EventScript_1B17E1:: @ 81B17E1 - giveitem ITEM_FIRE_STONE, 1, 1 + giveitem_std ITEM_FIRE_STONE, 1, 1 end FieryPath_EventScript_1B17EE:: @ 81B17EE - giveitem ITEM_TM06, 1, 1 + giveitem_std ITEM_TM06, 1, 1 end MeteorFalls_1F_1R_EventScript_1B17FB:: @ 81B17FB - giveitem ITEM_TM23, 1, 1 + giveitem_std ITEM_TM23, 1, 1 end MeteorFalls_1F_1R_EventScript_1B1808:: @ 81B1808 - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end MeteorFalls_1F_1R_EventScript_1B1815:: @ 81B1815 - giveitem ITEM_MOON_STONE, 1, 1 + giveitem_std ITEM_MOON_STONE, 1, 1 end MeteorFalls_1F_1R_EventScript_1B1822:: @ 81B1822 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end MeteorFalls_B1F_2R_EventScript_1B182F:: @ 81B182F - giveitem ITEM_TM02, 1, 1 + giveitem_std ITEM_TM02, 1, 1 end NewMauville_Inside_EventScript_1B183C:: @ 81B183C - giveitem ITEM_ULTRA_BALL, 1, 1 + giveitem_std ITEM_ULTRA_BALL, 1, 1 end NewMauville_Inside_EventScript_1B1849:: @ 81B1849 - giveitem ITEM_ESCAPE_ROPE, 1, 1 + giveitem_std ITEM_ESCAPE_ROPE, 1, 1 end NewMauville_Inside_EventScript_1B1856:: @ 81B1856 - giveitem ITEM_THUNDER_STONE, 1, 1 + giveitem_std ITEM_THUNDER_STONE, 1, 1 end NewMauville_Inside_EventScript_1B1863:: @ 81B1863 - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end NewMauville_Inside_EventScript_1B1870:: @ 81B1870 - giveitem ITEM_PARALYZE_HEAL, 1, 1 + giveitem_std ITEM_PARALYZE_HEAL, 1, 1 end AbandonedShip_Rooms_1F_EventScript_1B187D:: @ 81B187D - giveitem ITEM_HARBOR_MAIL, 1, 1 + giveitem_std ITEM_HARBOR_MAIL, 1, 1 end AbandonedShip_Rooms_B1F_EventScript_1B188A:: @ 81B188A - giveitem ITEM_ESCAPE_ROPE, 1, 1 + giveitem_std ITEM_ESCAPE_ROPE, 1, 1 end AbandonedShip_Rooms2_B1F_EventScript_1B1897:: @ 81B1897 - giveitem ITEM_DIVE_BALL, 1, 1 + giveitem_std ITEM_DIVE_BALL, 1, 1 end AbandonedShip_Room_B1F_EventScript_1B18A4:: @ 81B18A4 - giveitem ITEM_TM13, 1, 1 + giveitem_std ITEM_TM13, 1, 1 end AbandonedShip_Rooms2_1F_EventScript_1B18B1:: @ 81B18B1 - giveitem ITEM_REVIVE, 1, 1 + giveitem_std ITEM_REVIVE, 1, 1 end AbandonedShip_CaptainsOffice_EventScript_1B18BE:: @ 81B18BE - giveitem ITEM_STORAGE_KEY, 1, 1 + giveitem_std ITEM_STORAGE_KEY, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18CB:: @ 81B18CB - giveitem ITEM_LUXURY_BALL, 1, 1 + giveitem_std ITEM_LUXURY_BALL, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18D8:: @ 81B18D8 - giveitem ITEM_SCANNER, 1, 1 + giveitem_std ITEM_SCANNER, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18E5:: @ 81B18E5 - giveitem ITEM_WATER_STONE, 1, 1 + giveitem_std ITEM_WATER_STONE, 1, 1 end AbandonedShip_HiddenFloorRooms_EventScript_1B18F2:: @ 81B18F2 - giveitem ITEM_TM18, 1, 1 + giveitem_std ITEM_TM18, 1, 1 end ScorchedSlab_EventScript_1B18FF:: @ 81B18FF - giveitem ITEM_TM11, 1, 1 + giveitem_std ITEM_TM11, 1, 1 end SafariZone_Northwest_EventScript_1B190C:: @ 81B190C - giveitem ITEM_TM22, 1, 1 + giveitem_std ITEM_TM22, 1, 1 end SafariZone_Northeast_EventScript_1B1919:: @ 81B1919 - giveitem ITEM_CALCIUM, 1, 1 + giveitem_std ITEM_CALCIUM, 1, 1 end SafariZone_Southwest_EventScript_1B1926:: @ 81B1926 - giveitem ITEM_MAX_REVIVE, 1, 1 + giveitem_std ITEM_MAX_REVIVE, 1, 1 end MtPyre_2F_EventScript_1B1933:: @ 81B1933 - giveitem ITEM_ULTRA_BALL, 1, 1 + giveitem_std ITEM_ULTRA_BALL, 1, 1 end MtPyre_3F_EventScript_1B1940:: @ 81B1940 - giveitem ITEM_SUPER_REPEL, 1, 1 + giveitem_std ITEM_SUPER_REPEL, 1, 1 end MtPyre_4F_EventScript_1B194D:: @ 81B194D - giveitem ITEM_SEA_INCENSE, 1, 1 + giveitem_std ITEM_SEA_INCENSE, 1, 1 end MtPyre_5F_EventScript_1B195A:: @ 81B195A - giveitem ITEM_LAX_INCENSE, 1, 1 + giveitem_std ITEM_LAX_INCENSE, 1, 1 end MtPyre_6F_EventScript_1B1967:: @ 81B1967 - giveitem ITEM_TM30, 1, 1 + giveitem_std ITEM_TM30, 1, 1 end MtPyre_Exterior_EventScript_1B1974:: @ 81B1974 - giveitem ITEM_MAX_POTION, 1, 1 + giveitem_std ITEM_MAX_POTION, 1, 1 end MtPyre_Exterior_EventScript_1B1981:: @ 81B1981 - giveitem ITEM_TM48, 1, 1 + giveitem_std ITEM_TM48, 1, 1 end AquaHideout_B1F_EventScript_1B198E:: @ 81B198E - giveitem ITEM_MASTER_BALL, 1, 1 + giveitem_std ITEM_MASTER_BALL, 1, 1 end AquaHideout_B1F_EventScript_1B199B:: @ 81B199B - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end AquaHideout_B1F_EventScript_1B19A8:: @ 81B19A8 - giveitem ITEM_MAX_ELIXIR, 1, 1 + giveitem_std ITEM_MAX_ELIXIR, 1, 1 end AquaHideout_B2F_EventScript_1B19B5:: @ 81B19B5 - giveitem ITEM_NEST_BALL, 1, 1 + giveitem_std ITEM_NEST_BALL, 1, 1 end MagmaHideout_B1F_EventScript_1B19C2:: @ 81B19C2 - giveitem ITEM_MASTER_BALL, 1, 1 + giveitem_std ITEM_MASTER_BALL, 1, 1 end MagmaHideout_B1F_EventScript_1B19CF:: @ 81B19CF - giveitem ITEM_NUGGET, 1, 1 + giveitem_std ITEM_NUGGET, 1, 1 end MagmaHideout_B1F_EventScript_1B19DC:: @ 81B19DC - giveitem ITEM_MAX_ELIXIR, 1, 1 + giveitem_std ITEM_MAX_ELIXIR, 1, 1 end MagmaHideout_B2F_EventScript_1B19E9:: @ 81B19E9 - giveitem ITEM_NEST_BALL, 1, 1 + giveitem_std ITEM_NEST_BALL, 1, 1 end ShoalCave_LowTideEntranceRoom_EventScript_1B19F6:: @ 81B19F6 - giveitem ITEM_BIG_PEARL, 1, 1 + giveitem_std ITEM_BIG_PEARL, 1, 1 end ShoalCave_LowTideInnerRoom_EventScript_1B1A03:: @ 81B1A03 - giveitem ITEM_RARE_CANDY, 1, 1 + giveitem_std ITEM_RARE_CANDY, 1, 1 end ShoalCave_LowTideStairsRoom_EventScript_1B1A10:: @ 81B1A10 - giveitem ITEM_ICE_HEAL, 1, 1 + giveitem_std ITEM_ICE_HEAL, 1, 1 end ShoalCave_LowTideIceRoom_EventScript_1B1A1D:: @ 81B1A1D - giveitem ITEM_TM07, 1, 1 + giveitem_std ITEM_TM07, 1, 1 end ShoalCave_LowTideIceRoom_EventScript_1B1A2A:: @ 81B1A2A - giveitem ITEM_NEVER_MELT_ICE, 1, 1 + giveitem_std ITEM_NEVER_MELT_ICE, 1, 1 end SeafloorCavern_Room9_EventScript_1B1A37:: @ 81B1A37 - giveitem ITEM_TM26, 1, 1 + giveitem_std ITEM_TM26, 1, 1 end CaveOfOrigin_B3F_EventScript_1B1A44:: @ 81B1A44 - giveitem ITEM_HM07, 1, 1 + giveitem_std ITEM_HM07, 1, 1 end Route110_TrickHousePuzzle1_EventScript_1B1A51:: @ 81B1A51 - giveitem ITEM_ORANGE_MAIL, 1, 1 + giveitem_std ITEM_ORANGE_MAIL, 1, 1 end Route110_TrickHousePuzzle2_EventScript_1B1A5E:: @ 81B1A5E - giveitem ITEM_HARBOR_MAIL, 1, 1 + giveitem_std ITEM_HARBOR_MAIL, 1, 1 end Route110_TrickHousePuzzle2_EventScript_1B1A6B:: @ 81B1A6B - giveitem ITEM_WAVE_MAIL, 1, 1 + giveitem_std ITEM_WAVE_MAIL, 1, 1 end Route110_TrickHousePuzzle3_EventScript_1B1A78:: @ 81B1A78 - giveitem ITEM_SHADOW_MAIL, 1, 1 + giveitem_std ITEM_SHADOW_MAIL, 1, 1 end Route110_TrickHousePuzzle3_EventScript_1B1A85:: @ 81B1A85 - giveitem ITEM_WOOD_MAIL, 1, 1 + giveitem_std ITEM_WOOD_MAIL, 1, 1 end Route110_TrickHousePuzzle4_EventScript_1B1A92:: @ 81B1A92 - giveitem ITEM_MECH_MAIL, 1, 1 + giveitem_std ITEM_MECH_MAIL, 1, 1 end Route110_TrickHousePuzzle6_EventScript_1B1A9F:: @ 81B1A9F - giveitem ITEM_GLITTER_MAIL, 1, 1 + giveitem_std ITEM_GLITTER_MAIL, 1, 1 end Route110_TrickHousePuzzle7_EventScript_1B1AAC:: @ 81B1AAC - giveitem ITEM_TROPIC_MAIL, 1, 1 + giveitem_std ITEM_TROPIC_MAIL, 1, 1 end Route110_TrickHousePuzzle8_EventScript_1B1AB9:: @ 81B1AB9 - giveitem ITEM_BEAD_MAIL, 1, 1 + giveitem_std ITEM_BEAD_MAIL, 1, 1 end VictoryRoad_1F_EventScript_1B1AC6:: @ 81B1AC6 - giveitem ITEM_MAX_ELIXIR, 1, 1 + giveitem_std ITEM_MAX_ELIXIR, 1, 1 end VictoryRoad_1F_EventScript_1B1AD3:: @ 81B1AD3 - giveitem ITEM_PP_UP, 1, 1 + giveitem_std ITEM_PP_UP, 1, 1 end VictoryRoad_B1F_EventScript_1B1AE0:: @ 81B1AE0 - giveitem ITEM_TM29, 1, 1 + giveitem_std ITEM_TM29, 1, 1 end VictoryRoad_B1F_EventScript_1B1AED:: @ 81B1AED - giveitem ITEM_FULL_RESTORE, 1, 1 + giveitem_std ITEM_FULL_RESTORE, 1, 1 end VictoryRoad_B2F_EventScript_1B1AFA:: @ 81B1AFA - giveitem ITEM_FULL_HEAL, 1, 1 + giveitem_std ITEM_FULL_HEAL, 1, 1 end @ 81B1B07 - giveitem ITEM_HM08, 1, 1 + giveitem_std ITEM_HM08, 1, 1 end diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index b6b7401f3..3f47da1da 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -67,18 +67,18 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_setdivewarp @ 0x40 .4byte ScrCmd_setholewarp @ 0x41 .4byte ScrCmd_getplayerxy @ 0x42 - .4byte ScrCmd_countpokemon @ 0x43 - .4byte ScrCmd_additem @ 0x44 - .4byte ScrCmd_removeitem @ 0x45 + .4byte ScrCmd_getpartysize @ 0x43 + .4byte ScrCmd_giveitem @ 0x44 + .4byte ScrCmd_takeitem @ 0x45 .4byte ScrCmd_checkitemspace @ 0x46 .4byte ScrCmd_checkitem @ 0x47 .4byte ScrCmd_checkitemtype @ 0x48 - .4byte ScrCmd_addpcitem @ 0x49 + .4byte ScrCmd_givepcitem @ 0x49 .4byte ScrCmd_checkpcitem @ 0x4A - .4byte ScrCmd_adddecor @ 0x4B - .4byte ScrCmd_removedecor @ 0x4C - .4byte ScrCmd_hasdecor @ 0x4D - .4byte ScrCmd_checkdecor @ 0x4E + .4byte ScrCmd_givedecoration @ 0x4B + .4byte ScrCmd_takedecoration @ 0x4C + .4byte ScrCmd_checkdecor @ 0x4D + .4byte ScrCmd_checkdecorspace @ 0x4E .4byte ScrCmd_applymovement @ 0x4F .4byte ScrCmd_applymovement_at @ 0x50 .4byte ScrCmd_waitmovement @ 0x51 @@ -88,14 +88,14 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_addobject @ 0x55 .4byte ScrCmd_addobject_at @ 0x56 .4byte ScrCmd_setobjectxy @ 0x57 - .4byte ScrCmd_showobject @ 0x58 - .4byte ScrCmd_hideobject @ 0x59 + .4byte ScrCmd_showobjectat @ 0x58 + .4byte ScrCmd_hideobjectat @ 0x59 .4byte ScrCmd_faceplayer @ 0x5A .4byte ScrCmd_turnobject @ 0x5B .4byte ScrCmd_trainerbattle @ 0x5C - .4byte ScrCmd_battlebegin @ 0x5D - .4byte ScrCmd_ontrainerbattleend @ 0x5E - .4byte ScrCmd_ontrainerbattleendgoto @ 0x5F + .4byte ScrCmd_trainerbattlebegin @ 0x5D + .4byte ScrCmd_gotopostbattlescript @ 0x5E + .4byte ScrCmd_gotobeatenscript @ 0x5F .4byte ScrCmd_checktrainerflag @ 0x60 .4byte ScrCmd_settrainerflag @ 0x61 .4byte ScrCmd_cleartrainerflag @ 0x62 @@ -109,7 +109,7 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_lock @ 0x6A .4byte ScrCmd_releaseall @ 0x6B .4byte ScrCmd_release @ 0x6C - .4byte ScrCmd_waitbutton @ 0x6D + .4byte ScrCmd_waitbuttonpress @ 0x6D .4byte ScrCmd_yesnobox @ 0x6E .4byte ScrCmd_multichoice @ 0x6F .4byte ScrCmd_multichoicedefault @ 0x70 @@ -117,29 +117,29 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_drawbox @ 0x72 .4byte ScrCmd_erasebox @ 0x73 .4byte ScrCmd_drawboxtext @ 0x74 - .4byte ScrCmd_drawpokepic @ 0x75 - .4byte ScrCmd_erasepokepic @ 0x76 + .4byte ScrCmd_drawmonpic @ 0x75 + .4byte ScrCmd_erasemonpic @ 0x76 .4byte ScrCmd_drawcontestwinner @ 0x77 .4byte ScrCmd_braillemessage @ 0x78 - .4byte ScrCmd_givepoke @ 0x79 + .4byte ScrCmd_givemon @ 0x79 .4byte ScrCmd_giveegg @ 0x7A - .4byte ScrCmd_setpokemove @ 0x7B - .4byte ScrCmd_checkpokemove @ 0x7C - .4byte ScrCmd_getspeciesname @ 0x7D - .4byte ScrCmd_getfirstpartypokename @ 0x7E - .4byte ScrCmd_getpartypokename @ 0x7F - .4byte ScrCmd_getitemname @ 0x80 - .4byte ScrCmd_getdecorname @ 0x81 - .4byte ScrCmd_getmovename @ 0x82 - .4byte ScrCmd_getnumberstring @ 0x83 - .4byte ScrCmd_getstdstring @ 0x84 - .4byte ScrCmd_getstring @ 0x85 + .4byte ScrCmd_setmonmove @ 0x7B + .4byte ScrCmd_checkpartymove @ 0x7C + .4byte ScrCmd_bufferspeciesname @ 0x7D + .4byte ScrCmd_bufferleadmonspeciesname @ 0x7E + .4byte ScrCmd_bufferpartymonnick @ 0x7F + .4byte ScrCmd_bufferitemname @ 0x80 + .4byte ScrCmd_bufferdecorationname @ 0x81 + .4byte ScrCmd_buffermovename @ 0x82 + .4byte ScrCmd_buffernumberstring @ 0x83 + .4byte ScrCmd_bufferstdstring @ 0x84 + .4byte ScrCmd_bufferstring @ 0x85 .4byte ScrCmd_pokemart @ 0x86 - .4byte ScrCmd_pokemartdecor @ 0x87 - .4byte ScrCmd_pokemartbp @ 0x88 + .4byte ScrCmd_pokemartdecoration @ 0x87 + .4byte ScrCmd_pokemartdecoration2 @ 0x88 .4byte ScrCmd_playslotmachine @ 0x89 - .4byte ScrCmd_plantberrytree @ 0x8A - .4byte ScrCmd_choosecontestpkmn @ 0x8B + .4byte ScrCmd_setberrytree @ 0x8A + .4byte ScrCmd_choosecontestmon @ 0x8B .4byte ScrCmd_startcontest @ 0x8C .4byte ScrCmd_showcontestresults @ 0x8D .4byte ScrCmd_contestlinktransfer @ 0x8E @@ -152,21 +152,21 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_updatemoneybox @ 0x95 .4byte ScrCmd_getpricereduction @ 0x96 .4byte ScrCmd_fadescreen @ 0x97 - .4byte ScrCmd_fadescreendelay @ 0x98 - .4byte ScrCmd_setdarklevel @ 0x99 - .4byte ScrCmd_animdarklevel @ 0x9A + .4byte ScrCmd_fadescreenspeed @ 0x98 + .4byte ScrCmd_setflashradius @ 0x99 + .4byte ScrCmd_animateflash @ 0x9A .4byte ScrCmd_messageautoscroll @ 0x9B .4byte ScrCmd_dofieldeffect @ 0x9C - .4byte ScrCmd_setfieldeffect @ 0x9D + .4byte ScrCmd_setfieldeffectargument @ 0x9D .4byte ScrCmd_waitfieldeffect @ 0x9E - .4byte ScrCmd_sethealplace @ 0x9F + .4byte ScrCmd_setrespawn @ 0x9F .4byte ScrCmd_checkplayergender @ 0xA0 - .4byte ScrCmd_playpokecry @ 0xA1 - .4byte ScrCmd_setmaptile @ 0xA2 + .4byte ScrCmd_playmoncry @ 0xA1 + .4byte ScrCmd_setmetatile @ 0xA2 .4byte ScrCmd_resetweather @ 0xA3 .4byte ScrCmd_setweather @ 0xA4 .4byte ScrCmd_doweather @ 0xA5 - .4byte ScrCmd_tileeffect @ 0xA6 + .4byte ScrCmd_setstepcallback @ 0xA6 .4byte ScrCmd_setmaplayoutindex @ 0xA7 .4byte ScrCmd_setobjectpriority @ 0xA8 .4byte ScrCmd_resetobjectpriority @ 0xA9 @@ -190,14 +190,14 @@ gScriptCmdTable:: @ 814AE30 .4byte ScrCmd_vgoto_if @ 0xBB .4byte ScrCmd_vcall_if @ 0xBC .4byte ScrCmd_vmessage @ 0xBD - .4byte ScrCmd_vloadword @ 0xBE - .4byte ScrCmd_vgetstring @ 0xBF + .4byte ScrCmd_vloadptr @ 0xBE + .4byte ScrCmd_vbufferstring @ 0xBF .4byte ScrCmd_showcoinsbox @ 0xC0 .4byte ScrCmd_hidecoinsbox @ 0xC1 .4byte ScrCmd_updatecoinsbox @ 0xC2 .4byte ScrCmd_incrementgamestat @ 0xC3 .4byte ScrCmd_setescapewarp @ 0xC4 - .4byte ScrCmd_waitpokecry @ 0xC5 + .4byte ScrCmd_waitmoncry @ 0xC5 gScriptCmdTableEnd:: .4byte ScrCmd_nop diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index be1cafbdd..ab700cbc3 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -14,7 +14,7 @@ Route102_EventScript_1A1533:: @ 81A1533 lockall message Route102_Text_1A1946 waitmessage - waitbutton + waitbuttonpress releaseall end @@ -26,7 +26,7 @@ Route102_EventScript_1A153D:: @ 81A153D goto_if_eq Route102_EventScript_1A1558 message Route102_Text_1A16B6 waitmessage - waitbutton + waitbuttonpress release end @@ -45,7 +45,7 @@ Route102_EventScript_1A1577:: @ 81A1577 waitstate compare ITEM_ID, 0 goto_if_eq Route102_EventScript_1A1593 - removeitem ITEM_ID, 1 + takeitem ITEM_ID, 1 call Route102_EventScript_1A16A9 Route102_EventScript_1A1593:: @ 81A1593 @@ -56,21 +56,21 @@ Route102_EventScript_1A1595:: @ 81A1595 lockall message Route102_Text_1A172C waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15A2:: @ 81A15A2 lockall message Route102_Text_1A174B waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15AF:: @ 81A15AF lockall message Route102_Text_1A175C waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15BC:: @ 81A15BC @@ -78,7 +78,7 @@ Route102_EventScript_1A15BC:: @ 81A15BC lockall message Route102_Text_1A177D waitmessage - waitbutton + waitbuttonpress goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE @@ -86,19 +86,19 @@ Route102_EventScript_1A15CE:: @ 81A15CE goto_if_eq Route102_EventScript_1A15F2 compare 0x8005, 4 goto_if_eq Route102_EventScript_1A15EB - getstring 1, Route102_Text_1A17B7 + bufferstring 1, Route102_Text_1A17B7 return Route102_EventScript_1A15EB:: @ 81A15EB - getstring 1, Route102_Text_1A179F + bufferstring 1, Route102_Text_1A179F return Route102_EventScript_1A15F2:: @ 81A15F2 - getstring 1, Route102_Text_1A17B0 + bufferstring 1, Route102_Text_1A17B0 return Route102_EventScript_1A15F9:: @ 81A15F9 - getnumberstring 1, 0x8006 + buffernumberstring 1, 0x8006 lock faceplayer msgbox Route102_Text_1A17C0, 5 @@ -116,24 +116,24 @@ Route102_EventScript_1A161D:: @ 81A161D playfanfare 387 waitmessage waitfanfare - waitbutton + waitbuttonpress message Route102_Text_1A181A waitmessage - waitbutton + waitbuttonpress release end Route102_EventScript_1A1642:: @ 81A1642 message Route102_Text_1A1881 waitmessage - waitbutton + waitbuttonpress release end Route102_EventScript_1A164B:: @ 81A164B message Route102_Text_1A18C5 waitmessage - waitbutton + waitbuttonpress release end @@ -170,7 +170,7 @@ Route102_EventScript_1A1693:: @ 81A1693 waitstate message Route102_Text_1A1925 waitmessage - waitbutton + waitbuttonpress releaseall end @@ -179,5 +179,5 @@ Route102_EventScript_1A16A9:: @ 81A16A9 incrementgamestat GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB waitmessage - waitbutton + waitbuttonpress return diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 60ce36e43..0cedcd0d5 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -52,15 +52,15 @@ VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 end OldaleTown_PokemonCenter_2F_EventScript_1A3D6A:: @ 81A3D6A - setmaptile 5, 3, 514, 0 + setmetatile 5, 3, 514, 0 end OldaleTown_PokemonCenter_2F_EventScript_1A3D74:: @ 81A3D74 - setmaptile 8, 3, 514, 0 + setmetatile 8, 3, 514, 0 end OldaleTown_PokemonCenter_2F_EventScript_1A3D7E:: @ 81A3D7E - setmaptile 11, 3, 514, 0 + setmetatile 11, 3, 514, 0 end DewfordTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 @@ -119,7 +119,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E0C:: @ 81A3E0C OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 lockall call OldaleTown_PokemonCenter_2F_EventScript_1A3E30 - setmaptile 8, 3, 605, 1 + setmetatile 8, 3, 605, 1 special DrawWholeMapView erasebox 0, 0, 29, 19 releaseall @@ -147,14 +147,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 OldaleTown_PokemonCenter_2F_EventScript_1A3E7B:: @ 81A3E7B call OldaleTown_PokemonCenter_2F_EventScript_1A3DB2 - setmaptile 11, 3, 605, 1 + setmetatile 11, 3, 605, 1 special DrawWholeMapView end OldaleTown_PokemonCenter_2F_EventScript_1A3E8D:: @ 81A3E8D lockall call OldaleTown_PokemonCenter_2F_EventScript_1A3DDA - setmaptile 5, 3, 605, 1 + setmetatile 5, 3, 605, 1 special DrawWholeMapView erasebox 0, 0, 29, 19 releaseall @@ -221,7 +221,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E copyvar 0x4087, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmaptile 5, 3, 514, 0 + setmetatile 5, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -233,7 +233,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 5, 1 waitdooranim release @@ -255,7 +255,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD OldaleTown_PokemonCenter_2F_EventScript_1A3FDD:: @ 81A3FDD message OldaleTown_PokemonCenter_2F_Text_1A4696 waitmessage - waitbutton + waitbuttonpress message OldaleTown_PokemonCenter_2F_Text_1A4826 waitmessage goto OldaleTown_PokemonCenter_2F_EventScript_1A3EBC @@ -289,7 +289,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 message OldaleTown_PokemonCenter_2F_Text_1A486A waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF OldaleTown_PokemonCenter_2F_EventScript_1A4062:: @ 81A4062 @@ -307,28 +307,28 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4093:: @ 81A4093 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C03 waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40A2:: @ 81A40A2 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4BCC waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40B1:: @ 81A40B1 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B95 waitmessage - waitbutton + waitbuttonpress goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0 OldaleTown_PokemonCenter_2F_EventScript_1A40C0:: @ 81A40C0 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4C38 waitmessage - waitbutton + waitbuttonpress release end @@ -386,7 +386,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 copyvar 0x4087, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmaptile 8, 3, 514, 0 + setmetatile 8, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -398,7 +398,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 8, 1 waitdooranim release @@ -417,14 +417,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB OldaleTown_PokemonCenter_2F_EventScript_1A41E1:: @ 81A41E1 message OldaleTown_PokemonCenter_2F_Text_1A48A3 waitmessage - waitbutton + waitbuttonpress setvar RESULT, 0 return OldaleTown_PokemonCenter_2F_EventScript_1A41EE:: @ 81A41EE message OldaleTown_PokemonCenter_2F_Text_1A48DD waitmessage - waitbutton + waitbuttonpress setvar RESULT, 0 return @@ -484,7 +484,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 copyvar 0x4087, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage - setmaptile 11, 3, 514, 0 + setmetatile 11, 3, 514, 0 special DrawWholeMapView delay 60 applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -496,7 +496,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 waitdooranim applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F waitmovement 0 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 11, 1 waitdooranim release @@ -506,7 +506,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4AC8 waitmessage - waitbutton + waitbuttonpress release end @@ -514,7 +514,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4A85 waitmessage - waitbutton + waitbuttonpress release end @@ -522,7 +522,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4A30 waitmessage - waitbutton + waitbuttonpress release end @@ -530,7 +530,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B1D waitmessage - waitbutton + waitbuttonpress release end @@ -538,7 +538,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4319:: @ 81A4319 special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B59 waitmessage - waitbutton + waitbuttonpress release end @@ -552,7 +552,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A432D:: @ 81A432D special CloseLink message OldaleTown_PokemonCenter_2F_Text_1A4B6C waitmessage - waitbutton + waitbuttonpress release end @@ -598,7 +598,7 @@ OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361 gUnknown_081A4363:: @ 81A4363 lockall special ShowLinkBattleRecords - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -719,17 +719,17 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 end RecordCorner_EventScript_1A446C:: @ 81A446C - getitemname 1, 0x4001 + bufferitemname 1, 0x4001 message RecordCorner_Text_1A4E3B waitmessage - waitbutton + waitbuttonpress releaseall end TradeRoom_ReadTrainerCard1:: @ 81A4479 message CableClub_LookAtTrainerCard1 waitmessage - waitbutton + waitbuttonpress fadescreen 1 special sub_8083BDC waitstate @@ -738,7 +738,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479 TradeRoom_ReadTrainerCard2:: @ 81A4487 message CableClub_LookAtTrainerCard2 waitmessage - waitbutton + waitbuttonpress fadescreen 1 special sub_8083BDC waitstate @@ -747,7 +747,7 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487 TradeRoom_TooBusyToNotice:: @ 81A4495 message CableClub_TooBusyToNotice waitmessage - waitbutton + waitbuttonpress closemessage end @@ -755,7 +755,7 @@ SingleBattleColosseum_EventScript_1A449E:: @ 81A449E special sub_8064EAC message SingleBattleColosseum_Text_1A4D7E waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end @@ -764,7 +764,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD special sub_8064EAC message TradeCenter_Text_1A4DAB waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end @@ -775,7 +775,7 @@ RecordCorner_EventScript_1A44BC:: @ 81A44BC special sub_8064EAC message RecordCorner_Text_1A4DD7 waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end @@ -784,7 +784,7 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6 special sub_8064EAC message RecordCorner_Text_1A4DF7 waitmessage - waitbutton + waitbuttonpress special sub_8064ED4 closemessage end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index bc87b9a4e..50202c7d6 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F - getstdstring 0, 0x800b + bufferstdstring 0, 0x800b msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 @@ -43,7 +43,7 @@ FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 checkflag FLAG_RECEIVED_CONTEST_PASS goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44 msgbox FallarborTown_ContestLobby_Text_1A6583, 4 - giveitem ITEM_CONTEST_PASS + giveitem_std ITEM_CONTEST_PASS setflag FLAG_RECEIVED_CONTEST_PASS setflag FLAG_TEMP_1 msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 @@ -62,7 +62,7 @@ FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E end FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 - giveitem ITEM_LUXURY_BALL + giveitem_std ITEM_LUXURY_BALL compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 setvar 0x408a, 0 @@ -119,7 +119,7 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 - choosecontestpkmn + choosecontestmon compare 0x8004, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 @@ -260,8 +260,8 @@ LinkContestRoom1_EventScript_1A523F:: @ 81A523F return LinkContestRoom1_EventScript_1A5245:: @ 81A5245 - getstdstring 1, 0x8008 - getstdstring 2, 0x8009 + bufferstdstring 1, 0x8008 + bufferstdstring 2, 0x8009 call LinkContestRoom1_EventScript_1A525F lockall applymovement 1, LinkContestRoom1_Movement_1A5D87 @@ -339,7 +339,7 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 LinkContestRoom1_EventScript_1A5323:: @ 81A5323 special sub_80C4C64 addvar 0x8006, 1 - getnumberstring 1, 0x8006 + buffernumberstring 1, 0x8006 lockall applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C waitmovement 0 @@ -885,7 +885,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 special sub_80C47F0 special sub_80C4858 addvar 0x8005, 1 - getnumberstring 1, 0x8005 + buffernumberstring 1, 0x8005 addvar 0x8005, -1 call LinkContestRoom1_EventScript_1A5A75 applymovement 0x4003, LinkContestRoom1_Movement_1A5D99 @@ -1134,7 +1134,7 @@ LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D return LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B - giveitem ITEM_LUXURY_BALL + giveitem_std ITEM_LUXURY_BALL compare RESULT, 0 goto_if_eq LinkContestRoom1_EventScript_1A5D2D msgbox LinkContestRoom1_Text_1A6DF1, 3 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index a09e47810..fd3273c78 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -39,7 +39,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 playfanfare 367 waitfanfare waitmessage - waitbutton + waitbuttonpress msgbox Route117_Text_1B27CD, 4 special GiveEggFromDaycare clearflag FLAG_PENDING_DAYCARE_EGG @@ -70,7 +70,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE special SetDaycareCompatibilityString special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress setvar 0x8004, 0 call Route117_EventScript_1B22CD setvar 0x8004, 1 @@ -110,9 +110,9 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialvar 0x8005, GetSelectedDaycareMonNickname waitse - playpokecry 0x8005, 0 + playmoncry 0x8005, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 - waitpokecry + waitmoncry special StoreSelectedPokemonInDaycare incrementgamestat GAME_STAT_USED_DAYCARE specialvar RESULT, GetDaycareState @@ -211,9 +211,9 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse - playpokecry RESULT, 0 + playmoncry RESULT, 0 msgbox Route117_PokemonDayCare_Text_1B2B93, 4 - waitpokecry + waitmoncry specialvar RESULT, GetDaycareState compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B2520 diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 1bc38a099..c27951abb 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -15,11 +15,11 @@ AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 end AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 - setmaptile 11, 4, 563, 1 + setmetatile 11, 4, 563, 1 return AbandonedShip_Corridors_B1F_EventScript_15E9C0:: @ 815E9C0 - setmaptile 11, 4, 555, 1 + setmetatile 11, 4, 555, 1 return AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA @@ -35,7 +35,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse 21 - removeitem ITEM_STORAGE_KEY, 1 + takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_15E9C0 special DrawWholeMapView diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index b09a6e5f1..35e86543b 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -27,35 +27,35 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A end AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 - setmaptile 3, 8, 555, 1 + setmetatile 3, 8, 555, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD:: @ 815EBAD - setmaptile 6, 8, 555, 1 + setmetatile 6, 8, 555, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7:: @ 815EBB7 - setmaptile 3, 3, 538, 0 + setmetatile 3, 3, 538, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1:: @ 815EBC1 - setmaptile 9, 3, 538, 0 + setmetatile 9, 3, 538, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB:: @ 815EBCB - setmaptile 3, 8, 563, 1 + setmetatile 3, 8, 563, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5:: @ 815EBD5 - setmaptile 6, 8, 563, 1 + setmetatile 6, 8, 563, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF:: @ 815EBDF - setmaptile 3, 3, 564, 0 + setmetatile 3, 3, 564, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 - setmaptile 9, 3, 564, 0 + setmetatile 9, 3, 564, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 @@ -67,7 +67,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_1_KEY, 1 + takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 special DrawWholeMapView @@ -83,7 +83,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_2_KEY, 1 + takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD special DrawWholeMapView @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_4_KEY, 1 + takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 special DrawWholeMapView @@ -115,7 +115,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_6_KEY, 1 + takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 special DrawWholeMapView diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index eb5c1dccd..c1e77a8c7 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -39,9 +39,9 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B delay 20 - setfieldeffect 0, 10 - setfieldeffect 1, 10 - setfieldeffect 2, 0 + setfieldeffectargument 0, 10 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4D4 compare RESULT, 0 @@ -69,13 +69,13 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB delay 20 - setfieldeffect 0, 8 - setfieldeffect 1, 5 - setfieldeffect 2, 0 + setfieldeffectargument 0, 8 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 11 - setfieldeffect 1, 3 - setfieldeffect 2, 0 + setfieldeffectargument 0, 11 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4FC compare RESULT, 0 @@ -86,17 +86,17 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 delay 20 - setfieldeffect 0, 16 - setfieldeffect 1, 3 - setfieldeffect 2, 0 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 25 - setfieldeffect 1, 2 - setfieldeffect 2, 0 + setfieldeffectargument 0, 25 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 24 - setfieldeffect 1, 6 - setfieldeffect 2, 0 + setfieldeffectargument 0, 24 + setfieldeffectargument 1, 6 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4B0 compare RESULT, 0 @@ -109,30 +109,30 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A end AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B - setfieldeffect 0, 42 - setfieldeffect 1, 10 - setfieldeffect 2, 0 + setfieldeffectargument 0, 42 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B - setfieldeffect 0, 20 - setfieldeffect 1, 5 - setfieldeffect 2, 0 + setfieldeffectargument 0, 20 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B - setfieldeffect 0, 1 - setfieldeffect 1, 12 - setfieldeffect 2, 0 + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 12 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B - setfieldeffect 0, 1 - setfieldeffect 1, 2 - setfieldeffect 2, 0 + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 dofieldeffect 54 return diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 268563660..b849f41ba 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -23,12 +23,12 @@ AncientTomb_MapScript1_15EFE0:: @ 815EFE0 end AncientTomb_EventScript_15EFEA:: @ 815EFEA - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return AncientTomb_EventScript_15F021:: @ 815F021 @@ -36,7 +36,7 @@ AncientTomb_EventScript_15F021:: @ 815F021 checkflag FLAG_SYS_BRAILLE_FLY goto_if_eq AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -49,7 +49,7 @@ AncientTomb_EventScript_15F038:: @ 815F038 AncientTomb_EventScript_15F042:: @ 815F042 lockall braillemessage AncientTomb_Braille_1C552E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,9 +58,9 @@ AncientTomb_EventScript_15F050:: @ 815F050 lock faceplayer waitse - playpokecry SPECIES_REGISTEEL, 2 + playmoncry SPECIES_REGISTEEL, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag FLAG_HIDE_REGISTEEL setflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index ac97aa14b..828d975fc 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -6,13 +6,13 @@ BattleTower_Corridor_MapScripts:: @ 8160845 BattleTower_Corridor_MapScript1_160850:: @ 8160850 compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E - setmaptile 12, 0, 519, 0 - setmaptile 12, 1, 527, 0 + setmetatile 12, 0, 519, 0 + setmetatile 12, 1, 527, 0 end BattleTower_Corridor_EventScript_16086E:: @ 816086E - setmaptile 15, 0, 519, 0 - setmaptile 15, 1, 527, 0 + setmetatile 15, 0, 519, 0 + setmetatile 15, 1, 527, 0 end BattleTower_Corridor_MapScript2_160881:: @ 8160881 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 2186c8534..69db45ede 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -379,7 +379,7 @@ BattleTower_Lobby_EventScript_16071E:: @ 816071E BattleTower_Lobby_EventScript_160727:: @ 8160727 lockall special ShowBattleTowerRecords - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -393,7 +393,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar 0x8008, DECOR_SILVER_SHIELD - givedecoration DECOR_SILVER_SHIELD + givedecoration_std DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag FLAG_RECEIVED_SILVER_SHIELD @@ -407,7 +407,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar 0x8008, DECOR_GOLD_SHIELD - givedecoration DECOR_GOLD_SHIELD + givedecoration_std DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag FLAG_RECEIVED_GOLD_SHIELD @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - getdecorname 1, 0x8008 + bufferdecorationname 1, 0x8008 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 1a254f7df..e0aba0b9c 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -67,7 +67,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmovement 0 delay 30 - hideobject 5, 26, 4 + hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE setvar 0x8004, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index a2067fe60..1b5146760 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -38,9 +38,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special WaitWeather waitstate playse 209 - setfieldeffect 0, 9 - setfieldeffect 1, 13 - setfieldeffect 2, 0 + setfieldeffectargument 0, 9 + setfieldeffectargument 1, 13 + setfieldeffectargument 2, 0 dofieldeffect 54 waitfieldeffect 54 .ifdef SAPPHIRE @@ -58,9 +58,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 delay 60 setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE waitse - playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 + playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartGroudonKyogreBattle waitstate diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index c767dd7e7..7aa56a82d 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -19,12 +19,12 @@ DesertRuins_MapScript1_15CB11:: @ 815CB11 end DesertRuins_EventScript_15CB1B:: @ 815CB1B - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return DesertRuins_MapScript1_15CB52:: @ 815CB52 @@ -36,7 +36,7 @@ DesertRuins_EventScript_15CB56:: @ 815CB56 checkflag FLAG_SYS_BRAILLE_STRENGTH goto_if_eq DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -49,7 +49,7 @@ DesertRuins_EventScript_15CB6D:: @ 815CB6D DesertRuins_EventScript_15CB77:: @ 815CB77 lockall braillemessage DesertRuins_Braille_1C54C8 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,9 +58,9 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 lock faceplayer waitse - playpokecry SPECIES_REGIROCK, 2 + playmoncry SPECIES_REGIROCK, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag FLAG_HIDE_REGIROCK setflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 3d3240e81..bb1fdeda4 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -85,7 +85,7 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 DewfordTown_EventScript_14E0F0:: @ 814E0F0 msgbox DewfordTown_Text_16B6A8, 4 - giveitem ITEM_OLD_ROD + giveitem_std ITEM_OLD_ROD setflag FLAG_RECEIVED_OLD_ROD msgbox DewfordTown_Text_16B6F9, 4 release @@ -118,30 +118,30 @@ DewfordTown_EventScript_14E147:: @ 814E147 DewfordTown_EventScript_14E151:: @ 814E151 call DewfordTown_EventScript_1A010C - setobjectpriority 2, 0, 11, 0 - setobjectpriority 255, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - hideobject 255, 0, 11 + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E293 applymovement 255, DewfordTown_Movement_14E293 waitmovement 0 - showobject 255, 0, 19 + showobjectat 255, MAP_ROUTE104 call DewfordTown_EventScript_1A02EF applymovement 255, DewfordTown_Movement_14E405 waitmovement 0 - showobject 255, 0, 19 + showobjectat 255, MAP_ROUTE104 clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD - hideobject 4, 0, 11 + hideobjectat 4, MAP_DEWFORD_TOWN setvar 0x408e, 2 - resetobjectpriority 255, 0, 11 + resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar 0x4096, 0x8008 waitstate @@ -150,40 +150,40 @@ DewfordTown_EventScript_14E151:: @ 814E151 DewfordTown_EventScript_14E1D8:: @ 814E1D8 call DewfordTown_EventScript_1A010C - setobjectpriority 2, 0, 11, 0 - setobjectpriority 255, 0, 11, 1 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - hideobject 255, 0, 11 + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E356 applymovement 255, DewfordTown_Movement_14E356 waitmovement 0 call DewfordTown_EventScript_1A02EF - showobject 255, 0, 24 + showobjectat 255, MAP_ROUTE109 applymovement 255, DewfordTown_Movement_14E409 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 - setobjectpriority 2, 0, 24, 0 + setobjectpriority 2, MAP_ROUTE109, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 addobject 1 clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD - hideobject 4, 0, 11 + hideobjectat 4, MAP_DEWFORD_TOWN checkflag FLAG_DELIVERED_DEVON_GOODS call_if 0, DewfordTown_EventScript_14E281 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 11 - resetobjectpriority 2, 0, 24 + resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index cbcb4d5eb..afd918a96 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -20,23 +20,23 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto DewfordTown_Gym_EventScript_1530AE DewfordTown_Gym_EventScript_1530AA:: @ 81530AA - setdarklevel 0 + setflashradius 0 return DewfordTown_Gym_EventScript_1530AE:: @ 81530AE - setdarklevel 1 + setflashradius 1 return DewfordTown_Gym_EventScript_1530B2:: @ 81530B2 - setdarklevel 2 + setflashradius 2 return DewfordTown_Gym_EventScript_1530B6:: @ 81530B6 - setdarklevel 3 + setflashradius 3 return DewfordTown_Gym_EventScript_1530BA:: @ 81530BA - setdarklevel 4 + setflashradius 4 return DewfordTown_Gym_EventScript_1530BE:: @ 81530BE @@ -57,25 +57,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 playse 35 - animdarklevel 3 + animateflash 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 playse 35 - animdarklevel 2 + animateflash 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C playse 35 - animdarklevel 1 + animateflash 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 playse 35 - animdarklevel 0 + animateflash 0 call DewfordTown_Gym_EventScript_153071 return @@ -123,7 +123,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 - giveitem ITEM_TM08 + giveitem_std ITEM_TM08 compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 3c0565678..a3830ebb8 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -255,7 +255,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D checkflag FLAG_RECEIVED_TM36 goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 - giveitem ITEM_TM36 + giveitem_std ITEM_TM36 compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag FLAG_RECEIVED_TM36 diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/scripts/maps/DewfordTown_House1.inc index e8897b974..4a112eea2 100644 --- a/data/scripts/maps/DewfordTown_House1.inc +++ b/data/scripts/maps/DewfordTown_House1.inc @@ -13,8 +13,8 @@ DewfordTown_House1_EventScript_153001:: @ 8153001 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox DewfordTown_House1_Text_174CC8, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index 29ae58a22..e704efa50 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -7,7 +7,7 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC checkflag FLAG_RECEIVED_SILK_SCARF goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 - giveitem ITEM_SILK_SCARF + giveitem_std ITEM_SILK_SCARF compare RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B setflag FLAG_RECEIVED_SILK_SCARF diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index 70e75492e..c1288078f 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A - sethealplace 15 + setrespawn 15 call DewfordTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 setvar 0x800b, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index ae3cbd4ad..d59476417 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -46,8 +46,8 @@ EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playse 8 - setmaptile 6, 1, 838, 0 - setmaptile 6, 2, 839, 0 + setmetatile 6, 1, 838, 0 + setmetatile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closemessage diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index d9baaee89..904dc7531 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -51,16 +51,16 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 end EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 - sethealplace 1 - fadescreendelay 1, 24 + setrespawn 1 + fadescreenspeed 1, 24 special GameClear waitstate releaseall end EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D - sethealplace 2 - fadescreendelay 1, 24 + setrespawn 2 + fadescreenspeed 1, 24 special GameClear waitstate releaseall diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 57262b211..018658416 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C - sethealplace 11 + setrespawn 11 end EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 @@ -11,7 +11,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 setvar 0x800b, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index a78338808..4a8919b98 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 .byte 0 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B - sethealplace 20 + setrespawn 20 setflag FLAG_SYS_POKEMON_LEAGUE_FLY checkflag FLAG_ENTERED_ELITE_FOUR call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B @@ -18,7 +18,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A setvar 0x800b, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 70f3cbc3b..8ea580e28 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -35,9 +35,9 @@ FallarborTown_EventScript_14E826:: @ 814E826 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 0 + playmoncry SPECIES_AZURILL, 0 msgbox FallarborTown_Text_16C92C, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index b483b0259..72da4cd40 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -23,14 +23,14 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, FallarborTown_ContestLobby_Movement_153A8C @@ -115,7 +115,7 @@ FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 6c7509508..17267f926 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -25,7 +25,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 - giveitem ITEM_TM27 + giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index c827eea7b..001863d5c 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -43,7 +43,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A compare 0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 - removeitem ITEM_HEART_SCALE, 1 + takeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_153D60 end diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc index e6f715697..cfd239e8a 100644 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ b/data/scripts/maps/FallarborTown_Mart.inc @@ -41,8 +41,8 @@ FallarborTown_Mart_EventScript_1539AE:: @ 81539AE lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox FallarborTown_Mart_Text_1770D3, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 1e50c2fd6..dd6e83be3 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 - sethealplace 17 + setrespawn 17 call FallarborTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 setvar 0x800b, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index dd947d0e5..239c1410d 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -8,7 +8,7 @@ FortreeCity_MapScript1_14C94E:: @ 814C94E end FortreeCity_MapScript1_14C952:: @ 814C952 - tileeffect 2 + setstepcallback 2 end FortreeCity_EventScript_14C955:: @ 814C955 @@ -76,9 +76,9 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 applymovement LAST_TALKED, FortreeCity_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry applymovement LAST_TALKED, FortreeCity_Movement_14CA13 waitmovement 0 removeobject LAST_TALKED diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/scripts/maps/FortreeCity_DecorationShop.inc index fca20b866..56a360708 100644 --- a/data/scripts/maps/FortreeCity_DecorationShop.inc +++ b/data/scripts/maps/FortreeCity_DecorationShop.inc @@ -14,7 +14,7 @@ FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 waitmessage - pokemartdecor FortreeCity_DecorationShop_Decorations1 + pokemartdecoration FortreeCity_DecorationShop_Decorations1 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release end @@ -38,7 +38,7 @@ FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 waitmessage - pokemartdecor FortreeCity_DecorationShop_Decorations2 + pokemartdecoration FortreeCity_DecorationShop_Decorations2 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index d3f7be155..a0eb6186a 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -36,7 +36,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 end FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E - giveitem ITEM_TM40 + giveitem_std ITEM_TM40 compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 9ce96effe..14b9b2c31 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -28,7 +28,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 special sub_804DB68 special sub_804E174 waitstate - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_185737, 4 release end @@ -58,8 +58,8 @@ FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House1_Text_185888, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index 4d935e841..ae70b8644 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -21,7 +21,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 switch RESULT case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 - giveitem ITEM_TM10 + giveitem_std ITEM_TM10 compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM10 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 23a96af51..1b1b41877 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -34,7 +34,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 - giveitem ITEM_MENTAL_HERB + giveitem_std ITEM_MENTAL_HERB compare RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B setflag FLAG_RECEIVED_MENTAL_HERB @@ -60,8 +60,8 @@ FortreeCity_House4_EventScript_15821E:: @ 815821E lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox FortreeCity_House4_Text_18695C, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/scripts/maps/FortreeCity_House5.inc index fe10b53b0..888ebe0e2 100644 --- a/data/scripts/maps/FortreeCity_House5.inc +++ b/data/scripts/maps/FortreeCity_House5.inc @@ -13,8 +13,8 @@ FortreeCity_House5_EventScript_158244:: @ 8158244 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House5_Text_186A4F, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index 5268cbeed..b82927be1 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 - sethealplace 7 + setrespawn 7 end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B setvar 0x800b, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index 1932940c4..33296e510 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -7,7 +7,7 @@ GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 checkflag FLAG_RECEIVED_HM05 goto_if_eq GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 - giveitem ITEM_HM05 + giveitem_std ITEM_HM05 setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_194A3E, 4 release diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index 07a95c3f1..c6be3feca 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -5,6 +5,6 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD .byte 0 GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED - tileeffect 7 + setstepcallback 7 setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index dc61a77bf..344ccd479 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -9,7 +9,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 - giveitem ITEM_TM47 + giveitem_std ITEM_TM47 compare RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 6cf2d630b..18cfb904d 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -4,13 +4,13 @@ InsideOfTruck_MapScripts:: @ 815FBFF .byte 0 InsideOfTruck_MapScript1_15FC0A:: @ 815FC0A - setmaptile 4, 1, 520, 0 - setmaptile 4, 2, 528, 0 - setmaptile 4, 3, 536, 0 + setmetatile 4, 1, 520, 0 + setmetatile 4, 2, 528, 0 + setmetatile 4, 3, 536, 0 end InsideOfTruck_MapScript1_15FC26:: @ 815FC26 - tileeffect 5 + setstepcallback 5 end InsideOfTruck_EventScript_15FC29:: @ 815FC29 @@ -24,7 +24,7 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 end InsideOfTruck_EventScript_15FC45:: @ 815FC45 - sethealplace 1 + setrespawn 1 setvar 0x4092, 1 setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_MAY @@ -36,7 +36,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 end InsideOfTruck_EventScript_15FC68:: @ 815FC68 - sethealplace 2 + setrespawn 2 setvar 0x4092, 2 setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index e8489eb8a..dbc71b6bb 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -19,12 +19,12 @@ IslandCave_MapScript1_15EED4:: @ 815EED4 end IslandCave_EventScript_15EEDE:: @ 815EEDE - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return IslandCave_MapScript1_15EF15:: @ 815EF15 @@ -32,12 +32,12 @@ IslandCave_MapScript1_15EF15:: @ 815EF15 end S_OpenRegiceChamber:: @ 815EF19 - setmaptile 7, 19, 554, 1 - setmaptile 8, 19, 555, 1 - setmaptile 9, 19, 556, 1 - setmaptile 7, 20, 562, 1 - setmaptile 8, 20, 563, 0 - setmaptile 9, 20, 564, 1 + setmetatile 7, 19, 554, 1 + setmetatile 8, 19, 555, 1 + setmetatile 9, 19, 556, 1 + setmetatile 7, 20, 562, 1 + setmetatile 8, 20, 563, 0 + setmetatile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN setflag FLAG_SYS_BRAILLE_WAIT @@ -69,7 +69,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C end IslandCave_EventScript_15EF95:: @ 815EF95 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -78,9 +78,9 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D lock faceplayer waitse - playpokecry SPECIES_REGICE, 2 + playmoncry SPECIES_REGICE, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag FLAG_HIDE_REGICE setflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 6f910d0ad..c7efee318 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -4,7 +4,7 @@ JaggedPass_MapScripts:: @ 815D266 .byte 0 JaggedPass_MapScript1_15D271:: @ 815D271 - tileeffect 1 + setstepcallback 1 end JaggedPass_MapScript1_15D274:: @ 815D274 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 29b5ef2b9..8b4384ed8 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -83,7 +83,7 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB msgbox LavaridgeTown_Text_16BDA4, 4 - giveitem ITEM_GO_GOGGLES + giveitem_std ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16BE7D, 4 goto LavaridgeTown_EventScript_14E5F5 @@ -91,7 +91,7 @@ LavaridgeTown_EventScript_14E5AB:: @ 814E5AB LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 msgbox LavaridgeTown_Text_16BF92, 4 - giveitem ITEM_GO_GOGGLES + giveitem_std ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16C020, 4 goto LavaridgeTown_EventScript_14E5F5 @@ -277,7 +277,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A msgbox LavaridgeTown_Text_16C174, 5 compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E7B2 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index a44368925..9dd1ae59d 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -94,7 +94,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 end LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 - giveitem ITEM_TM50 + giveitem_std ITEM_TM50 compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index c5e033422..913734dd5 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -31,7 +31,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 checkflag FLAG_RECEIVED_CHARCOAL goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 - giveitem ITEM_CHARCOAL + giveitem_std ITEM_CHARCOAL compare RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag FLAG_RECEIVED_CHARCOAL diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/scripts/maps/LavaridgeTown_House.inc index c75cb9e4b..6fc14e0b6 100644 --- a/data/scripts/maps/LavaridgeTown_House.inc +++ b/data/scripts/maps/LavaridgeTown_House.inc @@ -9,8 +9,8 @@ LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox LavaridgeTown_House_Text_176D94, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index 9d0f31059..0efda9c1e 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 - sethealplace 16 + setrespawn 16 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B setvar 0x800b, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 30f0ff36e..6494f2a6f 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -15,18 +15,18 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 LilycoveCity_MapScript1_14CA3F:: @ 814CA3F .ifndef SAPPHIRE - setmaptile 69, 4, 169, 1 - setmaptile 70, 4, 680, 1 - setmaptile 71, 4, 681, 1 - setmaptile 72, 4, 682, 1 - setmaptile 69, 5, 145, 1 - setmaptile 70, 5, 688, 1 - setmaptile 71, 5, 689, 0 - setmaptile 72, 5, 690, 1 - setmaptile 69, 6, 446, 0 - setmaptile 70, 6, 447, 0 - setmaptile 71, 6, 368, 0 - setmaptile 72, 6, 445, 0 + setmetatile 69, 4, 169, 1 + setmetatile 70, 4, 680, 1 + setmetatile 71, 4, 681, 1 + setmetatile 72, 4, 682, 1 + setmetatile 69, 5, 145, 1 + setmetatile 70, 5, 688, 1 + setmetatile 71, 5, 689, 0 + setmetatile 72, 5, 690, 1 + setmetatile 69, 6, 446, 0 + setmetatile 70, 6, 447, 0 + setmetatile 71, 6, 368, 0 + setmetatile 72, 6, 445, 0 .endif checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE @@ -35,29 +35,29 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F end LilycoveCity_EventScript_14CABE:: @ 814CABE - setmaptile 76, 12, 656, 1 - setmaptile 77, 12, 657, 1 - setmaptile 76, 13, 672, 1 - setmaptile 77, 13, 673, 1 - setmaptile 76, 14, 664, 1 - setmaptile 77, 14, 665, 1 - setmaptile 76, 15, 672, 1 - setmaptile 77, 15, 673, 1 - setmaptile 77, 16, 664, 1 - setmaptile 78, 16, 665, 1 - setmaptile 77, 17, 672, 1 - setmaptile 78, 17, 673, 1 + setmetatile 76, 12, 656, 1 + setmetatile 77, 12, 657, 1 + setmetatile 76, 13, 672, 1 + setmetatile 77, 13, 673, 1 + setmetatile 76, 14, 664, 1 + setmetatile 77, 14, 665, 1 + setmetatile 76, 15, 672, 1 + setmetatile 77, 15, 673, 1 + setmetatile 77, 16, 664, 1 + setmetatile 78, 16, 665, 1 + setmetatile 77, 17, 672, 1 + setmetatile 78, 17, 673, 1 return LilycoveCity_EventScript_14CB2B:: @ 814CB2B - setmaptile 69, 4, 169, 1 - setmaptile 70, 4, 169, 1 - setmaptile 71, 4, 169, 1 - setmaptile 72, 4, 169, 1 - setmaptile 69, 5, 145, 1 - setmaptile 70, 5, 145, 1 - setmaptile 71, 5, 145, 1 - setmaptile 72, 5, 145, 1 + setmetatile 69, 4, 169, 1 + setmetatile 70, 4, 169, 1 + setmetatile 71, 4, 169, 1 + setmetatile 72, 4, 169, 1 + setmetatile 69, 5, 145, 1 + setmetatile 70, 5, 145, 1 + setmetatile 71, 5, 145, 1 + setmetatile 72, 5, 145, 1 return LilycoveCity_EventScript_14CB74:: @ 814CB74 @@ -69,7 +69,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE @@ -415,7 +415,7 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject LAST_TALKED diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 6a1bc09e8..c97a01989 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -360,7 +360,7 @@ LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35 LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 - choosecontestpkmn + choosecontestmon compare 0x8004, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 @@ -472,7 +472,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C addvar 0x8004, 1 - getnumberstring 1, 32772 + buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage addvar 0x8004, 65535 @@ -497,14 +497,14 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 playse 71 - setmaptile 9, 2, 545, 1 - setmaptile 9, 3, 609, 1 + setmetatile 9, 2, 545, 1 + setmetatile 9, 3, 609, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 playse 71 - setmaptile 9, 2, 721, 1 - setmaptile 9, 3, 729, 1 + setmetatile 9, 2, 721, 1 + setmetatile 9, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE @@ -585,7 +585,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar 0x4094, 0x1 - additem ITEM_CONTEST_PASS, 1 + giveitem ITEM_CONTEST_PASS, 1 setvar 0x800b, 8 setvar CONTEST_RANK, 3 setvar 0x4099, 1 @@ -636,14 +636,14 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, LilycoveCity_ContestLobby_Movement_15901C @@ -765,7 +765,7 @@ LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 7078a83ca..2806b6125 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -23,7 +23,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 faceplayer message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4 waitmessage - pokemartdecor LilycoveCity_DepartmentStoreRooftop_Decorations + pokemartdecoration LilycoveCity_DepartmentStoreRooftop_Decorations msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4 release end @@ -146,12 +146,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop - getitemname 0, 0x4000 + bufferitemname 0, 0x4000 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -161,9 +161,9 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -173,9 +173,9 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index cfcca25fb..dbfd79e98 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - getitemname 0, 0x8005 + bufferitemname 0, 0x8005 compare 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare 0x8004, 2 @@ -49,7 +49,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A compare 0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem 0x8005 + giveitem_std 0x8005 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E @@ -111,7 +111,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 - giveitem 0x4045 + giveitem_std 0x4045 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 @@ -134,9 +134,9 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc index 835a0f48d..184d3b816 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items1 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items1 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -34,7 +34,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items2 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items2 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -59,7 +59,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items3 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items3 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -84,7 +84,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items4 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items4 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 7385f8c72..9687c73fe 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -79,13 +79,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 13, 10 + hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -117,7 +117,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 13, 10 + hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 @@ -134,7 +134,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/scripts/maps/LilycoveCity_House1.inc index 4defe37b8..15535a122 100644 --- a/data/scripts/maps/LilycoveCity_House1.inc +++ b/data/scripts/maps/LilycoveCity_House1.inc @@ -9,8 +9,8 @@ LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F lock faceplayer waitse - playpokecry SPECIES_KECLEON, 0 + playmoncry SPECIES_KECLEON, 0 msgbox LilycoveCity_House1_Text_18B82B, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index bbca8aa6d..d0065c9e8 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -7,7 +7,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 checkflag FLAG_RECEIVED_TM44 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 - giveitem ITEM_TM44 + giveitem_std ITEM_TM44 compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM44 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index db9855211..577805fb2 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -33,32 +33,32 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD - setmaptile 10, 6, 606, 1 - setmaptile 11, 6, 607, 1 + setmetatile 10, 6, 606, 1 + setmetatile 11, 6, 607, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615 - setmaptile 18, 6, 604, 1 - setmaptile 19, 6, 605, 1 + setmetatile 18, 6, 604, 1 + setmetatile 19, 6, 605, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D - setmaptile 14, 10, 608, 1 - setmaptile 15, 10, 609, 1 + setmetatile 14, 10, 608, 1 + setmetatile 15, 10, 609, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645 - setmaptile 6, 10, 602, 1 - setmaptile 7, 10, 603, 1 + setmetatile 6, 10, 602, 1 + setmetatile 7, 10, 603, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D - setmaptile 2, 6, 610, 1 - setmaptile 3, 6, 611, 1 + setmetatile 2, 6, 610, 1 + setmetatile 3, 6, 611, 1 end LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 @@ -124,7 +124,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 - givedecoration DECOR_GLASS_ORNAMENT + givedecoration_std DECOR_GLASS_ORNAMENT compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag FLAG_RECEIVED_GLASS_ORNAMENT diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index d1be7b704..38428311b 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D - sethealplace 8 + setrespawn 8 end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 setvar 0x800b, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 52c52b798..13c18d51e 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -124,7 +124,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmovement 0 setflag FLAG_HIDE_MOM_LITTLEROOT setvar 0x4092, 3 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 0x8004, 0x8005 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT @@ -599,7 +599,7 @@ LittlerootTown_EventScript_14DB46:: @ 814DB46 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -611,7 +611,7 @@ LittlerootTown_EventScript_14DB6C:: @ 814DB6C waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -623,7 +623,7 @@ LittlerootTown_EventScript_14DB92:: @ 814DB92 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -635,7 +635,7 @@ LittlerootTown_EventScript_14DBB8:: @ 814DBB8 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -647,7 +647,7 @@ LittlerootTown_EventScript_14DBDE:: @ 814DBDE waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -659,7 +659,7 @@ LittlerootTown_EventScript_14DC04:: @ 814DC04 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -671,7 +671,7 @@ LittlerootTown_EventScript_14DC2A:: @ 814DC2A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -683,7 +683,7 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -853,7 +853,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim goto LittlerootTown_EventScript_14DD2B diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 731e6fb5f..d4dd94aae 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -12,8 +12,8 @@ LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B end LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 - setmaptile 5, 4, 624, 1 - setmaptile 5, 2, 616, 1 + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 return LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 @@ -23,7 +23,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 return LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 - setmaptile 3, 7, 659, 1 + setmetatile 3, 7, 659, 1 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index d65e943fd..e23a05243 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -12,8 +12,8 @@ LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 end LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E - setmaptile 5, 4, 624, 1 - setmaptile 5, 2, 616, 1 + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 return LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 @@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 return LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE - setmaptile 6, 7, 659, 1 + setmetatile 6, 7, 659, 1 return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index f78d30ec2..6792c5932 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -24,7 +24,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE lockall - getfirstpartypokename 0 + bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage playfanfare 370 @@ -138,7 +138,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 - giveitem ITEM_POKE_BALL, 5 + giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 @@ -147,7 +147,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 - giveitem ITEM_POKE_BALL, 5 + giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index ae00ca369..6a7e02848 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -291,7 +291,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 checkflag FLAG_RECEIVED_BASEMENT_KEY goto_if_eq MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 - giveitem ITEM_BASEMENT_KEY + giveitem_std ITEM_BASEMENT_KEY setflag FLAG_RECEIVED_BASEMENT_KEY msgbox MauvilleCity_Text_166331, 4 release @@ -304,7 +304,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 - giveitem ITEM_TM24 + giveitem_std ITEM_TM24 compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag FLAG_RECEIVED_TM24 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index ef44a20bb..6c2dc57e1 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -46,13 +46,13 @@ MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D msgbox MauvilleCity_BikeShop_Text_181332, 4 - giveitem ITEM_MACH_BIKE + giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_156847:: @ 8156847 msgbox MauvilleCity_BikeShop_Text_18134A, 4 - giveitem ITEM_ACRO_BIKE + giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end @@ -90,16 +90,16 @@ MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181439, 4 - removeitem ITEM_ACRO_BIKE, 1 - giveitem ITEM_MACH_BIKE + takeitem ITEM_ACRO_BIKE, 1 + giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181408, 4 - removeitem ITEM_MACH_BIKE, 1 - giveitem ITEM_ACRO_BIKE + takeitem ITEM_MACH_BIKE, 1 + giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 646546dc7..8228238f3 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -129,17 +129,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 setvar 0x4001, 1 - getdecorname 0, 88 + bufferdecorationname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 setvar 0x4001, 2 - getdecorname 0, 89 + bufferdecorationname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE setvar 0x4001, 3 - getdecorname 0, 90 + bufferdecorationname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C @@ -156,12 +156,12 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 88 - checkdecor 88 + bufferdecorationname 1, 88 + checkdecorspace 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 88 + givedecoration 88 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -172,12 +172,12 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 89 - checkdecor 89 + bufferdecorationname 1, 89 + checkdecorspace 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 89 + givedecoration 89 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -188,12 +188,12 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 90 - checkdecor 90 + bufferdecorationname 1, 90 + checkdecorspace 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 90 + givedecoration 90 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar 0x4001, 1 - getitemname 0, ITEM_TM32 + bufferitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar 0x4001, 2 - getitemname 0, ITEM_TM29 + bufferitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar 0x4001, 3 - getitemname 0, ITEM_TM35 + bufferitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar 0x4001, 4 - getitemname 0, ITEM_TM24 + bufferitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar 0x4001, 5 - getitemname 0, ITEM_TM13 + bufferitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC @@ -295,7 +295,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 1500 - additem ITEM_TM32, 1 + giveitem ITEM_TM32, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -310,7 +310,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 3500 - additem ITEM_TM29, 1 + giveitem ITEM_TM29, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -325,7 +325,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM35, 1 + giveitem ITEM_TM35, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -340,7 +340,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM24, 1 + giveitem ITEM_TM24, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -355,7 +355,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM13, 1 + giveitem ITEM_TM13, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -401,34 +401,34 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 end MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB - getdecorname 1, DECOR_TREECKO_DOLL - checkdecor DECOR_TREECKO_DOLL + bufferdecorationname 1, DECOR_TREECKO_DOLL + checkdecorspace DECOR_TREECKO_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration DECOR_TREECKO_DOLL + givedecoration_std DECOR_TREECKO_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 - getdecorname 1, DECOR_TORCHIC_DOLL - checkdecor DECOR_TORCHIC_DOLL + bufferdecorationname 1, DECOR_TORCHIC_DOLL + checkdecorspace DECOR_TORCHIC_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration DECOR_TORCHIC_DOLL + givedecoration_std DECOR_TORCHIC_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F - getdecorname 1, DECOR_MUDKIP_DOLL - checkdecor DECOR_MUDKIP_DOLL + bufferdecorationname 1, DECOR_MUDKIP_DOLL + checkdecorspace DECOR_MUDKIP_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration DECOR_MUDKIP_DOLL + givedecoration_std DECOR_MUDKIP_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index d94436973..799fb0992 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -18,31 +18,31 @@ MauvilleCity_Gym_EventScript_156491:: @ 8156491 end MauvilleCity_Gym_EventScript_15649B:: @ 815649B - setmaptile 4, 7, 560, 0 - setmaptile 4, 8, 568, 0 - setmaptile 5, 7, 561, 0 - setmaptile 5, 8, 569, 0 - setmaptile 3, 8, 578, 1 - setmaptile 3, 9, 538, 0 - setmaptile 3, 10, 593, 0 - setmaptile 1, 10, 546, 0 - setmaptile 1, 11, 554, 1 - setmaptile 2, 10, 547, 0 - setmaptile 2, 11, 555, 1 - setmaptile 4, 10, 546, 0 - setmaptile 4, 11, 554, 1 - setmaptile 5, 10, 547, 0 - setmaptile 5, 11, 555, 1 - setmaptile 6, 11, 578, 1 - setmaptile 6, 12, 538, 0 - setmaptile 6, 13, 593, 0 - setmaptile 3, 11, 577, 1 - setmaptile 3, 12, 585, 1 - setmaptile 3, 13, 592, 1 - setmaptile 4, 13, 560, 0 - setmaptile 4, 14, 568, 0 - setmaptile 5, 13, 561, 0 - setmaptile 5, 14, 569, 0 + setmetatile 4, 7, 560, 0 + setmetatile 4, 8, 568, 0 + setmetatile 5, 7, 561, 0 + setmetatile 5, 8, 569, 0 + setmetatile 3, 8, 578, 1 + setmetatile 3, 9, 538, 0 + setmetatile 3, 10, 593, 0 + setmetatile 1, 10, 546, 0 + setmetatile 1, 11, 554, 1 + setmetatile 2, 10, 547, 0 + setmetatile 2, 11, 555, 1 + setmetatile 4, 10, 546, 0 + setmetatile 4, 11, 554, 1 + setmetatile 5, 10, 547, 0 + setmetatile 5, 11, 555, 1 + setmetatile 6, 11, 578, 1 + setmetatile 6, 12, 538, 0 + setmetatile 6, 13, 593, 0 + setmetatile 3, 11, 577, 1 + setmetatile 3, 12, 585, 1 + setmetatile 3, 13, 592, 1 + setmetatile 4, 13, 560, 0 + setmetatile 4, 14, 568, 0 + setmetatile 5, 13, 561, 0 + setmetatile 5, 14, 569, 0 end MauvilleCity_Gym_EventScript_15657D:: @ 815657D @@ -96,7 +96,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB end MauvilleCity_Gym_EventScript_15661D:: @ 815661D - giveitem ITEM_TM34 + giveitem_std ITEM_TM34 compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index acb9f39fa..210288517 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -7,7 +7,7 @@ MauvilleCity_House1_EventScript_1569FD:: @ 81569FD checkflag FLAG_RECEIVED_HM06 goto_if_eq MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 - giveitem ITEM_HM06 + giveitem_std ITEM_HM06 setflag FLAG_RECEIVED_HM06 msgbox MauvilleCity_House1_Text_181B64, 4 release diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 7104ebee7..a058003bc 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -28,8 +28,8 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 MauvilleCity_House2_EventScript_15731B:: @ 815731B msgbox MauvilleCity_House2_Text_182515, 4 - removeitem ITEM_HARBOR_MAIL, 1 - giveitem ITEM_COIN_CASE + takeitem ITEM_HARBOR_MAIL, 1 + giveitem_std ITEM_COIN_CASE setflag FLAG_RECEIVED_COIN_CASE goto MauvilleCity_House2_EventScript_15733D end diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index 7122b8c3c..de30e21cd 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 - sethealplace 5 + setrespawn 5 call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B goto MauvilleCity_PokemonCenter_1F_EventScript_157365 end @@ -16,7 +16,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 setvar 0x800b, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 31ed83b2a..f165bd3ef 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -74,7 +74,7 @@ MossdeepCity_EventScript_14D027:: @ 814D027 compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 - giveitem ITEM_KINGS_ROCK + giveitem_std ITEM_KINGS_ROCK compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B setflag FLAG_RECEIVED_KINGS_ROCK diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index afc02e82c..75fc3c6b8 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -11,8 +11,8 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 end MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 - setmaptile 3, 0, 653, 1 - setmaptile 3, 1, 661, 1 + setmetatile 3, 0, 653, 1 + setmetatile 3, 1, 661, 1 return MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 94f44e311..12a94154b 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -48,14 +48,14 @@ MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 setvar 0x40c0, 1 special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress return MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE setvar 0x40c0, 2 special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress return MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 0c27c28f7..b1550a4c1 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -26,26 +26,26 @@ MossdeepCity_Gym_EventScript_15A506:: @ 815A506 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 - setmaptile 5, 5, 516, 0 - setmaptile 2, 7, 569, 1 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A528:: @ 815A528 - setmaptile 8, 14, 516, 0 - setmaptile 8, 10, 569, 1 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A540:: @ 815A540 - setmaptile 15, 17, 524, 0 - setmaptile 17, 15, 569, 1 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A558:: @ 815A558 - setmaptile 1, 23, 525, 0 - setmaptile 5, 24, 569, 1 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B @@ -72,7 +72,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 end MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 - giveitem ITEM_TM04 + giveitem_std ITEM_TM04 compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 @@ -87,8 +87,8 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 5, 5, 516, 0 - setmaptile 2, 7, 569, 1 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -102,8 +102,8 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 5, 5, 524, 0 - setmaptile 2, 7, 568, 1 + setmetatile 5, 5, 524, 0 + setmetatile 2, 7, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -114,8 +114,8 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 8, 14, 516, 0 - setmaptile 8, 10, 569, 1 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -123,8 +123,8 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 8, 14, 517, 0 - setmaptile 8, 10, 568, 1 + setmetatile 8, 14, 517, 0 + setmetatile 8, 10, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -135,8 +135,8 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 15, 17, 524, 0 - setmaptile 17, 15, 569, 1 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -144,8 +144,8 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 15, 17, 516, 0 - setmaptile 17, 15, 568, 1 + setmetatile 15, 17, 516, 0 + setmetatile 17, 15, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -156,8 +156,8 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 1, 23, 525, 0 - setmaptile 5, 24, 569, 1 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -165,8 +165,8 @@ MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 1, 23, 516, 0 - setmaptile 5, 24, 568, 1 + setmetatile 1, 23, 516, 0 + setmetatile 5, 24, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 62edffc8b..97a5fc452 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -4,7 +4,7 @@ MossdeepCity_House1_MapScripts:: @ 815A82E MossdeepCity_House1_EventScript_15A82F:: @ 815A82F lock faceplayer - getfirstpartypokename 0 + bufferleadmonspeciesname 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialvar RESULT, GetPokeblockNameByMonNature compare RESULT, 0 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index f90fc9350..1da204ff0 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -13,9 +13,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox MossdeepCity_House2_Text_18D61E, 4 - waitpokecry + waitmoncry closemessage setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 63054a60c..6632ac793 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -10,7 +10,7 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 compare RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 - giveitem ITEM_SUPER_ROD + giveitem_std ITEM_SUPER_ROD setflag FLAG_RECEIVED_SUPER_ROD msgbox MossdeepCity_House3_Text_18D9E3, 4 release diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index fd400ad16..856ee1287 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -35,8 +35,8 @@ MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox MossdeepCity_House4_Text_18E1E1, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index 4ed3ea57e..c26238102 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 - sethealplace 9 + setrespawn 9 end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA setvar 0x800b, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 165742145..884124567 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B faceplayer dodailyevents specialvar RESULT, GetWeekCount - getnumberstring 0, RESULT + buffernumberstring 0, RESULT compare RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 @@ -35,7 +35,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 - giveitem ITEM_SUN_STONE + giveitem_std ITEM_SUN_STONE compare RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 55ee9ebac..7e08cfa69 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -10,7 +10,7 @@ MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 end MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF - setmaptile 6, 4, 753, 1 + setmetatile 6, 4, 753, 1 return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 @@ -39,7 +39,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 - giveitem ITEM_HM08 + giveitem_std ITEM_HM08 setflag FLAG_RECEIVED_HM08 setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 @@ -74,7 +74,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 compare RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT @@ -83,8 +83,8 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage - givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 - getspeciesname 1, SPECIES_BELDUM + givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 + bufferspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 @@ -125,6 +125,6 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 end MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 - giveitem ITEM_HM08, 1, 1 + giveitem_std ITEM_HM08, 1, 1 setflag FLAG_RECEIVED_HM08 end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 0a3570d6d..a51695b59 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -9,7 +9,7 @@ MtChimney_MapScript1_15CF87:: @ 815CF87 end MtChimney_MapScript1_15CF92:: @ 815CF92 - tileeffect 1 + setstepcallback 1 end MtChimney_EventScript_15CF95:: @ 815CF95 @@ -27,7 +27,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 checkitemspace ITEM_LAVA_COOKIE, 1 compare RESULT, 1 call_if 1, MtChimney_EventScript_15D000 - giveitem ITEM_LAVA_COOKIE + giveitem_std ITEM_LAVA_COOKIE compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoneybox 0, 0 @@ -414,7 +414,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 - giveitem ITEM_METEORITE + giveitem_std ITEM_METEORITE setflag FLAG_RECEIVED_METEORITE releaseall end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 5d6e42874..7073000d5 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -7,7 +7,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 checkflag FLAG_RECEIVED_CLEANSE_TAG goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 - giveitem ITEM_CLEANSE_TAG + giveitem_std ITEM_CLEANSE_TAG compare RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B setflag FLAG_RECEIVED_CLEANSE_TAG diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index 90ad1d9cc..1d2368597 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -5,7 +5,7 @@ MtPyre_2F_MapScripts:: @ 815D36E .byte 0 MtPyre_2F_MapScript1_15D37E:: @ 815D37E - tileeffect 7 + setstepcallback 7 setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 47a842b56..73e2e4d97 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -63,7 +63,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 .else msgbox MtPyre_Summit_Text_1B5FE6, 4 .endif - giveitem ITEM_RED_OR_BLUE_ORB + giveitem_std ITEM_RED_OR_BLUE_ORB setflag FLAG_RECEIVED_RED_OR_BLUE_ORB releaseall end diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 1234f5653..a88b35087 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -9,12 +9,12 @@ NewMauville_Entrance_MapScript1_15E495:: @ 815E495 end NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 - setmaptile 3, 0, 788, 1 - setmaptile 4, 0, 789, 1 - setmaptile 5, 0, 790, 1 - setmaptile 3, 1, 796, 1 - setmaptile 4, 1, 797, 1 - setmaptile 5, 1, 798, 1 + setmetatile 3, 0, 788, 1 + setmetatile 4, 0, 789, 1 + setmetatile 5, 0, 790, 1 + setmetatile 3, 1, 796, 1 + setmetatile 4, 1, 797, 1 + setmetatile 5, 1, 798, 1 return NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 @@ -33,12 +33,12 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 - setmaptile 3, 0, 707, 0 - setmaptile 4, 0, 708, 0 - setmaptile 5, 0, 709, 0 - setmaptile 3, 1, 715, 1 - setmaptile 4, 1, 716, 0 - setmaptile 5, 1, 717, 1 + setmetatile 3, 0, 707, 0 + setmetatile 4, 0, 708, 0 + setmetatile 5, 0, 709, 0 + setmetatile 3, 1, 715, 1 + setmetatile 4, 1, 716, 0 + setmetatile 5, 1, 717, 1 special DrawWholeMapView playse 20 setvar 0x40ba, 1 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index aa6cf6310..aefb23c61 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -48,83 +48,83 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 end NewMauville_Inside_EventScript_15E5DA:: @ 815E5DA - setmaptile 23, 34, 617, 1 - setmaptile 23, 35, 625, 1 - setmaptile 23, 36, 621, 0 - setmaptile 23, 37, 641, 0 - setmaptile 10, 16, 617, 1 - setmaptile 10, 17, 625, 1 - setmaptile 10, 18, 621, 0 - setmaptile 10, 19, 641, 0 - setmaptile 10, 0, 617, 1 - setmaptile 10, 1, 625, 1 - setmaptile 10, 2, 621, 0 - setmaptile 10, 3, 641, 0 - setmaptile 37, 33, 694, 1 - setmaptile 37, 34, 702, 1 - setmaptile 37, 35, 710, 1 - setmaptile 37, 36, 718, 1 - setmaptile 28, 22, 694, 1 - setmaptile 28, 23, 702, 1 - setmaptile 28, 24, 710, 1 - setmaptile 28, 25, 718, 1 - setmaptile 10, 24, 694, 1 - setmaptile 10, 25, 702, 1 - setmaptile 10, 26, 710, 1 - setmaptile 10, 27, 718, 1 - setmaptile 21, 2, 694, 1 - setmaptile 21, 3, 702, 1 - setmaptile 21, 4, 710, 1 - setmaptile 21, 5, 718, 1 - setmaptile 6, 11, 591, 0 - setmaptile 13, 10, 591, 0 - setmaptile 16, 22, 591, 0 - setmaptile 4, 26, 591, 0 - setmaptile 30, 38, 591, 0 - setmaptile 2, 11, 558, 0 - setmaptile 17, 10, 558, 0 - setmaptile 25, 18, 558, 0 - setmaptile 18, 36, 558, 0 + setmetatile 23, 34, 617, 1 + setmetatile 23, 35, 625, 1 + setmetatile 23, 36, 621, 0 + setmetatile 23, 37, 641, 0 + setmetatile 10, 16, 617, 1 + setmetatile 10, 17, 625, 1 + setmetatile 10, 18, 621, 0 + setmetatile 10, 19, 641, 0 + setmetatile 10, 0, 617, 1 + setmetatile 10, 1, 625, 1 + setmetatile 10, 2, 621, 0 + setmetatile 10, 3, 641, 0 + setmetatile 37, 33, 694, 1 + setmetatile 37, 34, 702, 1 + setmetatile 37, 35, 710, 1 + setmetatile 37, 36, 718, 1 + setmetatile 28, 22, 694, 1 + setmetatile 28, 23, 702, 1 + setmetatile 28, 24, 710, 1 + setmetatile 28, 25, 718, 1 + setmetatile 10, 24, 694, 1 + setmetatile 10, 25, 702, 1 + setmetatile 10, 26, 710, 1 + setmetatile 10, 27, 718, 1 + setmetatile 21, 2, 694, 1 + setmetatile 21, 3, 702, 1 + setmetatile 21, 4, 710, 1 + setmetatile 21, 5, 718, 1 + setmetatile 6, 11, 591, 0 + setmetatile 13, 10, 591, 0 + setmetatile 16, 22, 591, 0 + setmetatile 4, 26, 591, 0 + setmetatile 30, 38, 591, 0 + setmetatile 2, 11, 558, 0 + setmetatile 17, 10, 558, 0 + setmetatile 25, 18, 558, 0 + setmetatile 18, 36, 558, 0 return NewMauville_Inside_EventScript_15E728:: @ 815E728 - setmaptile 23, 34, 695, 1 - setmaptile 23, 35, 703, 1 - setmaptile 23, 36, 711, 1 - setmaptile 23, 37, 719, 1 - setmaptile 10, 16, 695, 1 - setmaptile 10, 17, 703, 1 - setmaptile 10, 18, 711, 1 - setmaptile 10, 19, 719, 1 - setmaptile 10, 0, 695, 1 - setmaptile 10, 1, 703, 1 - setmaptile 10, 2, 711, 1 - setmaptile 10, 3, 719, 1 - setmaptile 37, 33, 617, 1 - setmaptile 37, 34, 625, 1 - setmaptile 37, 35, 621, 0 - setmaptile 37, 36, 641, 0 - setmaptile 28, 22, 617, 1 - setmaptile 28, 23, 625, 1 - setmaptile 28, 24, 621, 0 - setmaptile 28, 25, 641, 0 - setmaptile 10, 24, 617, 1 - setmaptile 10, 25, 625, 1 - setmaptile 10, 26, 621, 0 - setmaptile 10, 27, 641, 0 - setmaptile 21, 2, 617, 1 - setmaptile 21, 3, 625, 1 - setmaptile 21, 4, 621, 0 - setmaptile 21, 5, 641, 0 - setmaptile 2, 11, 591, 0 - setmaptile 17, 10, 591, 0 - setmaptile 25, 18, 591, 0 - setmaptile 18, 36, 591, 0 - setmaptile 6, 11, 566, 0 - setmaptile 13, 10, 566, 0 - setmaptile 16, 22, 566, 0 - setmaptile 4, 26, 566, 0 - setmaptile 30, 38, 566, 0 + setmetatile 23, 34, 695, 1 + setmetatile 23, 35, 703, 1 + setmetatile 23, 36, 711, 1 + setmetatile 23, 37, 719, 1 + setmetatile 10, 16, 695, 1 + setmetatile 10, 17, 703, 1 + setmetatile 10, 18, 711, 1 + setmetatile 10, 19, 719, 1 + setmetatile 10, 0, 695, 1 + setmetatile 10, 1, 703, 1 + setmetatile 10, 2, 711, 1 + setmetatile 10, 3, 719, 1 + setmetatile 37, 33, 617, 1 + setmetatile 37, 34, 625, 1 + setmetatile 37, 35, 621, 0 + setmetatile 37, 36, 641, 0 + setmetatile 28, 22, 617, 1 + setmetatile 28, 23, 625, 1 + setmetatile 28, 24, 621, 0 + setmetatile 28, 25, 641, 0 + setmetatile 10, 24, 617, 1 + setmetatile 10, 25, 625, 1 + setmetatile 10, 26, 621, 0 + setmetatile 10, 27, 641, 0 + setmetatile 21, 2, 617, 1 + setmetatile 21, 3, 625, 1 + setmetatile 21, 4, 621, 0 + setmetatile 21, 5, 641, 0 + setmetatile 2, 11, 591, 0 + setmetatile 17, 10, 591, 0 + setmetatile 25, 18, 591, 0 + setmetatile 18, 36, 591, 0 + setmetatile 6, 11, 566, 0 + setmetatile 13, 10, 566, 0 + setmetatile 16, 22, 566, 0 + setmetatile 4, 26, 566, 0 + setmetatile 30, 38, 566, 0 return NewMauville_Inside_EventScript_15E876:: @ 815E876 @@ -136,15 +136,15 @@ NewMauville_Inside_EventScript_15E876:: @ 815E876 end NewMauville_Inside_EventScript_15E88B:: @ 815E88B - setmaptile 33, 6, 591, 0 - setmaptile 32, 2, 752, 1 - setmaptile 33, 2, 753, 1 - setmaptile 34, 2, 754, 1 - setmaptile 35, 2, 755, 1 - setmaptile 32, 3, 756, 1 - setmaptile 33, 3, 757, 1 - setmaptile 34, 3, 758, 1 - setmaptile 35, 3, 759, 1 + setmetatile 33, 6, 591, 0 + setmetatile 32, 2, 752, 1 + setmetatile 33, 2, 753, 1 + setmetatile 34, 2, 754, 1 + setmetatile 35, 2, 755, 1 + setmetatile 32, 3, 756, 1 + setmetatile 33, 3, 757, 1 + setmetatile 34, 3, 758, 1 + setmetatile 35, 3, 759, 1 special DrawWholeMapView return @@ -166,9 +166,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -181,9 +181,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -196,9 +196,9 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 64928f840..465cbcfc6 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -75,7 +75,7 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 - giveitem ITEM_POTION + giveitem_std ITEM_POTION compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index 69503908a..cbf3acd27 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E - sethealplace 14 + setrespawn 14 call OldaleTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 setvar 0x800b, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/scripts/maps/PacifidlogTown.inc index 085d083d8..d7ac80a0a 100644 --- a/data/scripts/maps/PacifidlogTown.inc +++ b/data/scripts/maps/PacifidlogTown.inc @@ -8,7 +8,7 @@ PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9 end PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD - tileeffect 3 + setstepcallback 3 end PacifidlogTown_EventScript_14E900:: @ 814E900 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index 942f5626b..f073201ca 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -45,7 +45,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 - giveitem ITEM_TM27 + giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK @@ -61,7 +61,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 - giveitem ITEM_TM21 + giveitem_std ITEM_TM21 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK @@ -72,7 +72,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 PacifidlogTown_House2_EventScript_154254:: @ 8154254 specialvar RESULT, sub_810F908 - getnumberstring 0, RESULT + buffernumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release end @@ -81,9 +81,9 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 0 + playmoncry SPECIES_AZURILL, 0 msgbox PacifidlogTown_House2_Text_17938B, 4 - waitpokecry + waitmoncry msgbox PacifidlogTown_House2_Text_17939B, 4 release end @@ -92,9 +92,9 @@ PacifidlogTown_House2_EventScript_154282:: @ 8154282 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 2 + playmoncry SPECIES_AZURILL, 2 msgbox PacifidlogTown_House2_Text_1793CC, 4 - waitpokecry + waitmoncry msgbox PacifidlogTown_House2_Text_1793DD, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index a2e033a24..624a221d5 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -28,7 +28,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E special sub_804DB68 special sub_804E174 waitstate - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index 64dd5008c..95d5448e8 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 - sethealplace 19 + setrespawn 19 end @ 8154109 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index e2967169f..add786bf0 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -383,7 +383,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 return PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 - giveitem ITEM_ENIGMA_BERRY + giveitem_std ITEM_ENIGMA_BERRY compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 @@ -412,7 +412,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 end PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C - giveitem ITEM_TM42 + giveitem_std ITEM_TM42 compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM42 @@ -962,51 +962,51 @@ PetalburgCity_Gym_EventScript_155081:: @ 8155081 return PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2 - setmaptile 6, 85, 528, 0 - setmaptile 7, 85, 529, 0 - setmaptile 1, 98, 528, 0 - setmaptile 2, 98, 529, 0 + setmetatile 6, 85, 528, 0 + setmetatile 7, 85, 529, 0 + setmetatile 1, 98, 528, 0 + setmetatile 2, 98, 529, 0 return PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7 - setmaptile 6, 46, 528, 0 - setmaptile 7, 46, 529, 0 - setmaptile 1, 59, 528, 0 - setmaptile 2, 59, 529, 0 + setmetatile 6, 46, 528, 0 + setmetatile 7, 46, 529, 0 + setmetatile 1, 59, 528, 0 + setmetatile 2, 59, 529, 0 return PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC - setmaptile 6, 59, 528, 0 - setmaptile 7, 59, 529, 0 - setmaptile 1, 72, 528, 0 - setmaptile 2, 72, 529, 0 + setmetatile 6, 59, 528, 0 + setmetatile 7, 59, 529, 0 + setmetatile 1, 72, 528, 0 + setmetatile 2, 72, 529, 0 return PetalburgCity_Gym_EventScript_155111:: @ 8155111 - setmaptile 1, 20, 528, 0 - setmaptile 2, 20, 529, 0 + setmetatile 1, 20, 528, 0 + setmetatile 2, 20, 529, 0 return PetalburgCity_Gym_EventScript_155124:: @ 8155124 - setmaptile 6, 20, 528, 0 - setmaptile 7, 20, 529, 0 - setmaptile 1, 33, 528, 0 - setmaptile 2, 33, 529, 0 + setmetatile 6, 20, 528, 0 + setmetatile 7, 20, 529, 0 + setmetatile 1, 33, 528, 0 + setmetatile 2, 33, 529, 0 return PetalburgCity_Gym_EventScript_155149:: @ 8155149 - setmaptile 6, 33, 528, 0 - setmaptile 7, 33, 529, 0 + setmetatile 6, 33, 528, 0 + setmetatile 7, 33, 529, 0 return PetalburgCity_Gym_EventScript_15515C:: @ 815515C - setmaptile 1, 7, 528, 0 - setmaptile 2, 7, 529, 0 + setmetatile 1, 7, 528, 0 + setmetatile 2, 7, 529, 0 return PetalburgCity_Gym_EventScript_15516F:: @ 815516F - setmaptile 6, 7, 528, 0 - setmaptile 7, 7, 529, 0 + setmetatile 6, 7, 528, 0 + setmetatile 7, 7, 529, 0 return PetalburgCity_Gym_EventScript_155182:: @ 8155182 diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index e2013a1d6..1dc99159a 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A - sethealplace 3 + setrespawn 3 call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 setvar 0x800b, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index 110b798b7..08bbcb0c7 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -25,7 +25,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 msgbox PetalburgCity_WallysHouse_Text_179996, 4 - giveitem ITEM_HM03 + giveitem_std ITEM_HM03 setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_179B14, 4 release diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index c38d4d559..be74cbf4c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -90,7 +90,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA applymovement 255, PetalburgWoods_Movement_1A0845 waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 - giveitem ITEM_GREAT_BALL + giveitem_std ITEM_GREAT_BALL compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D @@ -244,7 +244,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC checkflag FLAG_RECEIVED_MIRACLE_SEED goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 - giveitem ITEM_MIRACLE_SEED + giveitem_std ITEM_MIRACLE_SEED compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B setflag FLAG_RECEIVED_MIRACLE_SEED diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 92f5d5593..a04dcd86d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -34,7 +34,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 - giveitem ITEM_CHESTO_BERRY + giveitem_std ITEM_CHESTO_BERRY compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 @@ -53,7 +53,7 @@ Route104_EventScript_14EF09:: @ 814EF09 checkflag FLAG_RECEIVED_WHITE_HERB goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 - giveitem ITEM_WHITE_HERB + giveitem_std ITEM_WHITE_HERB compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_WHITE_HERB @@ -107,7 +107,7 @@ Route104_EventScript_14EF93:: @ 814EF93 checkflag FLAG_RECEIVED_TM09 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 - giveitem ITEM_TM09 + giveitem_std ITEM_TM09 compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_TM09 @@ -124,14 +124,14 @@ Route104_EventScript_14EFCC:: @ 814EFCC end Route104_EventScript_14EFD5:: @ 814EFD5 - setobjectpriority 8, 0, 19, 0 - setobjectpriority 255, 0, 19, 0 + setobjectpriority 8, MAP_ROUTE104, 0 + setobjectpriority 255, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 removeobject 8 applymovement 255, Route104_Movement_14F162 waitmovement 0 - hideobject 255, 0, 19 + hideobjectat 255, MAP_ROUTE104 call Route104_EventScript_1A02E7 applymovement 7, Route104_Movement_14F09F applymovement 255, Route104_Movement_14F09F @@ -139,12 +139,12 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement 255, Route104_Movement_14F166 waitmovement 0 call Route104_EventScript_1A02EF - showobject 255, 0, 11 + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route104_Movement_14F168 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN applymovement 2, Route104_Movement_14F16F waitmovement 0 @@ -152,10 +152,10 @@ Route104_EventScript_14EFD5:: @ 814EFD5 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 - hideobject 7, 0, 19 + hideobjectat 7, MAP_ROUTE104 copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 19 - resetobjectpriority 2, 0, 11 + resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar 0x408e, 0 checkflag FLAG_DELIVERED_STEVEN_LETTER diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 9369f7573..4eb1d9705 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -92,8 +92,8 @@ Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox Route104_MrBrineysHouse_Text_191FB9, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 07abd21bc..2de6bf51f 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -52,7 +52,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73 Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C message Route104_PrettyPetalFlowerShop_Text_1A0C42 waitmessage - pokemartbp Route104_PrettyPetalFlowerShop_Items + pokemartdecoration2 Route104_PrettyPetalFlowerShop_Items msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4 release end @@ -80,7 +80,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4 - giveitem ITEM_WAILMER_PAIL + giveitem_std ITEM_WAILMER_PAIL msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 setflag FLAG_RECEIVED_WAILMER_PAIL release @@ -95,7 +95,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index de7188aae..30157e52f 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -8,8 +8,8 @@ Route105_MapScript1_14F29E:: @ 814F29E end Route105_EventScript_14F2A8:: @ 814F2A8 - setmaptile 9, 19, 124, 1 - setmaptile 9, 20, 145, 1 + setmetatile 9, 19, 124, 1 + setmetatile 9, 20, 145, 1 return Route105_EventScript_14F2BB:: @ 814F2BB diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 1277168e0..a9fa7d906 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -3,8 +3,8 @@ Route109_MapScripts:: @ 814F4D2 Route109_EventScript_14F4D3:: @ 814F4D3 call Route109_EventScript_1A010C - setobjectpriority 2, 0, 24, 0 - setobjectpriority 255, 0, 24, 0 + setobjectpriority 2, MAP_ROUTE109, 0 + setobjectpriority 255, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_14F67B waitmovement 0 removeobject 2 @@ -33,30 +33,30 @@ Route109_EventScript_14F538:: @ 814F538 end Route109_EventScript_14F548:: @ 814F548 - hideobject 255, 0, 24 + hideobjectat 255, MAP_ROUTE109 call Route109_EventScript_1A02E7 applymovement 1, Route109_Movement_14F5BF applymovement 255, Route109_Movement_14F5BF waitmovement 0 call Route109_EventScript_1A02EF - showobject 255, 0, 11 + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route109_Movement_14F670 waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 - hideobject 1, 0, 24 + hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 24 - resetobjectpriority 2, 0, 11 + resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release end @@ -331,7 +331,7 @@ Route109_EventScript_14F725:: @ 814F725 checkflag FLAG_RECEIVED_SOFT_SAND goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 - giveitem ITEM_SOFT_SAND + giveitem_std ITEM_SOFT_SAND compare RESULT, 0 goto_if_eq Route109_EventScript_1A029B closemessage @@ -360,9 +360,9 @@ Route109_EventScript_14F788:: @ 814F788 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox Route109_Text_16E5CA, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index f60413d81..7a12f5850 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -27,7 +27,7 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 - giveitem ITEM_SODA_POP, 6 + giveitem_std ITEM_SODA_POP, 6 compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag FLAG_RECEIVED_6_SODA_POP @@ -61,7 +61,7 @@ Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A takemoney 0x12c, 0 updatemoneybox 0, 0 nop - giveitem ITEM_SODA_POP + giveitem_std ITEM_SODA_POP hidemoneybox 0, 0 release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 146be5959..5e10782e9 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -420,7 +420,7 @@ Route110_EventScript_14FE8A:: @ 814FE8A end Route110_EventScript_14FEA5:: @ 814FEA5 - giveitem ITEM_ITEMFINDER + giveitem_std ITEM_ITEMFINDER return Route110_EventScript_14FEB2:: @ 814FEB2 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 12309207c..813cbb9e9 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -22,7 +22,7 @@ Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F addobject 1 - showobject 1, 29, 1 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END turnobject 1, 4 end @@ -37,7 +37,7 @@ Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 end Route110_TrickHouseEnd_EventScript_161994:: @ 8161994 - setmaptile 10, 1, 539, 1 + setmetatile 10, 1, 539, 1 return Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E @@ -60,7 +60,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C2B2, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_RARE_CANDY + giveitem_std ITEM_RARE_CANDY compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -73,7 +73,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C333, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_TIMER_BALL + giveitem_std ITEM_TIMER_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -86,7 +86,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C3A7, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_HARD_STONE + giveitem_std ITEM_HARD_STONE compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -99,7 +99,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C41F, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_SMOKE_BALL + giveitem_std ITEM_SMOKE_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C491, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_TM12 + giveitem_std ITEM_TM12 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -125,7 +125,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C515, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_MAGNET + giveitem_std ITEM_MAGNET compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -138,7 +138,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C567, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_PP_MAX + giveitem_std ITEM_PP_MAX compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -167,9 +167,9 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar 0x40c1, 0 .ifdef SAPPHIRE - givedecoration 32 + givedecoration_std 32 .else - givedecoration 31 + givedecoration_std 31 .endc compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index bf0c36ff3..b9582b64c 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -139,14 +139,14 @@ Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 addobject 1 - showobject 1, 29, 0 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 turnobject 255, 3 end Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 addobject 1 - hideobject 1, 29, 0 + hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE switch 0x4044 case 0, Route110_TrickHouseEntrance_EventScript_16116B case 1, Route110_TrickHouseEntrance_EventScript_161173 @@ -368,7 +368,7 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE - giveitem ITEM_RARE_CANDY + giveitem_std ITEM_RARE_CANDY compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -378,7 +378,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE end Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA - giveitem ITEM_TIMER_BALL + giveitem_std ITEM_TIMER_BALL compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -388,7 +388,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA end Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 - giveitem ITEM_HARD_STONE + giveitem_std ITEM_HARD_STONE compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -398,7 +398,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 end Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 - giveitem ITEM_SMOKE_BALL + giveitem_std ITEM_SMOKE_BALL compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -408,7 +408,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 end Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E - giveitem ITEM_TM12 + giveitem_std ITEM_TM12 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -418,7 +418,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E end Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA - giveitem ITEM_MAGNET + giveitem_std ITEM_MAGNET compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -428,7 +428,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA end Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 - giveitem ITEM_PP_MAX + giveitem_std ITEM_PP_MAX compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -450,9 +450,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, 4 .ifdef SAPPHIRE - givedecoration 32 + givedecoration_std 32 .else - givedecoration 31 + givedecoration_std 31 .endif compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 @@ -501,7 +501,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 end Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD - setmaptile 5, 1, 537, 0 + setmetatile 5, 1, 537, 0 special DrawWholeMapView delay 20 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856 @@ -607,7 +607,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 msgbox UnknownString_819CAD1, 4 playse SE_PIN setvar 0x40AB, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -618,7 +618,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 msgbox UnknownString_819CCCB, 4 playse SE_PIN setvar 0x40AC, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -629,7 +629,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 msgbox UnknownString_819CEF9, 4 playse SE_PIN setvar 0x40AD, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -640,7 +640,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB msgbox UnknownString_819D164, 4 playse SE_PIN setvar 0x40AE, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -651,7 +651,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 msgbox UnknownString_819D3A5, 4 playse SE_PIN setvar 0x40AF, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -662,7 +662,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D msgbox UnknownString_819DC0A, 4 playse SE_PIN setvar 0x40B0, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -673,7 +673,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 msgbox UnknownString_819DE8D, 4 playse SE_PIN setvar 0x40B1, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -684,7 +684,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F msgbox UnknownString_819E0FF, 4 playse SE_PIN setvar 0x40B2, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -757,9 +757,9 @@ Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B return Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920 - setfieldeffect 0, 32772 - setfieldeffect 1, 32773 - setfieldeffect 2, 32774 + setfieldeffectargument 0, 32772 + setfieldeffectargument 1, 32773 + setfieldeffectargument 2, 32774 dofieldeffect 54 waitfieldeffect 54 delay 10 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 3a89c2db1..4fffd9914 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE end Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 end Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index f71a9611a..6425d05cb 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -70,23 +70,23 @@ Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 end Route110_TrickHousePuzzle2_EventScript_161E2C:: @ 8161E2C - setmaptile 14, 21, 601, 0 - setmaptile 1, 12, 618, 0 + setmetatile 14, 21, 601, 0 + setmetatile 1, 12, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E3F:: @ 8161E3F - setmaptile 8, 17, 601, 0 - setmaptile 12, 13, 618, 0 + setmetatile 8, 17, 601, 0 + setmetatile 12, 13, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E52:: @ 8161E52 - setmaptile 4, 10, 601, 0 - setmaptile 8, 4, 618, 0 + setmetatile 4, 10, 601, 0 + setmetatile 8, 4, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 - setmaptile 5, 2, 601, 0 - setmaptile 12, 5, 618, 0 + setmetatile 5, 2, 601, 0 + setmetatile 12, 5, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index a50ecd3ce..54cea16c9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -24,13 +24,13 @@ Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 end Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 - setmaptile 5, 20, 600, 0 - setmaptile 4, 12, 600, 0 - setmaptile 11, 10, 600, 0 - setmaptile 3, 8, 600, 0 - setmaptile 13, 7, 600, 0 - setmaptile 1, 3, 600, 0 - setmaptile 10, 2, 600, 0 + setmetatile 5, 20, 600, 0 + setmetatile 4, 12, 600, 0 + setmetatile 11, 10, 600, 0 + setmetatile 3, 8, 600, 0 + setmetatile 13, 7, 600, 0 + setmetatile 1, 3, 600, 0 + setmetatile 10, 2, 600, 0 compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F compare 0x4008, 2 @@ -48,201 +48,201 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 return Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F - setmaptile 5, 20, 601, 0 + setmetatile 5, 20, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FA9:: @ 8161FA9 - setmaptile 4, 12, 601, 0 + setmetatile 4, 12, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FB3:: @ 8161FB3 - setmaptile 11, 10, 601, 0 + setmetatile 11, 10, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FBD:: @ 8161FBD - setmaptile 3, 8, 601, 0 + setmetatile 3, 8, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FC7:: @ 8161FC7 - setmaptile 13, 7, 601, 0 + setmetatile 13, 7, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FD1:: @ 8161FD1 - setmaptile 1, 3, 601, 0 + setmetatile 1, 3, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FDB:: @ 8161FDB - setmaptile 10, 2, 601, 0 + setmetatile 10, 2, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FE5:: @ 8161FE5 - setmaptile 1, 6, 587, 0 - setmaptile 2, 6, 588, 0 - setmaptile 1, 7, 595, 0 - setmaptile 2, 7, 596, 0 - setmaptile 4, 9, 587, 0 - setmaptile 5, 9, 588, 0 - setmaptile 4, 10, 595, 0 - setmaptile 5, 10, 596, 0 - setmaptile 4, 18, 587, 0 - setmaptile 5, 18, 588, 0 - setmaptile 4, 19, 595, 0 - setmaptile 5, 19, 596, 0 - setmaptile 7, 3, 587, 0 - setmaptile 8, 3, 588, 0 - setmaptile 7, 4, 595, 0 - setmaptile 8, 4, 596, 0 - setmaptile 7, 9, 587, 0 - setmaptile 8, 9, 588, 0 - setmaptile 7, 10, 595, 0 - setmaptile 8, 10, 596, 0 - setmaptile 7, 18, 587, 0 - setmaptile 8, 18, 588, 0 - setmaptile 7, 19, 595, 0 - setmaptile 8, 19, 596, 0 - setmaptile 13, 3, 587, 0 - setmaptile 14, 3, 588, 0 - setmaptile 13, 4, 595, 0 - setmaptile 14, 4, 596, 0 - setmaptile 13, 9, 587, 0 - setmaptile 14, 9, 588, 0 - setmaptile 13, 10, 595, 0 - setmaptile 14, 10, 596, 0 - setmaptile 13, 15, 587, 0 - setmaptile 14, 15, 588, 0 - setmaptile 13, 16, 595, 0 - setmaptile 14, 16, 596, 0 - setmaptile 3, 13, 589, 1 - setmaptile 3, 14, 597, 0 - setmaptile 6, 7, 589, 1 - setmaptile 6, 8, 597, 0 - setmaptile 9, 16, 589, 1 - setmaptile 9, 17, 597, 0 - setmaptile 12, 4, 589, 1 - setmaptile 12, 5, 597, 0 - setmaptile 12, 10, 589, 1 - setmaptile 12, 11, 597, 0 - setmaptile 1, 15, 568, 0 - setmaptile 2, 15, 569, 0 - setmaptile 1, 16, 576, 1 - setmaptile 2, 16, 577, 1 - setmaptile 4, 6, 568, 0 - setmaptile 5, 6, 569, 0 - setmaptile 4, 7, 576, 1 - setmaptile 5, 7, 577, 1 - setmaptile 7, 12, 568, 0 - setmaptile 8, 12, 569, 0 - setmaptile 7, 13, 576, 1 - setmaptile 8, 13, 577, 1 - setmaptile 10, 12, 568, 0 - setmaptile 11, 12, 569, 0 - setmaptile 10, 13, 576, 1 - setmaptile 11, 13, 577, 1 - setmaptile 10, 18, 568, 0 - setmaptile 11, 18, 569, 0 - setmaptile 10, 19, 576, 1 - setmaptile 11, 19, 577, 1 - setmaptile 3, 4, 570, 1 - setmaptile 3, 5, 578, 1 - setmaptile 6, 10, 570, 1 - setmaptile 6, 11, 578, 1 - setmaptile 6, 13, 570, 1 - setmaptile 6, 14, 578, 1 - setmaptile 6, 16, 570, 1 - setmaptile 6, 17, 578, 1 - setmaptile 9, 4, 570, 1 - setmaptile 9, 5, 578, 1 - setmaptile 9, 7, 570, 1 - setmaptile 9, 8, 578, 1 - setmaptile 12, 13, 570, 1 - setmaptile 12, 14, 578, 1 - setmaptile 12, 16, 570, 1 - setmaptile 12, 17, 578, 1 + setmetatile 1, 6, 587, 0 + setmetatile 2, 6, 588, 0 + setmetatile 1, 7, 595, 0 + setmetatile 2, 7, 596, 0 + setmetatile 4, 9, 587, 0 + setmetatile 5, 9, 588, 0 + setmetatile 4, 10, 595, 0 + setmetatile 5, 10, 596, 0 + setmetatile 4, 18, 587, 0 + setmetatile 5, 18, 588, 0 + setmetatile 4, 19, 595, 0 + setmetatile 5, 19, 596, 0 + setmetatile 7, 3, 587, 0 + setmetatile 8, 3, 588, 0 + setmetatile 7, 4, 595, 0 + setmetatile 8, 4, 596, 0 + setmetatile 7, 9, 587, 0 + setmetatile 8, 9, 588, 0 + setmetatile 7, 10, 595, 0 + setmetatile 8, 10, 596, 0 + setmetatile 7, 18, 587, 0 + setmetatile 8, 18, 588, 0 + setmetatile 7, 19, 595, 0 + setmetatile 8, 19, 596, 0 + setmetatile 13, 3, 587, 0 + setmetatile 14, 3, 588, 0 + setmetatile 13, 4, 595, 0 + setmetatile 14, 4, 596, 0 + setmetatile 13, 9, 587, 0 + setmetatile 14, 9, 588, 0 + setmetatile 13, 10, 595, 0 + setmetatile 14, 10, 596, 0 + setmetatile 13, 15, 587, 0 + setmetatile 14, 15, 588, 0 + setmetatile 13, 16, 595, 0 + setmetatile 14, 16, 596, 0 + setmetatile 3, 13, 589, 1 + setmetatile 3, 14, 597, 0 + setmetatile 6, 7, 589, 1 + setmetatile 6, 8, 597, 0 + setmetatile 9, 16, 589, 1 + setmetatile 9, 17, 597, 0 + setmetatile 12, 4, 589, 1 + setmetatile 12, 5, 597, 0 + setmetatile 12, 10, 589, 1 + setmetatile 12, 11, 597, 0 + setmetatile 1, 15, 568, 0 + setmetatile 2, 15, 569, 0 + setmetatile 1, 16, 576, 1 + setmetatile 2, 16, 577, 1 + setmetatile 4, 6, 568, 0 + setmetatile 5, 6, 569, 0 + setmetatile 4, 7, 576, 1 + setmetatile 5, 7, 577, 1 + setmetatile 7, 12, 568, 0 + setmetatile 8, 12, 569, 0 + setmetatile 7, 13, 576, 1 + setmetatile 8, 13, 577, 1 + setmetatile 10, 12, 568, 0 + setmetatile 11, 12, 569, 0 + setmetatile 10, 13, 576, 1 + setmetatile 11, 13, 577, 1 + setmetatile 10, 18, 568, 0 + setmetatile 11, 18, 569, 0 + setmetatile 10, 19, 576, 1 + setmetatile 11, 19, 577, 1 + setmetatile 3, 4, 570, 1 + setmetatile 3, 5, 578, 1 + setmetatile 6, 10, 570, 1 + setmetatile 6, 11, 578, 1 + setmetatile 6, 13, 570, 1 + setmetatile 6, 14, 578, 1 + setmetatile 6, 16, 570, 1 + setmetatile 6, 17, 578, 1 + setmetatile 9, 4, 570, 1 + setmetatile 9, 5, 578, 1 + setmetatile 9, 7, 570, 1 + setmetatile 9, 8, 578, 1 + setmetatile 12, 13, 570, 1 + setmetatile 12, 14, 578, 1 + setmetatile 12, 16, 570, 1 + setmetatile 12, 17, 578, 1 return Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 - setmaptile 1, 6, 571, 0 - setmaptile 2, 6, 572, 0 - setmaptile 1, 7, 579, 1 - setmaptile 2, 7, 580, 1 - setmaptile 4, 9, 571, 0 - setmaptile 5, 9, 572, 0 - setmaptile 4, 10, 579, 1 - setmaptile 5, 10, 580, 1 - setmaptile 4, 18, 571, 0 - setmaptile 5, 18, 572, 0 - setmaptile 4, 19, 579, 1 - setmaptile 5, 19, 580, 1 - setmaptile 7, 3, 571, 0 - setmaptile 8, 3, 572, 0 - setmaptile 7, 4, 579, 1 - setmaptile 8, 4, 580, 1 - setmaptile 7, 9, 571, 0 - setmaptile 8, 9, 572, 0 - setmaptile 7, 10, 579, 1 - setmaptile 8, 10, 580, 1 - setmaptile 7, 18, 571, 0 - setmaptile 8, 18, 572, 0 - setmaptile 7, 19, 579, 1 - setmaptile 8, 19, 580, 1 - setmaptile 13, 3, 571, 0 - setmaptile 14, 3, 572, 0 - setmaptile 13, 4, 579, 1 - setmaptile 14, 4, 580, 1 - setmaptile 13, 9, 571, 0 - setmaptile 14, 9, 572, 0 - setmaptile 13, 10, 579, 1 - setmaptile 14, 10, 580, 1 - setmaptile 13, 15, 571, 0 - setmaptile 14, 15, 572, 0 - setmaptile 13, 16, 579, 1 - setmaptile 14, 16, 580, 1 - setmaptile 3, 13, 573, 1 - setmaptile 3, 14, 581, 1 - setmaptile 6, 7, 573, 1 - setmaptile 6, 8, 581, 1 - setmaptile 9, 16, 573, 1 - setmaptile 9, 17, 581, 1 - setmaptile 12, 4, 573, 1 - setmaptile 12, 5, 581, 1 - setmaptile 12, 10, 573, 1 - setmaptile 12, 11, 581, 1 - setmaptile 1, 15, 584, 0 - setmaptile 2, 15, 585, 0 - setmaptile 1, 16, 592, 0 - setmaptile 2, 16, 593, 0 - setmaptile 4, 6, 584, 0 - setmaptile 5, 6, 585, 0 - setmaptile 4, 7, 592, 0 - setmaptile 5, 7, 593, 0 - setmaptile 7, 12, 584, 0 - setmaptile 8, 12, 585, 0 - setmaptile 7, 13, 592, 0 - setmaptile 8, 13, 593, 0 - setmaptile 10, 12, 584, 0 - setmaptile 11, 12, 585, 0 - setmaptile 10, 13, 592, 0 - setmaptile 11, 13, 593, 0 - setmaptile 10, 18, 584, 0 - setmaptile 11, 18, 585, 0 - setmaptile 10, 19, 592, 0 - setmaptile 11, 19, 593, 0 - setmaptile 3, 4, 586, 1 - setmaptile 3, 5, 594, 0 - setmaptile 6, 10, 586, 1 - setmaptile 6, 11, 594, 0 - setmaptile 6, 13, 586, 1 - setmaptile 6, 14, 594, 0 - setmaptile 6, 16, 586, 1 - setmaptile 6, 17, 594, 0 - setmaptile 9, 4, 586, 1 - setmaptile 9, 5, 594, 0 - setmaptile 9, 7, 586, 1 - setmaptile 9, 8, 594, 0 - setmaptile 12, 13, 586, 1 - setmaptile 12, 14, 594, 0 - setmaptile 12, 16, 586, 1 - setmaptile 12, 17, 594, 0 + setmetatile 1, 6, 571, 0 + setmetatile 2, 6, 572, 0 + setmetatile 1, 7, 579, 1 + setmetatile 2, 7, 580, 1 + setmetatile 4, 9, 571, 0 + setmetatile 5, 9, 572, 0 + setmetatile 4, 10, 579, 1 + setmetatile 5, 10, 580, 1 + setmetatile 4, 18, 571, 0 + setmetatile 5, 18, 572, 0 + setmetatile 4, 19, 579, 1 + setmetatile 5, 19, 580, 1 + setmetatile 7, 3, 571, 0 + setmetatile 8, 3, 572, 0 + setmetatile 7, 4, 579, 1 + setmetatile 8, 4, 580, 1 + setmetatile 7, 9, 571, 0 + setmetatile 8, 9, 572, 0 + setmetatile 7, 10, 579, 1 + setmetatile 8, 10, 580, 1 + setmetatile 7, 18, 571, 0 + setmetatile 8, 18, 572, 0 + setmetatile 7, 19, 579, 1 + setmetatile 8, 19, 580, 1 + setmetatile 13, 3, 571, 0 + setmetatile 14, 3, 572, 0 + setmetatile 13, 4, 579, 1 + setmetatile 14, 4, 580, 1 + setmetatile 13, 9, 571, 0 + setmetatile 14, 9, 572, 0 + setmetatile 13, 10, 579, 1 + setmetatile 14, 10, 580, 1 + setmetatile 13, 15, 571, 0 + setmetatile 14, 15, 572, 0 + setmetatile 13, 16, 579, 1 + setmetatile 14, 16, 580, 1 + setmetatile 3, 13, 573, 1 + setmetatile 3, 14, 581, 1 + setmetatile 6, 7, 573, 1 + setmetatile 6, 8, 581, 1 + setmetatile 9, 16, 573, 1 + setmetatile 9, 17, 581, 1 + setmetatile 12, 4, 573, 1 + setmetatile 12, 5, 581, 1 + setmetatile 12, 10, 573, 1 + setmetatile 12, 11, 581, 1 + setmetatile 1, 15, 584, 0 + setmetatile 2, 15, 585, 0 + setmetatile 1, 16, 592, 0 + setmetatile 2, 16, 593, 0 + setmetatile 4, 6, 584, 0 + setmetatile 5, 6, 585, 0 + setmetatile 4, 7, 592, 0 + setmetatile 5, 7, 593, 0 + setmetatile 7, 12, 584, 0 + setmetatile 8, 12, 585, 0 + setmetatile 7, 13, 592, 0 + setmetatile 8, 13, 593, 0 + setmetatile 10, 12, 584, 0 + setmetatile 11, 12, 585, 0 + setmetatile 10, 13, 592, 0 + setmetatile 11, 13, 593, 0 + setmetatile 10, 18, 584, 0 + setmetatile 11, 18, 585, 0 + setmetatile 10, 19, 592, 0 + setmetatile 11, 19, 593, 0 + setmetatile 3, 4, 586, 1 + setmetatile 3, 5, 594, 0 + setmetatile 6, 10, 586, 1 + setmetatile 6, 11, 594, 0 + setmetatile 6, 13, 586, 1 + setmetatile 6, 14, 594, 0 + setmetatile 6, 16, 586, 1 + setmetatile 6, 17, 594, 0 + setmetatile 9, 4, 586, 1 + setmetatile 9, 5, 594, 0 + setmetatile 9, 7, 586, 1 + setmetatile 9, 8, 594, 0 + setmetatile 12, 13, 586, 1 + setmetatile 12, 14, 594, 0 + setmetatile 12, 16, 586, 1 + setmetatile 12, 17, 594, 0 return Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 6756cd055..4ff925639 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -23,53 +23,53 @@ Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 return Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 - setmaptile 13, 17, 610, 0 - setmaptile 12, 16, 575, 1 + setmetatile 13, 17, 610, 0 + setmetatile 12, 16, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631A8:: @ 81631A8 - setmaptile 12, 13, 610, 0 - setmaptile 12, 11, 575, 1 + setmetatile 12, 13, 610, 0 + setmetatile 12, 11, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631BB:: @ 81631BB - setmaptile 7, 12, 610, 0 - setmaptile 5, 10, 575, 1 + setmetatile 7, 12, 610, 0 + setmetatile 5, 10, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631CE:: @ 81631CE - setmaptile 6, 6, 636, 0 - setmaptile 4, 4, 575, 1 + setmetatile 6, 6, 636, 0 + setmetatile 4, 4, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631E1:: @ 81631E1 - setmaptile 8, 4, 609, 0 - setmaptile 7, 5, 575, 1 + setmetatile 8, 4, 609, 0 + setmetatile 7, 5, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631F4:: @ 81631F4 - setmaptile 13, 17, 611, 0 - setmaptile 12, 16, 574, 1 + setmetatile 13, 17, 611, 0 + setmetatile 12, 16, 574, 1 return Route110_TrickHousePuzzle7_EventScript_163207:: @ 8163207 - setmaptile 12, 13, 609, 0 - setmaptile 12, 11, 574, 1 + setmetatile 12, 13, 609, 0 + setmetatile 12, 11, 574, 1 return Route110_TrickHousePuzzle7_EventScript_16321A:: @ 816321A - setmaptile 7, 12, 611, 0 - setmaptile 5, 10, 574, 1 + setmetatile 7, 12, 611, 0 + setmetatile 5, 10, 574, 1 return Route110_TrickHousePuzzle7_EventScript_16322D:: @ 816322D - setmaptile 6, 6, 635, 0 - setmaptile 4, 4, 574, 1 + setmetatile 6, 6, 635, 0 + setmetatile 4, 4, 574, 1 return Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 - setmaptile 8, 4, 608, 0 - setmaptile 7, 5, 574, 1 + setmetatile 8, 4, 608, 0 + setmetatile 7, 5, 574, 1 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 3e089e354..0a7e6befc 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -9,8 +9,8 @@ Route111_MapScript1_14FF9C:: @ 814FF9C end Route111_EventScript_14FFA6:: @ 814FFA6 - setmaptile 29, 86, 124, 1 - setmaptile 29, 87, 145, 1 + setmetatile 29, 86, 124, 1 + setmetatile 29, 87, 145, 1 return Route111_MapScript1_14FFB9:: @ 814FFB9 @@ -54,7 +54,7 @@ Route111_EventScript_150023:: @ 8150023 msgbox Route111_Text_16FA54, 5 compare RESULT, 0 goto_if_eq Route111_EventScript_15005F - giveitem ITEM_ROOT_FOSSIL + giveitem_std ITEM_ROOT_FOSSIL closemessage setflag FLAG_HIDE_ROOT_FOSSIL setflag FLAG_HIDE_CLAW_FOSSIL @@ -76,7 +76,7 @@ Route111_EventScript_150069:: @ 8150069 msgbox Route111_Text_16FAED, 5 compare RESULT, 0 goto_if_eq Route111_EventScript_1500A5 - giveitem ITEM_CLAW_FOSSIL + giveitem_std ITEM_CLAW_FOSSIL closemessage setflag FLAG_HIDE_CLAW_FOSSIL setflag FLAG_HIDE_ROOT_FOSSIL @@ -124,7 +124,7 @@ Route111_EventScript_1500C5:: @ 81500C5 checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 - giveitem ITEM_RAZZ_BERRY + giveitem_std ITEM_RAZZ_BERRY compare RESULT, 0 goto_if_eq Route111_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 9896af5ae..981971e41 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -16,7 +16,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 - giveitem ITEM_MACHO_BRACE + giveitem_std ITEM_MACHO_BRACE compare RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag FLAG_RECEIVED_MACHO_BRACE diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 2eb34cdf3..37fd0ed3f 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -4,7 +4,7 @@ Route113_MapScripts:: @ 81505CC .byte 0 Route113_MapScript1_1505D7:: @ 81505D7 - tileeffect 1 + setstepcallback 1 end Route113_MapScript1_1505DA:: @ 81505DA diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 078ac1006..8d853b88d 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -22,7 +22,7 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565 compare 0x40be, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 - giveitem ITEM_SOOT_SACK + giveitem_std ITEM_SOOT_SACK setvar 0x40be, 1 msgbox Route113_GlassWorkshop_Text_19E59B, 4 release @@ -68,7 +68,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 250 compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -82,7 +82,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -96,7 +96,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -110,7 +110,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -124,7 +124,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -139,7 +139,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8009, 1 setvar 0x8008, 13 - getdecorname 0, 0x8008 + bufferdecorationname 0, 0x8008 setvar 0x800a, 6000 compare 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -154,7 +154,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8009, 1 setvar 0x8008, 6 - getdecorname 0, 0x8008 + bufferdecorationname 0, 0x8008 setvar 0x800a, 8000 compare 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -174,14 +174,14 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E Route113_GlassWorkshop_EventScript_163818:: @ 8163818 setvar 0x800a, 250 subvar 0x800a, 16456 - getnumberstring 0, 32778 + buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 subvar 0x800a, 16456 - getnumberstring 1, 32778 + buffernumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage goto Route113_GlassWorkshop_EventScript_1635EE @@ -210,13 +210,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem 0x8008 + giveitem_std 0x8008 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration 0x8008 + givedecoration_std 0x8008 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -247,49 +247,49 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar 0x8009, 0 setvar 0x8008, 39 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar 0x8009, 0 setvar 0x8008, 40 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar 0x8009, 0 setvar 0x8008, 41 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar 0x8009, 0 setvar 0x8008, 43 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar 0x8009, 0 setvar 0x8008, 42 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar 0x8009, 1 setvar 0x8008, 13 - getdecorname 0, 13 + bufferdecorationname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar 0x8009, 1 setvar 0x8008, 6 - getdecorname 0, 6 + bufferdecorationname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 3d1da2014..302c162b0 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -11,7 +11,7 @@ Route114_EventScript_150733:: @ 8150733 random 5 addvar RESULT, 15 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 @@ -30,7 +30,7 @@ Route114_EventScript_150782:: @ 8150782 checkflag FLAG_RECEIVED_TM05 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 - giveitem ITEM_TM05 + giveitem_std ITEM_TM05 compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_RECEIVED_TM05 @@ -47,9 +47,9 @@ Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer waitse - playpokecry SPECIES_POOCHYENA, 2 + playmoncry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index abf9ac883..1a1445fde 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -12,7 +12,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 checkflag FLAG_RECEIVED_TM28 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 - giveitem ITEM_TM28 + giveitem_std ITEM_TM28 compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag FLAG_RECEIVED_TM28 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index 87b0f2cd6..f8ff5de73 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -14,9 +14,9 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE - givedecoration DECOR_LOTAD_DOLL + givedecoration_std DECOR_LOTAD_DOLL .else - givedecoration DECOR_SEEDOT_DOLL + givedecoration_std DECOR_SEEDOT_DOLL .endif compare RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 34c685196..9aadedb32 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -43,7 +43,7 @@ Route116_EventScript_150A7B:: @ 8150A7B Route116_EventScript_150A94:: @ 8150A94 setflag FLAG_MET_DEVON_EMPLOYEE - giveitem ITEM_REPEAT_BALL + giveitem_std ITEM_REPEAT_BALL compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index bf34b5426..ca69e01c4 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -20,7 +20,7 @@ Route118_EventScript_150F34:: @ 8150F34 Route118_EventScript_150F5E:: @ 8150F5E msgbox Route118_Text_170F46, 4 - giveitem ITEM_GOOD_ROD + giveitem_std ITEM_GOOD_ROD setflag FLAG_RECEIVED_GOOD_ROD msgbox Route118_Text_170F7E, 4 release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index fb3d75660..aff1254a9 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -148,7 +148,7 @@ Route119_EventScript_151337:: @ 8151337 end Route119_EventScript_151352:: @ 8151352 - giveitem ITEM_HM02 + giveitem_std ITEM_HM02 setflag FLAG_RECEIVED_HM02 return diff --git a/data/scripts/maps/Route119_House.inc b/data/scripts/maps/Route119_House.inc index 42cc89068..76763c68e 100644 --- a/data/scripts/maps/Route119_House.inc +++ b/data/scripts/maps/Route119_House.inc @@ -9,8 +9,8 @@ Route119_House_EventScript_163DE7:: @ 8163DE7 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox Route119_House_Text_19F406, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 4ee12fe93..991725b8c 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -55,14 +55,14 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage - givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 + givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 setflag FLAG_RECEIVED_CASTFORM msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 release diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 209291a3a..cd84f95af 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -59,15 +59,15 @@ Route120_MapScript1_151686:: @ 8151686 end Route120_EventScript_1516A2:: @ 81516A2 - setmaptile 7, 54, 124, 1 - setmaptile 7, 55, 145, 1 + setmetatile 7, 54, 124, 1 + setmetatile 7, 55, 145, 1 return Route120_EventScript_1516B5:: @ 81516B5 - setmaptile 13, 15, 663, 0 - setmaptile 12, 16, 671, 0 - setmaptile 12, 17, 161, 0 - setmaptile 13, 17, 161, 0 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 return Route120_EventScript_1516DA:: @ 81516DA @@ -160,7 +160,7 @@ Route120_EventScript_151808:: @ 8151808 end Route120_EventScript_151813:: @ 8151813 - giveitem 0x8004 + giveitem_std 0x8004 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 @@ -222,9 +222,9 @@ Route120_EventScript_15189D:: @ 815189D applymovement 30, Route120_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE @@ -238,22 +238,22 @@ Route120_EventScript_151908:: @ 8151908 applymovement 255, Route120_Movement_1A0841 waitmovement 0 msgbox Route120_Text_171A40, 4 - giveitem ITEM_DEVON_SCOPE + giveitem_std ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_171B0E, 4 closemessage applymovement 31, Route120_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject 31 waitfieldeffect 30 - setmaptile 13, 15, 663, 0 - setmaptile 12, 16, 671, 0 - setmaptile 12, 17, 161, 0 - setmaptile 13, 17, 161, 0 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 special DrawWholeMapView release end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 9f8753b76..431444dae 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -87,7 +87,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 end Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 - countpokemon + getpartysize compare RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialvar RESULT, CheckFreePokemonStorageSpace diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 9ad0220bd..adfebfe08 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -16,7 +16,7 @@ Route123_EventScript_151C5D:: @ 8151C5D compare RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 - giveitem ITEM_TM19 + giveitem_std ITEM_TM19 compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag FLAG_RECEIVED_TM19 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index dab303345..6948bff87 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -16,7 +16,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 random 10 addvar RESULT, 20 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER @@ -24,7 +24,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 random 10 addvar RESULT, 20 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 @@ -78,7 +78,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4 random 10 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D @@ -89,7 +89,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E checkflag FLAG_RECEIVED_SPELON_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_SPELON_BERRY + giveitem_std ITEM_SPELON_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_SPELON_BERRY @@ -100,7 +100,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F checkflag FLAG_RECEIVED_PAMTRE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_PAMTRE_BERRY + giveitem_std ITEM_PAMTRE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_PAMTRE_BERRY @@ -111,7 +111,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 checkflag FLAG_RECEIVED_WATMEL_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_WATMEL_BERRY + giveitem_std ITEM_WATMEL_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_WATMEL_BERRY @@ -122,7 +122,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 checkflag FLAG_RECEIVED_DURIN_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_DURIN_BERRY + giveitem_std ITEM_DURIN_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_DURIN_BERRY @@ -133,7 +133,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 checkflag FLAG_RECEIVED_BELUE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_BELUE_BERRY + giveitem_std ITEM_BELUE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_BELUE_BERRY diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 55f3141fd..4902d9f08 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -244,8 +244,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - getitemname 0, 0x8008 - getitemname 1, 0x8009 + bufferitemname 0, 0x8008 + bufferitemname 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -259,8 +259,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - removeitem 0x8008, 1 - giveitem 0x8009 + takeitem 0x8008, 1 + giveitem_std 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare 0x4001, 0 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index b0e295db6..a81e73c3e 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -52,7 +52,7 @@ Route128_EventScript_15213F:: @ 815213F removeobject 5 removeobject 4 delay 100 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 waitfieldeffect 30 addobject 3 @@ -77,7 +77,7 @@ Route128_EventScript_15213F:: @ 815213F applymovement 3, Route128_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject 3 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 7e3a0e191..c45389b9f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -468,7 +468,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D compare 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 - giveitem ITEM_GREAT_BALL + giveitem_std ITEM_GREAT_BALL compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index 77f2ee0a4..3371005c0 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -7,7 +7,7 @@ RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 checkflag FLAG_RECEIVED_HM01 goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 - giveitem ITEM_HM01 + giveitem_std ITEM_HM01 setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 097fee3fb..89d59258d 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -88,9 +88,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - getitemname 0, ITEM_ROOT_FOSSIL + bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 - removeitem ITEM_ROOT_FOSSIL, 1 + takeitem ITEM_ROOT_FOSSIL, 1 setvar 0x40c4, 1 setvar 0x40c5, 1 release @@ -106,9 +106,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - getitemname 0, ITEM_CLAW_FOSSIL + bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 - removeitem ITEM_CLAW_FOSSIL, 1 + takeitem ITEM_CLAW_FOSSIL, 1 setvar 0x40c4, 1 setvar 0x40c5, 2 release @@ -132,9 +132,9 @@ RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A end RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 - getspeciesname 1, SPECIES_LILEEP + bufferspeciesname 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT @@ -144,7 +144,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage - givepoke SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 @@ -152,9 +152,9 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 end RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 - getspeciesname 1, SPECIES_ANORITH + bufferspeciesname 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT @@ -164,7 +164,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage - givepoke SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 0e9786760..e2e70d4c0 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -48,7 +48,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 - giveitem ITEM_LETTER + giveitem_std ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 playfanfare 370 message RustboroCity_DevonCorp_3F_Text_183422 @@ -159,7 +159,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 - giveitem ITEM_EXP_SHARE + giveitem_std ITEM_EXP_SHARE compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag FLAG_RECEIVED_EXP_SHARE diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/scripts/maps/RustboroCity_Flat2_1F.inc index b6b8b41b1..a6ba54ce7 100644 --- a/data/scripts/maps/RustboroCity_Flat2_1F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc @@ -9,8 +9,8 @@ RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox RustboroCity_Flat2_1F_Text_185410, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 5be59b14e..3a2242c7a 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -11,7 +11,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 - giveitem ITEM_PREMIER_BALL + giveitem_std ITEM_PREMIER_BALL compare RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 427be433d..0dc403ec7 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -26,7 +26,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE end RustboroCity_Gym_EventScript_15793C:: @ 815793C - giveitem ITEM_TM39 + giveitem_std ITEM_TM39 compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM39 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 53a845648..0cad33204 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/scripts/maps/RustboroCity_House3.inc index a5088175e..86d77c18e 100644 --- a/data/scripts/maps/RustboroCity_House3.inc +++ b/data/scripts/maps/RustboroCity_House3.inc @@ -13,8 +13,8 @@ RustboroCity_House3_EventScript_157DFF:: @ 8157DFF lock faceplayer waitse - playpokecry SPECIES_PIKACHU, 0 + playmoncry SPECIES_PIKACHU, 0 msgbox RustboroCity_House3_Text_18567D, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index 53b481832..a1c0ac31b 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F - sethealplace 6 + setrespawn 6 call RustboroCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 setvar 0x800b, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 9fd77bd6b..21fdf3d3b 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -84,7 +84,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE compare FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 - giveitem ITEM_QUICK_CLAW + giveitem_std ITEM_QUICK_CLAW compare RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closemessage diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 04364b661..64fce8118 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -64,7 +64,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 call_if 1, RusturfTunnel_EventScript_15C8EB compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB - giveitem ITEM_HM04 + giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage @@ -300,9 +300,9 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox RusturfTunnel_Text_194188, 4 - waitpokecry + waitmoncry release end @@ -313,7 +313,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA msgbox RusturfTunnel_Text_19419B, 4 trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 - giveitem ITEM_DEVON_GOODS + giveitem_std ITEM_DEVON_GOODS closemessage applymovement 255, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 @@ -332,9 +332,9 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA message RusturfTunnel_Text_19434F waitmessage waitse - playpokecry SPECIES_WINGULL, 0 - waitbutton - waitpokecry + playmoncry SPECIES_WINGULL, 0 + waitbuttonpress + waitmoncry closemessage applymovement 5, RusturfTunnel_Movement_15CAB4 applymovement 7, RusturfTunnel_Movement_15CAC3 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 18cff8320..8e9a404a2 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -88,9 +88,9 @@ SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox SSTidalCorridor_Text_199388, 4 - waitpokecry + waitmoncry release end @@ -122,7 +122,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 end SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 - sethealplace 8 + setrespawn 8 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 @@ -132,7 +132,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 end SSTidalCorridor_EventScript_15FE17:: @ 815FE17 - sethealplace 4 + setrespawn 4 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 0a48ae453..0390177de 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -7,7 +7,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 checkflag FLAG_RECEIVED_TM49 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 - giveitem ITEM_TM49 + giveitem_std ITEM_TM49 compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag FLAG_RECEIVED_TM49 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 6a4d9af02..b31e8fc25 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -79,9 +79,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar RESULT, 0 .endif playse 209 - setfieldeffect 0, 16 - setfieldeffect 1, 42 - setfieldeffect 2, 0 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 42 + setfieldeffectargument 2, 0 dofieldeffect 54 waitfieldeffect 54 .ifdef SAPPHIRE diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index a0c6314cc..cd778202c 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -4,7 +4,7 @@ SealedChamber_InnerRoom_MapScripts:: @ 815F1E7 SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 lockall braillemessage SealedChamber_InnerRoom_Braille_1C53C1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 checkflag FLAG_REGI_DOORS_OPENED goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 @@ -42,7 +42,7 @@ SealedChamber_InnerRoom_EventScript_15F247:: @ 815F247 SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 lockall braillemessage SealedChamber_InnerRoom_Braille_1C53F2 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -50,7 +50,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5414 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,7 +58,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5435 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -66,7 +66,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 lockall braillemessage SealedChamber_InnerRoom_Braille_1C545C - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -74,7 +74,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5470 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -82,7 +82,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F lockall braillemessage SealedChamber_InnerRoom_Braille_1C549B - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 7add1e6f3..ad17819c2 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -19,18 +19,18 @@ SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB end SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 - setmaptile 9, 1, 553, 1 - setmaptile 10, 1, 553, 1 - setmaptile 11, 1, 553, 1 - setmaptile 9, 2, 565, 1 - setmaptile 10, 2, 565, 1 - setmaptile 11, 2, 565, 1 + setmetatile 9, 1, 553, 1 + setmetatile 10, 1, 553, 1 + setmetatile 11, 1, 553, 1 + setmetatile 9, 2, 565, 1 + setmetatile 10, 2, 565, 1 + setmetatile 11, 2, 565, 1 return SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C lockall braillemessage SealedChamber_OuterRoom_Braille_1C534F - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -38,7 +38,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A lockall braillemessage SealedChamber_OuterRoom_Braille_1C5359 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -46,7 +46,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5363 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -54,7 +54,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 lockall braillemessage SealedChamber_OuterRoom_Braille_1C536D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -62,7 +62,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5377 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -70,7 +70,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5381 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -78,7 +78,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 lockall braillemessage SealedChamber_OuterRoom_Braille_1C538B - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -86,7 +86,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E lockall braillemessage SealedChamber_OuterRoom_Braille_1C5396 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -94,7 +94,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C lockall braillemessage SealedChamber_OuterRoom_Braille_1C539E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -102,7 +102,7 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA lockall braillemessage SealedChamber_OuterRoom_Braille_1C53A9 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -112,7 +112,7 @@ SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 checkflag FLAG_SYS_BRAILLE_DIG goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -125,7 +125,7 @@ SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 lockall braillemessage SealedChamber_OuterRoom_Braille_1C53B1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc index 302bc3930..f72c3d76e 100644 --- a/data/scripts/maps/SecretBase_YellowCave4.inc +++ b/data/scripts/maps/SecretBase_YellowCave4.inc @@ -6,7 +6,7 @@ SecretBase_YellowCave4_MapScripts:: @ 815F337 .byte 0 SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C - tileeffect 6 + setstepcallback 6 end SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index fcff20944..533c46850 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -37,9 +37,9 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 compare RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 - removeitem ITEM_SHOAL_SALT, 4 - removeitem ITEM_SHOAL_SHELL, 4 - giveitem ITEM_SHELL_BELL + takeitem ITEM_SHOAL_SALT, 4 + takeitem ITEM_SHOAL_SHELL, 4 + giveitem_std ITEM_SHELL_BELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 43dfa8afa..b6aba9523 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -25,7 +25,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - setmaptile 31, 8, 856, 1 + setmetatile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end @@ -34,35 +34,35 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - setmaptile 14, 26, 856, 1 + setmetatile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 - setmaptile 41, 20, 857, 1 + setmetatile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B - setmaptile 41, 10, 857, 1 + setmetatile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 - setmaptile 6, 9, 857, 1 + setmetatile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 - setmaptile 16, 13, 857, 1 + setmetatile 16, 13, 857, 1 return ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 @@ -72,10 +72,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 41, 20, 859, 0 + setmetatile 41, 20, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 releaseall @@ -90,10 +90,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 41, 10, 859, 0 + setmetatile 41, 10, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 releaseall @@ -103,10 +103,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 6, 9, 859, 0 + setmetatile 6, 9, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 releaseall @@ -116,10 +116,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 16, 13, 859, 0 + setmetatile 16, 13, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 releaseall @@ -129,10 +129,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 31, 8, 858, 0 + setmetatile 31, 8, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_1 releaseall @@ -147,10 +147,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 14, 26, 858, 0 + setmetatile 14, 26, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_2 releaseall diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index adf7d5d9e..c7cb08a9b 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -9,7 +9,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 - setmaptile 18, 2, 856, 1 + setmetatile 18, 2, 856, 1 return ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 @@ -19,10 +19,10 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B - setmaptile 18, 2, 858, 0 + setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_4 releaseall @@ -39,7 +39,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F checkflag FLAG_RECEIVED_FOCUS_BAND goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 - giveitem ITEM_FOCUS_BAND + giveitem_std ITEM_FOCUS_BAND compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag FLAG_RECEIVED_FOCUS_BAND diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index d6858bc15..efcad59d3 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -9,7 +9,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 - setmaptile 11, 11, 856, 1 + setmetatile 11, 11, 856, 1 return ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 @@ -19,10 +19,10 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B - setmaptile 11, 11, 858, 0 + setmetatile 11, 11, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_3 releaseall diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index 3f388127b..bd87e8562 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -5,6 +5,6 @@ SkyPillar_2F_MapScripts:: @ 815F2C9 .byte 0 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 - tileeffect 7 + setstepcallback 7 setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index f0b9a6f85..860f35b48 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -5,6 +5,6 @@ SkyPillar_4F_MapScripts:: @ 815F2E5 .byte 0 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 - tileeffect 7 + setstepcallback 7 setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 37da10220..07a78d2c4 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -16,9 +16,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 faceplayer setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE waitse - playpokecry SPECIES_RAYQUAZA, 2 + playmoncry SPECIES_RAYQUAZA, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_RAYQUAZA setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index c163685b2..56fc0e59b 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -64,7 +64,7 @@ SlateportCity_Items1:: @ 814BAD0 SlateportCity_EventScript_14BAE0:: @ 814BAE0 lock faceplayer - getfirstpartypokename 0 + bufferleadmonspeciesname 0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon compare RESULT, 1 @@ -388,7 +388,7 @@ SlateportCity_EventScript_14BDF2:: @ 814BDF2 faceplayer message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations1 + pokemartdecoration SlateportCity_Decorations1 msgbox SlateportCity_Text_1A0C02, 4 release end @@ -414,7 +414,7 @@ SlateportCity_EventScript_14BE20:: @ 814BE20 goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations2 + pokemartdecoration SlateportCity_Decorations2 msgbox SlateportCity_Text_1A0C02, 4 release end @@ -446,7 +446,7 @@ SlateportCity_Decorations2:: @ 814BE40 goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations3 + pokemartdecoration SlateportCity_Decorations3 msgbox SlateportCity_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 220ca3374..0a6f40c75 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -15,7 +15,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E checkflag FLAG_RECEIVED_TM41 goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 - giveitem ITEM_TM41 + giveitem_std ITEM_TM41 compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag FLAG_RECEIVED_TM41 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 5a00f4830..c4a44d9c9 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -23,14 +23,14 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, SlateportCity_ContestLobby_Movement_1554DC @@ -106,7 +106,7 @@ SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 - giveitem ITEM_POKEBLOCK_CASE + giveitem_std ITEM_POKEBLOCK_CASE setflag FLAG_RECEIVED_POKEBLOCK_CASE releaseall end @@ -129,7 +129,7 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536 @ 815553F lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index ae19d0326..304013b08 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -222,13 +222,13 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 9, 8 + hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY setvar 0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E return @@ -335,10 +335,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem ITEM_DEEP_SEA_TOOTH + giveitem_std ITEM_DEEP_SEA_TOOTH compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B - removeitem ITEM_SCANNER, 1 + takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 @@ -348,10 +348,10 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem ITEM_DEEP_SEA_SCALE + giveitem_std ITEM_DEEP_SEA_SCALE compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B - removeitem ITEM_SCANNER, 1 + takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 0cb7b397e..9e002e61e 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -164,7 +164,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 - giveitem ITEM_TM46 + giveitem_std ITEM_TM46 compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag FLAG_RECEIVED_TM46 diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index 9aa326f70..ac4e8f240 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 - sethealplace 4 + setrespawn 4 call SlateportCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE setvar 0x800b, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 7f3c331bd..593e18fee 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 checkflag FLAG_RECEIVED_RED_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 - getfirstpartypokename 0 + bufferleadmonspeciesname 0 switch 0x4001 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 @@ -89,7 +89,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_RED_SCARF - giveitem ITEM_RED_SCARF + giveitem_std ITEM_RED_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4 release end @@ -100,7 +100,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_BLUE_SCARF - giveitem ITEM_BLUE_SCARF + giveitem_std ITEM_BLUE_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4 release end @@ -111,7 +111,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_PINK_SCARF - giveitem ITEM_PINK_SCARF + giveitem_std ITEM_PINK_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4 release end @@ -122,7 +122,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_GREEN_SCARF - giveitem ITEM_GREEN_SCARF + giveitem_std ITEM_GREEN_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4 release end @@ -133,7 +133,7 @@ SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_YELLOW_SCARF - giveitem ITEM_YELLOW_SCARF + giveitem_std ITEM_YELLOW_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4 release end @@ -212,7 +212,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 - giveitem ITEM_SOOTHE_BELL + giveitem_std ITEM_SOOTHE_BELL compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag FLAG_RECEIVED_SOOTHE_BELL @@ -236,9 +236,9 @@ SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4 - waitpokecry + waitmoncry release end @@ -246,9 +246,9 @@ SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox SlateportCity_PokemonFanClub_Text_17E164, 4 - waitpokecry + waitmoncry release end @@ -256,8 +256,8 @@ SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox SlateportCity_PokemonFanClub_Text_17E178, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 748dbe898..f4842bd40 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -13,7 +13,7 @@ SootopolisCity_MapScript1_14D08D:: @ 814D08D SootopolisCity_EventScript_14D0A0:: @ 814D0A0 setobjectxyperm 3, 31, 18 - setmaptile 31, 32, 592, 1 + setmetatile 31, 32, 592, 1 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 @@ -22,15 +22,15 @@ SootopolisCity_EventScript_14D0B1:: @ 814D0B1 return SootopolisCity_EventScript_14D0BB:: @ 814D0BB - setmaptile 9, 6, 584, 1 - setmaptile 9, 17, 584, 1 - setmaptile 9, 26, 584, 1 - setmaptile 44, 17, 584, 1 - setmaptile 8, 35, 584, 1 - setmaptile 53, 28, 584, 1 - setmaptile 45, 6, 584, 1 - setmaptile 48, 25, 584, 1 - setmaptile 31, 32, 592, 1 + setmetatile 9, 6, 584, 1 + setmetatile 9, 17, 584, 1 + setmetatile 9, 26, 584, 1 + setmetatile 44, 17, 584, 1 + setmetatile 8, 35, 584, 1 + setmetatile 53, 28, 584, 1 + setmetatile 45, 6, 584, 1 + setmetatile 48, 25, 584, 1 + setmetatile 31, 32, 592, 1 return SootopolisCity_MapScript1_14D10D:: @ 814D10D @@ -98,7 +98,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F random 10 addvar RESULT, 20 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS @@ -111,7 +111,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F end SootopolisCity_EventScript_14D1FF:: @ 814D1FF - giveitem ITEM_FIGY_BERRY + giveitem_std ITEM_FIGY_BERRY compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 @@ -119,7 +119,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF end SootopolisCity_EventScript_14D220:: @ 814D220 - giveitem ITEM_IAPAPA_BERRY + giveitem_std ITEM_IAPAPA_BERRY compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 @@ -461,7 +461,7 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject LAST_TALKED diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 6f99ba8a5..65ed13d87 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -10,7 +10,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C end SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 - tileeffect 4 + setstepcallback 4 end SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 @@ -25,16 +25,16 @@ SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 compare 0x4022, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 - setmaptile 8, 4, 519, 0 - setmaptile 8, 5, 519, 0 + setmetatile 8, 4, 519, 0 + setmetatile 8, 5, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF61:: @ 815AF61 - setmaptile 8, 10, 519, 0 - setmaptile 8, 11, 519, 0 + setmetatile 8, 10, 519, 0 + setmetatile 8, 11, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF73:: @ 815AF73 - setmaptile 8, 15, 519, 0 - setmaptile 8, 16, 519, 0 + setmetatile 8, 15, 519, 0 + setmetatile 8, 16, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85 return @@ -108,7 +108,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D end SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 - giveitem ITEM_TM03 + giveitem_std ITEM_TM03 compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 9a7b63c82..074c9a179 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -7,7 +7,7 @@ SootopolisCity_House1_EventScript_15B29B:: @ 815B29B checkflag FLAG_RECEIVED_TM31 goto_if_eq SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 - giveitem ITEM_TM31 + giveitem_std ITEM_TM31 setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_18FA03, 4 release @@ -22,8 +22,8 @@ SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 lock faceplayer waitse - playpokecry SPECIES_KECLEON, 0 + playmoncry SPECIES_KECLEON, 0 msgbox SootopolisCity_House1_Text_18FA50, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/scripts/maps/SootopolisCity_House4.inc index c192a0340..b552cc6d6 100644 --- a/data/scripts/maps/SootopolisCity_House4.inc +++ b/data/scripts/maps/SootopolisCity_House4.inc @@ -13,8 +13,8 @@ SootopolisCity_House4_EventScript_15B35F:: @ 815B35F lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox SootopolisCity_House4_Text_18FDD8, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 1adf05991..fb91202f3 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -10,7 +10,7 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 compare RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 - givedecoration DECOR_WAILMER_DOLL + givedecoration_std DECOR_WAILMER_DOLL compare RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag FLAG_RECEIVED_WAILMER_DOLL @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD end SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 - getdecorname 1, DECOR_WAILMER_DOLL + bufferdecorationname 1, DECOR_WAILMER_DOLL msgbox SootopolisCity_House6_Text_1A0CEF, 4 msgbox SootopolisCity_House6_Text_18FF28, 4 release diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index df536004e..bdff79375 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -38,7 +38,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 - giveitem ITEM_ELIXIR + giveitem_std ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closemessage @@ -87,7 +87,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 - giveitem ITEM_ELIXIR + giveitem_std ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closemessage diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 8bbb06575..7b87bc7fc 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 - sethealplace 10 + setrespawn 10 end @ 815B19A setvar 0x800B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 81c50559e..f62becf08 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -17,7 +17,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmovement 0 delay 30 - hideobject 1, 26, 9 + hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 0a9ca6b89..ea2f852f4 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -54,9 +54,9 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 waitmovement 0 delay 50 waitse - playpokecry SPECIES_LATIAS_OR_LATIOS, 0 + playmoncry SPECIES_LATIAS_OR_LATIOS, 0 delay 30 - waitpokecry + waitmoncry addobject 2 delay 30 applymovement 127, SouthernIsland_Interior_Movement_160C16 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 665cbf4af..d991a7096 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -20,18 +20,18 @@ Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF end Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 - setmaptile 5, 3, 542, 1 - setmaptile 6, 3, 542, 1 - setmaptile 7, 3, 542, 1 - setmaptile 8, 3, 542, 1 - setmaptile 5, 4, 552, 0 - setmaptile 6, 4, 552, 0 - setmaptile 7, 4, 552, 0 - setmaptile 8, 4, 552, 0 - setmaptile 5, 5, 552, 0 - setmaptile 6, 5, 552, 0 - setmaptile 7, 5, 552, 0 - setmaptile 8, 5, 552, 0 + setmetatile 5, 3, 542, 1 + setmetatile 6, 3, 542, 1 + setmetatile 7, 3, 542, 1 + setmetatile 8, 3, 542, 1 + setmetatile 5, 4, 552, 0 + setmetatile 6, 4, 552, 0 + setmetatile 7, 4, 552, 0 + setmetatile 8, 4, 552, 0 + setmetatile 5, 5, 552, 0 + setmetatile 6, 5, 552, 0 + setmetatile 7, 5, 552, 0 + setmetatile 8, 5, 552, 0 return Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 733a060c3..cb5c713ee 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -21,7 +21,7 @@ Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 lockall braillemessage Underwater_SealedChamber_Braille_1C533D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 213a3609a..1e0f14728 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A end LinkContestRoom1_EventScript_15F625:: @ 815F625 - hideobject 255, 0, 9 + hideobjectat 255, MAP_LITTLEROOT_TOWN call LinkContestRoom1_EventScript_15F919 end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 9726038d4..3694f089d 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -23,14 +23,14 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35 @@ -104,7 +104,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 checkflag FLAG_RECEIVED_TM45 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 - giveitem ITEM_TM45 + giveitem_std ITEM_TM45 compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag FLAG_RECEIVED_TM45 @@ -123,7 +123,7 @@ VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80 VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89 lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index 1cfa785d3..ed60ec1c7 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -56,8 +56,8 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 lock faceplayer waitse - playpokecry SPECIES_PIKACHU, 0 + playmoncry SPECIES_PIKACHU, 0 msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index a0b1f87de..598c3f60b 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F - sethealplace 18 + setrespawn 18 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B end @@ -12,7 +12,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 933de6769..3ccfbeb29 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -233,7 +233,7 @@ choose_story: setvar 0x8008, 1 special ScrSpecial_StorytellerDisplayStory waitmessage - waitbutton + waitbuttonpress specialvar RESULT, ScrSpecial_StorytellerUpdateStat compare RESULT, FALSE goto_if_eq no_stat_update diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index a553ae379..ea8128ee3 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -277,7 +277,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D checkflag FLAG_RECEIVED_AMULET_COIN goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 - giveitem ITEM_AMULET_COIN + giveitem_std ITEM_AMULET_COIN compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 @@ -313,9 +313,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CA6:: @ 81B6CA6 lock faceplayer waitse - playpokecry SPECIES_MACHOKE, 0 + playmoncry SPECIES_MACHOKE, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, 4 - waitpokecry + waitmoncry release end @@ -324,9 +324,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9 lock faceplayer waitse - playpokecry SPECIES_MACHOKE, 0 + playmoncry SPECIES_MACHOKE, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_172831, 4 - waitpokecry + waitmoncry release end @@ -383,7 +383,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE compare 0x8008, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 - giveitem ITEM_SS_TICKET + giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closemessage compare 0x8008, 0 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 6934ffe57..42e73e17c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -106,7 +106,7 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 msgbox FallarborTown_ContestLobby_Text_1B704A, 4 - giveitem ITEM_PECHA_BERRY + giveitem_std ITEM_PECHA_BERRY setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto FallarborTown_ContestLobby_EventScript_1B76EF end @@ -174,7 +174,7 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800 msgbox FallarborTown_ContestLobby_Text_1B74B4, 4 - giveitem ITEM_PECHA_BERRY + giveitem_std ITEM_PECHA_BERRY setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR msgbox FallarborTown_ContestLobby_Text_1B753A, 4 release diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 385f93d22..892630ac8 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -27,7 +27,7 @@ gUnknown_081C3448:: @ 81C3448 playse 73 message UnknownString_81C34E4 waitmessage - waitbutton + waitbuttonpress releaseall goto EventScript_1C341B @@ -36,7 +36,7 @@ gUnknown_081C3459:: @ 81C3459 playse 73 message UnknownString_81C3514 waitmessage - waitbutton + waitbuttonpress releaseall goto EventScript_1C341B @@ -62,13 +62,13 @@ EventScript_1C348E: EventScript_1C34A0: message UnknownString_81C35A9 waitmessage - waitbutton + waitbuttonpress releaseall end EventScript_1C34A9: message UnknownString_81C3583 waitmessage - waitbutton + waitbuttonpress releaseall end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index f5506bfec..deb30187f 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -9,7 +9,7 @@ Route111_EventScript_1A3858:: @ 81A3858 end Route111_EventScript_1A3877:: @ 81A3877 - giveitem ITEM_TM43 + giveitem_std ITEM_TM43 compare RESULT, 0 goto_if_eq Route111_EventScript_1A38D9 msgbox Route111_Text_1A35C5, 4 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index a74eba551..cf5fb26c5 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -58,7 +58,7 @@ EventScript_1A6F0B: EventScript_1A6F21: special DoTVShow waitmessage - waitbutton + waitbuttonpress compare RESULT, 1 goto_if 5, EventScript_1A6F21 goto EventScript_1A6F37 @@ -81,14 +81,14 @@ EventScript_1A6F50: compare RESULT, 0 goto_if_eq EventScript_1A6EBB waitmessage - waitbutton + waitbuttonpress goto EventScript_1A6F37 end EventScript_1A6F66: special DoTVShowInSearchOfTrainers waitmessage - waitbutton + waitbuttonpress compare RESULT, 0 goto_if_eq EventScript_1A6F66 goto EventScript_1A6F37 -- cgit v1.2.3 From 754e911b4e95205bafa5dc93242da9cee3f2c5c6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 21 Dec 2017 11:40:26 -0600 Subject: Rename gScript* vars to gSpecialVar_* --- data/event_scripts.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 3fd344b13..76b080a5b 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -32,12 +32,12 @@ gSpecialVars:: .4byte gSpecialVar_0x8009 .4byte gSpecialVar_0x800A .4byte gSpecialVar_0x800B - .4byte gScriptFacing - .4byte gScriptResult - .4byte gScriptItemId - .4byte gScriptLastTalked - .4byte gScriptContestRank - .4byte gScriptContestCategory + .4byte gSpecialVar_Facing + .4byte gSpecialVar_Result + .4byte gSpecialVar_ItemId + .4byte gSpecialVar_LastTalked + .4byte gSpecialVar_ContestRank + .4byte gSpecialVar_ContestCategory .include "data/specials.inc" -- cgit v1.2.3 From 683862fbd5fdcd9b1c60f926553db0cbe2847422 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 21 Dec 2017 19:12:42 -0500 Subject: through sub_8102460; decompile associated pointer table --- data/slot_machine.s | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 9bd6fe5c9..827d27747 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,38 +3,6 @@ .section .rodata - .align 2 -gUnknown_083ECAAC:: @ 83ECAAC - .4byte sub_8101D5C - .4byte sub_8101D8C - .4byte sub_8101DB0 - .4byte sub_8101DF4 - .4byte sub_8101E10 - .4byte sub_8101E3C - .4byte sub_8101F44 - .4byte sub_8101F60 - .4byte sub_8101F88 - .4byte sub_8101FA4 - .4byte sub_8102008 - .4byte sub_8102034 - .4byte sub_8102058 - .4byte sub_8102090 - .4byte sub_81020C8 - .4byte sub_81021E0 - .4byte sub_81021FC - .4byte sub_8102264 - .4byte sub_81022A0 - .4byte sub_81022CC - .4byte sub_81022F0 - .4byte sub_8102318 - .4byte sub_8102344 - .4byte sub_810239C - .4byte sub_81023B8 - .4byte sub_81023E0 - .4byte sub_81023FC - .4byte sub_8102424 - .4byte sub_8102460 - .align 2 gUnknown_083ECB20:: @ 83ECB20 .4byte sub_8102A9C -- cgit v1.2.3 From ce74d72c31a3ebda26adc6ae888700213f64b113 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 22 Dec 2017 14:19:09 -0600 Subject: label and clean up some things in contest.c --- data/contest_opponents.inc | 2 +- data/text/contest_strings.inc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/contest_opponents.inc b/data/contest_opponents.inc index 2c502285e..8c9c76f1b 100644 --- a/data/contest_opponents.inc +++ b/data/contest_opponents.inc @@ -1,5 +1,5 @@ .align 2 -gUnknown_083C9408:: @ 83C9408 +gContestOpponents:: @ 83C9408 .2byte 286 @ SPECIES_ID .string "POOCHY$", 11 @ POKE_NICKNAME .string "JIMMY$", 8 @ TRAINER_NAME diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 94366cc41..2d8b5b34e 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -208,10 +208,10 @@ gUnknown_083CAF70:: @ 83CAF70 .4byte ContestString_Smart .4byte ContestString_Tough -gUnknown_083CAF84:: @ 83CAF84 +gText_Contest_WhichMoveWillBePlayed:: @ 83CAF84 .string "Appeal no. {NAME_END}!\nWhich move will be played?$" -gUnknown_083CAFAE:: @ 83CAFAE +gText_Contest_ButItCantParticipate:: @ 83CAFAE .string "Appeal no. {NAME_END}!\nBut it can’t participate!$" gUnknown_083CAFD7:: @ 83CAFD7 @@ -280,7 +280,7 @@ ContestString_StandOutDidnt: .string "{STR_VAR_1} hasn’t made\nits appeal.{PAUSE_UNTIL_PRESS}$" .align 2 -gUnknown_083CB2F0:: @ 83CB2F0 +gContestStandOutStrings:: @ 83CB2F0 .4byte ContestString_StandOutNone .4byte ContestString_StandOutNotMuch .4byte ContestString_StandOutLittle @@ -625,7 +625,7 @@ ContestString_Toughness: .string "toughness$" .align 2 -gUnknown_083CC2D8:: @ 83CC2D8 +gContestCategoryStrings:: @ 83CC2D8 .4byte ContestString_Coolness .4byte ContestString_Beauty2 .4byte ContestString_Cuteness -- cgit v1.2.3 From 255f0d4ee4327c2eac59d55d5e50dccbb353370d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 22 Dec 2017 17:42:05 -0600 Subject: clean up and label more of contest.c --- data/text/contest_strings.inc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'data') diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 2d8b5b34e..5c9fdf0db 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -450,19 +450,19 @@ ContestString_ScrambleOrder: .string "It scrambled up the\norder for the next turn.{PAUSE 60}$" gUnknown_083CBD52:: @ 83CBD52 -ContestString_JudgeExpectantly2: +ContestString_JudgeExpectantly2:: .string "The JUDGE looked at\n{STR_VAR_1} expectantly.{PAUSE 60}$" gUnknown_083CBD79:: @ 83CBD79 -ContestString_WentOverWell: +ContestString_WentOverWell:: .string "The appeal combo went\nover well.{PAUSE 60}$" gUnknown_083CBD9D:: @ 83CBD9D -ContestString_WentOverVeryWell: +ContestString_WentOverVeryWell:: .string "The appeal combo went\nover very well.{PAUSE 60}$" gUnknown_083CBDC6:: @ 83CBDC6 -ContestString_AppealComboExcellently: +ContestString_AppealComboExcellently:: .string "The appeal combo went\nover excellently.{PAUSE 60}$" ContestString_AvertGaze: .string "{STR_VAR_1} managed to\navert its gaze.{PAUSE 60}$" @@ -504,33 +504,33 @@ ContestString_Unaffected: .string "{STR_VAR_1} was\nunaffected.{PAUSE 60}$" gUnknown_083CC075:: @ 83CC075 -ContestString_DissapointedRepeat: +ContestString_DissapointedRepeat:: .string "{STR_VAR_1} disappointed\nby repeating an appeal.{PAUSE 60}$" gUnknown_083CC0A0:: @ 83CC0A0 -ContestString_WentOverGreat: +ContestString_WentOverGreat:: .string "{STR_VAR_1}’s {STR_VAR_3}\nwent over great.{PAUSE 60}$" gUnknown_083CC0BC:: @ 83CC0BC -ContestString_DidntGoWell: +ContestString_DidntGoWell:: .string "{STR_VAR_1}’s {STR_VAR_3}\ndidn’t go over well here...{PAUSE 60}$" gUnknown_083CC0E3:: @ 83CC0E3 -ContestString_GotCrowdGoing: +ContestString_GotCrowdGoing:: .string "{STR_VAR_1}’s {STR_VAR_3}\ngot the crowd going.{PAUSE 60}$" gUnknown_083CC103:: @ 83CC103 -ContestString_CantAppealNextTurn: +ContestString_CantAppealNextTurn:: .string "{STR_VAR_1} can’t appeal\nnext turn...{PAUSE 60}$" -ContestString_AttractedAttention: +ContestString_AttractedAttention:: .string "It attracted the crowd’s\nattention.{PAUSE 60}$" gUnknown_083CC14A:: @ 83CC14A -ContestString_CrowdWatches: +ContestString_CrowdWatches:: .string "The crowd continues to\nwatch {STR_VAR_3}.{PAUSE 60}$" gUnknown_083CC16E:: @ 83CC16E -ContestString_Ignored2: +ContestString_Ignored2:: .string "{STR_VAR_1}’s\n{STR_VAR_2} is ignored.{PAUSE 60}$" .align 2 @@ -598,19 +598,19 @@ gUnknown_083CC188:: @ 83CC188 .4byte ContestString_Unaffected .4byte ContestString_AttractedAttention -gUnknown_083CC280:: @ 83CC280 +gText_Contest_Shyness:: @ 83CC280 .string "shyness$" -gUnknown_083CC288:: @ 83CC288 +gText_Contest_Anxiety:: @ 83CC288 .string "anxiety$" -gUnknown_083CC290:: @ 83CC290 +gText_Contest_Laziness:: @ 83CC290 .string "laziness$" -gUnknown_083CC299:: @ 83CC299 +gText_Contest_Hesitancy:: @ 83CC299 .string "hesitancy$" -gUnknown_083CC2A3:: @ 83CC2A3 +gText_Contest_Fear:: @ 83CC2A3 .string "fear$" ContestString_Coolness: -- cgit v1.2.3 From 4b5ad9de049a63b101b2bf5f2f2cb92beb26e5fb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Dec 2017 12:36:12 -0600 Subject: Name and use temp var constants --- data/event_scripts.s | 23 +-- data/map_events.s | 1 + data/maps/events/AquaHideout_B2F.inc | 4 +- data/maps/events/CaveOfOrigin_1F.inc | 6 +- data/maps/events/CaveOfOrigin_B1F.inc | 6 +- data/maps/events/CaveOfOrigin_B2F.inc | 6 +- data/maps/events/CaveOfOrigin_B3F.inc | 6 +- data/maps/events/CaveOfOrigin_B4F.inc | 4 +- data/maps/events/DoubleBattleColosseum.inc | 8 +- data/maps/events/EverGrandeCity.inc | 22 +-- data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc | 2 +- data/maps/events/MagmaHideout_B2F.inc | 8 +- data/maps/events/MauvilleCity_Gym.inc | 6 +- data/maps/events/MossdeepCity.inc | 8 +- data/maps/events/MossdeepCity_Gym.inc | 2 +- data/maps/events/NewMauville_Inside.inc | 18 +-- data/maps/events/RecordCorner.inc | 8 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 4 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 4 +- data/maps/events/Route110_TrickHouseEnd.inc | 2 +- data/maps/events/Route110_TrickHousePuzzle2.inc | 8 +- data/maps/events/Route110_TrickHousePuzzle3.inc | 14 +- data/maps/events/Route110_TrickHousePuzzle5.inc | 28 ++-- data/maps/events/Route110_TrickHousePuzzle7.inc | 2 +- data/maps/events/Route111.inc | 20 +-- data/maps/events/Route121_SafariZoneEntrance.inc | 2 +- data/maps/events/SingleBattleColosseum.inc | 4 +- data/maps/events/TradeCenter.inc | 4 +- data/scripts/cable_club.inc | 12 +- data/scripts/contest_hall.inc | 146 +++++++++--------- .../maps/AbandonedShip_HiddenFloorRooms.inc | 22 +-- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 +- data/scripts/maps/BattleTower_Corridor.inc | 6 +- data/scripts/maps/BattleTower_Elevator.inc | 10 +- data/scripts/maps/BattleTower_Lobby.inc | 32 ++-- data/scripts/maps/EverGrandeCity.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_Corridor1.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor2.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor3.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor4.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor5.inc | 2 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 6 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 6 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 20 +-- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 42 ++--- data/scripts/maps/LilycoveCity_House3.inc | 10 +- data/scripts/maps/LittlerootTown.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 68 ++++----- data/scripts/maps/MossdeepCity.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 4 +- data/scripts/maps/MtPyre_Exterior.inc | 4 +- data/scripts/maps/NewMauville_Inside.inc | 16 +- data/scripts/maps/PetalburgCity.inc | 6 +- data/scripts/maps/PetalburgCity_Gym.inc | 2 +- data/scripts/maps/Route101.inc | 4 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 4 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 4 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 14 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 24 +-- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 104 ++++++------- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 170 ++++++++++----------- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 2 +- data/scripts/maps/Route111.inc | 16 +- data/scripts/maps/Route113.inc | 6 +- data/scripts/maps/Route119.inc | 20 +-- data/scripts/maps/Route120.inc | 12 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 16 +- data/scripts/maps/RustboroCity.inc | 36 ++--- data/scripts/maps/RusturfTunnel.inc | 28 ++-- data/scripts/maps/SafariZone_Southeast.inc | 6 +- data/scripts/maps/SlateportCity_Harbor.inc | 6 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 20 +-- data/scripts/maps/UnknownMap_25_34.inc | 100 ++++++------ data/scripts/players_house.inc | 6 +- 83 files changed, 643 insertions(+), 641 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 76b080a5b..b18e4eb1a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -8,6 +8,7 @@ #include "constants/opponents.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/vars.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -2132,14 +2133,14 @@ Event_WorldMap:: @ 81A02D6 DewfordTown_EventScript_1A02E7:: @ 81A02E7 Route104_EventScript_1A02E7:: @ 81A02E7 Route109_EventScript_1A02E7:: @ 81A02E7 - setflag 0x4001 + setflag FLAG_SPECIAL_FLAG_1 playbgm 431, 0 return DewfordTown_EventScript_1A02EF:: @ 81A02EF Route104_EventScript_1A02EF:: @ 81A02EF Route109_EventScript_1A02EF:: @ 81A02EF - clearflag 0x4001 + clearflag FLAG_SPECIAL_FLAG_1 fadedefaultbgm return @@ -2303,7 +2304,7 @@ CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0 waitse playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 waitmoncry - setvar 0x4005, 1 + setvar VAR_TEMP_5, 1 releaseall end @@ -2312,20 +2313,20 @@ CaveOfOrigin_B1F_EventScript_1A04AF:: @ 81A04AF CaveOfOrigin_B2F_EventScript_1A04AF:: @ 81A04AF CaveOfOrigin_B3F_EventScript_1A04AF:: @ 81A04AF lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto CaveOfOrigin_1F_EventScript_1A04D3 end CaveOfOrigin_B2F_EventScript_1A04BB:: @ 81A04BB CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB lockall - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 goto CaveOfOrigin_B2F_EventScript_1A04D3 end @ 81A04C7 lockall - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 goto CaveOfOrigin_B2F_EventScript_1A04D3 end @@ -2343,11 +2344,11 @@ CaveOfOrigin_B1F_EventScript_1A04E3:: @ 81A04E3 CaveOfOrigin_B2F_EventScript_1A04E3:: @ 81A04E3 CaveOfOrigin_B3F_EventScript_1A04E3:: @ 81A04E3 CaveOfOrigin_B4F_EventScript_1A04E3:: @ 81A04E3 - setvar 0x4001, 1 - setvar 0x4002, 1 - setvar 0x4003, 1 - setvar 0x4004, 1 - setvar 0x4005, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_5, 1 return AquaHideout_B1F_EventScript_1A04FD:: @ 81A04FD diff --git a/data/map_events.s b/data/map_events.s index e7fb03fb6..0a2a25fb0 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -2,6 +2,7 @@ #include "constants/items.h" #include "constants/map_objects.h" #include "constants/maps.h" +#include "constants/vars.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index c4b0abc78..745a40543 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -18,8 +18,8 @@ AquaHideout_B2F_MapWarps:: @ 838CF94 warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents:: @ 838CFE4 - coord_event 28, 17, 3, 0, 0x4001, 0, 0, AquaHideout_B2F_EventScript_15D8BD - coord_event 28, 16, 3, 0, 0x4001, 0, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD AquaHideout_B2F_MapEvents:: @ 838D004 map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/events/CaveOfOrigin_1F.inc index 1e2185e9b..b0d77795c 100644 --- a/data/maps/events/CaveOfOrigin_1F.inc +++ b/data/maps/events/CaveOfOrigin_1F.inc @@ -3,9 +3,9 @@ CaveOfOrigin_1F_MapWarps:: @ 838D718 warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_1F_MapCoordEvents:: @ 838D728 - coord_event 7, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - coord_event 6, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - coord_event 5, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 7, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF CaveOfOrigin_1F_MapEvents:: @ 838D758 map_events 0x0, CaveOfOrigin_1F_MapWarps, CaveOfOrigin_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 905954d9b..a91ee50e4 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -3,9 +3,9 @@ CaveOfOrigin_B1F_MapWarps:: @ 838D76C warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_B2F CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C - coord_event 12, 15, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - coord_event 12, 16, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - coord_event 12, 17, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 15, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 16, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 17, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF CaveOfOrigin_B1F_MapEvents:: @ 838D7AC map_events 0x0, CaveOfOrigin_B1F_MapWarps, CaveOfOrigin_B1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/events/CaveOfOrigin_B2F.inc index 2d98e50ac..5d03aaaa2 100644 --- a/data/maps/events/CaveOfOrigin_B2F.inc +++ b/data/maps/events/CaveOfOrigin_B2F.inc @@ -3,9 +3,9 @@ CaveOfOrigin_B2F_MapWarps:: @ 838D7C0 warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 - coord_event 10, 6, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF - coord_event 10, 5, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF - coord_event 14, 13, 3, 0, 0x4002, 0, 0, CaveOfOrigin_B2F_EventScript_1A04BB + coord_event 10, 6, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 10, 5, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 14, 13, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B2F_EventScript_1A04BB CaveOfOrigin_B2F_MapEvents:: @ 838D800 map_events 0x0, CaveOfOrigin_B2F_MapWarps, CaveOfOrigin_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc index 2561dee6a..6f9544aa2 100644 --- a/data/maps/events/CaveOfOrigin_B3F.inc +++ b/data/maps/events/CaveOfOrigin_B3F.inc @@ -6,9 +6,9 @@ CaveOfOrigin_B3F_MapWarps:: @ 838D82C warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C - coord_event 5, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF - coord_event 8, 6, 3, 0, 0x4002, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB - coord_event 8, 5, 3, 0, 0x4002, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF + coord_event 8, 6, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 8, 5, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB CaveOfOrigin_B3F_MapEvents:: @ 838D86C map_events CaveOfOrigin_B3F_MapObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index 672604d3e..61bfe4eb9 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -6,8 +6,8 @@ CaveOfOrigin_B4F_MapWarps:: @ 838D898 CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 coord_event 9, 13, 3, 0, 0x409b, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 - coord_event 13, 9, 3, 0, 0x4005, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 - coord_event 5, 9, 3, 0, 0x4005, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 CaveOfOrigin_B4F_MapEvents:: @ 838D8D0 map_events CaveOfOrigin_B4F_MapObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc index 4c1058845..a04c7a3a9 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/events/DoubleBattleColosseum.inc @@ -5,10 +5,10 @@ DoubleBattleColosseum_MapWarps:: @ 8391428 warp_def 8, 8, 3, 127, MAP_NONE DoubleBattleColosseum_MapCoordEvents:: @ 8391448 - coord_event 3, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A4383 - coord_event 3, 6, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A43B9 - coord_event 10, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A439E - coord_event 10, 6, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A43D4 + coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A4383 + coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43B9 + coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A439E + coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43D4 DoubleBattleColosseum_MapEvents:: @ 8391488 map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc index a4b62f583..0a619b93d 100644 --- a/data/maps/events/EverGrandeCity.inc +++ b/data/maps/events/EverGrandeCity.inc @@ -5,17 +5,17 @@ EverGrandeCity_MapWarps:: @ 83807DC warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents:: @ 83807FC - coord_event 17, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 16, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 18, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 19, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 20, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 21, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 22, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 23, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 24, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 25, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 26, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 EverGrandeCity_MapBGEvents:: @ 83808AC bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_14D4E5 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index ec57d4ba8..63e3ff3be 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494 - coord_event 10, 2, 3, 0, 0x4001, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D + coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4 map_events LilycoveCity_CoveLilyMotel_1F_MapObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc index 16ac562b5..e300078aa 100644 --- a/data/maps/events/MagmaHideout_B2F.inc +++ b/data/maps/events/MagmaHideout_B2F.inc @@ -16,10 +16,10 @@ MagmaHideout_B2F_MapWarps:: @ 838EC5C warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C - coord_event 7, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 6, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 5, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 4, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 7, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 6, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 5, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 4, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD MagmaHideout_B2F_MapEvents:: @ 838ECDC map_events MagmaHideout_B2F_MapObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index d30c6b275..a9bd2a057 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -11,9 +11,9 @@ MauvilleCity_Gym_MapWarps:: @ 83882AC warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents:: @ 83882BC - coord_event 0, 9, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_15664B - coord_event 8, 11, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_156670 - coord_event 4, 15, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_156695 + coord_event 0, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_15664B + coord_event 8, 11, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156670 + coord_event 4, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156695 MauvilleCity_Gym_MapBGEvents:: @ 83882EC bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156761 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index a5b4fa74a..957d91d5a 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -22,10 +22,10 @@ MossdeepCity_MapWarps:: @ 8380504 warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents:: @ 8380554 - coord_event 25, 25, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 26, 25, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 32, 27, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 33, 27, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 MossdeepCity_MapBGEvents:: @ 8380594 bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_14CFF6 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index 80812cc4d..21521df5f 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -14,7 +14,7 @@ MossdeepCity_Gym_MapWarps:: @ 838A738 warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY MossdeepCity_Gym_MapCoordEvents:: @ 838A748 - coord_event 12, 3, 3, 0, 0x4001, 0, 0, MossdeepCity_Gym_EventScript_15A742 + coord_event 12, 3, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_15A742 MossdeepCity_Gym_MapBGEvents:: @ 838A758 bg_event 2, 7, 0, 0, 0, MossdeepCity_Gym_EventScript_15A5EA diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index a3b7ffbe2..cb7420edc 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -12,15 +12,15 @@ NewMauville_Inside_MapWarps:: @ 838DFC8 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents:: @ 838DFD0 - coord_event 30, 38, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 18, 36, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 4, 26, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 16, 22, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 25, 18, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 2, 11, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 6, 11, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 13, 10, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 17, 10, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 coord_event 33, 6, 3, 0, 0x40ba, 1, 0, NewMauville_Inside_EventScript_15E876 NewMauville_Inside_MapBGEvents:: @ 838E070 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index df26386b3..d46c252be 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -8,10 +8,10 @@ RecordCorner_MapWarps:: @ 83913B4 warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents:: @ 83913D4 - coord_event 6, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4418 - coord_event 6, 6, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4442 - coord_event 13, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A442D - coord_event 13, 6, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4457 + coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4418 + coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4442 + coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A442D + coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4457 RecordCorner_MapEvents:: @ 8391414 map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc index 9051ad929..4be4faaf3 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 warp_def 13, 5, 0, 3, MAP_ROUTE110 Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 - coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 - coord_event 5, 4, 3, 0, 0x4001, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04 map_events Route110_SeasideCyclingRoadNorthEntrance_MapObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc index 947cc714a..68d3e1f4c 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 warp_def 13, 5, 0, 5, MAP_ROUTE110 Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 - coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B - coord_event 5, 4, 3, 0, 0x4001, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98 map_events Route110_SeasideCyclingRoadSouthEntrance_MapObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index 8c3cf7e11..e3b83d48f 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapWarps:: @ 83921E8 warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents:: @ 83921F8 - coord_event 2, 2, 3, 0, 0x4002, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 + coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index 264465641..7adf7b9d2 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -11,10 +11,10 @@ Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC - coord_event 14, 21, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 - coord_event 8, 17, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 - coord_event 4, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06 - coord_event 5, 2, 0, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19 + coord_event 14, 21, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 + coord_event 8, 17, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 + coord_event 4, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06 + coord_event 5, 2, 0, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19 Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C bg_event 14, 5, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DC3 diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index 5c360ac6c..25381fba6 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -17,13 +17,13 @@ Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C - coord_event 5, 20, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB - coord_event 4, 12, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 - coord_event 11, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 - coord_event 3, 8, 3, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF - coord_event 13, 7, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB - coord_event 1, 3, 3, 0, 0x4006, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 - coord_event 10, 2, 3, 0, 0x4007, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 + coord_event 5, 20, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB + coord_event 4, 12, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 + coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 + coord_event 3, 8, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF + coord_event 13, 7, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB + coord_event 1, 3, 3, 0, VAR_TEMP_6, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 + coord_event 10, 2, 3, 0, VAR_TEMP_7, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC bg_event 0, 8, 3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1626EB diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index ac40ffef4..3c628eabf 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -11,20 +11,20 @@ Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C - coord_event 8, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 - coord_event 7, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 - coord_event 6, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF - coord_event 5, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB - coord_event 6, 14, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 - coord_event 7, 14, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 - coord_event 11, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF - coord_event 10, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB - coord_event 9, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 - coord_event 11, 5, 3, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903 - coord_event 10, 5, 3, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F - coord_event 2, 6, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B - coord_event 3, 6, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927 - coord_event 4, 6, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933 + coord_event 8, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 + coord_event 7, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 + coord_event 6, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF + coord_event 5, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB + coord_event 6, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 + coord_event 7, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 + coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF + coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB + coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 + coord_event 11, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903 + coord_event 10, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F + coord_event 2, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B + coord_event 3, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927 + coord_event 4, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933 Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C bg_event 2, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627D5 diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index 5beae5e18..9468d51bd 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C - coord_event 9, 2, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 + coord_event 9, 2, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C bg_event 7, 2, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_16328B diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index b282c7a8d..e3ae3bb04 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -43,21 +43,21 @@ Route111_MapWarps:: @ 8382500 Route111_MapCoordEvents:: @ 8382518 coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 - coord_event 12, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 - coord_event 13, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 + coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 + coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 + coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 12, 44, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 - coord_event 13, 43, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 - coord_event 14, 42, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 - coord_event 16, 40, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 - coord_event 14, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 + coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1501BC coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1501BC coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1501BC coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 17, 39, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 - coord_event 18, 38, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 + coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1501BC coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index 68ee79ca1..59b0a37d9 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -10,7 +10,7 @@ Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C - coord_event 8, 4, 3, 0, 0x4001, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 + coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C487 diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 181195444..321653635 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -6,8 +6,8 @@ SingleBattleColosseum_MapWarps:: @ 83912FC warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents:: @ 839130C - coord_event 3, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A436F - coord_event 10, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A4379 + coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A436F + coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379 SingleBattleColosseum_MapEvents:: @ 839132C map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index 8ecbb7e09..cae954321 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -6,8 +6,8 @@ TradeCenter_MapWarps:: @ 8391358 warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents:: @ 8391368 - coord_event 4, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43F0 - coord_event 7, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43FA + coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43F0 + coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA TradeCenter_MapEvents:: @ 8391388 map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 0cedcd0d5..709c7e0f5 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -690,7 +690,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 setvar 0x8005, 0 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -698,7 +698,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D setvar 0x8005, 1 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -706,7 +706,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 setvar 0x8005, 2 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end @@ -714,12 +714,12 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 setvar 0x8005, 3 special sub_80B929C waitstate - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if 5, RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A446C:: @ 81A446C - bufferitemname 1, 0x4001 + bufferitemname 1, VAR_TEMP_1 message RecordCorner_Text_1A4E3B waitmessage waitbuttonpress @@ -770,7 +770,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD end RecordCorner_EventScript_1A44BC:: @ 81A44BC - compare 0x4000, 0 + compare VAR_TEMP_0, 0 goto_if 5, RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 50202c7d6..9234acfdb 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -290,7 +290,7 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A compare 0x8006, 4 goto_if 5, LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 - setvar 0x4001, 6 + setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE @@ -441,24 +441,24 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 call_if 1, LinkContestRoom1_EventScript_1A5674 compare 0x4088, 5 call_if 1, LinkContestRoom1_EventScript_1A56D2 - setvar 0x4001, 9 - setvar 0x4002, 9 - setvar 0x4003, 9 - setvar 0x4004, 9 - setvar 0x4005, 9 - setvar 0x4006, 9 - setvar 0x4007, 9 - setvar 0x4008, 9 - compare 0x4000, 0 + setvar VAR_TEMP_1, 9 + setvar VAR_TEMP_2, 9 + setvar VAR_TEMP_3, 9 + setvar VAR_TEMP_4, 9 + setvar VAR_TEMP_5, 9 + setvar VAR_TEMP_6, 9 + setvar VAR_TEMP_7, 9 + setvar VAR_TEMP_8, 9 + compare VAR_TEMP_0, 0 call_if 2, LinkContestRoom1_EventScript_1A54EB - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - setvar 0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 return LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB @@ -480,7 +480,7 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB call_if 1, LinkContestRoom1_EventScript_1A5838 compare RESULT, 7 call_if 1, LinkContestRoom1_EventScript_1A585C - compare 0x4000, 0 + compare VAR_TEMP_0, 0 goto_if 2, LinkContestRoom1_EventScript_1A54EB waitmovement 0 return @@ -502,7 +502,7 @@ LinkContestRoom1_EventScript_1A555A:: @ 81A555A goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 10 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 @@ -522,7 +522,7 @@ LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 90 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 @@ -542,7 +542,7 @@ LinkContestRoom1_EventScript_1A5616:: @ 81A5616 goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 170 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 @@ -562,7 +562,7 @@ LinkContestRoom1_EventScript_1A5674:: @ 81A5674 goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 320 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 @@ -582,140 +582,140 @@ LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 goto_if 2, LinkContestRoom1_EventScript_1A5736 compare 0x8004, 100 goto_if 2, LinkContestRoom1_EventScript_1A5730 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5730:: @ 81A5730 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_1A5736:: @ 81A5736 - setvar 0x4000, 2 + setvar VAR_TEMP_0, 2 return LinkContestRoom1_EventScript_1A573C:: @ 81A573C - setvar 0x4000, 3 + setvar VAR_TEMP_0, 3 return LinkContestRoom1_EventScript_1A5742:: @ 81A5742 - setvar 0x4000, 4 + setvar VAR_TEMP_0, 4 return LinkContestRoom1_EventScript_1A5748:: @ 81A5748 - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 return LinkContestRoom1_EventScript_1A574E:: @ 81A574E - setvar 0x4000, 6 + setvar VAR_TEMP_0, 6 return LinkContestRoom1_EventScript_1A5754:: @ 81A5754 - setvar 0x4000, 7 + setvar VAR_TEMP_0, 7 return LinkContestRoom1_EventScript_1A575A:: @ 81A575A - setvar 0x4000, 8 + setvar VAR_TEMP_0, 8 return LinkContestRoom1_EventScript_1A5760:: @ 81A5760 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq LinkContestRoom1_EventScript_1A5783 applymovement 6, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4001, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_1, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A5783:: @ 81A5783 return LinkContestRoom1_EventScript_1A5784:: @ 81A5784 - compare 0x4002, 1 + compare VAR_TEMP_2, 1 goto_if_eq LinkContestRoom1_EventScript_1A57A7 applymovement 12, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4002, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_2, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A57A7:: @ 81A57A7 return LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 - compare 0x4003, 1 + compare VAR_TEMP_3, 1 goto_if_eq LinkContestRoom1_EventScript_1A57CB applymovement 7, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4003, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_3, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A57CB:: @ 81A57CB return LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC - compare 0x4004, 1 + compare VAR_TEMP_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A57EF applymovement 8, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4004, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_4, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A57EF:: @ 81A57EF return LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 - compare 0x4005, 1 + compare VAR_TEMP_5, 1 goto_if_eq LinkContestRoom1_EventScript_1A5813 applymovement 9, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4005, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_5, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A5813:: @ 81A5813 return LinkContestRoom1_EventScript_1A5814:: @ 81A5814 - compare 0x4006, 1 + compare VAR_TEMP_6, 1 goto_if_eq LinkContestRoom1_EventScript_1A5837 applymovement 10, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4006, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_6, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A5837:: @ 81A5837 return LinkContestRoom1_EventScript_1A5838:: @ 81A5838 - compare 0x4007, 1 + compare VAR_TEMP_7, 1 goto_if_eq LinkContestRoom1_EventScript_1A585B applymovement 11, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4007, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_7, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A585B:: @ 81A585B return LinkContestRoom1_EventScript_1A585C:: @ 81A585C - compare 0x4008, 1 + compare VAR_TEMP_8, 1 goto_if_eq LinkContestRoom1_EventScript_1A587F applymovement 15, LinkContestRoom1_Movement_1A5D8D playse 21 delay 14 - setvar 0x4008, 1 - addvar 0x4000, 65535 + setvar VAR_TEMP_8, 1 + addvar VAR_TEMP_0, -1 return LinkContestRoom1_EventScript_1A587F:: @ 81A587F @@ -771,9 +771,9 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE applymovement 2, LinkContestRoom1_Movement_1A5D95 waitmovement 0 releaseall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 startcontest - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 lockall applymovement 1, LinkContestRoom1_Movement_1A5D95 applymovement 2, LinkContestRoom1_Movement_1A5D91 @@ -802,9 +802,9 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A waitmovement 0 closemessage releaseall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 showcontestresults - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 playbgm 439, 0 return @@ -866,19 +866,19 @@ LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC return LinkContestRoom1_EventScript_1A5A31:: @ 81A5A31 - setvar 0x4003, 3 + setvar VAR_TEMP_3, 3 return LinkContestRoom1_EventScript_1A5A37:: @ 81A5A37 - setvar 0x4003, 4 + setvar VAR_TEMP_3, 4 return LinkContestRoom1_EventScript_1A5A3D:: @ 81A5A3D - setvar 0x4003, 5 + setvar VAR_TEMP_3, 5 return LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43 - setvar 0x4003, 14 + setvar VAR_TEMP_3, 14 return LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 @@ -888,10 +888,10 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 buffernumberstring 1, 0x8005 addvar 0x8005, -1 call LinkContestRoom1_EventScript_1A5A75 - applymovement 0x4003, LinkContestRoom1_Movement_1A5D99 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 playse 223 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 return LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 @@ -906,7 +906,7 @@ LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 return LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 - addvar 0x4001, 1 + addvar VAR_TEMP_1, 1 lockall compare 0x4088, 1 call_if 2, LinkContestRoom1_EventScript_1A5AE4 @@ -918,7 +918,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 applymovement 11, LinkContestRoom1_Movement_1A5DBB applymovement 6, LinkContestRoom1_Movement_1A5DB3 applymovement 8, LinkContestRoom1_Movement_1A5DAF - compare 0x4001, 4 + compare VAR_TEMP_1, 4 goto_if 5, LinkContestRoom1_EventScript_1A5A90 delay 30 return @@ -1003,7 +1003,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB call LinkContestRoom1_EventScript_1A5C7F call LinkContestRoom1_EventScript_1A5CE5 playse 223 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 call LinkContestRoom1_EventScript_1A5A90 delay 30 special sub_80C4CF8 @@ -1083,28 +1083,28 @@ LinkContestRoom1_EventScript_1A5C7F:: @ 81A5C7F LinkContestRoom1_EventScript_1A5CB1:: @ 81A5CB1 lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DF6 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DF6 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CBE:: @ 81A5CBE lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DFA + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DFA waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CCB:: @ 81A5CCB lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DA5 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DA5 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 lockall - applymovement 0x4003, LinkContestRoom1_Movement_1A5DA9 + applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5DA9 waitmovement 0 releaseall return diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index c1e77a8c7..343ef4233 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -3,20 +3,20 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01 .byte 0 AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07 - map_script_2 0x4001, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11 + map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11 .2byte 0 AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 - setvar 0x4001, 1 - getplayerxy 0x4002, 0x4003 - setvar 0x4004, 1 - compare 0x4002, 21 + setvar VAR_TEMP_1, 1 + getplayerxy VAR_TEMP_2, VAR_TEMP_3 + setvar VAR_TEMP_4, 1 + compare VAR_TEMP_2, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 - compare 0x4002, 36 + compare VAR_TEMP_2, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F - compare 0x4003, 2 + compare VAR_TEMP_3, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 - switch 0x4004 + switch VAR_TEMP_4 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 case 3, AbandonedShip_HiddenFloorRooms_EventScript_15EDC5 @@ -26,15 +26,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 end AbandonedShip_HiddenFloorRooms_EventScript_15ED89:: @ 815ED89 - addvar 0x4004, 1 + addvar VAR_TEMP_4, 1 return AbandonedShip_HiddenFloorRooms_EventScript_15ED8F:: @ 815ED8F - addvar 0x4004, 2 + addvar VAR_TEMP_4, 2 return AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 - addvar 0x4004, 3 + addvar VAR_TEMP_4, 3 return AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index a587fcc92..0535af6f3 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -19,7 +19,7 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD applymovement 0x8008, AquaHideout_B2F_Movement_1A0841 .endif waitmovement 0 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 3065c0cbb..7259e8305 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -3,11 +3,11 @@ BattleTower_BattleRoom_MapScripts:: @ 81608DB .byte 0 BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1 - map_script_2 0x4000, 0, BattleTower_BattleRoom_EventScript_1608EB + map_script_2 VAR_TEMP_0, 0, BattleTower_BattleRoom_EventScript_1608EB .2byte 0 BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 255, BattleTower_BattleRoom_Movement_160AB7 waitmovement 0 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 828d975fc..b0e957e6b 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -16,11 +16,11 @@ BattleTower_Corridor_EventScript_16086E:: @ 816086E end BattleTower_Corridor_MapScript2_160881:: @ 8160881 - map_script_2 0x4000, 0, BattleTower_Corridor_EventScript_16088B + map_script_2 VAR_TEMP_0, 0, BattleTower_Corridor_EventScript_16088B .2byte 0 BattleTower_Corridor_EventScript_16088B:: @ 816088B - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 @@ -34,7 +34,7 @@ BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 waitmovement 0 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index c006cdffe..fccfcdb2c 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -4,11 +4,11 @@ BattleTower_Elevator_MapScripts:: @ 81607CF .byte 0 BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA - map_script_2 0x4000, 0, BattleTower_Elevator_EventScript_1607E4 + map_script_2 VAR_TEMP_0, 0, BattleTower_Elevator_EventScript_1607E4 .2byte 0 BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 1, BattleTower_Elevator_Movement_160835 applymovement 255, BattleTower_Elevator_Movement_160839 waitmovement 0 @@ -18,17 +18,17 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 1, BattleTower_Elevator_Movement_16083D applymovement 255, BattleTower_Elevator_Movement_160841 waitmovement 0 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate end BattleTower_Elevator_MapScript2_160821:: @ 8160821 - map_script_2 0x4001, 0, BattleTower_Elevator_EventScript_16082B + map_script_2 VAR_TEMP_1, 0, BattleTower_Elevator_EventScript_16082B .2byte 0 BattleTower_Elevator_EventScript_16082B:: @ 816082B - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 69db45ede..ca90b8b28 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -41,20 +41,20 @@ BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8 end BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE - map_script_2 0x4001, 0, BattleTower_Lobby_EventScript_1602F8 + map_script_2 VAR_TEMP_1, 0, BattleTower_Lobby_EventScript_1602F8 .2byte 0 BattleTower_Lobby_EventScript_1602F8:: @ 81602F8 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleTower_Lobby_MapScript2_160302:: @ 8160302 - map_script_2 0x4000, 0, BattleTower_Lobby_EventScript_16032C - map_script_2 0x4000, 1, BattleTower_Lobby_EventScript_160330 - map_script_2 0x4000, 2, BattleTower_Lobby_EventScript_160342 - map_script_2 0x4000, 3, BattleTower_Lobby_EventScript_160419 - map_script_2 0x4000, 4, BattleTower_Lobby_EventScript_16044B + map_script_2 VAR_TEMP_0, 0, BattleTower_Lobby_EventScript_16032C + map_script_2 VAR_TEMP_0, 1, BattleTower_Lobby_EventScript_160330 + map_script_2 VAR_TEMP_0, 2, BattleTower_Lobby_EventScript_160342 + map_script_2 VAR_TEMP_0, 3, BattleTower_Lobby_EventScript_160419 + map_script_2 VAR_TEMP_0, 4, BattleTower_Lobby_EventScript_16044B .2byte 0 BattleTower_Lobby_EventScript_16032C:: @ 816032C @@ -66,7 +66,7 @@ BattleTower_Lobby_EventScript_160330:: @ 8160330 faceplayer msgbox BattleTower_Lobby_Text_19A3FD, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -125,7 +125,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -133,7 +133,7 @@ BattleTower_Lobby_EventScript_160408:: @ 8160408 msgbox BattleTower_Lobby_Text_19A520, 4 waitmessage closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -152,7 +152,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 waitse msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -171,14 +171,14 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B setvar 0x8004, 8 setvar 0x8005, 0 special sub_8135668 - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 special SavePlayerParty special sub_8135A14 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate BattleTower_Lobby_EventScript_16049E:: @ 816049E @@ -230,7 +230,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar 0x8004, 5 special sub_8135668 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 setvar 0x8004, 11 special sub_8135668 setvar 0x8004, 0 @@ -243,7 +243,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 closemessage delay 2 call S_DoSaveDialog - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 erasebox 0, 0, 15, 10 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 @@ -255,7 +255,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 closemessage call BattleTower_Lobby_EventScript_160664 warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate BattleTower_Lobby_EventScript_160600:: @ 8160600 diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index b4fa64cae..9a1bd9fa7 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -21,5 +21,5 @@ EverGrandeCity_EventScript_14D4F7:: @ 814D4F7 EverGrandeCity_EventScript_14D500:: @ 814D500 setflag FLAG_VISITED_EVER_GRANDE_CITY - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index d59476417..1ca62b61c 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF end EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 - map_script_2 0x4001, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF @@ -17,7 +17,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF end EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 - map_script_2 0x4001, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE @@ -27,7 +27,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE delay 40 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802 waitmovement 0 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_15B805 releaseall end diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.inc b/data/scripts/maps/EverGrandeCity_Corridor1.inc index 104504960..60d1f7253 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor1.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor1.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor1_MapScripts:: @ 815BA0C .byte 0 EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 - map_script_2 0x4001, 0, EverGrandeCity_Corridor1_EventScript_15BA1C + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor1_EventScript_15BA1C .2byte 0 EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.inc b/data/scripts/maps/EverGrandeCity_Corridor2.inc index c7c049020..d74be91c4 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor2.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor2.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor2_MapScripts:: @ 815BA21 .byte 0 EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 - map_script_2 0x4001, 0, EverGrandeCity_Corridor2_EventScript_15BA31 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor2_EventScript_15BA31 .2byte 0 EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.inc b/data/scripts/maps/EverGrandeCity_Corridor3.inc index 1714db5cc..006e570ef 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor3.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor3.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor3_MapScripts:: @ 815BA36 .byte 0 EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C - map_script_2 0x4001, 0, EverGrandeCity_Corridor3_EventScript_15BA46 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor3_EventScript_15BA46 .2byte 0 EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.inc b/data/scripts/maps/EverGrandeCity_Corridor4.inc index 64cc234eb..2ae857aa8 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor4.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor4.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor4_MapScripts:: @ 815BA4B .byte 0 EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 - map_script_2 0x4001, 0, EverGrandeCity_Corridor4_EventScript_15BA5B + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor4_EventScript_15BA5B .2byte 0 EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.inc b/data/scripts/maps/EverGrandeCity_Corridor5.inc index 73c0b5a84..09ce304f6 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor5.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor5.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor5_MapScripts:: @ 815BA60 .byte 0 EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 - map_script_2 0x4001, 0, EverGrandeCity_Corridor5_EventScript_15BA70 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor5_EventScript_15BA70 .2byte 0 EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index f7088e821..ef86b1df2 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D .byte 0 @ 815B71D - map_script_2 0x4001, 0, EverGrandeCity_DrakesRoom_EventScript_15B727 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_15B727 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index be9e7a897..bffb94bc4 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673 .byte 0 EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 - map_script_2 0x4001, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 904dc7531..501f1e51c 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -4,7 +4,7 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 815BB84 .byte 0 EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F - map_script_2 0x4001, 0, EverGrandeCity_HallOfFame_EventScript_15BB99 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BB99 .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 @@ -12,7 +12,7 @@ EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 end EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E - map_script_2 0x4001, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8 .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 @@ -41,7 +41,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 dofieldeffect 62 waitfieldeffect 62 delay 40 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkplayergender compare RESULT, 0 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 5ffa16d37..8f0fe97f1 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9 .byte 0 EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 - map_script_2 0x4001, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 4a8919b98..63bb4cac3 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -49,10 +49,10 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall checkflag FLAG_ENTERED_ELITE_FOUR goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 - getplayerxy 0x4000, 0x4001 - compare 0x4000, 11 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 11 call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 - compare 0x4000, 8 + compare VAR_TEMP_0, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 6e958aeed..50c951b17 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -21,7 +21,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570 EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 - map_script_2 0x4001, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index a0eb6186a..5cacc8bf3 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -8,7 +8,7 @@ FortreeCity_Gym_MapScript1_157EDE:: @ 8157EDE end FortreeCity_Gym_MapScript2_157EE2:: @ 8157EE2 - map_script_2 0x4000, 16384, FortreeCity_Gym_EventScript_157EEC + map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_157EEC .2byte 0 FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 18cfb904d..e3cef5fcb 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_15FC26:: @ 815FC26 InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 checkplayergender compare RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 9dd1ae59d..bbfe43bb6 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -8,34 +8,34 @@ LavaridgeTown_Gym_1F_MapScript1_153694:: @ 8153694 end LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F - setvar 0x400b, 0 - setvar 0x400c, 0 - setvar 0x400d, 0 - setvar 0x400e, 0 - setvar 0x400f, 0 + setvar VAR_TEMP_B, 0 + setvar VAR_TEMP_C, 0 + setvar VAR_TEMP_D, 0 + setvar VAR_TEMP_E, 0 + setvar VAR_TEMP_F, 0 checktrainerflag OPPONENT_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6 - setvar 0x400b, 1 + setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 checktrainerflag OPPONENT_ZANE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4 - setvar 0x400c, 1 + setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 checktrainerflag OPPONENT_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2 - setvar 0x400d, 1 + setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 checktrainerflag OPPONENT_SADIE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0 - setvar 0x400e, 1 + setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 checktrainerflag OPPONENT_ANDY goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE - setvar 0x400f, 1 + setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 2806b6125..ff7722f13 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -78,8 +78,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE multichoice 16, 0, 42, 0 - copyvar 0x4001, RESULT - switch 0x4001 + copyvar VAR_TEMP_1, RESULT + switch VAR_TEMP_1 case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A227 case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_15A232 @@ -88,17 +88,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C - setvar 0x4000, 26 + setvar VAR_TEMP_0, 26 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 - setvar 0x4000, 27 + setvar VAR_TEMP_0, 27 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 - setvar 0x4000, 28 + setvar VAR_TEMP_0, 28 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end @@ -127,54 +127,54 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop - bufferitemname 0, 0x4000 + bufferitemname 0, VAR_TEMP_0 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index f700eed9d..03203ed47 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -4,7 +4,7 @@ LilycoveCity_House3_MapScripts:: @ 8159BE4 LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA random 4 - copyvar 0x4001, RESULT + copyvar VAR_TEMP_1, RESULT end LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 @@ -41,7 +41,7 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32 LilycoveCity_House3_EventScript_159C49:: @ 8159C49 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -51,7 +51,7 @@ LilycoveCity_House3_EventScript_159C49:: @ 8159C49 LilycoveCity_House3_EventScript_159C7D:: @ 8159C7D lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -61,7 +61,7 @@ LilycoveCity_House3_EventScript_159C7D:: @ 8159C7D LilycoveCity_House3_EventScript_159CB1:: @ 8159CB1 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -71,7 +71,7 @@ LilycoveCity_House3_EventScript_159CB1:: @ 8159CB1 LilycoveCity_House3_EventScript_159CE5:: @ 8159CE5 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 13c18d51e..17565f7e8 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -128,7 +128,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B closedoor 0x8004, 0x8005 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 return LittlerootTown_Movement_14D6AC:: @ 814D6AC diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 8228238f3..5b6c47a86 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -32,8 +32,8 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 end MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE - checkcoins 16385 - compare 0x4001, 9950 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 compare RESULT, 0 @@ -51,8 +51,8 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE end MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 - checkcoins 16385 - compare 0x4001, 9500 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 compare RESULT, 0 @@ -109,7 +109,7 @@ MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 message MauvilleCity_GameCorner_Text_181E17 waitmessage showcoinsbox 0, 0 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B @@ -128,17 +128,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 end MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 bufferdecorationname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 bufferdecorationname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 bufferdecorationname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C @@ -146,15 +146,15 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D - switch 0x4001 + switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156C46 case 2, MauvilleCity_GameCorner_EventScript_156C80 case 3, MauvilleCity_GameCorner_EventScript_156CBA end MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 88 checkdecorspace 88 @@ -169,8 +169,8 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 end MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 89 checkdecorspace 89 @@ -185,8 +185,8 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 end MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 90 checkdecorspace 90 @@ -230,7 +230,7 @@ MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 message MauvilleCity_GameCorner_Text_181E17 waitmessage showcoinsbox 0, 0 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 @@ -251,27 +251,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 end MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 bufferitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 bufferitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 bufferitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 bufferitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 bufferitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC @@ -279,7 +279,7 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 - switch 0x4001 + switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156E3C case 2, MauvilleCity_GameCorner_EventScript_156E76 case 3, MauvilleCity_GameCorner_EventScript_156EB0 @@ -288,8 +288,8 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC end MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C - checkcoins 16386 - compare 0x4002, 1500 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 compare RESULT, 0 @@ -303,8 +303,8 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C end MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 - checkcoins 16386 - compare 0x4002, 3500 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 compare RESULT, 0 @@ -318,8 +318,8 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 end MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 compare RESULT, 0 @@ -333,8 +333,8 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 end MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 compare RESULT, 0 @@ -348,8 +348,8 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA end MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 compare RESULT, 0 @@ -462,8 +462,8 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag FLAG_RECEIVED_20_COINS goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA - checkcoins 16385 - compare 0x4001, 1 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag FLAG_RECEIVED_20_COINS givecoins 20 diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index f165bd3ef..fd4b8cfbf 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -53,7 +53,7 @@ MossdeepCity_EventScript_14CFFF:: @ 814CFFF MossdeepCity_EventScript_14D008:: @ 814D008 setflag FLAG_VISITED_MOSSDEEP_CITY - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end MossdeepCity_EventScript_14D011:: @ 814D011 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 75fc3c6b8..527e29dd5 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -24,7 +24,7 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 end MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, 8 return @@ -84,7 +84,7 @@ MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 12a94154b..b27965d61 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -8,7 +8,7 @@ MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60 end MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 - map_script_2 0x4001, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E + map_script_2 VAR_TEMP_1, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E .2byte 0 MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E @@ -33,7 +33,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmovement 0 special LoadPlayerParty - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1 waitstate releaseall diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 550f74d9a..76f1736c2 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -7,8 +7,8 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C end MtPyre_Exterior_EventScript_15D492:: @ 815D492 - getplayerxy 0x4000, 0x4001 - compare 0x4001, 12 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 12 goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index aefb23c61..ba991bcf2 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 815E55F .byte 0 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, NewMauville_Inside_EventScript_15E5DA - compare 0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, NewMauville_Inside_EventScript_15E728 checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_15E58F @@ -18,8 +18,8 @@ NewMauville_Inside_EventScript_15E58F:: @ 815E58F return NewMauville_Inside_MapScript1_15E593:: @ 815E593 - setvar 0x4001, 0 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E @@ -29,8 +29,8 @@ NewMauville_Inside_MapScript1_15E59E:: @ 815E59E NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA lockall - setvar 0x4001, 1 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 0 playse 21 call NewMauville_Inside_EventScript_15E5DA special DrawWholeMapView @@ -39,8 +39,8 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 lockall - setvar 0x4001, 0 - setvar 0x4002, 1 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 1 playse 21 call NewMauville_Inside_EventScript_15E728 special DrawWholeMapView diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 45cdce991..351b7ea85 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -25,7 +25,7 @@ PetalburgCity_MapScript2_14B73D:: @ 814B73D PetalburgCity_EventScript_14B747:: @ 814B747 lockall - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 special SavePlayerParty special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_14B7ED @@ -39,10 +39,10 @@ PetalburgCity_EventScript_14B747:: @ 814B747 waitmovement 0, 0, 2 msgbox PetalburgCity_Text_16D408, 4 closemessage - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 setvar 0x4057, 3 fadedefaultbgm - clearflag 0x4001 + clearflag FLAG_SPECIAL_FLAG_1 special LoadPlayerParty setvar 0x4085, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index add786bf0..0b6b3842f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -194,7 +194,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage - setflag 0x4001 + setflag FLAG_SPECIAL_FLAG_1 playbgm 420, 0 compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 1810a6495..f03d7cc62 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -12,7 +12,7 @@ Route101_MapScript2_14E935:: @ 814E935 .2byte 0 Route101_EventScript_14E93F:: @ 814E93F - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 setvar 0x4060, 1 end @@ -235,7 +235,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_HIDE_BIRCH_STARTERS_BAG setvar 0x4084, 2 setvar 0x4060, 3 - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 8e33517ca..6eedce42d 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -29,7 +29,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -56,6 +56,6 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A lockall setvar 0x40a9, 0 clearflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 51cab5ddd..2f54753ab 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -14,7 +14,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -33,6 +33,6 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall clearflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 813cbb9e9..aa1345c7e 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,18 +6,18 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 .byte 0 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161994 end Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 - setvar 0x4001, 0 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 special SetTrickHouseEndRoomFlag end Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 - map_script_2 0x4002, 0, Route110_TrickHouseEnd_EventScript_16196F + map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_16196F .2byte 0 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F @@ -27,11 +27,11 @@ Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F end Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C - map_script_2 0x4001, 0, Route110_TrickHouseEnd_EventScript_161986 + map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_161986 .2byte 0 Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 call Route110_TrickHouseEnd_EventScript_161994 special DrawWholeMapView end @@ -44,7 +44,7 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E lock faceplayer msgbox Route110_TrickHouseEnd_Text_19C281, 4 - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 switch 0x4044 case 0, Route110_TrickHouseEnd_EventScript_161A0B case 1, Route110_TrickHouseEnd_EventScript_161A47 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 6425d05cb..19ebfbf50 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,21 +4,21 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 .byte 0 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C - compare 0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F - compare 0x4003, 1 + compare VAR_TEMP_3, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 - compare 0x4004, 1 + compare VAR_TEMP_4, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 end Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 @@ -35,7 +35,7 @@ Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E2C special DrawWholeMapView @@ -44,7 +44,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 lockall - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E3F special DrawWholeMapView @@ -53,7 +53,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 lockall - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E52 special DrawWholeMapView @@ -62,7 +62,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 lockall - setvar 0x4004, 1 + setvar VAR_TEMP_4, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E65 special DrawWholeMapView diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 54cea16c9..be1f84c63 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,22 +5,22 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 - compare 0x4009, 0 + compare VAR_TEMP_9, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - setvar 0x4008, 0 - setvar 0x4009, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 + setvar VAR_TEMP_9, 0 end Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 @@ -31,19 +31,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmetatile 13, 7, 600, 0 setmetatile 1, 3, 600, 0 setmetatile 10, 2, 600, 0 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 - compare 0x4008, 6 + compare VAR_TEMP_8, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 - compare 0x4008, 7 + compare VAR_TEMP_8, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return @@ -247,43 +247,43 @@ Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB lockall - setvar 0x4008, 1 + setvar VAR_TEMP_8, 1 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625B7:: @ 81625B7 lockall - setvar 0x4008, 2 + setvar VAR_TEMP_8, 2 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625C3:: @ 81625C3 lockall - setvar 0x4008, 3 + setvar VAR_TEMP_8, 3 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625CF:: @ 81625CF lockall - setvar 0x4008, 4 + setvar VAR_TEMP_8, 4 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625DB:: @ 81625DB lockall - setvar 0x4008, 5 + setvar VAR_TEMP_8, 5 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625E7:: @ 81625E7 lockall - setvar 0x4008, 6 + setvar VAR_TEMP_8, 6 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 lockall - setvar 0x4008, 7 + setvar VAR_TEMP_8, 7 goto Route110_TrickHousePuzzle3_EventScript_1625FF end @@ -295,76 +295,76 @@ Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF end Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - compare 0x4008, 1 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B - compare 0x4008, 6 + compare VAR_TEMP_8, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 - compare 0x4008, 7 + compare VAR_TEMP_8, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 return Route110_TrickHousePuzzle3_EventScript_162689:: @ 8162689 - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 return Route110_TrickHousePuzzle3_EventScript_16268F:: @ 816268F - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 return Route110_TrickHousePuzzle3_EventScript_162695:: @ 8162695 - setvar 0x4004, 1 + setvar VAR_TEMP_4, 1 return Route110_TrickHousePuzzle3_EventScript_16269B:: @ 816269B - setvar 0x4005, 1 + setvar VAR_TEMP_5, 1 return Route110_TrickHousePuzzle3_EventScript_1626A1:: @ 81626A1 - setvar 0x4006, 1 + setvar VAR_TEMP_6, 1 return Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 - setvar 0x4007, 1 + setvar VAR_TEMP_7, 1 return Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 0 + compare VAR_TEMP_9, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView - compare 0x4009, 1 + compare VAR_TEMP_9, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD - compare 0x4009, 0 + compare VAR_TEMP_9, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end Route110_TrickHousePuzzle3_EventScript_1626DD:: @ 81626DD - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 releaseall end Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 4b9031715..695c532cf 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -3,12 +3,12 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 81627B0 .byte 0 Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_8, 0 end Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 @@ -27,9 +27,9 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F end @@ -37,9 +37,9 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4002, 1 + compare VAR_TEMP_2, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end @@ -47,9 +47,9 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4003, 1 + compare VAR_TEMP_3, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 end @@ -57,9 +57,9 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4004, 1 + compare VAR_TEMP_4, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B end @@ -67,109 +67,109 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4005, 1 + compare VAR_TEMP_5, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162897:: @ 8162897 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628A3:: @ 81628A3 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628AF:: @ 81628AF lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628BB:: @ 81628BB lockall - setvar 0x4009, 3 + setvar VAR_TEMP_9, 3 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628C7:: @ 81628C7 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628D3:: @ 81628D3 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628DF:: @ 81628DF lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628EB:: @ 81628EB lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628F7:: @ 81628F7 lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_162903:: @ 8162903 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16290F:: @ 816290F lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16291B:: @ 816291B lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162927:: @ 8162927 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F - setvar 0x4001, 1 - setvar 0x4008, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_8, 1 playse 21 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 @@ -180,18 +180,18 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F end Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 - setvar 0x4002, 1 - setvar 0x4008, 2 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_8, 2 playse 21 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 @@ -202,18 +202,18 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 end Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 - setvar 0x4003, 1 - setvar 0x4008, 3 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_8, 3 playse 21 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 @@ -224,18 +224,18 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 end Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B - setvar 0x4004, 1 - setvar 0x4008, 4 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_8, 4 playse 21 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 @@ -246,18 +246,18 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B end Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F - setvar 0x4005, 1 - setvar 0x4008, 5 + setvar VAR_TEMP_5, 1 + setvar VAR_TEMP_8, 5 playse 21 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 @@ -418,80 +418,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 end Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 - compare 0x4009, 4 + compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 - compare 0x4009, 5 + compare VAR_TEMP_9, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index ddf845142..917b9483b 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8 end Route110_TrickHousePuzzle6_MapScript2_1630DC:: @ 81630DC - map_script_2 0x4000, 16384, Route110_TrickHousePuzzle6_EventScript_1630E6 + map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_1630E6 .2byte 0 Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 0a7e6befc..17d4f91c6 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -21,16 +21,16 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 end Route111_EventScript_14FFCD:: @ 814FFCD - getplayerxy 0x4000, 0x4001 - compare 0x4001, 34 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 34 goto_if 0, Route111_EventScript_15000C - compare 0x4001, 107 + compare VAR_TEMP_1, 107 goto_if 2, Route111_EventScript_15000C - compare 0x4001, 72 + compare VAR_TEMP_1, 72 goto_if 2, Route111_EventScript_150009 - compare 0x4000, 2000 + compare VAR_TEMP_0, 2000 goto_if 2, Route111_EventScript_15000C - compare 0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 @@ -166,7 +166,7 @@ Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 compare RESULT, 0 goto_if_eq Route111_EventScript_150151 - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 releaseall end @@ -224,7 +224,7 @@ Route111_EventScript_1501BC:: @ 81501BC setweather 2 fadenewbgm 360 doweather - setvar 0x4003, 0 + setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 37fd0ed3f..82f7855e1 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -13,10 +13,10 @@ Route113_MapScript1_1505DA:: @ 81505DA end Route113_EventScript_1505E5:: @ 81505E5 - getplayerxy 0x4000, 0x4001 - compare 0x4000, 19 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 19 goto_if 0, Route113_EventScript_150604 - compare 0x4000, 84 + compare VAR_TEMP_0, 84 goto_if 2, Route113_EventScript_150604 setweather 7 return diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index aff1254a9..954be6f21 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -39,12 +39,12 @@ Route119_EventScript_1511B9:: @ 81511B9 return Route119_EventScript_1511C5:: @ 81511C5 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto Route119_EventScript_1511DB end Route119_EventScript_1511D0:: @ 81511D0 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto Route119_EventScript_1511DB end @@ -57,16 +57,16 @@ Route119_EventScript_1511DB:: @ 81511DB compare RESULT, 1 call_if 1, Route119_EventScript_151259 delay 65 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513A6 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513B1 applymovement 255, Route119_Movement_1A0845 waitmovement 0 delay 30 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513E1 removeobject 25 addobject 16 @@ -154,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513E1 removeobject 16 addobject 25 delay 30 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513BC - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513C7 removeobject 25 setvar 0x4072, 1 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index cd84f95af..98c0cf20d 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -80,12 +80,12 @@ Route120_MapScript1_1516DF:: @ 81516DF end Route120_EventScript_1516EA:: @ 81516EA - getplayerxy 0x4000, 0x4001 - compare 0x4001, 14 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 14 goto_if 3, Route120_EventScript_151715 - compare 0x4001, 60 + compare VAR_TEMP_1, 60 goto_if 3, Route120_EventScript_151719 - compare 0x4001, 61 + compare VAR_TEMP_1, 61 goto_if 4, Route120_EventScript_151711 return @@ -98,9 +98,9 @@ Route120_EventScript_151715:: @ 8151715 return Route120_EventScript_151719:: @ 8151719 - compare 0x4000, 7 + compare VAR_TEMP_0, 7 goto_if 3, Route120_EventScript_151735 - compare 0x4000, 19 + compare VAR_TEMP_0, 19 goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 4902d9f08..04da2d9c7 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,13 +23,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A @@ -45,19 +45,19 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 return Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A - addvar 0x4001, 1 + addvar VAR_TEMP_1, 1 return Route124_DivingTreasureHuntersHouse_EventScript_163E90:: @ 8163E90 - addvar 0x4001, 2 + addvar VAR_TEMP_1, 2 return Route124_DivingTreasureHuntersHouse_EventScript_163E96:: @ 8163E96 - addvar 0x4001, 4 + addvar VAR_TEMP_1, 4 return Route124_DivingTreasureHuntersHouse_EventScript_163E9C:: @ 8163E9C - addvar 0x4001, 8 + addvar VAR_TEMP_1, 8 return Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 @@ -68,7 +68,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0 message Route124_DivingTreasureHuntersHouse_Text_19F5C5 waitmessage - switch 0x4001 + switch VAR_TEMP_1 case 1, Route124_DivingTreasureHuntersHouse_EventScript_163F61 case 2, Route124_DivingTreasureHuntersHouse_EventScript_163F87 case 3, Route124_DivingTreasureHuntersHouse_EventScript_163FAD @@ -263,7 +263,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 giveitem_std 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 compare RESULT, 1 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c45389b9f..831cffaea 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -334,42 +334,42 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF RustboroCity_EventScript_14C614:: @ 814C614 waitse - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C620:: @ 814C620 lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C62C:: @ 814C62C lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C638:: @ 814C638 lockall - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C644:: @ 814C644 lockall - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C650:: @ 814C650 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_14C691 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F setvar 0x405a, 3 @@ -434,38 +434,38 @@ RustboroCity_Movement_14C74B:: @ 814C74B RustboroCity_EventScript_14C74D:: @ 814C74D lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C759:: @ 814C759 lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C765:: @ 814C765 lockall - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C771:: @ 814C771 lockall - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C77D:: @ 814C77D - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_14C82A - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_14C856 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C882 - compare 0x4001, 4 + compare VAR_TEMP_1, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem_std ITEM_GREAT_BALL diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 64fce8118..0063564a3 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -52,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C8CA - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C8DF - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C8EB - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C880 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C892 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C909 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall @@ -266,15 +266,15 @@ RusturfTunnel_Movement_15C994:: @ 815C994 step_end RusturfTunnel_EventScript_15C999:: @ 815C999 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end RusturfTunnel_EventScript_15C99F:: @ 815C99F - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 end RusturfTunnel_EventScript_15C9A5:: @ 815C9A5 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 end RusturfTunnel_EventScript_15C9AB:: @ 815C9AB diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 6d31cf981..d11fc16d3 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -9,7 +9,7 @@ SafariZone_Southeast_MapScript2_160041:: @ 8160041 SafariZone_Southeast_EventScript_16004B:: @ 816004B lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 applymovement 255, SafariZone_Southeast_Movement_160087 waitmovement 0 applymovement 1, SafariZone_Southeast_Movement_160089 @@ -52,7 +52,7 @@ SafariZone_Southeast_EventScript_16009E:: @ 816009E SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 compare RESULT, 1 @@ -62,7 +62,7 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 end SafariZone_Southeast_EventScript_1600D1:: @ 81600D1 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 msgbox SafariZone_Southeast_Text_1C3B2D, 4 release end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 304013b08..5d7a38401 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -4,7 +4,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag FLAG_SYS_GAME_CLEAR @@ -300,7 +300,7 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 end SlateportCity_Harbor_EventScript_15626F:: @ 815626F - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 compare RESULT, 1 @@ -369,7 +369,7 @@ SlateportCity_Harbor_EventScript_156374:: @ 8156374 end SlateportCity_Harbor_EventScript_156380:: @ 8156380 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 msgbox SlateportCity_Harbor_Text_180491, 4 release end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 593e18fee..40b410f77 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -22,7 +22,7 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 end SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 - setvar 0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag FLAG_RECEIVED_GREEN_SCARF @@ -33,7 +33,7 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag FLAG_RECEIVED_RED_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - compare 0x4002, 5 + compare VAR_TEMP_2, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D compare 0x40b7, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE @@ -48,7 +48,7 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE checkflag FLAG_RECEIVED_GREEN_SCARF @@ -60,7 +60,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 checkflag FLAG_RECEIVED_RED_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 bufferleadmonspeciesname 0 - switch 0x4001 + switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 case 2, SlateportCity_PokemonFanClub_EventScript_1558D4 @@ -75,7 +75,7 @@ SlateportCity_PokemonFanClub_EventScript_15588D:: @ 815588D return SlateportCity_PokemonFanClub_EventScript_155893:: @ 8155893 - addvar 0x4002, 1 + addvar VAR_TEMP_2, 1 return SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 @@ -150,7 +150,7 @@ SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 return SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 return SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 @@ -160,7 +160,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 return SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 return SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 @@ -170,7 +170,7 @@ SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 return SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 return SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 @@ -180,7 +180,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 return SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 return SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE @@ -190,7 +190,7 @@ SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE return SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 return SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 1e0f14728..c31eef6ba 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -7,7 +7,7 @@ UnknownMap_25_34_MapScripts:: @ 815F580 LinkContestRoom1_MapScript1_15F595:: @ 815F595 call LinkContestRoom1_EventScript_15F5A5 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 call LinkContestRoom1_EventScript_15F630 end @@ -46,7 +46,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, LinkContestRoom1_EventScript_15F600 end @@ -75,12 +75,12 @@ LinkContestRoom1_EventScript_15F625:: @ 815F625 LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 - compare 0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, LinkContestRoom1_EventScript_15F630 return LinkContestRoom1_EventScript_15F646:: @ 815F646 - switch 0x4000 + switch VAR_TEMP_0 case 1, LinkContestRoom1_EventScript_15F699 case 2, LinkContestRoom1_EventScript_15F6A4 case 3, LinkContestRoom1_EventScript_15F6AF @@ -91,38 +91,38 @@ LinkContestRoom1_EventScript_15F646:: @ 815F646 end LinkContestRoom1_EventScript_15F699:: @ 815F699 - copyvar 0x4014, 0x4001 - addvar 0x4000, 1 + copyvar 0x4014, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4 - copyvar 0x4015, 0x4001 - addvar 0x4000, 1 + copyvar 0x4015, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF - copyvar 0x4016, 0x4001 - addvar 0x4000, 1 + copyvar 0x4016, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA - copyvar 0x4017, 0x4001 - addvar 0x4000, 1 + copyvar 0x4017, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5 - copyvar 0x4018, 0x4001 - addvar 0x4000, 1 + copyvar 0x4018, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0 - copyvar 0x4019, 0x4001 - addvar 0x4000, 1 + copyvar 0x4019, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB - copyvar 0x401a, 0x4001 - addvar 0x4000, 1 + copyvar 0x401a, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 @@ -165,131 +165,131 @@ LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 end LinkContestRoom1_EventScript_15F859:: @ 815F859 - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 return LinkContestRoom1_EventScript_15F85F:: @ 815F85F - setvar 0x4001, 6 + setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_15F865:: @ 815F865 - setvar 0x4001, 7 + setvar VAR_TEMP_1, 7 return LinkContestRoom1_EventScript_15F86B:: @ 815F86B - setvar 0x4001, 8 + setvar VAR_TEMP_1, 8 return LinkContestRoom1_EventScript_15F871:: @ 815F871 - setvar 0x4001, 10 + setvar VAR_TEMP_1, 10 return LinkContestRoom1_EventScript_15F877:: @ 815F877 - setvar 0x4001, 11 + setvar VAR_TEMP_1, 11 return LinkContestRoom1_EventScript_15F87D:: @ 815F87D - setvar 0x4001, 12 + setvar VAR_TEMP_1, 12 return LinkContestRoom1_EventScript_15F883:: @ 815F883 - setvar 0x4001, 13 + setvar VAR_TEMP_1, 13 return LinkContestRoom1_EventScript_15F889:: @ 815F889 - setvar 0x4001, 14 + setvar VAR_TEMP_1, 14 return LinkContestRoom1_EventScript_15F88F:: @ 815F88F - setvar 0x4001, 15 + setvar VAR_TEMP_1, 15 return LinkContestRoom1_EventScript_15F895:: @ 815F895 - setvar 0x4001, 17 + setvar VAR_TEMP_1, 17 return LinkContestRoom1_EventScript_15F89B:: @ 815F89B - setvar 0x4001, 18 + setvar VAR_TEMP_1, 18 return LinkContestRoom1_EventScript_15F8A1:: @ 815F8A1 - setvar 0x4001, 19 + setvar VAR_TEMP_1, 19 return LinkContestRoom1_EventScript_15F8A7:: @ 815F8A7 - setvar 0x4001, 20 + setvar VAR_TEMP_1, 20 return LinkContestRoom1_EventScript_15F8AD:: @ 815F8AD - setvar 0x4001, 21 + setvar VAR_TEMP_1, 21 return LinkContestRoom1_EventScript_15F8B3:: @ 815F8B3 - setvar 0x4001, 22 + setvar VAR_TEMP_1, 22 return LinkContestRoom1_EventScript_15F8B9:: @ 815F8B9 - setvar 0x4001, 25 + setvar VAR_TEMP_1, 25 return LinkContestRoom1_EventScript_15F8BF:: @ 815F8BF - setvar 0x4001, 26 + setvar VAR_TEMP_1, 26 return LinkContestRoom1_EventScript_15F8C5:: @ 815F8C5 - setvar 0x4001, 27 + setvar VAR_TEMP_1, 27 return LinkContestRoom1_EventScript_15F8CB:: @ 815F8CB - setvar 0x4001, 47 + setvar VAR_TEMP_1, 47 return LinkContestRoom1_EventScript_15F8D1:: @ 815F8D1 - setvar 0x4001, 30 + setvar VAR_TEMP_1, 30 return LinkContestRoom1_EventScript_15F8D7:: @ 815F8D7 - setvar 0x4001, 31 + setvar VAR_TEMP_1, 31 return LinkContestRoom1_EventScript_15F8DD:: @ 815F8DD - setvar 0x4001, 32 + setvar VAR_TEMP_1, 32 return LinkContestRoom1_EventScript_15F8E3:: @ 815F8E3 - setvar 0x4001, 33 + setvar VAR_TEMP_1, 33 return LinkContestRoom1_EventScript_15F8E9:: @ 815F8E9 - setvar 0x4001, 34 + setvar VAR_TEMP_1, 34 return LinkContestRoom1_EventScript_15F8EF:: @ 815F8EF - setvar 0x4001, 35 + setvar VAR_TEMP_1, 35 return LinkContestRoom1_EventScript_15F8F5:: @ 815F8F5 - setvar 0x4001, 36 + setvar VAR_TEMP_1, 36 return LinkContestRoom1_EventScript_15F8FB:: @ 815F8FB - setvar 0x4001, 37 + setvar VAR_TEMP_1, 37 return LinkContestRoom1_EventScript_15F901:: @ 815F901 - setvar 0x4001, 38 + setvar VAR_TEMP_1, 38 return LinkContestRoom1_EventScript_15F907:: @ 815F907 - setvar 0x4001, 44 + setvar VAR_TEMP_1, 44 return LinkContestRoom1_EventScript_15F90D:: @ 815F90D - setvar 0x4001, 45 + setvar VAR_TEMP_1, 45 return LinkContestRoom1_EventScript_15F913:: @ 815F913 - setvar 0x4001, 46 + setvar VAR_TEMP_1, 46 return LinkContestRoom1_EventScript_15F919:: @ 815F919 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index ea8128ee3..aa4c8fc0f 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, 4 msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4 closemessage - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8 @@ -198,7 +198,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, 4 msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4 closemessage - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B6AB8 @@ -260,7 +260,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 compare 0x4092, 7 goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C -- cgit v1.2.3 From e696b89ff2902c283207e5f712ccc6c59f174555 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Dec 2017 13:27:24 -0600 Subject: Name and use dynamic object gfx id vars --- data/event_scripts.s | 40 +++++++++++----------- data/scripts/maps/SlateportCity.inc | 8 ++--- .../maps/SlateportCity_OceanicMuseum_1F.inc | 8 ++--- data/scripts/maps/SouthernIsland_Interior.inc | 8 ++--- data/scripts/maps/UnknownMap_25_34.inc | 18 +++++----- 5 files changed, 41 insertions(+), 41 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index b18e4eb1a..d66ec1eb3 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1854,11 +1854,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E end RustboroCity_EventScript_1A0166:: @ 81A0166 - setvar 0x4010, 105 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL return RustboroCity_EventScript_1A016C:: @ 81A016C - setvar 0x4010, 100 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL return LavaridgeTown_EventScript_1A0172:: @ 81A0172 @@ -1872,11 +1872,11 @@ Route119_EventScript_1A0172:: @ 81A0172 end LavaridgeTown_EventScript_1A018A:: @ 81A018A - setvar 0x4013, 106 + setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE return LavaridgeTown_EventScript_1A0190:: @ 81A0190 - setvar 0x4013, 101 + setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE return AquaHideout_1F_EventScript_1A0196:: @ 81A0196 @@ -1903,30 +1903,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196 .ifdef SAPPHIRE - setvar 0x4011, 117 - setvar 0x4012, 118 - setvar 0x4014, 119 - setvar 0x4015, 120 - setvar 0x4016, 195 - setvar 0x4017, 196 + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_MAXIE .else - setvar 0x4011, 119 - setvar 0x4012, 120 - setvar 0x4014, 117 - setvar 0x4015, 118 - setvar 0x4016, 196 - setvar 0x4017, 195 + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_ARCHIE .endif return CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5 .ifdef SAPPHIRE - setvar 0x4018, 197 - setvar 0x4019, 205 + setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_KYOGRE_1 + setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_KYOGRE_2 .else - setvar 0x4018, 198 - setvar 0x4019, 206 + setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_GROUDON_1 + setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_GROUDON_2 .endif return diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 56fc0e59b..796775aa2 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36 SlateportCity_MapScript1_14BA3C:: @ 814BA3C .ifdef SAPPHIRE - setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 9e002e61e..98d2160a8 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .ifdef SAPPHIRE - setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index ea2f852f4..6386c3b82 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -14,9 +14,9 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C .ifdef SAPPHIRE - setvar 0x4011, 188 + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIOS .else - setvar 0x4011, 187 + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIAS .endif call SouthernIsland_Interior_EventScript_160B77 end @@ -30,11 +30,11 @@ SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 end SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F - setvar 0x4010, 100 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL return SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 - setvar 0x4010, 105 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL return SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index c31eef6ba..6c25c34c5 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -91,37 +91,37 @@ LinkContestRoom1_EventScript_15F646:: @ 815F646 end LinkContestRoom1_EventScript_15F699:: @ 815F699 - copyvar 0x4014, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4 - copyvar 0x4015, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF - copyvar 0x4016, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA - copyvar 0x4017, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5 - copyvar 0x4018, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0 - copyvar 0x4019, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB - copyvar 0x401a, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return @@ -421,9 +421,9 @@ VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB return FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 - setvar 0x4013, 100 + setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL return FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9 - setvar 0x4013, 105 + setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_NORMAL return -- cgit v1.2.3 From 2379a5b6ebe1f8e59d27850279b00fca588804cc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Dec 2017 13:58:56 -0600 Subject: Name and use dynamic object gfx ids --- data/maps/events/AquaHideout_1F.inc | 6 ++--- data/maps/events/AquaHideout_B1F.inc | 6 ++--- data/maps/events/AquaHideout_B2F.inc | 6 ++--- data/maps/events/BattleTower_BattleRoom.inc | 2 +- data/maps/events/CaveOfOrigin_B4F.inc | 2 +- data/maps/events/EverGrandeCity_ChampionsRoom.inc | 2 +- data/maps/events/LavaridgeTown.inc | 4 +-- data/maps/events/LilycoveCity.inc | 12 ++++----- data/maps/events/LinkContestRoom1.inc | 22 ++++++++-------- .../events/LittlerootTown_BrendansHouse_2F.inc | 24 ++++++++--------- data/maps/events/LittlerootTown_MaysHouse_2F.inc | 24 ++++++++--------- .../events/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/maps/events/MagmaHideout_1F.inc | 6 ++--- data/maps/events/MagmaHideout_B1F.inc | 6 ++--- data/maps/events/MagmaHideout_B2F.inc | 6 ++--- data/maps/events/MauvilleCity_PokemonCenter_1F.inc | 2 +- data/maps/events/MeteorFalls_1F_1R.inc | 10 ++++---- data/maps/events/MossdeepCity_GameCorner_B1F.inc | 2 +- data/maps/events/MtChimney.inc | 26 +++++++++---------- data/maps/events/MtPyre_Summit.inc | 8 +++--- data/maps/events/OldaleTown.inc | 2 +- data/maps/events/PetalburgWoods.inc | 2 +- data/maps/events/Route103.inc | 2 +- data/maps/events/Route110.inc | 14 +++++----- data/maps/events/Route112.inc | 4 +-- data/maps/events/Route119.inc | 8 +++--- data/maps/events/Route119_WeatherInstitute_1F.inc | 4 +-- data/maps/events/Route119_WeatherInstitute_2F.inc | 6 ++--- data/maps/events/Route121.inc | 6 ++--- data/maps/events/Route128.inc | 4 +-- data/maps/events/RustboroCity.inc | 4 +-- data/maps/events/RusturfTunnel.inc | 2 +- data/maps/events/SeafloorCavern_Room1.inc | 4 +-- data/maps/events/SeafloorCavern_Room3.inc | 2 +- data/maps/events/SeafloorCavern_Room4.inc | 2 +- data/maps/events/SeafloorCavern_Room9.inc | 12 ++++----- data/maps/events/SecretBase_BlueCave1.inc | 30 +++++++++++----------- data/maps/events/SecretBase_BlueCave2.inc | 30 +++++++++++----------- data/maps/events/SecretBase_BlueCave3.inc | 30 +++++++++++----------- data/maps/events/SecretBase_BlueCave4.inc | 30 +++++++++++----------- data/maps/events/SecretBase_BrownCave1.inc | 30 +++++++++++----------- data/maps/events/SecretBase_BrownCave2.inc | 30 +++++++++++----------- data/maps/events/SecretBase_BrownCave3.inc | 30 +++++++++++----------- data/maps/events/SecretBase_BrownCave4.inc | 30 +++++++++++----------- data/maps/events/SecretBase_RedCave1.inc | 30 +++++++++++----------- data/maps/events/SecretBase_RedCave2.inc | 30 +++++++++++----------- data/maps/events/SecretBase_RedCave3.inc | 30 +++++++++++----------- data/maps/events/SecretBase_RedCave4.inc | 30 +++++++++++----------- data/maps/events/SecretBase_Shrub1.inc | 30 +++++++++++----------- data/maps/events/SecretBase_Shrub2.inc | 30 +++++++++++----------- data/maps/events/SecretBase_Shrub3.inc | 30 +++++++++++----------- data/maps/events/SecretBase_Shrub4.inc | 30 +++++++++++----------- data/maps/events/SecretBase_Tree1.inc | 30 +++++++++++----------- data/maps/events/SecretBase_Tree2.inc | 30 +++++++++++----------- data/maps/events/SecretBase_Tree3.inc | 30 +++++++++++----------- data/maps/events/SecretBase_Tree4.inc | 30 +++++++++++----------- data/maps/events/SecretBase_YellowCave1.inc | 30 +++++++++++----------- data/maps/events/SecretBase_YellowCave2.inc | 30 +++++++++++----------- data/maps/events/SecretBase_YellowCave3.inc | 30 +++++++++++----------- data/maps/events/SecretBase_YellowCave4.inc | 30 +++++++++++----------- data/maps/events/SlateportCity.inc | 16 ++++++------ data/maps/events/SlateportCity_Harbor.inc | 4 +-- .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 14 +++++----- .../maps/events/SlateportCity_OceanicMuseum_2F.inc | 6 ++--- data/maps/events/SouthernIsland_Interior.inc | 4 +-- 65 files changed, 510 insertions(+), 510 deletions(-) (limited to 'data') diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index ff3212aa9..551585bb6 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -1,7 +1,7 @@ AquaHideout_1F_MapObjects:: @ 838CD0C - object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 - object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 - object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 AquaHideout_1F_MapWarps:: @ 838CD54 warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index 3f4d8e4ec..c902b1765 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -1,8 +1,8 @@ AquaHideout_B1F_MapObjects:: @ 838CD80 - object_event 1, 241, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 2, 241, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_1, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1, 0, 0 - object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3, 0, 0 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index 745a40543..e3dade2d0 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -1,9 +1,9 @@ AquaHideout_B2F_MapObjects:: @ 838CF1C - object_event 1, 241, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 2, 241, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1, 0, 0 object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 - object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 AquaHideout_B2F_MapWarps:: @ 838CF94 warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc index c1b2ad55e..02884109f 100644 --- a/data/maps/events/BattleTower_BattleRoom.inc +++ b/data/maps/events/BattleTower_BattleRoom.inc @@ -1,5 +1,5 @@ BattleTower_BattleRoom_MapObjects:: @ 8391DAC - object_event 1, 240, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_0, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 0, 0 object_event 2, MAP_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleTower_BattleRoom_MapWarps:: @ 8391DDC diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index 61bfe4eb9..9b1dfea01 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -1,5 +1,5 @@ CaveOfOrigin_B4F_MapObjects:: @ 838D880 - object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_8, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0 CaveOfOrigin_B4F_MapWarps:: @ 838D898 warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index c0e672813..2be82cbb4 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -1,6 +1,6 @@ EverGrandeCity_ChampionsRoom_MapObjects:: @ 838B334 object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, 240, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, 0, 0 object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM, 0, 0 EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index 1c63eb83e..c064f7823 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -5,8 +5,8 @@ LavaridgeTown_MapObjects:: @ 8380C78 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 0, 13, 0, 3, 3, 32, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E736, 0, 0, 0 object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 0, 4, 0, 3, 18, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0, 0, 0 object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 0, 4, 0, 3, 17, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0, 0, 0 - object_event 7, 243, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2, 0, 0 - object_event 8, 240, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_3, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_0, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1, 0, 0 object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E75A, 0, 0, 0 LavaridgeTown_MapWarps:: @ 8380D50 diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index 8e53d3544..0822ded72 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -8,14 +8,14 @@ LilycoveCity_MapObjects:: @ 838016C object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 35, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0, 0, 0 object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 34, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0, 0, 0 object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 57, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0, 0, 0 - object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_1, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1, 0, 0 - object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 - object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 - object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 - object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_1, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_1, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_1, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_1, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 50, 0, 7, 0, 5, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CB74, 0, 0, 0 - object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART, 0, 0 + object_event 17, MAP_OBJ_GFX_VAR_0, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART, 0, 0 LilycoveCity_MapWarps:: @ 8380304 warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc index 18d1dcd74..1c0ac9368 100644 --- a/data/maps/events/LinkContestRoom1.inc +++ b/data/maps/events/LinkContestRoom1.inc @@ -1,18 +1,18 @@ LinkContestRoom1_MapObjects:: @ 839149C object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 2, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, 240, 0, 4, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, 241, 0, 6, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, 242, 0, 8, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, 244, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, 246, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, 247, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, 248, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, 249, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, 250, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, 245, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_0, 0, 4, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_2, 0, 8, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_6, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_7, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_8, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_9, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_A, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_5, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL, 0, 0 - object_event 14, 243, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_3, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 15, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 LinkContestRoom1_MapEvents:: @ 8391604 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index b7367b1d0..102da33a2 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -1,17 +1,17 @@ LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728 object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index fbec5e0e7..b00a8d57d 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -1,17 +1,17 @@ LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978 object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS, 0, 0 - object_event 2, 240, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL, 0, 0 diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index fbe8df720..41acfb14e 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -1,7 +1,7 @@ LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0 object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0 - object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_0, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index 2a41a962f..3601ce8b2 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -1,7 +1,7 @@ MagmaHideout_1F_MapObjects:: @ 838E9BC - object_event 1, 241, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 - object_event 2, 241, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 - object_event 3, 241, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0 MagmaHideout_1F_MapWarps:: @ 838EA04 warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc index 3ed63b847..01b1bdf63 100644 --- a/data/maps/events/MagmaHideout_B1F.inc +++ b/data/maps/events/MagmaHideout_B1F.inc @@ -1,7 +1,7 @@ MagmaHideout_B1F_MapObjects:: @ 838EA28 - object_event 1, 241, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0 - object_event 2, 241, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0 - object_event 3, 242, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_1, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_1, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_2, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0 diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc index e300078aa..58883c3a2 100644 --- a/data/maps/events/MagmaHideout_B2F.inc +++ b/data/maps/events/MagmaHideout_B2F.inc @@ -1,8 +1,8 @@ MagmaHideout_B2F_MapObjects:: @ 838EBE4 - object_event 1, 241, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 2, 241, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_1, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 - object_event 4, 242, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1, 0, 0 MagmaHideout_B2F_MapWarps:: @ 838EC5C diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc index da60ac284..e949ee3d0 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc @@ -1,6 +1,6 @@ MauvilleCity_PokemonCenter_1F_MapObjects:: @ 8388660 object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0, 0, 0 - object_event 2, 240, 0, 2, 0, 3, 0, 3, 9, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 2, 0, 3, 0, 3, 9, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 8, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 11, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0, 0, 0 object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 2, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0, 0, 0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index abccfa283..e34cb92e8 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -3,11 +3,11 @@ MeteorFalls_1F_1R_MapObjects:: @ 838BACC object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4, 0, 0 - object_event 5, 241, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 - object_event 6, 241, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 - object_event 7, 247, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 - object_event 8, 244, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 - object_event 9, 244, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_7, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_4, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_4, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS, 0, 0 MeteorFalls_1F_1R_MapWarps:: @ 838BBBC diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc index 58acb3300..dc88e208b 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_B1F_MapObjects:: @ 838ACBC - object_event 1, 240, 0, 6, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_0, 0, 6, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4 warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index 7bc90433c..e685159c0 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -1,26 +1,26 @@ MtChimney_MapObjects:: @ 838C330 - object_event 1, 247, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 - object_event 2, 246, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 3, 241, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 4, 241, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 5, 241, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 6, 244, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 - object_event 7, 244, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 - object_event 8, 244, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_7, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_6, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_1, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_1, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_4, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_4, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 - object_event 10, 241, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_1, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 13, 241, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 16, 241, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 17, 241, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 16, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 17, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 22, 241, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 22, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 21217ac8f..d0e3ce713 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -1,10 +1,10 @@ MtPyre_Summit_MapObjects:: @ 838CBD8 object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 22, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0, 0, 0 - object_event 2, 246, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_6, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT, 0, 0 object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 23, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0, 0, 0 - object_event 4, 241, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 - object_event 5, 241, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 - object_event 6, 241, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_1, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 MtPyre_Summit_MapWarps:: @ 838CC68 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index 828ffc986..8a41c1bf7 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -2,7 +2,7 @@ OldaleTown_MapObjects:: @ 8380A78 object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 16, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 13, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0, 0, 0 object_event 3, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0, 0, 0 - object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_0, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0 OldaleTown_MapWarps:: @ 8380AD8 warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index e80b33c13..0a1230a37 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,7 +1,7 @@ PetalburgWoods_MapObjects:: @ 838C14C object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 - object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1, 0, 0 diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index 580e8a91b..abe48ad20 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -1,6 +1,6 @@ Route103_MapObjects:: @ 8381300 object_event 1, MAP_OBJ_GFX_MAN_4, 0, 49, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route103_EventScript_14ED82, 0, 0, 0 - object_event 2, 240, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 0, 0 object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 71, 0, 10, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route103_EventScript_14ED94, 0, 0, 0 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 91531dbe5..2f21186f4 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -20,14 +20,14 @@ Route110_MapObjects:: @ 8381D58 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1, 0, 0 object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0 - object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 - object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 - object_event 24, 241, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 - object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 - object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 22, MAP_OBJ_GFX_VAR_1, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 23, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 24, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 25, MAP_OBJ_GFX_VAR_1, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 26, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 0, 78, 0, 4, 51, 23, 0, 1, 0, 2, 0, Route110_EventScript_14FB11, 0, 0, 0 - object_event 28, 240, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110, 0, 0 - object_event 29, 243, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110, 0, 0 + object_event 28, MAP_OBJ_GFX_VAR_0, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110, 0, 0 + object_event 29, MAP_OBJ_GFX_VAR_3, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110, 0, 0 object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 33, 0, 69, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FC10, 0, 0, 0 object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 73, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route110_EventScript_14FBD2, 0, 0, 0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index c739f9d0b..2169e4d34 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -1,10 +1,10 @@ Route112_MapObjects:: @ 8382818 - object_event 1, 241, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_1, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 object_event 2, MAP_OBJ_GFX_HIKER, 0, 24, 0, 34, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route112_EventScript_150549, 0, 0, 0 object_event 3, MAP_OBJ_GFX_CAMPER, 0, 29, 0, 49, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route112_EventScript_15059E, 0, 0, 0 object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0 object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0 - object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_1, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 506256be0..4db19c38a 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -14,16 +14,16 @@ Route119_MapObjects:: @ 8383914 object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 49, 0, 3, 58, 0, 0, 1, 0, 3, 0, Route119_EventScript_151580, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 50, 0, 4, 10, 0, 0, 1, 0, 3, 0, Route119_EventScript_15153B, 0, 0, 0 object_event 15, MAP_OBJ_GFX_MAN_6, 0, 8, 0, 62, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route119_EventScript_151552, 0, 0, 0 - object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0 + object_event 16, MAP_OBJ_GFX_VAR_0, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0 object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6, 0, 0 - object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 0, 0 + object_event 23, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 24, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 25, MAP_OBJ_GFX_VAR_3, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 0, 0 object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0 object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0 object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index 920439340..e9933edef 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -1,6 +1,6 @@ Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0 - object_event 1, 241, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 2, 242, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0 diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index 4a2db97f1..2ec794f7f 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -1,7 +1,7 @@ Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94 - object_event 1, 241, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 2, 241, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 3, 242, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_1, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_2, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 6, 0, 3, 1, 18, 0, 0, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0, 0, 0 object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index b97f956c2..a2b108ec1 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -10,9 +10,9 @@ Route121_MapObjects:: @ 8384504 object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0 object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0 - object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 - object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 - object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_1, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0 diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc index 1f86907bd..555101a97 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -2,8 +2,8 @@ Route128_MapObjects:: @ 83850D0 object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 77, 0, 24, 0, 1, 48, 85, 0, 1, 0, 3, 0, Route128_EventScript_1522A4, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 34, 0, 1, 28, 5, 0, 1, 0, 7, 0, Route128_EventScript_1522E2, 0, 0, 0 object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128, 0, 0 - object_event 4, 246, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128, 0, 0 - object_event 5, 247, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_6, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_7, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128, 0, 0 object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 63, 0, 28, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route128_EventScript_15234E, 0, 0, 0 object_event 7, MAP_OBJ_GFX_MAN_4, 0, 24, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, Route128_EventScript_152337, 0, 0, 0 object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 47, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route128_EventScript_152320, 0, 0, 0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index c16bfcdb0..d718ecd06 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -8,11 +8,11 @@ RustboroCity_MapObjects:: @ 837FD14 object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 24, 0, 51, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0, 0, 0 object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 0, 51, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0, 0, 0 object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO, 0, 0 - object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0 object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1, 0, 0 object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0 - object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_0, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0 RustboroCity_MapWarps:: @ 837FE64 warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 4c25d2131..6d79e5722 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -4,7 +4,7 @@ RusturfTunnel_MapObjects:: @ 838BD2C object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0 - object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0 object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0 object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 0, 0 object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index b86a61cb8..0a003bd34 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -2,8 +2,8 @@ SeafloorCavern_Room1_MapObjects:: @ 838D0B8 object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 - object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 - object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room1_MapWarps:: @ 838D130 warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index a78848955..5c686bc37 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -8,7 +8,7 @@ SeafloorCavern_Room3_MapObjects:: @ 838D268 object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 - object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room3_MapWarps:: @ 838D358 warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index 565bcfcae..be696fc94 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room4_MapObjects:: @ 838D384 - object_event 1, 241, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_1, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room4_MapWarps:: @ 838D39C warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 77719389b..8651bb61c 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -1,11 +1,11 @@ SeafloorCavern_Room9_MapObjects:: @ 838D620 - object_event 1, 248, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0 - object_event 2, 246, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0 - object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0 - object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 - object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_8, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_6, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_7, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_4, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_5, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1, 0, 0 - object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_9, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index 1ef513e65..72fd09222 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave1_MapObjects:: @ 838F18C - object_event 1, 255, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave1_MapWarps:: @ 838F2F4 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index 2a2fdb421..6f599527b 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave2_MapObjects:: @ 838FAA4 - object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave2_MapWarps:: @ 838FC0C warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index 8fc65ad54..f9b4cbe91 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave3_MapObjects:: @ 83903BC - object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave3_MapWarps:: @ 8390524 warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index 497123d44..75ac8b0cb 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave4_MapObjects:: @ 8390CD4 - object_event 1, 255, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave4_MapWarps:: @ 8390E3C warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index 2db31b4d2..88978e210 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave1_MapObjects:: @ 838F008 - object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave1_MapWarps:: @ 838F170 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index 72fb53a86..e3648a538 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave2_MapObjects:: @ 838F920 - object_event 1, 255, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave2_MapWarps:: @ 838FA88 warp_def 1, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 2b320d6bb..7d8e140cc 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave3_MapObjects:: @ 8390238 - object_event 1, 255, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave3_MapWarps:: @ 83903A0 warp_def 11, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index 26b0f2537..614e20c89 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave4_MapObjects:: @ 8390B50 - object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave4_MapWarps:: @ 8390CB8 warp_def 2, 8, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index 733d4d808..d9fee6da1 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -1,19 +1,19 @@ SecretBase_RedCave1_MapObjects:: @ 838EE84 - object_event 1, 255, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave1_MapWarps:: @ 838EFEC warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index 84fcd52f0..f73de0783 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -1,19 +1,19 @@ SecretBase_RedCave2_MapObjects:: @ 838F79C - object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave2_MapWarps:: @ 838F904 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index f129a82fb..639207929 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -1,19 +1,19 @@ SecretBase_RedCave3_MapObjects:: @ 83900B4 - object_event 1, 255, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave3_MapWarps:: @ 839021C warp_def 3, 6, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index 97e71648e..ffa6596a9 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -1,19 +1,19 @@ SecretBase_RedCave4_MapObjects:: @ 83909CC - object_event 1, 255, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave4_MapWarps:: @ 8390B34 warp_def 2, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 7727f5efb..938ad397e 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -1,19 +1,19 @@ SecretBase_Shrub1_MapObjects:: @ 838F618 - object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub1_MapWarps:: @ 838F780 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 32b495b05..4ea2a0a79 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -1,19 +1,19 @@ SecretBase_Shrub2_MapObjects:: @ 838FF30 - object_event 1, 255, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub2_MapWarps:: @ 8390098 warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index 173305a86..fb7b96483 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -1,19 +1,19 @@ SecretBase_Shrub3_MapObjects:: @ 8390848 - object_event 1, 255, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub3_MapWarps:: @ 83909B0 warp_def 6, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index 1920bbd08..0e79ed287 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -1,19 +1,19 @@ SecretBase_Shrub4_MapObjects:: @ 8391160 - object_event 1, 255, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub4_MapWarps:: @ 83912C8 warp_def 11, 8, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index a43b1ad76..af6c46e00 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -1,19 +1,19 @@ SecretBase_Tree1_MapObjects:: @ 838F494 - object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree1_MapWarps:: @ 838F5FC warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index aa0ef4b7d..47ee02e45 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -1,19 +1,19 @@ SecretBase_Tree2_MapObjects:: @ 838FDAC - object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree2_MapWarps:: @ 838FF14 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index 69414c222..972530141 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -1,19 +1,19 @@ SecretBase_Tree3_MapObjects:: @ 83906C4 - object_event 1, 255, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree3_MapWarps:: @ 839082C warp_def 8, 6, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index 3ea6c57ea..3746c569a 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -1,19 +1,19 @@ SecretBase_Tree4_MapObjects:: @ 8390FDC - object_event 1, 255, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree4_MapWarps:: @ 8391144 warp_def 7, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 12fd311e3..036dfaa42 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave1_MapObjects:: @ 838F310 - object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave1_MapWarps:: @ 838F478 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 5e3abde63..cf7fa415e 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave2_MapObjects:: @ 838FC28 - object_event 1, 255, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave2_MapWarps:: @ 838FD90 warp_def 12, 7, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index 3a139d2d9..6fc48d147 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave3_MapObjects:: @ 8390540 - object_event 1, 255, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave3_MapWarps:: @ 83906A8 warp_def 5, 9, 0, 126, MAP_NONE diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index 5812a25e0..e63dbdb0b 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave4_MapObjects:: @ 8390E58 - object_event 1, 255, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_F, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave4_MapWarps:: @ 8390FC0 warp_def 6, 12, 0, 126, MAP_NONE diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index adb85b96f..05b59b576 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -3,7 +3,7 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 2, MAP_OBJ_GFX_MAN_1, 0, 35, 0, 27, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BOY_4, 0, 15, 0, 13, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBB5, 0, 0, 0 object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 26, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0, 0, 0 - object_event 5, 240, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_0, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 object_event 6, MAP_OBJ_GFX_COOK, 0, 5, 0, 43, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0, 0, 0 object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 20, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB60, 0, 0, 0 object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 42, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB81, 0, 0, 0 @@ -17,19 +17,19 @@ SlateportCity_MapObjects:: @ 837F7AC object_event 16, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD06, 0, 0, 0 object_event 17, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 24, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCB8, 0, 0, 0 object_event 18, MAP_OBJ_GFX_WOMAN_7, 0, 15, 0, 31, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0, 0, 0 - object_event 19, 241, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 - object_event 20, 241, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 19, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 20, MAP_OBJ_GFX_VAR_1, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 38, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0, 0, 0 object_event 22, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 5, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0, 0, 0 object_event 23, MAP_OBJ_GFX_MAN_6, 0, 34, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 47, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0, 0, 0 object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT, 0, 0 object_event 26, MAP_OBJ_GFX_MAN_3, 0, 5, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAB6, 0, 0, 0 - object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 - object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 - object_event 29, 241, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 - object_event 30, 241, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 - object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 27, MAP_OBJ_GFX_VAR_1, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 28, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 29, MAP_OBJ_GFX_VAR_1, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 30, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 31, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 SlateportCity_MapWarps:: @ 837FA94 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index 801f16779..0498d8b16 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -4,8 +4,8 @@ SlateportCity_Harbor_MapObjects:: @ 8387F30 object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0 object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0 object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0 - object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0 - object_event 7, 246, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_1, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0 + object_event 7, MAP_OBJ_GFX_VAR_6, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0 object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR, 0, 0 SlateportCity_Harbor_MapWarps:: @ 8387FF0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index a4c92861d..1650b9f27 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -1,17 +1,17 @@ SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38 object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 - object_event 2, 241, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 - object_event 3, 241, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 - object_event 4, 241, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 - object_event 5, 240, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 - object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_1, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 5, MAP_OBJ_GFX_VAR_0, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 - object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 8, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 - object_event 13, 241, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM, 0, 0 + object_event 13, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM, 0, 0 object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index 911d8e7e2..490c3697f 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -1,8 +1,8 @@ SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70 object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F, 0, 0 - object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0 - object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0 - object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_6, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0 + object_event 3, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0 + object_event 4, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index bab1d1baf..065c11315 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_MapObjects:: @ 8391E60 - object_event 1, 240, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING, 0, 0 - object_event 2, 241, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY, 0, 0 + object_event 1, MAP_OBJ_GFX_VAR_0, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING, 0, 0 + object_event 2, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY, 0, 0 SouthernIsland_Interior_MapWarps:: @ 8391E90 warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR -- cgit v1.2.3 From 51247c3eb9dc1f8ecf4298ada62ed7c2f768b50e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Dec 2017 10:41:27 -0600 Subject: Name and use general purpose vars --- data/event_scripts.s | 72 ++++----- data/maps/events/CaveOfOrigin_B4F.inc | 2 +- data/maps/events/InsideOfTruck.inc | 6 +- data/maps/events/LittlerootTown.inc | 18 +-- .../events/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/maps/events/LittlerootTown_MaysHouse_1F.inc | 2 +- data/maps/events/MeteorFalls_1F_1R.inc | 2 +- data/maps/events/MtPyre_Summit.inc | 12 +- data/maps/events/NewMauville_Entrance.inc | 2 +- data/maps/events/NewMauville_Inside.inc | 2 +- data/maps/events/OldaleTown.inc | 8 +- data/maps/events/PetalburgCity.inc | 8 +- data/maps/events/PetalburgWoods.inc | 4 +- data/maps/events/Route101.inc | 18 +-- data/maps/events/Route110.inc | 10 +- data/maps/events/Route110_TrickHouseEntrance.inc | 8 +- data/maps/events/Route116.inc | 2 +- data/maps/events/Route118.inc | 6 +- data/maps/events/Route119.inc | 4 +- data/maps/events/Route121.inc | 8 +- data/maps/events/RustboroCity.inc | 26 +-- data/maps/events/RusturfTunnel.inc | 4 +- data/maps/events/SeafloorCavern_Room9.inc | 2 +- data/maps/events/SlateportCity_Harbor.inc | 8 +- .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 4 +- data/maps/events/SootopolisCity.inc | 2 +- data/maps/events/VictoryRoad_1F.inc | 6 +- data/scripts/cable_club.inc | 42 ++--- data/scripts/contest_hall.inc | 52 +++--- data/scripts/maps/BattleTower_Lobby.inc | 4 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 +- data/scripts/maps/DewfordTown.inc | 6 +- data/scripts/maps/DewfordTown_Gym.inc | 4 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 6 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 8 +- data/scripts/maps/JaggedPass.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 6 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 6 +- data/scripts/maps/LilycoveCity.inc | 6 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 26 +-- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 22 +-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 8 +- data/scripts/maps/LilycoveCity_Harbor.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 4 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 16 +- data/scripts/maps/LittlerootTown.inc | 38 ++--- .../maps/LittlerootTown_BrendansHouse_1F.inc | 20 +-- .../maps/LittlerootTown_BrendansHouse_2F.inc | 6 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 22 +-- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 10 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 20 +-- data/scripts/maps/MauvilleCity.inc | 4 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 2 +- data/scripts/maps/MauvilleCity_Gym.inc | 20 +-- data/scripts/maps/MeteorFalls_1F_1R.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 16 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 6 +- data/scripts/maps/MtChimney.inc | 2 +- data/scripts/maps/MtChimney_CableCarStation.inc | 8 +- data/scripts/maps/MtPyre_Summit.inc | 8 +- data/scripts/maps/NewMauville_Entrance.inc | 4 +- data/scripts/maps/NewMauville_Inside.inc | 6 +- data/scripts/maps/OldaleTown.inc | 4 +- data/scripts/maps/PetalburgCity.inc | 10 +- data/scripts/maps/PetalburgCity_Gym.inc | 30 ++-- .../maps/PetalburgCity_PokemonCenter_1F.inc | 6 +- data/scripts/maps/PetalburgWoods.inc | 2 +- data/scripts/maps/Route101.inc | 10 +- data/scripts/maps/Route103.inc | 10 +- data/scripts/maps/Route104.inc | 6 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 4 +- data/scripts/maps/Route109.inc | 2 +- data/scripts/maps/Route110.inc | 16 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 10 +- data/scripts/maps/Route110_TrickHouseCorridor.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 24 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 174 ++++++++++----------- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 6 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 14 +- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 4 +- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 8 +- data/scripts/maps/Route113_GlassWorkshop.inc | 62 ++++---- data/scripts/maps/Route116.inc | 4 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 10 +- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 6 +- data/scripts/maps/Route121.inc | 2 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 6 +- data/scripts/maps/Route128.inc | 4 +- data/scripts/maps/RustboroCity.inc | 10 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 32 ++-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 10 +- data/scripts/maps/RustboroCity_Gym.inc | 6 +- data/scripts/maps/RusturfTunnel.inc | 12 +- data/scripts/maps/SSTidalCorridor.inc | 36 ++--- data/scripts/maps/SafariZone_Southeast.inc | 8 +- data/scripts/maps/SeafloorCavern_Room9.inc | 8 +- data/scripts/maps/SecretBase_YellowCave4.inc | 2 +- data/scripts/maps/SlateportCity.inc | 22 +-- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 8 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 4 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 8 +- data/scripts/maps/SootopolisCity.inc | 4 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 22 +-- data/scripts/maps/UnknownMap_25_34.inc | 8 +- data/scripts/maps/VerdanturfTown.inc | 2 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- data/scripts/players_house.inc | 18 +-- data/scripts/safari_zone.inc | 4 +- 125 files changed, 695 insertions(+), 695 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index d66ec1eb3..5677d2470 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1297,7 +1297,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL clearflag FLAG_HIDE_STEVENS_LETTER - setvar 0x40c6, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR @@ -1321,8 +1321,8 @@ EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E return EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62 - setvar 0x4082, 3 - setvar 0x408c, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 clearflag FLAG_HIDE_NORMAN_LITTLEROOT return @@ -1342,15 +1342,15 @@ EventScript_19FC84: checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if 0, Route101_EventScript_1A14DC clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1 - setvar 0x4053, 2 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 return gUnknown_0819FC9F:: @ 819FC9F - compare 0x4096, 1 + compare VAR_BRINEY_LOCATION, 1 goto_if_eq EventScript_19FCC1 - compare 0x4096, 2 + compare VAR_BRINEY_LOCATION, 2 goto_if_eq EventScript_19FCD7 - compare 0x4096, 3 + compare VAR_BRINEY_LOCATION, 3 goto_if_eq EventScript_19FCF0 end @@ -1391,7 +1391,7 @@ EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09 clearflag FLAG_DEFEATED_ELITE_4_PHOEBE clearflag FLAG_DEFEATED_ELITE_4_GLACIA clearflag FLAG_DEFEATED_ELITE_4_DRAKE - setvar 0x409c, 0 + setvar VAR_ELITE_4_STATE, 0 return DewfordTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B @@ -1416,15 +1416,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B return OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49 - setvar 0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 return OldaleTown_PokemonCenter_1F_EventScript_19FD4F:: @ 819FD4F - setvar 0x4096, 2 + setvar VAR_BRINEY_LOCATION, 2 return OldaleTown_PokemonCenter_1F_EventScript_19FD55:: @ 819FD55 - setvar 0x4096, 3 + setvar VAR_BRINEY_LOCATION, 3 return DewfordTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B @@ -1816,8 +1816,8 @@ DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 DewfordTown_EventScript_1A010C:: @ 81A010C Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C Route109_EventScript_1A010C:: @ 81A010C - copyvar 0x8008, 0x4096 - setvar 0x4096, 0 + copyvar 0x8008, VAR_BRINEY_LOCATION + setvar VAR_BRINEY_LOCATION, 0 return UseSurfScript:: @ 81A0117 @@ -2147,23 +2147,23 @@ Route109_EventScript_1A02EF:: @ 81A02EF LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4 Route101_EventScript_1A02F4:: @ 81A02F4 Route103_EventScript_1A02F4:: @ 81A02F4 - compare 0x4085, 0 + compare VAR_PETALBURG_GYM_STATE, 0 goto_if_eq Route101_EventScript_1A14DC - compare 0x4049, 0 + compare VAR_BIRCH_STATE, 0 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 1 + compare VAR_BIRCH_STATE, 1 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 2 + compare VAR_BIRCH_STATE, 2 call_if 1, Route101_EventScript_1A0365 - compare 0x4049, 3 + compare VAR_BIRCH_STATE, 3 call_if 1, Route101_EventScript_1A0365 - compare 0x4049, 4 + compare VAR_BIRCH_STATE, 4 call_if 1, Route101_EventScript_1A0372 - compare 0x4049, 5 + compare VAR_BIRCH_STATE, 5 call_if 1, Route101_EventScript_1A0372 - compare 0x4049, 6 + compare VAR_BIRCH_STATE, 6 call_if 1, Route101_EventScript_1A0358 - compare 0x4049, 7 + compare VAR_BIRCH_STATE, 7 call_if 1, Route101_EventScript_1A0358 return @@ -2261,7 +2261,7 @@ PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE - setvar 0x4096, 0 + setvar VAR_BRINEY_LOCATION, 0 return RusturfTunnel_EventScript_1A0442:: @ 81A0442 @@ -2269,7 +2269,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 removeobject 10 clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE clearflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE - setvar 0x409a, 6 + setvar VAR_RUSTURF_TUNNEL_STATE, 6 setflag FLAG_RUSTURF_TUNNEL_OPENED return @@ -3723,21 +3723,21 @@ EventScript_1A2DAA: EventScript_1A2DB8: closemessage playse 9 - setvar 0x4097, 0 + setvar VAR_0x4097, 0 setflag FLAG_DECORATION_1 special sub_80BB8CC special sub_80BBAF0 setvar 0x8004, 0 setvar 0x8005, 0 special sub_80BBDD0 - setvar 0x4089, 1 + setvar VAR_0x4089, 1 waitstate end SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE applymovement 255, SecretBase_RedCave1_Movement_1A2E11 waitmovement 0 - setvar 0x4097, 1 + setvar VAR_0x4097, 1 msgbox SecretBase_RedCave1_Text_198F89, 5 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 @@ -3760,21 +3760,21 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 gUnknown_081A2E14:: @ 81A2E14 lockall - setvar 0x4097, 1 + setvar VAR_0x4097, 1 playse 9 special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 clearflag FLAG_DECORATION_1 special sub_80BBAF0 - setvar 0x4089, 0 + setvar VAR_0x4089, 0 waitstate end EventScript_1A2E38: setflag FLAG_DECORATION_1 special sub_80BBAF0 - setvar 0x4089, 0 + setvar VAR_0x4089, 0 waitstate end @@ -3864,7 +3864,7 @@ SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 setvar 0x8004, 0 setvar 0x8005, 0 special sub_80BBDD0 - setvar 0x4089, 1 + setvar VAR_0x4089, 1 end gUnknown_081A2F7B:: @ 81A2F7B @@ -4629,13 +4629,13 @@ FallarborTown_ContestLobby_EventScript_1AE188:: @ 81AE188 LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 - compare 0x4086, 2 + compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar 0x8005, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE - switch 0x4088 + switch VAR_CONTEST_LOCATION case 0, FallarborTown_ContestLobby_EventScript_1AE1FE case 2, FallarborTown_ContestLobby_EventScript_1AE1EE case 1, FallarborTown_ContestLobby_EventScript_1AE1F2 @@ -4735,7 +4735,7 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 end BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED - compare 0x40bc, 0 + compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar 0x8005, 7 special sub_80BF2C4 @@ -4869,14 +4869,14 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5 SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5 SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5 - map_script_2 0x4022, 0, S_FallDownHole + map_script_2 VAR_ICE_STEP_COUNT, 0, S_FallDownHole .2byte 0 GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF MtPyre_2F_MapScript1_1C6BBF:: @ 81C6BBF SkyPillar_2F_MapScript1_1C6BBF:: @ 81C6BBF SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF - copyvar 0x4022, 0x1 + copyvar VAR_ICE_STEP_COUNT, 0x1 end S_FallDownHole:: @ 81C6BC5 diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index 9b1dfea01..ad2217b46 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B4F_MapWarps:: @ 838D898 warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 - coord_event 9, 13, 3, 0, 0x409b, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 + coord_event 9, 13, 3, 0, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index 3b177129a..d89f267e3 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -9,9 +9,9 @@ InsideOfTruck_MapWarps:: @ 8391660 warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents:: @ 8391678 - coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 2, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 3, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 1, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 2, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 InsideOfTruck_MapBGEvents:: @ 83916A8 bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index 23debe434..c2842c68e 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -12,15 +12,15 @@ LittlerootTown_MapWarps:: @ 838098C warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents:: @ 83809A4 - coord_event 10, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D739 - coord_event 11, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D797 - coord_event 11, 1, 3, 0, 0x4050, 1, 0, LittlerootTown_EventScript_14D7C7 - coord_event 8, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D89E - coord_event 9, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D8AA - coord_event 10, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D886 - coord_event 11, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D892 - coord_event 10, 2, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D860 - coord_event 11, 2, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D873 + coord_event 10, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D739 + coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D797 + coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 1, 0, LittlerootTown_EventScript_14D7C7 + coord_event 8, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D89E + coord_event 9, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D8AA + coord_event 10, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D886 + coord_event 11, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D892 + coord_event 10, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D860 + coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873 LittlerootTown_MapBGEvents:: @ 8380A34 bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index bb3d3b195..58c8f8993 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -11,7 +11,7 @@ LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704 - coord_event 8, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 + coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714 map_events LittlerootTown_BrendansHouse_1F_MapObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index 27a0efbed..cbeccb348 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -11,7 +11,7 @@ LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954 - coord_event 2, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 + coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964 map_events LittlerootTown_MaysHouse_1F_MapObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index e34cb92e8..17efa037a 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -18,7 +18,7 @@ MeteorFalls_1F_1R_MapWarps:: @ 838BBBC warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 - coord_event 14, 18, 4, 0, 0x40bf, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C + coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842 diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index d0e3ce713..3aaf21244 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -12,12 +12,12 @@ MtPyre_Summit_MapWarps:: @ 838CC68 warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents:: @ 838CC80 - coord_event 22, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4BD - coord_event 23, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4C9 - coord_event 24, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4D5 - coord_event 22, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6CE - coord_event 23, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6DA - coord_event 24, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6E6 + coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4BD + coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4C9 + coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4D5 + coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6CE + coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6DA + coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6 MtPyre_Summit_MapBGEvents:: @ 838CCE0 bg_event 9, 25, 0, 7, 0, ITEM_ZINC, 79, 0 diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc index 65405fbe7..8967a1df0 100644 --- a/data/maps/events/NewMauville_Entrance.inc +++ b/data/maps/events/NewMauville_Entrance.inc @@ -3,7 +3,7 @@ NewMauville_Entrance_MapWarps:: @ 838DED4 warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 - coord_event 4, 2, 3, 0, 0x40ba, 0, 0, NewMauville_Entrance_EventScript_15E4DC + coord_event 4, 2, 3, 0, VAR_NEW_MAUVILLE_STATE, 0, 0, NewMauville_Entrance_EventScript_15E4DC NewMauville_Entrance_MapEvents:: @ 838DEF4 map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index cb7420edc..c88c554c6 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -21,7 +21,7 @@ NewMauville_Inside_MapCoordEvents:: @ 838DFD0 coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 33, 6, 3, 0, 0x40ba, 1, 0, NewMauville_Inside_EventScript_15E876 + coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876 NewMauville_Inside_MapBGEvents:: @ 838E070 bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index 8a41c1bf7..cad717a21 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -11,10 +11,10 @@ OldaleTown_MapWarps:: @ 8380AD8 warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents:: @ 8380AF8 - coord_event 0, 10, 3, 0, 0x4051, 0, 0, OldaleTown_EventScript_14DEFF - coord_event 8, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF41 - coord_event 9, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF5C - coord_event 10, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF77 + coord_event 0, 10, 3, 0, VAR_ROUTE102_ACCESSIBLE, 0, 0, OldaleTown_EventScript_14DEFF + coord_event 8, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF41 + coord_event 9, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF5C + coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77 OldaleTown_MapBGEvents:: @ 8380B38 bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 739cbf905..4b169abac 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -18,10 +18,10 @@ PetalburgCity_MapWarps:: @ 837F6C8 warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents:: @ 837F6F8 - coord_event 8, 10, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B836 - coord_event 8, 11, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B842 - coord_event 8, 12, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B84E - coord_event 8, 13, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B85A + coord_event 8, 10, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B836 + coord_event 8, 11, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B842 + coord_event 8, 12, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B84E + coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A PetalburgCity_MapBGEvents:: @ 837F738 bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 0a1230a37..4094fc103 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -22,8 +22,8 @@ PetalburgWoods_MapWarps:: @ 838C284 warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents:: @ 838C2B4 - coord_event 26, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CCA8 - coord_event 27, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CD42 + coord_event 26, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CCA8 + coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42 PetalburgWoods_MapBGEvents:: @ 838C2D4 bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15 diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index a527ada51..b19dc1cf0 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -7,15 +7,15 @@ Route101_MapObjects:: @ 83810BC object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0 Route101_MapCoordEvents:: @ 838114C - coord_event 10, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948 - coord_event 11, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948 - coord_event 10, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9B8 - coord_event 11, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9B8 - coord_event 6, 16, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 15, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 17, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE - coord_event 7, 13, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9E4 + coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 + coord_event 11, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 + coord_event 10, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 + coord_event 11, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 + coord_event 6, 16, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 15, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 17, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4 Route101_MapBGEvents:: @ 83811DC bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 2f21186f4..278fee52b 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -40,11 +40,11 @@ Route110_MapWarps:: @ 8382040 warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE Route110_MapCoordEvents:: @ 8382070 - coord_event 28, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27 - coord_event 29, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27 - coord_event 33, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD13 - coord_event 34, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD1E - coord_event 35, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD29 + coord_event 28, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 + coord_event 29, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 + coord_event 33, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD13 + coord_event 34, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD1E + coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29 Route110_MapBGEvents:: @ 83820C0 bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index 9f6e305cc..903d893c3 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -7,10 +7,10 @@ Route110_TrickHouseEntrance_MapWarps:: @ 8392158 warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170 - coord_event 4, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 5, 6, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 6, 6, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 7, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 4, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 5, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 6, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 77262f4c1..3b1858f33 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -28,7 +28,7 @@ Route116_MapWarps:: @ 8383380 warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL Route116_MapCoordEvents:: @ 8383398 - coord_event 47, 9, 3, 0, 0x406f, 1, 0, Route116_EventScript_150B6E + coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E Route116_MapBGEvents:: @ 83833A8 bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 2faff5e7d..154b96b75 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -21,9 +21,9 @@ Route118_MapObjects:: @ 8383684 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1, 0, 0 Route118_MapCoordEvents:: @ 8383864 - coord_event 43, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FAE - coord_event 44, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FCE - coord_event 45, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FE4 + coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE + coord_event 44, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FCE + coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4 Route118_MapBGEvents:: @ 8383894 bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 4db19c38a..ae3cdce20 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -42,8 +42,8 @@ Route119_MapWarps:: @ 8383C8C warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents:: @ 8383C9C - coord_event 25, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511C5 - coord_event 26, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511D0 + coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5 + coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0 coord_event 28, 13, 0, 0, 20, 0, 0, 0x0 coord_event 29, 13, 3, 0, 20, 0, 0, 0x0 coord_event 30, 13, 3, 0, 20, 0, 0, 0x0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index a2b108ec1..0aae42562 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -26,10 +26,10 @@ Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents:: @ 838471C - coord_event 25, 5, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 - coord_event 25, 6, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 - coord_event 25, 7, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 - coord_event 25, 8, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 + coord_event 25, 5, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 6, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 7, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 Route121_MapBGEvents:: @ 838475C bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index d718ecd06..64a1d1a66 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -29,19 +29,19 @@ RustboroCity_MapWarps:: @ 837FE64 warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents:: @ 837FEC4 - coord_event 23, 20, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C481 - coord_event 23, 21, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C498 - coord_event 23, 22, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4AF - coord_event 23, 23, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4C6 - coord_event 23, 24, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4DD - coord_event 30, 9, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C620 - coord_event 29, 10, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C62C - coord_event 30, 11, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C638 - coord_event 30, 12, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C644 - coord_event 30, 9, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C74D - coord_event 31, 10, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C759 - coord_event 30, 11, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C765 - coord_event 30, 12, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C771 + coord_event 23, 20, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C481 + coord_event 23, 21, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C498 + coord_event 23, 22, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4AF + coord_event 23, 23, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4C6 + coord_event 23, 24, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4DD + coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C620 + coord_event 29, 10, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C62C + coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C638 + coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C644 + coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C74D + coord_event 31, 10, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C759 + coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C765 + coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771 RustboroCity_MapBGEvents:: @ 837FF94 bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 6d79e5722..f0b67df82 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -17,8 +17,8 @@ RusturfTunnel_MapWarps:: @ 838BE1C RusturfTunnel_MapCoordEvents:: @ 838BE34 coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 - coord_event 9, 4, 3, 0, 0x409a, 2, 0, RusturfTunnel_EventScript_15C9AB - coord_event 9, 5, 3, 0, 0x409a, 2, 0, RusturfTunnel_EventScript_15C9AB + coord_event 9, 4, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB + coord_event 9, 5, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 8651bb61c..09a94cf27 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -11,7 +11,7 @@ SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 - coord_event 17, 42, 3, 0, 0x40a2, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA + coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA SeafloorCavern_Room9_MapEvents:: @ 838D6E0 map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index 0498d8b16..77f0735cd 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -15,10 +15,10 @@ SlateportCity_Harbor_MapWarps:: @ 8387FF0 warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents:: @ 8388010 - coord_event 8, 11, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155F9B - coord_event 8, 12, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FA7 - coord_event 8, 13, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FB3 - coord_event 8, 14, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FBF + coord_event 8, 11, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155F9B + coord_event 8, 12, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FA7 + coord_event 8, 13, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FB3 + coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF SlateportCity_Harbor_MapEvents:: @ 8388050 map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index 1650b9f27..b432f3c3e 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -20,8 +20,8 @@ SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0 - coord_event 9, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 - coord_event 10, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 + coord_event 9, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 + coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index 3bbd87f0b..e725b8e80 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -26,7 +26,7 @@ SootopolisCity_MapWarps:: @ 8380710 warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE8 SootopolisCity_MapCoordEvents:: @ 8380770 - coord_event 25, 6, 3, 0, 0x405e, 1, 0, SootopolisCity_EventScript_14D308 + coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308 SootopolisCity_MapBGEvents:: @ 8380780 bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index 593f2df02..c88f9363c 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -15,9 +15,9 @@ VictoryRoad_1F_MapWarps:: @ 838D98C warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents:: @ 838D9B4 - coord_event 34, 3, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DE97 - coord_event 34, 4, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DEAB - coord_event 34, 5, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DEBF + coord_event 34, 3, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DE97 + coord_event 34, 4, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEAB + coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF VictoryRoad_1F_MapBGEvents:: @ 838D9E4 bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 709c7e0f5..d8aee8038 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -13,11 +13,11 @@ RustboroCity_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 SlateportCity_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 SootopolisCity_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 - map_script_2 0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D - map_script_2 0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D - map_script_2 0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D - map_script_2 0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D - map_script_2 0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D + map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D + map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D + map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D + map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D + map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_1A3D2D .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_1A3D2D:: @ 81A3D2D @@ -39,15 +39,15 @@ RustboroCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SlateportCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 - compare 0x4087, 1 + compare VAR_CABLE_CLUB_STATE, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare 0x4087, 2 + compare VAR_CABLE_CLUB_STATE, 2 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare 0x4087, 5 + compare VAR_CABLE_CLUB_STATE, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D6A - compare 0x4087, 3 + compare VAR_CABLE_CLUB_STATE, 3 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D74 - compare 0x4087, 4 + compare VAR_CABLE_CLUB_STATE, 4 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3D7E end @@ -78,16 +78,16 @@ RustboroCity_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 SlateportCity_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 SootopolisCity_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88 - map_script_2 0x4087, 1, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D - map_script_2 0x4087, 2, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D - map_script_2 0x4087, 5, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D - map_script_2 0x4087, 3, OldaleTown_PokemonCenter_2F_EventScript_1A3E17 - map_script_2 0x4087, 4, OldaleTown_PokemonCenter_2F_EventScript_1A3E7B + map_script_2 VAR_CABLE_CLUB_STATE, 1, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D + map_script_2 VAR_CABLE_CLUB_STATE, 2, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D + map_script_2 VAR_CABLE_CLUB_STATE, 5, OldaleTown_PokemonCenter_2F_EventScript_1A3E8D + map_script_2 VAR_CABLE_CLUB_STATE, 3, OldaleTown_PokemonCenter_2F_EventScript_1A3E17 + map_script_2 VAR_CABLE_CLUB_STATE, 4, OldaleTown_PokemonCenter_2F_EventScript_1A3E7B .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 special CloseLink - setvar 0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 compare 0x8007, 0 @@ -100,7 +100,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA special CloseLink - setvar 0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 @@ -127,7 +127,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 special CloseLink - setvar 0x4087, 0 + setvar VAR_CABLE_CLUB_STATE, 0 compare 0x8007, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 @@ -218,7 +218,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E special ScrSpecial_HealPlayerParty special SavePlayerParty special LoadPlayerBag - copyvar 0x4087, 0x8004 + copyvar VAR_CABLE_CLUB_STATE, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 5, 3, 514, 0 @@ -383,7 +383,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 setvar 0x8004, 3 - copyvar 0x4087, 0x8004 + copyvar VAR_CABLE_CLUB_STATE, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 8, 3, 514, 0 @@ -481,7 +481,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 setvar 0x8004, 4 - copyvar 0x4087, 0x8004 + copyvar VAR_CABLE_CLUB_STATE, 0x8004 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 11, 3, 514, 0 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 9234acfdb..f13e2647d 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -7,7 +7,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD - compare 0x408a, 0 + compare VAR_CONTEST_PRIZE_PICKUP, 0 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F @@ -57,7 +57,7 @@ FallarborTown_ContestLobby_EventScript_1A4F44:: @ 81A4F44 FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E msgbox FallarborTown_ContestLobby_Text_1A685A, 4 - switch 0x408a + switch VAR_CONTEST_PRIZE_PICKUP case 4, FallarborTown_ContestLobby_EventScript_1A4F67 end @@ -65,7 +65,7 @@ FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67 giveitem_std ITEM_LUXURY_BALL compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86 - setvar 0x408a, 0 + setvar VAR_CONTEST_PRIZE_PICKUP, 0 closemessage release end @@ -182,7 +182,7 @@ FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D msgbox FallarborTown_ContestLobby_Text_1A67C1, 4 closemessage releaseall - setvar 0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 return LinkContestRoom1_EventScript_1A514D:: @ 81A514D @@ -203,7 +203,7 @@ LinkContestRoom1_EventScript_1A514D:: @ 81A514D call LinkContestRoom1_EventScript_1A5A49 call LinkContestRoom1_EventScript_1A5A90 call LinkContestRoom1_EventScript_1A5BAB - setvar 0x4086, 2 + setvar VAR_LINK_CONTEST_ROOM_STATE, 2 return LinkContestRoom1_EventScript_1A51A0:: @ 81A51A0 @@ -270,7 +270,7 @@ LinkContestRoom1_EventScript_1A5245:: @ 81A5245 return LinkContestRoom1_EventScript_1A525F:: @ 81A525F - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5273 msgbox LinkContestRoom1_Text_1A68F0, 3 return @@ -357,7 +357,7 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 return LinkContestRoom1_EventScript_1A535E:: @ 81A535E - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5370 message LinkContestRoom1_Text_1A6A04 waitmessage @@ -385,7 +385,7 @@ LinkContestRoom1_EventScript_1A5377:: @ 81A5377 return LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A53C7 msgbox LinkContestRoom1_Text_1A6A1F, 4 return @@ -396,7 +396,7 @@ LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7 return LinkContestRoom1_EventScript_1A53CE:: @ 81A53CE - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A53DF message LinkContestRoom1_Text_1A6AE1 return @@ -431,15 +431,15 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 LinkContestRoom1_EventScript_1A5455:: @ 81A5455 special sub_80C47A0 - compare 0x4088, 1 + compare VAR_CONTEST_LOCATION, 1 call_if 1, LinkContestRoom1_EventScript_1A555A - compare 0x4088, 2 + compare VAR_CONTEST_LOCATION, 2 call_if 1, LinkContestRoom1_EventScript_1A55B8 - compare 0x4088, 3 + compare VAR_CONTEST_LOCATION, 3 call_if 1, LinkContestRoom1_EventScript_1A5616 - compare 0x4088, 4 + compare VAR_CONTEST_LOCATION, 4 call_if 1, LinkContestRoom1_EventScript_1A5674 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 call_if 1, LinkContestRoom1_EventScript_1A56D2 setvar VAR_TEMP_1, 9 setvar VAR_TEMP_2, 9 @@ -782,7 +782,7 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE return LinkContestRoom1_EventScript_1A5930:: @ 81A5930 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5944 msgbox LinkContestRoom1_Text_1A6AF5, 3 return @@ -809,7 +809,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A return LinkContestRoom1_EventScript_1A5984:: @ 81A5984 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5998 msgbox LinkContestRoom1_Text_1A6C06, 4 return @@ -821,7 +821,7 @@ LinkContestRoom1_EventScript_1A5998:: @ 81A5998 return LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A59B6 msgbox LinkContestRoom1_Text_1A6C21, 4 return @@ -833,7 +833,7 @@ LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6 return LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A59D4 msgbox LinkContestRoom1_Text_1A6C9D, 4 return @@ -845,7 +845,7 @@ LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4 return LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A59F2 msgbox LinkContestRoom1_Text_1A6D16, 4 return @@ -895,7 +895,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 return LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75 - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5A89 msgbox LinkContestRoom1_Text_1A6D3C, 4 return @@ -908,7 +908,7 @@ LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89 LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 addvar VAR_TEMP_1, 1 lockall - compare 0x4088, 1 + compare VAR_CONTEST_LOCATION, 1 call_if 2, LinkContestRoom1_EventScript_1A5AE4 applymovement 9, LinkContestRoom1_Movement_1A5DB7 applymovement 12, LinkContestRoom1_Movement_1A5DBB @@ -993,7 +993,7 @@ LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4 return LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB - compare 0x4088, 5 + compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 checkflag FLAG_TEMP_2 @@ -1046,7 +1046,7 @@ LinkContestRoom1_EventScript_1A5C42:: @ 81A5C42 return LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46 - setvar 0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 return LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C @@ -1059,7 +1059,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C return LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 - setvar 0x4099, 2 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2 return LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A @@ -1117,7 +1117,7 @@ LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 return LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC - compare 0x4088, 2 + compare VAR_CONTEST_LOCATION, 2 call_if 1, LinkContestRoom1_EventScript_1A5C42 incrementgamestat GAME_STAT_WON_CONTEST specialvar RESULT, sub_80C4440 @@ -1130,7 +1130,7 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D msgbox LinkContestRoom1_Text_1A6E1F, 3 - setvar 0x408a, 4 + setvar VAR_CONTEST_PRIZE_PICKUP, 4 return LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index ca90b8b28..902ffd4ba 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -159,7 +159,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 BattleTower_Lobby_EventScript_16044B:: @ 816044B lock faceplayer - setvar 0x40bc, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 message BattleTower_Lobby_Text_19A5B1 waitmessage message BattleTower_Lobby_Text_19A5CE @@ -250,7 +250,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty special sub_8135A14 - setvar 0x40bc, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index e0aba0b9c..69c160562 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -4,7 +4,7 @@ BattleTower_Outside_MapScripts:: @ 8160156 BattleTower_Outside_MapScript1_16015C:: @ 816015C setflag FLAG_LANDMARK_BATTLE_TOWER - setvar 0x40bc, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_REPORTER_BATTLE_TOWER end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 1b5146760..ee702c102 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -72,11 +72,11 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM - setvar 0x409b, 1 + setvar VAR_CAVE_OF_ORIGIN_B4F_STATE, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS clearflag FLAG_SYS_WEATHER_CTRL - setvar 0x40b9, 2 + setvar VAR_MT_PYRE_STATE, 2 clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT releaseall end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index bb1fdeda4..c2e03bc38 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -140,10 +140,10 @@ DewfordTown_EventScript_14E151:: @ 814E151 clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobjectat 4, MAP_DEWFORD_TOWN - setvar 0x408e, 2 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, 0x8008 waitstate release end @@ -181,7 +181,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, 0x8008 resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index afd918a96..42f1fccb1 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -114,8 +114,8 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 msgbox DewfordTown_Gym_Text_1752E6, 4 setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET - addvar 0x4085, 1 - compare 0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index ef86b1df2..ec18ff9b5 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -13,20 +13,20 @@ EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 end EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C - map_script_2 0x409c, 3, EverGrandeCity_DrakesRoom_EventScript_15B736 + map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_15B736 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 lockall call EverGrandeCity_DrakesRoom_EventScript_1A0710 - setvar 0x409c, 4 + setvar VAR_ELITE_4_STATE, 4 releaseall end EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 checkflag FLAG_DEFEATED_ELITE_4_DRAKE call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 - compare 0x409c, 4 + compare VAR_ELITE_4_STATE, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E end diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index bffb94bc4..0e5b493e2 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -13,20 +13,20 @@ EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D end EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692 - map_script_2 0x409c, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C + map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C lockall call EverGrandeCity_GlaciasRoom_EventScript_1A0710 - setvar 0x409c, 3 + setvar VAR_ELITE_4_STATE, 3 releaseall end EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 checkflag FLAG_DEFEATED_ELITE_4_GLACIA call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE - compare 0x409c, 3 + compare VAR_ELITE_4_STATE, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 8f0fe97f1..19219a626 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -13,20 +13,20 @@ EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 end EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8 - map_script_2 0x409c, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602 + map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 lockall call EverGrandeCity_PhoebesRoom_EventScript_1A0710 - setvar 0x409c, 2 + setvar VAR_ELITE_4_STATE, 2 releaseall end EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F checkflag FLAG_DEFEATED_ELITE_4_PHOEBE call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 - compare 0x409c, 2 + compare VAR_ELITE_4_STATE, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A end diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 50c951b17..f3df03b7d 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F checkflag FLAG_DEFEATED_ELITE_4_SYDNEY call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 - compare 0x409c, 1 + compare VAR_ELITE_4_STATE, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A end @@ -29,13 +29,13 @@ EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A end EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F - map_script_2 0x409c, 0, EverGrandeCity_SidneysRoom_EventScript_15B589 + map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_15B589 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 lockall call EverGrandeCity_SidneysRoom_EventScript_1A0710 - setvar 0x409c, 1 + setvar VAR_ELITE_4_STATE, 1 releaseall end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 8ea580e28..23295f778 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -4,7 +4,7 @@ FallarborTown_MapScripts:: @ 814E7E0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 setflag FLAG_VISITED_FALLARBOR_TOWN - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR clearflag FLAG_CONTEST_SKETCH_CREATED end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 72da4cd40..0e47f9859 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -13,7 +13,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD call FallarborTown_ContestLobby_EventScript_1539F8 special sub_80C4BF0 call FallarborTown_ContestLobby_EventScript_15FBDB - setvar 0x4088, 2 + setvar VAR_CONTEST_LOCATION, 2 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index e3cef5fcb..37fa85041 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -25,24 +25,24 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 InsideOfTruck_EventScript_15FC45:: @ 815FC45 setrespawn 1 - setvar 0x4092, 1 + setvar VAR_LITTLEROOT_INTRO_STATE, 1 setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_MAY setflag FLAG_HIDE_BRENDAN_MOM setflag FLAG_HIDE_BRENDAN_UPSTAIRS - setvar 0x408c, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end InsideOfTruck_EventScript_15FC68:: @ 815FC68 setrespawn 2 - setvar 0x4092, 2 + setvar VAR_LITTLEROOT_INTRO_STATE, 2 setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN setflag FLAG_HIDE_MAY_MOM setflag FLAG_HIDE_MAY_UPSTAIRS - setvar 0x4082, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index c7efee318..1a4fd9bdc 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -8,7 +8,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 end JaggedPass_MapScript1_15D274:: @ 815D274 - compare 0x40bd, 1 + compare VAR_JAGGED_PASS_ASH_WEATHER, 1 call_if 1, JaggedPass_EventScript_15D280 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 8b4384ed8..4ef3ae82c 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -9,7 +9,7 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 - compare 0x4053, 2 + compare VAR_LAVARIDGE_RIVAL_STATE, 2 call_if 1, LavaridgeTown_EventScript_14E4D0 end @@ -23,7 +23,7 @@ LavaridgeTown_EventScript_14E4DF:: @ 814E4DF return LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 - map_script_2 0x4053, 1, LavaridgeTown_EventScript_14E4ED + map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_14E4ED .2byte 0 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED @@ -111,7 +111,7 @@ LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 removeobject 7 - setvar 0x4053, 2 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm compare 0x8008, 0 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index bbfe43bb6..044f72d11 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -83,13 +83,13 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET - addvar 0x4085, 1 - compare 0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE - setvar 0x4053, 1 + setvar VAR_LAVARIDGE_RIVAL_STATE, 1 goto LavaridgeTown_Gym_1F_EventScript_1537A7 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 6494f2a6f..33c81b108 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -5,7 +5,7 @@ LilycoveCity_MapScripts:: @ 814CA15 LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE checkflag FLAG_SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 @@ -263,7 +263,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_14CE46 case 1, LilycoveCity_EventScript_14CE56 case 2, LilycoveCity_EventScript_14CE66 @@ -294,7 +294,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_14CE76 case 1, LilycoveCity_EventScript_14CE86 case 2, LilycoveCity_EventScript_14CE96 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index c97a01989..bc61c5ecd 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -8,14 +8,14 @@ LilycoveCity_ContestLobby_MapScript1_158871:: @ 8158871 end LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 - map_script_2 0x4099, 1, LilycoveCity_ContestLobby_EventScript_158889 - map_script_2 0x4099, 2, LilycoveCity_ContestLobby_EventScript_158A5B + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_158889 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_158A5B .2byte 0 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 @@ -42,7 +42,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 closemessage special sub_80C4CEC - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 @@ -62,7 +62,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 4 releaseall end @@ -190,7 +190,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A @@ -215,7 +215,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 closemessage special sub_80C4CEC - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 @@ -235,7 +235,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 11 releaseall end @@ -481,9 +481,9 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE call LilycoveCity_ContestLobby_EventScript_158E0B - setvar 0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 special sub_80C4F70 - setvar 0x4088, 5 + setvar VAR_CONTEST_LOCATION, 5 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_158F08 end @@ -577,18 +577,18 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 call LilycoveCity_ContestLobby_EventScript_158F86 special sub_80C4BF0 call LilycoveCity_ContestLobby_EventScript_15FBDB - setvar 0x4088, 4 + setvar VAR_CONTEST_LOCATION, 4 call LilycoveCity_ContestLobby_EventScript_158F08 waitstate end LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - copyvar 0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 setvar 0x800b, 8 setvar CONTEST_RANK, 3 - setvar 0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index ca60bbc89..c25a014f3 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C faceplayer checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF - copyvar 0x8005, 0x4043 + copyvar 0x8005, VAR_DEPT_STORE_FLOOR special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage @@ -22,46 +22,46 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 - compare 0x4043, 0 + compare VAR_DEPT_STORE_FLOOR, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 0 + setvar VAR_DEPT_STORE_FLOOR, 0 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 - compare 0x4043, 1 + compare VAR_DEPT_STORE_FLOOR, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 1 + setvar VAR_DEPT_STORE_FLOOR, 1 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 - compare 0x4043, 2 + compare VAR_DEPT_STORE_FLOOR, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 2 + setvar VAR_DEPT_STORE_FLOOR, 2 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 - compare 0x4043, 3 + compare VAR_DEPT_STORE_FLOOR, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 3 + setvar VAR_DEPT_STORE_FLOOR, 3 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 - compare 0x4043, 4 + compare VAR_DEPT_STORE_FLOOR, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 4 + setvar VAR_DEPT_STORE_FLOOR, 4 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index dbfd79e98..6cdb3367e 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -9,7 +9,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer dodailyevents - compare 0x4045, 0 + compare VAR_LOTTERY_PRIZE, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag FLAG_DAILY_PICKED_LOTTO_TICKET goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C @@ -100,7 +100,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 return LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C - copyvar 0x4045, 0x8005 + copyvar VAR_LOTTERY_PRIZE, 0x8005 goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end @@ -111,10 +111,10 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 - giveitem_std 0x4045 + giveitem_std VAR_LOTTERY_PRIZE compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 - setvar 0x4045, 0 + setvar VAR_LOTTERY_PRIZE, 0 release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 9687c73fe..d1ac96d93 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -50,7 +50,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, 5 compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E - setvar 0x40b4, 5 + setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_15998A warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 577805fb2..74c53591d 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -62,7 +62,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D end LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 - map_script_2 0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15867A + map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15867A .2byte 0 LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A @@ -81,7 +81,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, 3 - copyvar 0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 releaseall end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 13217b340..31f849b9f 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -4,7 +4,7 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 815938A .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395 - map_script_2 0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15939F + map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15939F .2byte 0 LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F @@ -24,7 +24,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C waitmovement 0 - setvar 0x4095, 2 + setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2 releaseall end @@ -61,9 +61,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 - compare 0x4095, 1 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 - compare 0x4095, 2 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 2 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 end @@ -148,7 +148,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F faceplayer setvar 0x8004, 13 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -188,7 +188,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 faceplayer setvar 0x8004, 8 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -228,7 +228,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D faceplayer setvar 0x8004, 9 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -268,7 +268,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 faceplayer setvar 0x8004, 10 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 specialvar RESULT, sub_810FD60 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 17565f7e8..cd0a61fef 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -5,19 +5,19 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag FLAG_VISITED_LITTLEROOT_TOWN - compare 0x4092, 2 + compare VAR_LITTLEROOT_INTRO_STATE, 2 call_if 1, LittlerootTown_EventScript_14D57B checkflag FLAG_RESCUED_BIRCH call_if 0, LittlerootTown_EventScript_14D583 - compare 0x4050, 3 + compare VAR_LITTLEROOT_STATE, 3 call_if 1, LittlerootTown_EventScript_14D5A6 - compare 0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare 0x408c, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare 0x40c7, 1 + compare VAR_OLDALE_STATE, 1 call_if 1, LittlerootTown_EventScript_14D567 - compare 0x408d, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if 1, LittlerootTown_EventScript_14D563 end @@ -26,13 +26,13 @@ LittlerootTown_EventScript_14D563:: @ 814D563 return LittlerootTown_EventScript_14D567:: @ 814D567 - setvar 0x40c7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_RIVAL_OLDALE_TOWN return LittlerootTown_EventScript_14D570:: @ 814D570 - setvar 0x4082, 5 - setvar 0x408c, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 return LittlerootTown_EventScript_14D57B:: @ 814D57B @@ -40,7 +40,7 @@ LittlerootTown_EventScript_14D57B:: @ 814D57B return LittlerootTown_EventScript_14D583:: @ 814D583 - compare 0x4050, 0 + compare VAR_LITTLEROOT_STATE, 0 goto_if_eq LittlerootTown_EventScript_14D59A setobjectxyperm 1, 10, 1 setobjectmovementtype 1, 7 @@ -70,9 +70,9 @@ LittlerootTown_EventScript_14D5CD:: @ 814D5CD return LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 - map_script_2 0x4092, 1, LittlerootTown_EventScript_14D5EF - map_script_2 0x4092, 2, LittlerootTown_EventScript_14D60D - map_script_2 0x4092, 7, LittlerootTown_EventScript_14D6C5 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_14D5EF + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_14D60D + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 7, LittlerootTown_EventScript_14D6C5 .2byte 0 LittlerootTown_EventScript_14D5EF:: @ 814D5EF @@ -123,7 +123,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 255, LittlerootTown_Movement_14D6BD waitmovement 0 setflag FLAG_HIDE_MOM_LITTLEROOT - setvar 0x4092, 3 + setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat 255, MAP_PETALBURG_CITY closedoor 0x8004, 0x8005 waitdooranim @@ -172,7 +172,7 @@ LittlerootTown_Movement_14D6C0:: @ 814D6C0 LittlerootTown_EventScript_14D6C5:: @ 814D6C5 lockall - setvar 0x4092, 8 + setvar VAR_LITTLEROOT_INTRO_STATE, 8 releaseall end @@ -191,7 +191,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF goto_if_eq LittlerootTown_EventScript_14D72F checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_EventScript_14D722 - compare 0x4050, 0 + compare VAR_LITTLEROOT_STATE, 0 goto_if 5, LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release @@ -202,7 +202,7 @@ LittlerootTown_EventScript_14D708:: @ 814D708 closemessage applymovement 1, LittlerootTown_Movement_1A083D waitmovement 0 - setvar 0x4050, 2 + setvar VAR_LITTLEROOT_STATE, 2 release end @@ -319,7 +319,7 @@ LittlerootTown_EventScript_14D7C7:: @ 814D7C7 closemessage applymovement 1, LittlerootTown_Movement_1A083D waitmovement 0 - setvar 0x4050, 2 + setvar VAR_LITTLEROOT_STATE, 2 releaseall end @@ -862,7 +862,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 LittlerootTown_EventScript_14DD2B:: @ 814DD2B removeobject 4 setflag FLAG_SYS_B_DASH - setvar 0x4050, 4 + setvar VAR_LITTLEROOT_STATE, 4 release end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index d4dd94aae..ba530cefc 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 @@ -27,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A - compare 0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 - compare 0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end @@ -51,11 +51,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526C4:: @ 81526C4 return LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0 - map_script_2 0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_152722 - map_script_2 0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1526FA - map_script_2 0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_152733 - map_script_2 0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_152744 - map_script_2 0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_152722 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1526FA + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_152733 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_152744 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE .2byte 0 LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA @@ -101,7 +101,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 setflag FLAG_MET_RIVAL_MOM - setvar 0x4082, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE, 2 releaseall end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 8f3b07312..e7f3b6b62 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -6,10 +6,10 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE - compare 0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D - setvar 0x4089, 0 + setvar VAR_0x4089, 0 end LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE @@ -18,7 +18,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE return LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA - map_script_2 0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 + map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 .2byte 0 LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index e23a05243..e3255b289 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 @@ -27,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 - compare 0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 - compare 0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 end @@ -51,11 +51,11 @@ LittlerootTown_MaysHouse_1F_EventScript_152902:: @ 8152902 return LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E - map_script_2 0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_152960 - map_script_2 0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_152938 - map_script_2 0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_152971 - map_script_2 0x408c, 1, LittlerootTown_MaysHouse_1F_EventScript_152982 - map_script_2 0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_1B6CDE + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_152960 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_152938 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_152971 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_152982 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1B6CDE .2byte 0 LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 @@ -101,7 +101,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4 setflag FLAG_MET_RIVAL_MOM - setvar 0x408c, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 releaseall end @@ -139,7 +139,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 - compare 0x408d, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 020c39eac..ee449d263 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -6,10 +6,10 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A - compare 0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D - setvar 0x4089, 0 + setvar VAR_0x4089, 0 end LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A @@ -18,7 +18,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A return LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 - map_script_2 0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 + map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 .2byte 0 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 @@ -39,8 +39,8 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse 9 removeobject LAST_TALKED - setvar 0x408d, 3 - setvar 0x4050, 1 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 + setvar VAR_LITTLEROOT_STATE, 1 savebgm 0 fadedefaultbgm releaseall diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 6792c5932..35478a445 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -10,7 +10,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92 end LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D - map_script_2 0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7 .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 @@ -18,8 +18,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 end LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC - map_script_2 0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE - map_script_2 0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE + map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE @@ -53,7 +53,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4 clearflag FLAG_HIDE_BOY_ROUTE101 - setvar 0x4084, 3 + setvar VAR_BIRCH_LAB_STATE, 3 releaseall end @@ -85,7 +85,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer - compare 0x4084, 3 + compare VAR_BIRCH_LAB_STATE, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 checkflag FLAG_BIRCH_AIDE_MET goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 @@ -109,7 +109,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A faceplayer checkflag FLAG_UNKNOWN_BIRCH_380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F - compare 0x4084, 5 + compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 release @@ -128,11 +128,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 - setvar 0x4084, 5 + setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED - setvar 0x4051, 1 - setvar 0x408d, 4 - setvar 0x4050, 3 + setvar VAR_ROUTE102_ACCESSIBLE, 1 + setvar VAR_LITTLEROOT_RIVAL_STATE, 4 + setvar VAR_LITTLEROOT_STATE, 3 releaseall end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 6a7e02848..6861e46c8 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -7,7 +7,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - setvar 0x4093, 0 + setvar VAR_MAUVILLE_GYM_STATE, 0 checkflag FLAG_RECEIVED_TM24 call_if 1, MauvilleCity_EventScript_14C053 end @@ -286,7 +286,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 faceplayer checkflag FLAG_RECEIVED_TM24 goto_if_eq MauvilleCity_EventScript_14C368 - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_EventScript_14C33C checkflag FLAG_RECEIVED_BASEMENT_KEY goto_if_eq MauvilleCity_EventScript_14C332 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 5b6c47a86..7dc063149 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -394,7 +394,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157068 - switch 0x4023 + switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_156FDB case 1, MauvilleCity_GameCorner_EventScript_157005 case 2, MauvilleCity_GameCorner_EventScript_15702F diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 799fb0992..4e4d5cf31 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -5,7 +5,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1565A7 - switch 0x4093 + switch VAR_MAUVILLE_GYM_STATE case 0, MauvilleCity_Gym_EventScript_156491 case 1, MauvilleCity_Gym_EventScript_15657D case 2, MauvilleCity_Gym_EventScript_15658B @@ -71,7 +71,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag FLAG_RECEIVED_TM34 goto_if 0, MauvilleCity_Gym_EventScript_15661D - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 release @@ -84,8 +84,8 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB msgbox MauvilleCity_Gym_Text_180DDA, 4 setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET - addvar 0x4085, 1 - compare 0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB setvar 0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 @@ -113,9 +113,9 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 1 + compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - setvar 0x4093, 1 + setvar VAR_MAUVILLE_GYM_STATE, 1 setvar 0x8004, 0 goto MauvilleCity_Gym_EventScript_1566BA end @@ -124,9 +124,9 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 2 + compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - setvar 0x4093, 2 + setvar VAR_MAUVILLE_GYM_STATE, 2 setvar 0x8004, 1 goto MauvilleCity_Gym_EventScript_1566BA end @@ -135,9 +135,9 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 3 + compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - setvar 0x4093, 3 + setvar VAR_MAUVILLE_GYM_STATE, 3 setvar 0x8004, 2 goto MauvilleCity_Gym_EventScript_1566BA end diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 7ce6e3704..a3e396ab0 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -78,7 +78,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C removeobject 8 removeobject 9 setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR - setvar 0x40bf, 1 + setvar VAR_METEOR_FALLS_STATE, 1 releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 527e29dd5..1e7c26511 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -19,7 +19,7 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special ValidateEReaderTrainer compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E - compare 0x40c0, 0 + compare VAR_GAME_CORNER_STATE, 0 call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF end @@ -35,9 +35,9 @@ MossdeepCity_GameCorner_1F_EventScript_15ACAF:: @ 815ACAF return MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB - map_script_2 0x40c0, 1, MossdeepCity_GameCorner_1F_EventScript_15ACD5 - map_script_2 0x40c0, 2, MossdeepCity_GameCorner_1F_EventScript_15ACD5 - map_script_2 0x40c0, 3, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 1, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 2, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 3, MossdeepCity_GameCorner_1F_EventScript_15ACD5 .2byte 0 MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 @@ -49,14 +49,14 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 moveobjectoffscreen 1 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 - compare 0x40c0, 1 + compare VAR_GAME_CORNER_STATE, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 - compare 0x40c0, 2 + compare VAR_GAME_CORNER_STATE, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B - compare 0x40c0, 3 + compare VAR_GAME_CORNER_STATE, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty - setvar 0x40c0, 0 + setvar VAR_GAME_CORNER_STATE, 0 releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index b27965d61..9d4f26cfa 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -40,19 +40,19 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E end MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5 - setvar 0x40c0, 3 + setvar VAR_GAME_CORNER_STATE, 3 msgbox MossdeepCity_GameCorner_B1F_Text_18E796, 4 return MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 - setvar 0x40c0, 1 + setvar VAR_GAME_CORNER_STATE, 1 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE - setvar 0x40c0, 2 + setvar VAR_GAME_CORNER_STATE, 2 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 7e08cfa69..a11b12fcc 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -14,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 - compare 0x40c6, 1 + compare VAR_STEVENS_HOUSE_STATE, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 end @@ -24,7 +24,7 @@ MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 return MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01 - map_script_2 0x40c6, 0, MossdeepCity_StevensHouse_EventScript_15AA0B + map_script_2 VAR_STEVENS_HOUSE_STATE, 0, MossdeepCity_StevensHouse_EventScript_15AA0B .2byte 0 MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B @@ -47,7 +47,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B delay 20 applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76 waitmovement 0 - setvar 0x40c6, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 releaseall end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a51695b59..a831f0dcc 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -4,7 +4,7 @@ MtChimney_MapScripts:: @ 815CF7C .byte 0 MtChimney_MapScript1_15CF87:: @ 815CF87 - setvar 0x40bd, 1 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 call MtChimney_EventScript_1A0196 end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 9d99eb5fb..7b71ebd76 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA .byte 0 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 - compare 0x40a3, 1 + compare VAR_CABLE_CAR_STATION_STATE, 1 call_if 1, MtChimney_CableCarStation_EventScript_15C111 end @@ -14,7 +14,7 @@ MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 return MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D - map_script_2 0x40a3, 1, MtChimney_CableCarStation_EventScript_15C127 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_15C127 .2byte 0 MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 @@ -22,7 +22,7 @@ MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 applymovement 255, MtChimney_CableCarStation_Movement_15C1B4 applymovement 1, MtChimney_CableCarStation_Movement_15C1AA waitmovement 0 - setvar 0x40a3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, 8 releaseall @@ -45,7 +45,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 setvar 0x8004, 1 - setvar 0x40a3, 2 + setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special sub_8123218 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 73e2e4d97..34828f415 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -70,11 +70,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 MtPyre_Summit_EventScript_15D57A:: @ 815D57A setflag FLAG_MT_PYRE_ORB_STOLEN - setvar 0x4058, 1 + setvar VAR_SLATEPORT_STATE, 1 clearflag FLAG_HIDE_STERN_SLATEPORT clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT - setvar 0x40a0, 1 - setvar 0x40b9, 1 + setvar VAR_SLATEPORT_HARBOR_STATE, 1 + setvar VAR_MT_PYRE_STATE, 1 return MtPyre_Summit_EventScript_15D593:: @ 815D593 @@ -287,7 +287,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D795 removeobject 2 - setvar 0x40b9, 3 + setvar VAR_MT_PYRE_STATE, 3 releaseall end diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index a88b35087..1e4cdf256 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A .byte 0 NewMauville_Entrance_MapScript1_15E495:: @ 815E495 - compare 0x40ba, 0 + compare VAR_NEW_MAUVILLE_STATE, 0 call_if 1, NewMauville_Entrance_EventScript_15E4A1 end @@ -41,7 +41,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmetatile 5, 1, 717, 1 special DrawWholeMapView playse 20 - setvar 0x40ba, 1 + setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index ba991bcf2..283b6bfed 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -23,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 call_if 1, NewMauville_Inside_EventScript_15E88B end @@ -131,7 +131,7 @@ NewMauville_Inside_EventScript_15E876:: @ 815E876 lockall msgbox NewMauville_Inside_Text_1983B1, 4 call NewMauville_Inside_EventScript_15E88B - setvar 0x40ba, 2 + setvar VAR_NEW_MAUVILLE_STATE, 2 releaseall end @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 lockall - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq NewMauville_Inside_EventScript_15E8F6 msgbox NewMauville_Inside_Text_198315, 4 releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 465cbcfc6..329313e74 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -14,7 +14,7 @@ OldaleTown_MapScript1_14DD68:: @ 814DD68 end OldaleTown_EventScript_14DD8C:: @ 814DD8C - setvar 0x4051, 1 + setvar VAR_ROUTE102_ACCESSIBLE, 1 return OldaleTown_EventScript_14DD92:: @ 814DD92 @@ -278,7 +278,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 applymovement 4, OldaleTown_Movement_14DFE5 waitmovement 0 removeobject 4 - setvar 0x40c7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_RIVAL_OLDALE_TOWN releaseall end diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 351b7ea85..caec9b4a2 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -5,9 +5,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag FLAG_VISITED_PETALBURG_CITY - compare 0x4057, 0 + compare VAR_PETALBURG_STATE, 0 call_if 1, PetalburgCity_EventScript_14B731 - compare 0x4057, 2 + compare VAR_PETALBURG_STATE, 2 call_if 1, PetalburgCity_EventScript_14B739 end @@ -20,7 +20,7 @@ PetalburgCity_EventScript_14B739:: @ 814B739 return PetalburgCity_MapScript2_14B73D:: @ 814B73D - map_script_2 0x4057, 2, PetalburgCity_EventScript_14B747 + map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_14B747 .2byte 0 PetalburgCity_EventScript_14B747:: @ 814B747 @@ -40,11 +40,11 @@ PetalburgCity_EventScript_14B747:: @ 814B747 msgbox PetalburgCity_Text_16D408, 4 closemessage clearflag FLAG_SPECIAL_FLAG_0 - setvar 0x4057, 3 + setvar VAR_PETALBURG_STATE, 3 fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_1 special LoadPlayerParty - setvar 0x4085, 1 + setvar VAR_PETALBURG_GYM_STATE, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 0b6b3842f..727818f34 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 .byte 0 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 - compare 0x4085, 7 + compare VAR_PETALBURG_GYM_STATE, 7 call_if 4, PetalburgCity_Gym_EventScript_1544ED end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED return PetalburgCity_Gym_MapScript1_15451B:: @ 815451B - compare 0x4085, 1 + compare VAR_PETALBURG_GYM_STATE, 1 call_if 1, PetalburgCity_Gym_EventScript_15453B - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 checkflag FLAG_SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_15454B @@ -65,7 +65,7 @@ PetalburgCity_Gym_EventScript_15454B:: @ 815454B return PetalburgCity_Gym_MapScript2_154553:: @ 8154553 - map_script_2 0x4085, 1, PetalburgCity_Gym_EventScript_15455D + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15455D .2byte 0 PetalburgCity_Gym_EventScript_15455D:: @ 815455D @@ -73,7 +73,7 @@ PetalburgCity_Gym_EventScript_15455D:: @ 815455D end PetalburgCity_Gym_MapScript2_154562:: @ 8154562 - map_script_2 0x4085, 1, PetalburgCity_Gym_EventScript_15456C + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15456C .2byte 0 PetalburgCity_Gym_EventScript_15456C:: @ 815456C @@ -91,7 +91,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement 255, PetalburgCity_Gym_Movement_1A0841 waitmovement 0 msgbox PetalburgCity_Gym_Text_17A2A4, 4 - setvar 0x4085, 2 + setvar VAR_PETALBURG_GYM_STATE, 2 releaseall end @@ -105,7 +105,7 @@ PetalburgCity_Gym_Movement_1545B4:: @ 81545B4 PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 lock faceplayer - switch 0x4085 + switch VAR_PETALBURG_GYM_STATE case 2, PetalburgCity_Gym_EventScript_154907 case 3, PetalburgCity_Gym_EventScript_154911 case 4, PetalburgCity_Gym_EventScript_15491B @@ -206,8 +206,8 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 - setvar 0x4085, 1 - setvar 0x4057, 2 + setvar VAR_PETALBURG_GYM_STATE, 1 + setvar VAR_PETALBURG_STATE, 2 clearflag FLAG_HIDE_WALLY_PETALBURG clearflag FLAG_HIDE_WALLY_PETALBURG_GYM setflag FLAG_HIDE_RIVAL_BIRCH_LAB @@ -372,7 +372,7 @@ PetalburgCity_Gym_EventScript_154969:: @ 8154969 checkpcitem ITEM_ENIGMA_BERRY, 1 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 - compare 0x402d, 0 + compare VAR_ENIGMA_BERRY_AVAILABLE, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 setvar RESULT, 1 @@ -386,7 +386,7 @@ PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem_std ITEM_ENIGMA_BERRY compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B - setvar 0x402d, 0 + setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end @@ -398,7 +398,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 call PetalburgCity_Gym_EventScript_1A02C5 msgbox PetalburgCity_Gym_Text_17A805, 4 setflag FLAG_DEFEATED_PETALBURG_GYM - setvar 0x4085, 7 + setvar VAR_PETALBURG_GYM_STATE, 7 setflag FLAG_BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM @@ -592,7 +592,7 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 85 @@ -622,7 +622,7 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 98 diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 1dc99159a..25af3e1cb 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -34,11 +34,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 end PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F - compare 0x4023, 0 + compare VAR_STARTER_MON, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 - compare 0x4023, 1 + compare VAR_STARTER_MON, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B - compare 0x4023, 2 + compare VAR_STARTER_MON, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index be74cbf4c..83bfe7da4 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -111,7 +111,7 @@ PetalburgWoods_EventScript_15CE4D:: @ 815CE4D PetalburgWoods_EventScript_15CE69:: @ 815CE69 removeobject 4 - setvar 0x4098, 1 + setvar VAR_PETALBURG_WOODS_STATE, 1 releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index f03d7cc62..6749f2136 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -8,12 +8,12 @@ Route101_MapScript1_14E92F:: @ 814E92F end Route101_MapScript2_14E935:: @ 814E935 - map_script_2 0x4060, 0, Route101_EventScript_14E93F + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F .2byte 0 Route101_EventScript_14E93F:: @ 814E93F setflag FLAG_SPECIAL_FLAG_0 - setvar 0x4060, 1 + setvar VAR_ROUTE101_STATE, 1 end Route101_EventScript_14E948:: @ 814E948 @@ -37,7 +37,7 @@ Route101_EventScript_14E948:: @ 814E948 waitmovement 0 msgbox Route101_Text_16D119, 4 closemessage - setvar 0x4060, 2 + setvar VAR_ROUTE101_STATE, 2 releaseall end @@ -233,8 +233,8 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA clearflag FLAG_HIDE_BIRCH_IN_LAB setflag FLAG_HIDE_BIRCH_STARTERS_BAG - setvar 0x4084, 2 - setvar 0x4060, 3 + setvar VAR_BIRCH_LAB_STATE, 2 + setvar VAR_ROUTE101_STATE, 3 clearflag FLAG_SPECIAL_FLAG_0 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index ee9decedc..35994cd45 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -26,7 +26,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB applymovement 2, Route103_Movement_1A0835 waitmovement 0 msgbox Route103_Text_16D5B6, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route103_EventScript_14EC5D case 1, Route103_EventScript_14EC6D case 2, Route103_EventScript_14EC7D @@ -42,7 +42,7 @@ Route103_EventScript_14EC04:: @ 814EC04 applymovement 2, Route103_Movement_1A0835 waitmovement 0 msgbox Route103_Text_16D7A9, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route103_EventScript_14EC8D case 1, Route103_EventScript_14EC9D case 2, Route103_EventScript_14ECAD @@ -117,11 +117,11 @@ Route103_EventScript_14ED29:: @ 814ED29 Route103_EventScript_14ED46:: @ 814ED46 removeobject 2 - setvar 0x4062, 1 - setvar 0x4084, 4 + setvar VAR_ROUTE103_STATE, 1 + setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_DEFEATED_RIVAL_ROUTE103 - setvar 0x40c7, 1 + setvar VAR_OLDALE_STATE, 1 clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a04dcd86d..1bf579d77 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -4,7 +4,7 @@ Route104_MapScripts:: @ 814EE8C .byte 0 Route104_MapScript2_14EE97:: @ 814EE97 - map_script_2 0x408e, 1, Route104_EventScript_14EEA1 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_14EEA1 .2byte 0 Route104_EventScript_14EEA1:: @ 814EEA1 @@ -153,11 +153,11 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, 0x8008 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 - setvar 0x408e, 0 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_EventScript_14F08B checkflag FLAG_DELIVERED_STEVEN_LETTER diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 4eb1d9705..cb52908f5 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE - compare 0x4090, 1 + compare VAR_BRINEY_HOUSE_STATE, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag FLAG_RECEIVED_POKENAV call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 @@ -79,7 +79,7 @@ Route104_MrBrineysHouse_EventScript_15BDA1:: @ 815BDA1 Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB msgbox Route104_MrBrineysHouse_Text_191BFD, 4 call Route104_MrBrineysHouse_EventScript_1A010C - setvar 0x408e, 1 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 clearflag FLAG_HIDE_MR_BRINEY_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index a9fa7d906..61ad2bddd 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -54,7 +54,7 @@ Route109_EventScript_14F548:: @ 814F548 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, 0x8008 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 5e10782e9..9d6cc22d3 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -12,7 +12,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A0196 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 - compare 0x40a9, 1 + compare VAR_CYCLING_CHALLENGE_STATE, 1 call_if 1, Route110_EventScript_14F92F end @@ -21,12 +21,12 @@ Route110_EventScript_14F92F:: @ 814F92F return Route110_MapScript2_14F933:: @ 814F933 - map_script_2 0x40a9, 1, Route110_EventScript_14F93D + map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_14F93D .2byte 0 Route110_EventScript_14F93D:: @ 814F93D special ScrSpecial_BeginCyclingRoadChallenge - setvar 0x40a9, 2 + setvar VAR_CYCLING_CHALLENGE_STATE, 2 return Route110_EventScript_14F946:: @ 814F946 @@ -149,7 +149,7 @@ Route110_EventScript_14FA53:: @ 814FA53 specialvar RESULT, GetPlayerAvatarBike compare RESULT, 1 goto_if_eq Route110_EventScript_14FA84 - compare 0x40a9, 0 + compare VAR_CYCLING_CHALLENGE_STATE, 0 goto_if_eq Route110_EventScript_14FA7A msgbox Route110_Text_16F26A, 4 release @@ -303,7 +303,7 @@ Route110_EventScript_14FCFB:: @ 814FCFB end Route110_EventScript_14FD09:: @ 814FD09 - setvar 0x40a9, 3 + setvar VAR_CYCLING_CHALLENGE_STATE, 3 savebgm 0 fadedefaultbgm return @@ -361,7 +361,7 @@ Route110_EventScript_14FDAC:: @ 814FDAC Route110_EventScript_14FDB1:: @ 814FDB1 msgbox Route110_Text_16E7A1, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route110_EventScript_14FDE0 case 1, Route110_EventScript_14FDF0 case 2, Route110_EventScript_14FE00 @@ -391,7 +391,7 @@ Route110_EventScript_14FE10:: @ 814FE10 Route110_EventScript_14FE2B:: @ 814FE2B msgbox Route110_Text_16E99A, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route110_EventScript_14FE5A case 1, Route110_EventScript_14FE6A case 2, Route110_EventScript_14FE7A @@ -443,7 +443,7 @@ Route110_EventScript_14FEB2:: @ 814FEB2 compare 0x8008, 3 call_if 1, Route110_EventScript_14FF4B removeobject 29 - setvar 0x4069, 1 + setvar VAR_ROUTE110_STATE, 1 savebgm 0 fadedefaultbgm releaseall diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 6eedce42d..af72dedd0 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -3,14 +3,14 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 .byte 0 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE - compare 0x40a9, 3 + compare VAR_CYCLING_CHALLENGE_STATE, 3 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 - compare 0x40a9, 2 + compare VAR_CYCLING_CHALLENGE_STATE, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5 - setvar 0x40a9, 1 + setvar VAR_CYCLING_CHALLENGE_STATE, 1 return Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB @@ -35,7 +35,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D @ You're on the Mach Bike! - setvar 0x40a9, 1 + setvar VAR_CYCLING_CHALLENGE_STATE, 1 return Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 @@ -54,7 +54,7 @@ Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538 Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left lockall - setvar 0x40a9, 0 + setvar VAR_CYCLING_CHALLENGE_STATE, 0 clearflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 0 releaseall diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/scripts/maps/Route110_TrickHouseCorridor.inc index 7b3d93118..be70476e6 100644 --- a/data/scripts/maps/Route110_TrickHouseCorridor.inc +++ b/data/scripts/maps/Route110_TrickHouseCorridor.inc @@ -3,5 +3,5 @@ Route110_TrickHouseCorridor_MapScripts:: @ 8161CEC .byte 0 Route110_TrickHouseCorridor_MapScript1_161CF2:: @ 8161CF2 - setvar 0x40b5, 1 + setvar VAR_TRICK_HOUSE_STATE, 1 end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index aa1345c7e..c825c1234 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -45,7 +45,7 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E faceplayer msgbox Route110_TrickHouseEnd_Text_19C281, 4 setvar VAR_TEMP_2, 1 - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEnd_EventScript_161A0B case 1, Route110_TrickHouseEnd_EventScript_161A47 case 2, Route110_TrickHouseEnd_EventScript_161A83 @@ -59,7 +59,7 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C2B2, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -72,7 +72,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C333, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -85,7 +85,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C3A7, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -98,7 +98,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C41F, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -111,7 +111,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C491, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -124,7 +124,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C515, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -137,7 +137,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C567, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -165,7 +165,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_19C691, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 .ifdef SAPPHIRE givedecoration_std 32 .else @@ -186,19 +186,19 @@ Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 removeobject 1 - addvar 0x4044, 1 + addvar VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 return Route110_TrickHouseEnd_EventScript_161C4E:: @ 8161C4E call Route110_TrickHouseEnd_EventScript_1A02A5 msgbox Route110_TrickHouseEnd_Text_19C92E, 4 - setvar 0x40c1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61 call Route110_TrickHouseEnd_EventScript_1A02B8 msgbox Route110_TrickHouseEnd_Text_19C7D7, 4 - setvar 0x40c1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index b9582b64c..05b570482 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -6,19 +6,19 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B setflag FLAG_LANDMARK_TRICK_HOUSE - compare 0x40b5, 1 + compare VAR_TRICK_HOUSE_STATE, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE - compare 0x40c1, 1 + compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 - compare 0x40a6, 1 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E - compare 0x40a7, 5 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare 0x40a7, 3 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare 0x40a7, 0 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - switch 0x40a7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_16109A case 1, Route110_TrickHouseEntrance_EventScript_1610A0 case 3, Route110_TrickHouseEntrance_EventScript_1610A6 @@ -26,39 +26,39 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B end Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 - setvar 0x40a5, 1 - compare 0x4044, 8 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 - setvar 0x40a7, 2 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2 end Route110_TrickHouseEntrance_EventScript_160FC8:: @ 8160FC8 - setvar 0x40a7, 6 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6 end Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE - setvar 0x40b5, 0 - setvar 0x40a7, 5 - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_STATE, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE - setvar 0x40a7, 0 - compare 0x4044, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_16103C - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_161046 - compare 0x4044, 3 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_161050 - compare 0x4044, 4 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_16105A - compare 0x4044, 5 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_161064 - compare 0x4044, 6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_16106E - compare 0x4044, 7 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_161078 - compare 0x4044, 8 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 call_if 1, Route110_TrickHouseEntrance_EventScript_161082 return @@ -98,11 +98,11 @@ Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 return Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082 - setvar 0x40a7, 4 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4 return Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088 - setvar 0x40a7, 3 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 return Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E @@ -111,30 +111,30 @@ Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E end Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A - setvar 0x40a5, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0 end Route110_TrickHouseEntrance_EventScript_1610A0:: @ 81610A0 - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_1610A6:: @ 81610A6 - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_1610AC:: @ 81610AC - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 - map_script_2 0x40a6, 1, Route110_TrickHouseEntrance_EventScript_1610F4 - map_script_2 0x40a7, 0, Route110_TrickHouseEntrance_EventScript_161105 - map_script_2 0x40a7, 1, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 0x40a7, 2, Route110_TrickHouseEntrance_EventScript_1611AF - map_script_2 0x40a7, 3, Route110_TrickHouseEntrance_EventScript_1611AF - map_script_2 0x40a7, 4, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 0x40a7, 5, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 0x40a7, 6, Route110_TrickHouseEntrance_EventScript_1611BE + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1610F4 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_161105 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_1611AF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_1611AF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_1611BE .2byte 0 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 @@ -147,7 +147,7 @@ Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 addobject 1 hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEntrance_EventScript_16116B case 1, Route110_TrickHouseEntrance_EventScript_161173 case 2, Route110_TrickHouseEntrance_EventScript_161193 @@ -207,13 +207,13 @@ Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE end Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD - map_script_2 0x40a6, 1, Route110_TrickHouseEntrance_EventScript_1611D7 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1611D7 .2byte 0 Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall delay 20 - compare 0x4044, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closemessage @@ -224,8 +224,8 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 - setvar 0x40a7, 1 - setvar 0x40a6, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0 releaseall end @@ -235,7 +235,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A lockall - switch 0x40a7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_16124D case 2, Route110_TrickHouseEntrance_EventScript_16136E case 3, Route110_TrickHouseEntrance_EventScript_161330 @@ -248,24 +248,24 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmovement 0 - compare 0x4044, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD - compare 0x4044, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF - compare 0x4044, 3 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 - compare 0x4044, 4 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 - compare 0x4044, 5 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA - compare 0x4044, 6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_161303 - compare 0x4044, 7 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closemessage - setvar 0x40a6, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall @@ -351,19 +351,19 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 - compare 0x4044, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA - compare 0x4044, 3 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 - compare 0x4044, 4 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 - compare 0x4044, 5 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E - compare 0x4044, 6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA - compare 0x4044, 7 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 end @@ -438,8 +438,8 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 end Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502 - setvar 0x40c1, 0 - setvar 0x40a7, 3 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 waitmovement 0 releaseall @@ -473,14 +473,14 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 - setvar 0x40c1, 0 - setvar 0x40a7, 5 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 releaseall end Route110_TrickHouseEntrance_EventScript_16158A:: @ 816158A lockall - switch 0x40a7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_1615BD case 1, Route110_TrickHouseEntrance_EventScript_1615C7 case 4, Route110_TrickHouseEntrance_EventScript_1616B8 @@ -508,7 +508,7 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_16165E waitmovement 0 - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEntrance_EventScript_161660 case 1, Route110_TrickHouseEntrance_EventScript_16166B case 2, Route110_TrickHouseEntrance_EventScript_161676 @@ -577,7 +577,7 @@ Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 end Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 - compare 0x4044, 8 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 releaseall @@ -590,7 +590,7 @@ Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7 gUnknown_081616E1:: @ 81616E1 lockall - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEntrance_EventScript_161740 case 1, Route110_TrickHouseEntrance_EventScript_161769 case 2, Route110_TrickHouseEntrance_EventScript_161792 @@ -602,88 +602,88 @@ gUnknown_081616E1:: @ 81616E1 end Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 - compare 0x40AB, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 playse SE_PIN - setvar 0x40AB, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 - compare 0x40AC, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 playse SE_PIN - setvar 0x40AC, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 - compare 0x40AD, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 playse SE_PIN - setvar 0x40AD, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB - compare 0x40AE, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 playse SE_PIN - setvar 0x40AE, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 - compare 0x40AF, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 playse SE_PIN - setvar 0x40AF, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D - compare 0x40B0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 playse SE_PIN - setvar 0x40B0, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 - compare 0x40B1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 playse SE_PIN - setvar 0x40B1, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F - compare 0x40B2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 playse SE_PIN - setvar 0x40B2, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall @@ -726,13 +726,13 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 lockall msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall - compare 0x4044, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 - compare 0x4044, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_16190B - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 4fffd9914..df0484baf 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 .byte 0 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE - compare 0x40ab, 2 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A end @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall - compare 0x40ab, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 goto Route110_TrickHousePuzzle1_EventScript_161892 end Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 - setvar 0x40ab, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1 goto Route110_TrickHousePuzzle1_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 19ebfbf50..9ebde8451 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -23,13 +23,13 @@ Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall - compare 0x40ac, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 goto Route110_TrickHousePuzzle2_EventScript_161892 end Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 - setvar 0x40ac, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1 goto Route110_TrickHousePuzzle2_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index be1f84c63..cb129b06d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -370,13 +370,13 @@ Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall - compare 0x40ad, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD goto Route110_TrickHousePuzzle3_EventScript_161892 end Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD - setvar 0x40ad, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1 goto Route110_TrickHousePuzzle3_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 0c9fc426f..3808f1f2d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall - compare 0x40ae, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 goto Route110_TrickHousePuzzle4_EventScript_161892 end Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 - setvar 0x40ae, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1 goto Route110_TrickHousePuzzle4_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 695c532cf..5fedee3a9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall - compare 0x40af, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 goto Route110_TrickHousePuzzle5_EventScript_161892 end Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7 - setvar 0x40af, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1 goto Route110_TrickHousePuzzle5_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index 917b9483b..971d2a275 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -17,13 +17,13 @@ Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall - compare 0x40b0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC goto Route110_TrickHousePuzzle6_EventScript_161892 end Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC - setvar 0x40b0, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1 goto Route110_TrickHousePuzzle6_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 4ff925639..66aa8b5e7 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -73,7 +73,7 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 - compare 0x40b6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 @@ -86,33 +86,33 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E end Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F - compare 0x40b6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 end Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B - map_script_2 0x40b6, 1, Route110_TrickHousePuzzle7_EventScript_163285 + map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_163285 .2byte 0 Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 - setvar 0x40b6, 0 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0 end Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall - compare 0x40b1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D goto Route110_TrickHousePuzzle7_EventScript_161892 end Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D - setvar 0x40b1, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1 goto Route110_TrickHousePuzzle7_EventScript_16189C end Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 lockall - setvar 0x40b6, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index 5f0b00684..2c55aae4c 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall - compare 0x40b2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E goto Route110_TrickHousePuzzle8_EventScript_161892 end Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E - setvar 0x40b2, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1 goto Route110_TrickHousePuzzle8_EventScript_16189C end diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index d0d464207..f38a296e7 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -4,7 +4,7 @@ Route112_MapScripts:: @ 8150502 Route112_MapScript1_150508:: @ 8150508 call Route112_EventScript_1A0196 - setvar 0x40bd, 0 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end Route112_EventScript_150513:: @ 8150513 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index d414ca8ed..9c572c0ca 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E setescapewarp MAP_ROUTE112, 255, 28, 28 - compare 0x40a3, 2 + compare VAR_CABLE_CAR_STATION_STATE, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end @@ -15,7 +15,7 @@ Route112_CableCarStation_EventScript_15C052:: @ 815C052 return Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E - map_script_2 0x40a3, 2, Route112_CableCarStation_EventScript_15C068 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_15C068 .2byte 0 Route112_CableCarStation_EventScript_15C068:: @ 815C068 @@ -23,7 +23,7 @@ Route112_CableCarStation_EventScript_15C068:: @ 815C068 applymovement 255, Route112_CableCarStation_Movement_15C0F5 applymovement 1, Route112_CableCarStation_Movement_15C0EB waitmovement 0 - setvar 0x40a3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, 8 releaseall @@ -46,7 +46,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 setvar 0x8004, 0 - setvar 0x40a3, 1 + setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special sub_8123218 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 8d853b88d..3424fbb6f 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -4,26 +4,26 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag FLAG_LANDMARK_GLASS_WORKSHOP - compare 0x40be, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end Route113_GlassWorkshop_EventScript_16355F:: @ 816355F - setvar 0x40be, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 return Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer - compare 0x40be, 10 + compare VAR_GLASS_WORKSHOP_STATE, 10 goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 - compare 0x40be, 2 + compare VAR_GLASS_WORKSHOP_STATE, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 - compare 0x40be, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 giveitem_std ITEM_SOOT_SACK - setvar 0x40be, 1 + setvar VAR_GLASS_WORKSHOP_STATE, 1 msgbox Route113_GlassWorkshop_Text_19E59B, 4 release end @@ -38,7 +38,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 - compare 0x4048, 250 + compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waitmessage @@ -70,13 +70,13 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 bufferitemname 0, 0x8008 setvar 0x800a, 250 - compare 0x4048, 250 + compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 10 - subvar 0x4048, 250 + setvar VAR_GLASS_WORKSHOP_STATE, 10 + subvar VAR_ASH_GATHER_COUNT, 250 goto Route113_GlassWorkshop_EventScript_163851 end @@ -84,13 +84,13 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 bufferitemname 0, 0x8008 setvar 0x800a, 500 - compare 0x4048, 500 + compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 11 - subvar 0x4048, 500 + setvar VAR_GLASS_WORKSHOP_STATE, 11 + subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_163851 end @@ -98,13 +98,13 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 bufferitemname 0, 0x8008 setvar 0x800a, 500 - compare 0x4048, 500 + compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 12 - subvar 0x4048, 500 + setvar VAR_GLASS_WORKSHOP_STATE, 12 + subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_163851 end @@ -112,13 +112,13 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 bufferitemname 0, 0x8008 setvar 0x800a, 1000 - compare 0x4048, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 13 - subvar 0x4048, 1000 + setvar VAR_GLASS_WORKSHOP_STATE, 13 + subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_163851 end @@ -126,13 +126,13 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 bufferitemname 0, 0x8008 setvar 0x800a, 1000 - compare 0x4048, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 14 - subvar 0x4048, 1000 + setvar VAR_GLASS_WORKSHOP_STATE, 14 + subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_163851 end @@ -141,13 +141,13 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8008, 13 bufferdecorationname 0, 0x8008 setvar 0x800a, 6000 - compare 0x4048, 6000 + compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 15 - subvar 0x4048, 6000 + setvar VAR_GLASS_WORKSHOP_STATE, 15 + subvar VAR_ASH_GATHER_COUNT, 6000 goto Route113_GlassWorkshop_EventScript_163851 end @@ -156,13 +156,13 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8008, 6 bufferdecorationname 0, 0x8008 setvar 0x800a, 8000 - compare 0x4048, 8000 + compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 16 - subvar 0x4048, 8000 + setvar VAR_GLASS_WORKSHOP_STATE, 16 + subvar VAR_ASH_GATHER_COUNT, 8000 goto Route113_GlassWorkshop_EventScript_163851 end @@ -205,7 +205,7 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 call_if 1, Route113_GlassWorkshop_EventScript_163889 compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 - setvar 0x40be, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end @@ -234,7 +234,7 @@ Route113_GlassWorkshop_EventScript_1638C3:: @ 81638C3 end Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 - switch 0x40be + switch VAR_GLASS_WORKSHOP_STATE case 10, Route113_GlassWorkshop_EventScript_163925 case 11, Route113_GlassWorkshop_EventScript_163939 case 12, Route113_GlassWorkshop_EventScript_16394D @@ -299,7 +299,7 @@ Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 call_if 1, Route113_GlassWorkshop_EventScript_163889 compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 - setvar 0x40be, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 9aadedb32..b1b331d00 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -130,7 +130,7 @@ Route116_EventScript_150B5D:: @ 8150B5D lock faceplayer msgbox Route116_Text_17032A, 4 - setvar 0x406f, 2 + setvar VAR_ROUTE116_STATE, 2 release end @@ -140,7 +140,7 @@ Route116_EventScript_150B6E:: @ 8150B6E applymovement 255, Route116_Movement_1A083F waitmovement 0 msgbox Route116_Text_17032A, 4 - setvar 0x406f, 2 + setvar VAR_ROUTE116_STATE, 2 releaseall end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index ca69e01c4..bc2ab0a51 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -89,7 +89,7 @@ Route118_EventScript_151004:: @ 8151004 call_if 1, Route118_EventScript_151053 compare 0x8008, 2 call_if 1, Route118_EventScript_15105E - setvar 0x4071, 1 + setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 954be6f21..ca9acd2d5 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -27,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A014E call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 - compare 0x40b3, 1 + compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -35,7 +35,7 @@ Route119_MapScript1_15119B:: @ 815119B Route119_EventScript_1511B9:: @ 81511B9 setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F - setvar 0x40b3, 2 + setvar VAR_WEATHER_INSTITUTE_STATE, 2 return Route119_EventScript_1511C5:: @ 81511C5 @@ -89,7 +89,7 @@ Route119_EventScript_151259:: @ 8151259 Route119_EventScript_15125E:: @ 815125E msgbox Route119_Text_1710BB, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route119_EventScript_15128D case 1, Route119_EventScript_15129D case 2, Route119_EventScript_1512AD @@ -119,7 +119,7 @@ Route119_EventScript_1512BD:: @ 81512BD Route119_EventScript_1512D8:: @ 81512D8 msgbox Route119_Text_171358, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route119_EventScript_151307 case 1, Route119_EventScript_151317 case 2, Route119_EventScript_151327 @@ -166,7 +166,7 @@ Route119_EventScript_151362:: @ 8151362 compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513C7 removeobject 25 - setvar 0x4072, 1 + setvar VAR_ROUTE119_STATE, 1 savebgm 0 fadedefaultbgm releaseall diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 3dc9672e3..8a5c1033f 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -4,7 +4,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 - compare 0x40b3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 end @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D lock faceplayer special GetPlayerBigGuyGirlString - compare 0x40b3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 991725b8c..50f453465 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -4,9 +4,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 - compare 0x40b3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 - compare 0x40b3, 1 + compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 end @@ -38,7 +38,7 @@ Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 closemessage - setvar 0x40b3, 1 + setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F fadedefaultbgm fadescreen 1 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 39443d2f9..d1f153117 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -29,7 +29,7 @@ Route121_EventScript_151B25:: @ 8151B25 removeobject 12 removeobject 13 removeobject 14 - setvar 0x4074, 1 + setvar VAR_ROUTE121_STATE, 1 releaseall end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 431444dae..6235e3b1c 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -3,7 +3,7 @@ Route121_SafariZoneEntrance_MapScripts:: @ 815C323 .byte 0 Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329 - map_script_2 0x40a4, 1, Route121_SafariZoneEntrance_EventScript_15C333 + map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_15C333 .2byte 0 Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 @@ -11,7 +11,7 @@ Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 applymovement 255, Route121_SafariZoneEntrance_Movement_15C348 waitmovement 0 special ExitSafariMode - setvar 0x40a4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end @@ -81,7 +81,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E waitmovement 0 special EnterSafariMode - setvar 0x40a4, 2 + setvar VAR_SAFARI_ZONE_STATE, 2 warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33 waitstate end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index a81e73c3e..7a08d0acb 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -10,7 +10,7 @@ Route128_MapScript1_152126:: @ 8152126 end Route128_MapScript2_152135:: @ 8152135 - map_script_2 0x407b, 1, Route128_EventScript_15213F + map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_15213F .2byte 0 Route128_EventScript_15213F:: @ 815213F @@ -82,7 +82,7 @@ Route128_EventScript_15213F:: @ 815213F delay 15 removeobject 3 waitfieldeffect 30 - setvar 0x407b, 2 + setvar VAR_ROUTE128_STATE, 2 releaseall end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 831cffaea..efe390f8a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -180,9 +180,9 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 setobjectxyperm 9, 30, 10 clearflag FLAG_HIDE_DEVON_RUSTBORO setflag FLAG_DEVON_GOODS_STOLEN - setvar 0x405a, 2 - setvar 0x409a, 2 - setvar 0x406f, 1 + setvar VAR_RUSTBORO_STATE, 2 + setvar VAR_RUSTURF_TUNNEL_STATE, 2 + setvar VAR_ROUTE116_STATE, 1 clearflag FLAG_HIDE_BRINEY_ROUTE116 clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL @@ -372,7 +372,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F - setvar 0x405a, 3 + setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 releaseall @@ -475,7 +475,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D closemessage setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_DEVON_RUSTBORO - setvar 0x405a, 5 + setvar VAR_RUSTBORO_STATE, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 89d59258d..71fc9731d 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -3,18 +3,18 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA .byte 0 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC end RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC - setvar 0x40c4, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 2 return RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release @@ -64,9 +64,9 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 lock faceplayer - compare 0x40c4, 2 + compare VAR_FOSSIL_RESURRECTION_STATE, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 @@ -91,8 +91,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 takeitem ITEM_ROOT_FOSSIL, 1 - setvar 0x40c4, 1 - setvar 0x40c5, 1 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 1 release end @@ -109,8 +109,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 takeitem ITEM_CLAW_FOSSIL, 1 - setvar 0x40c4, 1 - setvar 0x40c5, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 2 release end @@ -125,9 +125,9 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 end RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A - compare 0x40c5, 1 + compare VAR_WHICH_FOSSIL_REVIVED, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 - compare 0x40c5, 2 + compare VAR_WHICH_FOSSIL_REVIVED, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 end @@ -138,7 +138,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT - setvar 0x40c4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E @@ -158,7 +158,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT - setvar 0x40c4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index e2e70d4c0..af5d5d6ee 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 - compare 0x408f, 0 + compare VAR_DEVON_CORP_3F_STATE, 0 call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D end @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D return RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 - map_script_2 0x408f, 0, RustboroCity_DevonCorp_3F_EventScript_157743 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 end RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 - map_script_2 0x408f, 0, RustboroCity_DevonCorp_3F_EventScript_157752 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 @@ -62,9 +62,9 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE - setvar 0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 clearflag FLAG_HIDE_RIVAL_RUSTBORO - setvar 0x408f, 1 + setvar VAR_DEVON_CORP_3F_STATE, 1 releaseall end diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 0dc403ec7..7ed47d35c 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -16,11 +16,11 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE msgbox RustboroCity_Gym_Text_1840D5, 4 setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET - setvar 0x405a, 1 - addvar 0x4085, 1 + setvar VAR_RUSTBORO_STATE, 1 + addvar VAR_PETALBURG_GYM_STATE, 1 setvar 0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 0063564a3..d50e7cec0 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -4,13 +4,13 @@ RusturfTunnel_MapScripts:: @ 815C745 .byte 0 RusturfTunnel_MapScript2_15C750:: @ 815C750 - map_script_2 0x409a, 4, RusturfTunnel_EventScript_15C7D1 - map_script_2 0x409a, 5, RusturfTunnel_EventScript_15C7D1 + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_15C7D1 + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_15C7D1 .2byte 0 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 - compare 0x409a, 2 + compare VAR_RUSTURF_TUNNEL_STATE, 2 call_if 1, RusturfTunnel_EventScript_15C773 end @@ -286,7 +286,7 @@ RusturfTunnel_EventScript_15C9AB:: @ 815C9AB waitmovement 0 moveobjectoffscreen 6 moveobjectoffscreen 7 - setvar 0x409a, 3 + setvar VAR_RUSTURF_TUNNEL_STATE, 3 releaseall end @@ -343,8 +343,8 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA removeobject 7 clearflag FLAG_DEVON_GOODS_STOLEN setflag FLAG_RECOVERED_DEVON_GOODS - setvar 0x405a, 4 - setvar 0x4090, 1 + setvar VAR_RUSTBORO_STATE, 4 + setvar VAR_BRINEY_HOUSE_STATE, 1 setflag FLAG_HIDE_BRINEY_ROUTE116 release end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 8e9a404a2..fc018a7b9 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -3,15 +3,15 @@ SSTidalCorridor_MapScripts:: @ 815FC94 .byte 0 SSTidalCorridor_MapScript2_15FC9A:: @ 815FC9A - map_script_2 0x40b4, 1, SSTidalCorridor_EventScript_15FCBC - map_script_2 0x40b4, 5, SSTidalCorridor_EventScript_15FCD2 - map_script_2 0x40b4, 9, SSTidalCorridor_EventScript_15FD24 - map_script_2 0x40b4, 10, SSTidalCorridor_EventScript_15FD3A + map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_15FCBC + map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_15FCD2 + map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_15FD24 + map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_15FD3A .2byte 0 SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag - setvar 0x40b4, 2 + setvar VAR_PORTHOLE_STATE, 2 lockall playse 73 msgbox SSTidalCorridor_Text_199007, 4 @@ -19,7 +19,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC end SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 - setvar 0x40b4, 6 + setvar VAR_PORTHOLE_STATE, 6 lockall playse 73 msgbox SSTidalCorridor_Text_199088, 4 @@ -28,28 +28,28 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag - setvar 0x40b4, 7 + setvar VAR_PORTHOLE_STATE, 7 playse 73 msgbox SSTidalRooms_Text_199007, 4 return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag - setvar 0x40b4, 4 + setvar VAR_PORTHOLE_STATE, 4 playse 73 msgbox SSTidalRooms_Text_1990F8, 4 return gUnknown_0815FD0D:: @ 815FD0D - compare 0x40B4, 2 + compare VAR_PORTHOLE_STATE, 2 goto_if_eq SSTidalCorridor_EventScript_15FD24 - compare 0x40B4, 7 + compare VAR_PORTHOLE_STATE, 7 goto_if_eq SSTidalCorridor_EventScript_15FD3A end SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag - setvar 0x40b4, 3 + setvar VAR_PORTHOLE_STATE, 3 lockall playse 73 msgbox SSTidalCorridor_Text_199088, 4 @@ -58,7 +58,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag - setvar 0x40b4, 8 + setvar VAR_PORTHOLE_STATE, 8 lockall playse 73 msgbox SSTidalCorridor_Text_1990B4, 4 @@ -67,13 +67,13 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag - setvar 0x40b4, 8 + setvar VAR_PORTHOLE_STATE, 8 playse 73 msgbox SSTidalRooms_Text_1990B4, 4 return SSTidalRooms_EventScript_15FD64:: @ 815FD64 - switch 0x40b4 + switch VAR_PORTHOLE_STATE case 2, SSTidalRooms_EventScript_15FCF9 case 3, SSTidalRooms_EventScript_15FCF9 case 6, SSTidalRooms_EventScript_15FCE5 @@ -113,9 +113,9 @@ SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 lock faceplayer - compare 0x40b4, 4 + compare VAR_PORTHOLE_STATE, 4 goto_if_eq SSTidalCorridor_EventScript_15FDF8 - compare 0x40b4, 8 + compare VAR_PORTHOLE_STATE, 8 goto_if_eq SSTidalCorridor_EventScript_15FE17 msgbox SSTidalCorridor_Text_19913B, 4 release @@ -147,9 +147,9 @@ SSTidalCorridor_EventScript_15FE36:: @ 815FE36 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A lockall - compare 0x40b4, 2 + compare VAR_PORTHOLE_STATE, 2 goto_if_eq SSTidalCorridor_EventScript_15FE5B - compare 0x40b4, 7 + compare VAR_PORTHOLE_STATE, 7 goto_if_eq SSTidalCorridor_EventScript_15FE5B msgbox SSTidalCorridor_Text_199268, 4 releaseall diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index d11fc16d3..2dbd716cb 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -4,7 +4,7 @@ SafariZone_Southeast_MapScripts:: @ 8160036 .byte 0 SafariZone_Southeast_MapScript2_160041:: @ 8160041 - map_script_2 0x40a4, 2, SafariZone_Southeast_EventScript_16004B + map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_Southeast_EventScript_16004B .2byte 0 SafariZone_Southeast_EventScript_16004B:: @ 816004B @@ -15,12 +15,12 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B applymovement 1, SafariZone_Southeast_Movement_160089 waitmovement 0 setobjectxyperm 1, 32, 34 - setvar 0x40a4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end SafariZone_Southeast_MapScript1_160073:: @ 8160073 - compare 0x40a4, 2 + compare VAR_SAFARI_ZONE_STATE, 2 call_if 1, SafariZone_Southeast_EventScript_16007F end @@ -92,7 +92,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F end SafariZone_Southeast_EventScript_160139:: @ 8160139 - setvar 0x40a4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index b31e8fc25..f9bf888e2 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -191,20 +191,20 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4ECA, 4 .endif - setvar 0x407b, 1 + setvar VAR_ROUTE128_STATE, 1 clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS - setvar 0x405e, 1 + setvar VAR_SOOTOPOLIS_STATE, 1 clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE - setvar 0x40c6, 1 - setvar 0x40a2, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 + setvar VAR_SEAFLOOR_CAVERN_STATE, 1 setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc index f72c3d76e..bb673b7b6 100644 --- a/data/scripts/maps/SecretBase_YellowCave4.inc +++ b/data/scripts/maps/SecretBase_YellowCave4.inc @@ -19,5 +19,5 @@ SecretBase_RedCave1_MapScript2_15F358:: @ 815F358 .2byte 0 SecretBase_RedCave1_MapScript2_15F362:: @ 815F362 - map_script_2 0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE + map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE .2byte 0 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 796775aa2..4079763a3 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -10,15 +10,15 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif - setvar 0x40aa, 0 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_14BA5C - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BA68 end SlateportCity_EventScript_14BA5C:: @ 814BA5C setflag FLAG_VISITED_SLATEPORT_CITY - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return @@ -95,7 +95,7 @@ SlateportCity_EventScript_14BB35:: @ 814BB35 SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release @@ -109,7 +109,7 @@ SlateportCity_EventScript_14BB56:: @ 814BB56 SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release @@ -123,7 +123,7 @@ SlateportCity_EventScript_14BB77:: @ 814BB77 SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BBA1 checkflag FLAG_RECEIVED_SECRET_POWER goto_if_eq SlateportCity_EventScript_14BBAB @@ -144,7 +144,7 @@ SlateportCity_EventScript_14BBAB:: @ 814BBAB SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release @@ -156,7 +156,7 @@ SlateportCity_EventScript_14BBCC:: @ 814BBCC end SlateportCity_EventScript_14BBD6:: @ 814BBD6 - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 goto_if_eq SlateportCity_EventScript_14BBEA msgbox SlateportCity_Text_164AA9, 2 end @@ -168,7 +168,7 @@ SlateportCity_EventScript_14BBEA:: @ 814BBEA SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release @@ -253,7 +253,7 @@ SlateportCity_EventScript_14BCAF:: @ 814BCAF SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release @@ -537,7 +537,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR - setvar 0x4058, 2 + setvar VAR_SLATEPORT_STATE, 2 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index c4a44d9c9..0e64282e4 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -13,7 +13,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D call SlateportCity_ContestLobby_EventScript_155448 special sub_80C4BF0 call SlateportCity_ContestLobby_EventScript_15FBDB - setvar 0x4088, 3 + setvar VAR_CONTEST_LOCATION, 3 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 5d7a38401..c13dbaf9c 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 - compare 0x40a0, 1 + compare VAR_SLATEPORT_HARBOR_STATE, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag FLAG_SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_155F85 @@ -62,7 +62,7 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 6 removeobject 7 removeobject 8 - setvar 0x40a0, 2 + setvar VAR_SLATEPORT_HARBOR_STATE, 2 compare 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C compare 0x8008, 1 @@ -193,7 +193,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A - setvar 0x40b4, 1 + setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_156196 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate @@ -274,7 +274,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq SlateportCity_Harbor_EventScript_156258 - compare 0x40a0, 2 + compare VAR_SLATEPORT_HARBOR_STATE, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 98d2160a8..abbe3f78f 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -51,7 +51,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D updatemoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4 - setvar 0x40aa, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox 0, 0 releaseall end @@ -69,7 +69,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, 4 - setvar 0x40aa, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox 0, 0 releaseall end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 40b410f77..6e7d2614b 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonFanClub_MapScript1_15576A:: @ 815576A SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B lock faceplayer - switch 0x40b7 + switch VAR_SLATEPORT_FAN_CLUB_STATE case 0, SlateportCity_PokemonFanClub_EventScript_155795 case 1, SlateportCity_PokemonFanClub_EventScript_1557A8 case 2, SlateportCity_PokemonFanClub_EventScript_1557FE @@ -16,7 +16,7 @@ SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B end SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 - setvar 0x40b7, 1 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1 msgbox SlateportCity_PokemonFanClub_Text_17D773, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 end @@ -35,7 +35,7 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 compare VAR_TEMP_2, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D - compare 0x40b7, 2 + compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 @@ -71,7 +71,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 end SlateportCity_PokemonFanClub_EventScript_15588D:: @ 815588D - setvar 0x40b7, 2 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2 return SlateportCity_PokemonFanClub_EventScript_155893:: @ 8155893 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index f4842bd40..e29700981 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -45,7 +45,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 call SootopolisCity_EventScript_1A02C1 setobjectxyperm 1, 29, 19 setobjectxyperm 2, 33, 19 - compare 0x405e, 1 + compare VAR_SOOTOPOLIS_STATE, 1 call_if 1, SootopolisCity_EventScript_14D142 return @@ -288,7 +288,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 setobjectmovementtype 5, 9 moveobjectoffscreen 10 setobjectmovementtype 10, 10 - setvar 0x405e, 2 + setvar VAR_SOOTOPOLIS_STATE, 2 releaseall end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 65ed13d87..90748bbf5 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -6,7 +6,7 @@ SootopolisCity_Gym_1F_MapScripts:: @ 815AF07 .byte 0 SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C - setvar 0x4022, 1 + setvar VAR_ICE_STEP_COUNT, 1 end SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 @@ -19,11 +19,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E - compare 0x4022, 8 + compare VAR_ICE_STEP_COUNT, 8 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 - compare 0x4022, 28 + compare VAR_ICE_STEP_COUNT, 28 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 - compare 0x4022, 69 + compare VAR_ICE_STEP_COUNT, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 setmetatile 8, 4, 519, 0 setmetatile 8, 5, 519, 0 @@ -40,14 +40,14 @@ SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85 return SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 - map_script_2 0x4022, 8, SootopolisCity_Gym_1F_EventScript_15AFA8 - map_script_2 0x4022, 28, SootopolisCity_Gym_1F_EventScript_15AFBC - map_script_2 0x4022, 69, SootopolisCity_Gym_1F_EventScript_15AFD0 - map_script_2 0x4022, 0, SootopolisCity_Gym_1F_EventScript_15AFE4 + map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_15AFA8 + map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_15AFBC + map_script_2 VAR_ICE_STEP_COUNT, 69, SootopolisCity_Gym_1F_EventScript_15AFD0 + map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_15AFE4 .2byte 0 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 - addvar 0x4022, 1 + addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E @@ -55,7 +55,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 end SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC - addvar 0x4022, 1 + addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E @@ -63,7 +63,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC end SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 - addvar 0x4022, 1 + addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 6c25c34c5..e2afd07dc 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -55,11 +55,11 @@ LinkContestRoom1_EventScript_15F600:: @ 815F600 return LinkContestRoom1_MapScript2_15F606:: @ 815F606 - map_script_2 0x4086, 1, LinkContestRoom1_EventScript_15F61A + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F61A .2byte 0 LinkContestRoom1_MapScript2_15F610:: @ 815F610 - map_script_2 0x4086, 1, LinkContestRoom1_EventScript_15F625 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F625 .2byte 0 LinkContestRoom1_EventScript_15F61A:: @ 815F61A @@ -293,7 +293,7 @@ LinkContestRoom1_EventScript_15F913:: @ 815F913 return LinkContestRoom1_EventScript_15F919:: @ 815F919 - switch 0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_15F956 case 2, LinkContestRoom1_EventScript_15F969 case 3, LinkContestRoom1_EventScript_15F9C4 @@ -372,7 +372,7 @@ LinkContestRoom1_EventScript_15FA70:: @ 815FA70 return LinkContestRoom1_EventScript_15FB64:: @ 815FB64 - switch 0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_15FBA1 case 2, LinkContestRoom1_EventScript_15FBAD case 3, LinkContestRoom1_EventScript_15FBB9 diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index b9e9b85a5..ca2a3c245 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -4,7 +4,7 @@ VerdanturfTown_MapScripts:: @ 814E854 VerdanturfTown_MapScript1_14E85A:: @ 814E85A setflag FLAG_VISITED_VERDANTURF_TOWN - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 3694f089d..11568ad22 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -13,7 +13,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 call VerdanturfTown_ContestLobby_EventScript_153DA1 special sub_80C4BF0 call VerdanturfTown_ContestLobby_EventScript_15FBDB - setvar 0x4088, 1 + setvar VAR_CONTEST_LOCATION, 1 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 7e48d3d90..a206d5531 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -44,7 +44,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - setvar 0x40c3, 1 + setvar VAR_VICTORY_ROAD_1F_STATE, 1 releaseall end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index aa4c8fc0f..21ba933ce 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -1,6 +1,6 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6950:: @ 81B6950 LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950 - setvar 0x4092, 5 + setvar VAR_LITTLEROOT_INTRO_STATE, 5 return LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956 @@ -14,7 +14,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closemessage - setvar 0x4092, 4 + setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 waitmovement 0 @@ -64,7 +64,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4 call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B delay 30 - setvar 0x4092, 6 + setvar VAR_LITTLEROOT_INTRO_STATE, 6 setflag FLAG_SET_WALL_CLOCK setflag FLAG_HIDE_MACHOKE_MOVER_1 setflag FLAG_HIDE_MACHOKE_MOVER_2 @@ -150,7 +150,7 @@ LittlerootTown_BrendansHouse_2F_Movement_1B6AB4:: @ 81B6AB4 LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 - setvar 0x4092, 7 + setvar VAR_LITTLEROOT_INTRO_STATE, 7 releaseall end @@ -252,9 +252,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 lock faceplayer - compare 0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - compare 0x408c, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 checkflag FLAG_BADGE05_GET goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D @@ -262,7 +262,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 compare VAR_TEMP_1, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 - compare 0x4092, 7 + compare VAR_LITTLEROOT_INTRO_STATE, 7 goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 release @@ -399,8 +399,8 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE playse 8 removeobject 0x8009 setflag FLAG_RECEIVED_SS_TICKET - setvar 0x4082, 4 - setvar 0x408c, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 releaseall end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 892630ac8..ca48bb41f 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,11 +1,11 @@ gUnknown_081C340A:: @ 81C340A - setvar 0x40a4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 end EventScript_1C341B: @ 81C341B - setvar 0x40a4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate -- cgit v1.2.3 From 1c8b05e7b059a98d4259f4129896d0cc1eaa3847 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Dec 2017 10:11:43 -0600 Subject: Name and use constants for special vars --- data/event_scripts.s | 309 ++++++++++----------- data/scripts/berry_tree.inc | 10 +- data/scripts/cable_club.inc | 76 ++--- data/scripts/contest_hall.inc | 170 ++++++------ data/scripts/day_care.inc | 24 +- data/scripts/gabby_and_ty.inc | 12 +- data/scripts/maps/AquaHideout_B2F.inc | 32 +-- data/scripts/maps/BattleTower_BattleRoom.inc | 30 +- data/scripts/maps/BattleTower_Corridor.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 68 ++--- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/DewfordTown.inc | 8 +- data/scripts/maps/DewfordTown_Gym.inc | 28 +- data/scripts/maps/DewfordTown_Hall.inc | 12 +- data/scripts/maps/DewfordTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- .../maps/EverGrandeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 2 +- data/scripts/maps/FallarborTown_House2.inc | 6 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 24 +- data/scripts/maps/FortreeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 16 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 20 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 2 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 22 +- data/scripts/maps/LilycoveCity_Harbor.inc | 4 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 4 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 4 +- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 32 +-- data/scripts/maps/LittlerootTown.inc | 120 ++++---- .../maps/LittlerootTown_BrendansHouse_1F.inc | 14 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 4 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 14 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 4 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 24 +- data/scripts/maps/MauvilleCity_Gym.inc | 14 +- .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 4 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- .../scripts/maps/MossdeepCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 38 +-- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PacifidlogTown_House3.inc | 24 +- .../maps/PacifidlogTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 24 +- data/scripts/maps/PetalburgCity_Gym.inc | 172 ++++++------ .../maps/PetalburgCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/Route104.inc | 2 +- data/scripts/maps/Route109.inc | 2 +- data/scripts/maps/Route110.inc | 24 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 18 +- data/scripts/maps/Route111.inc | 16 +- .../maps/Route111_WinstrateFamilysHouse.inc | 10 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/scripts/maps/Route113_GlassWorkshop.inc | 104 +++---- data/scripts/maps/Route118.inc | 12 +- data/scripts/maps/Route119.inc | 4 +- data/scripts/maps/Route120.inc | 26 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 14 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 28 +- data/scripts/maps/RustboroCity.inc | 10 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 4 +- data/scripts/maps/RustboroCity_Gym.inc | 2 +- data/scripts/maps/RustboroCity_House1.inc | 22 +- .../scripts/maps/RustboroCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 60 ++-- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 18 +- data/scripts/maps/SlateportCity_House1.inc | 4 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 2 +- .../maps/SlateportCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SootopolisCity_House8.inc | 4 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 6 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- .../maps/VerdanturfTown_PokemonCenter_1F.inc | 2 +- data/scripts/mauville_man.inc | 26 +- data/scripts/mystery_event_club.inc | 10 +- data/scripts/players_house.inc | 96 +++---- data/scripts/pokeblocks.inc | 42 +-- data/scripts/tv.inc | 6 +- 96 files changed, 1007 insertions(+), 1008 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 5677d2470..5170a0707 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -12,7 +12,6 @@ .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" - .include "constants/variables.inc" .section script_data, "aw", %progbits @@ -1454,11 +1453,11 @@ do_heal_party:: @ 819FD7C incrementgamestat GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon waitmessage - applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F + applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_1A083F waitmovement 0 dofieldeffect 25 waitfieldeffect 25 - applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 + applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty checkflag FLAG_POKERUS_EXPLAINED @@ -1469,7 +1468,7 @@ do_heal_party:: @ 819FD7C OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 message gText_NurseJoy_ThankYouForWaiting waitmessage - applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4 + applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_19FDF4 waitmovement 0 message gText_NurseJoy_WeHopeToSeeYouAgain waitmessage @@ -1500,18 +1499,18 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 step_end Std_ObtainItem: @ 819FDF7 - giveitem 0x8000, 0x8001 - copyvar 0x8007, RESULT + giveitem SPECIALVAR_0, SPECIALVAR_1 + copyvar SPECIALVAR_7, RESULT call Std_ObtainItem_ return Std_ObtainItem_: @ 819FE07 - bufferitemname 1, 0x8000 - checkitemtype 0x8000 + bufferitemname 1, SPECIALVAR_0 + checkitemtype SPECIALVAR_0 call GetItem_HandlePocket - compare 0x8007, 0x1 + compare SPECIALVAR_7, 0x1 call_if 1, Std_ObtainItem_Success - compare 0x8007, 0x0 + compare SPECIALVAR_7, 0x0 call_if 1, Std_ObtainItem_Fail return @@ -1526,31 +1525,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstdstring 2, 0xE - compare 0x8007, 1 + compare SPECIALVAR_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstdstring 2, 0xF - compare 0x8007, 1 + compare SPECIALVAR_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstdstring 2, 0x10 - compare 0x8007, 1 + compare SPECIALVAR_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstdstring 2, 0x11 - compare 0x8007, 1 + compare SPECIALVAR_7, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstdstring 2, 0x12 - compare 0x8007, 1 + compare SPECIALVAR_7, 1 call_if 1, PlayGetItemFanfare return @@ -1575,16 +1574,16 @@ PlayGetTMHMFanfare: return Std_ObtainDecoration: @ 819FEDA - givedecoration 0x8000 - copyvar 0x8007, RESULT + givedecoration SPECIALVAR_0 + copyvar SPECIALVAR_7, RESULT call Std_ObtainDecoration_ return Std_ObtainDecoration_: @ 819FEE8 - bufferdecorationname 1, 0x8000 - compare 0x8007, 1 + bufferdecorationname 1, SPECIALVAR_0 + compare SPECIALVAR_7, 1 call_if 1, Std_ObtainDecoration_Success - compare 0x8007, 0 + compare SPECIALVAR_7, 0 call_if 1, Std_ObtainDecoration_Fail return @@ -1605,14 +1604,14 @@ Std_FindItem: @ 819FF21 lock faceplayer waitse - giveitem 0x8000, 0x8001 - copyvar 0x8007, RESULT - bufferitemname 1, 0x8000 - checkitemtype 0x8000 + giveitem SPECIALVAR_0, SPECIALVAR_1 + copyvar SPECIALVAR_7, RESULT + bufferitemname 1, SPECIALVAR_0 + checkitemtype SPECIALVAR_0 call GetItem_HandlePocket - compare 0x8007, 1 + compare SPECIALVAR_7, 1 call_if 1, Std_FindItem_Success - compare 0x8007, 0 + compare SPECIALVAR_7, 0 call_if 1, Std_FindItem_Fail release return @@ -1634,14 +1633,14 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall waitse - giveitem 0x8005, 1 - copyvar 0x8007, RESULT - bufferitemname 0x1, 0x8005 - checkitemtype 0x8005 + giveitem SPECIALVAR_5, 1 + copyvar SPECIALVAR_7, RESULT + bufferitemname 0x1, SPECIALVAR_5 + checkitemtype SPECIALVAR_5 call GetItem_HandlePocket - compare 0x8007, 1 + compare SPECIALVAR_7, 1 goto_if_eq HiddenItemScript_Success - compare 0x8007, 0 + compare SPECIALVAR_7, 0 goto_if_eq HiddenItemScript_Fail end @@ -1684,7 +1683,7 @@ UnusedMixRecordsScript_Done: @ 81A0000 gUnknown_081A0009:: @ 81A0009 lockall - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special DoPCTurnOnEffect playse 4 msgbox UnknownString_81A09EC, 4 @@ -1737,7 +1736,7 @@ EventScript_1A00B5: return EventScript_1A00BE: - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 playse 3 special DoPCTurnOffEffect releaseall @@ -1809,14 +1808,14 @@ RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 dodailyevents - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_80FA5BC return DewfordTown_EventScript_1A010C:: @ 81A010C Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C Route109_EventScript_1A010C:: @ 81A010C - copyvar 0x8008, VAR_BRINEY_LOCATION + copyvar SPECIALVAR_8, VAR_BRINEY_LOCATION setvar VAR_BRINEY_LOCATION, 0 return @@ -1938,7 +1937,7 @@ MossdeepCity_Gym_EventScript_1A01C0:: @ 81A01C0 PetalburgCity_Gym_EventScript_1A01C0:: @ 81A01C0 RustboroCity_Gym_EventScript_1A01C0:: @ 81A01C0 SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 - switch 0x8008 + switch SPECIALVAR_8 case 1, DewfordTown_Gym_EventScript_1A021E case 2, DewfordTown_Gym_EventScript_1A0225 case 3, DewfordTown_Gym_EventScript_1A022F @@ -2206,7 +2205,7 @@ Route101_EventScript_1A039B:: @ 81A039B end Route101_EventScript_1A03A5:: @ 81A03A5 - copyvar 0x8004, 0x8009 + copyvar SPECIALVAR_4, SPECIALVAR_9 special ShowPokedexRatingMessage waitmessage waitbuttonpress @@ -2214,23 +2213,23 @@ Route101_EventScript_1A03A5:: @ 81A03A5 EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0 Route101_EventScript_1A03B0:: @ 81A03B0 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 specialvar RESULT, ScriptGetPokedexInfo - copyvar 0x8008, 0x8005 - copyvar 0x8009, 0x8006 - copyvar 0x800a, RESULT - buffernumberstring 0, 0x8008 - buffernumberstring 1, 0x8009 + copyvar SPECIALVAR_8, SPECIALVAR_5 + copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar SPECIALVAR_A, RESULT + buffernumberstring 0, SPECIALVAR_8 + buffernumberstring 1, SPECIALVAR_9 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 - compare 0x800a, 0 + compare SPECIALVAR_A, 0 goto_if_eq Route101_EventScript_1A14DC - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 specialvar RESULT, ScriptGetPokedexInfo - copyvar 0x8008, 0x8005 - copyvar 0x8009, 0x8006 - buffernumberstring 0, 0x8008 - buffernumberstring 1, 0x8009 + copyvar SPECIALVAR_8, SPECIALVAR_5 + copyvar SPECIALVAR_9, SPECIALVAR_6 + buffernumberstring 0, SPECIALVAR_8 + buffernumberstring 1, SPECIALVAR_9 msgbox Route101_Text_1C4B05, 4 return @@ -2238,7 +2237,7 @@ BattleTower_Outside_EventScript_1A040E:: @ 81A040E LilycoveCity_Harbor_EventScript_1A040E:: @ 81A040E SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E delay 60 - applymovement 0x8004, SlateportCity_Harbor_Movement_1A041C + applymovement SPECIALVAR_4, SlateportCity_Harbor_Movement_1A041C waitmovement 0 return @@ -2332,8 +2331,8 @@ CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3 CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3 - setvar 0x8004, 1 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 special sub_810F758 waitstate releaseall @@ -2386,49 +2385,49 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B Route120_EventScript_1A0539:: @ 81A0539 lock faceplayer - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0546:: @ 81A0546 lock faceplayer - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0553:: @ 81A0553 lock faceplayer - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0560:: @ 81A0560 lock faceplayer - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 goto Route120_EventScript_1A0594 end Route120_EventScript_1A056D:: @ 81A056D lock faceplayer - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 goto Route120_EventScript_1A0594 end Route119_EventScript_1A057A:: @ 81A057A lock faceplayer - setvar 0x8004, 6 + setvar SPECIALVAR_4, 6 goto Route119_EventScript_1A0594 end Route119_EventScript_1A0587:: @ 81A0587 lock faceplayer - setvar 0x8004, 7 + setvar SPECIALVAR_4, 7 goto Route119_EventScript_1A0594 end @@ -2460,19 +2459,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - compare 0x8004, 1 + compare SPECIALVAR_4, 1 call_if 1, Route119_EventScript_1A0646 - compare 0x8004, 2 + compare SPECIALVAR_4, 2 call_if 1, Route119_EventScript_1A064A - compare 0x8004, 3 + compare SPECIALVAR_4, 3 call_if 1, Route119_EventScript_1A064E - compare 0x8004, 4 + compare SPECIALVAR_4, 4 call_if 1, Route119_EventScript_1A0652 - compare 0x8004, 5 + compare SPECIALVAR_4, 5 call_if 1, Route119_EventScript_1A0656 - compare 0x8004, 6 + compare SPECIALVAR_4, 6 call_if 1, Route119_EventScript_1A065A - compare 0x8004, 7 + compare SPECIALVAR_4, 7 call_if 1, Route119_EventScript_1A065E setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -2547,12 +2546,12 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F - bufferitemname 0, 0x8004 + bufferitemname 0, SPECIALVAR_4 playfanfare 372 message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare - takeitem 0x8004, 1 + takeitem SPECIALVAR_4, 1 return EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 @@ -3613,17 +3612,17 @@ gUnknown_081A2C51:: @ 81A2C51 checkpartymove MOVE_SECRET_POWER setfieldeffectargument 0, RESULT buffermovename 1, MOVE_SECRET_POWER - compare 0x8007, 1 + compare SPECIALVAR_7, 1 goto_if_eq EventScript_1A2CB0 - compare 0x8007, 2 + compare SPECIALVAR_7, 2 goto_if_eq EventScript_1A2CB0 - compare 0x8007, 3 + compare SPECIALVAR_7, 3 goto_if_eq EventScript_1A2CB0 - compare 0x8007, 4 + compare SPECIALVAR_7, 4 goto_if_eq EventScript_1A2CB0 - compare 0x8007, 5 + compare SPECIALVAR_7, 5 goto_if_eq EventScript_1A2D08 - compare 0x8007, 6 + compare SPECIALVAR_7, 6 goto_if_eq EventScript_1A2D60 end @@ -3727,8 +3726,8 @@ EventScript_1A2DB8: setflag FLAG_DECORATION_1 special sub_80BB8CC special sub_80BBAF0 - setvar 0x8004, 0 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 0 special sub_80BBDD0 setvar VAR_0x4089, 1 waitstate @@ -3783,7 +3782,7 @@ EventScript_1A2E45: compare RESULT, 6 goto_if_eq EventScript_1A2EF7 setfieldeffectargument 0, RESULT - setorcopyvar 0x8004, RESULT + setorcopyvar SPECIALVAR_4, RESULT lockall special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 @@ -3799,38 +3798,38 @@ EventScript_1A2E45: msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A - bufferpartymonnick 0, 0x8004 + bufferpartymonnick 0, SPECIALVAR_4 buffermovename 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closemessage closemessage - compare 0x8007, 1 + compare SPECIALVAR_7, 1 goto_if_eq gUnknown_081A2CE6 - compare 0x8007, 2 + compare SPECIALVAR_7, 2 goto_if_eq gUnknown_081A2CE6 - compare 0x8007, 3 + compare SPECIALVAR_7, 3 goto_if_eq gUnknown_081A2CE6 - compare 0x8007, 4 + compare SPECIALVAR_7, 4 goto_if_eq gUnknown_081A2CE6 - compare 0x8007, 5 + compare SPECIALVAR_7, 5 goto_if_eq gUnknown_081A2D3E - compare 0x8007, 6 + compare SPECIALVAR_7, 6 goto_if_eq gUnknown_081A2D96 releaseall end EventScript_1A2EF7:: - compare 0x8007, 1 + compare SPECIALVAR_7, 1 goto_if_eq EventScript_1A2CF1 - compare 0x8007, 2 + compare SPECIALVAR_7, 2 goto_if_eq EventScript_1A2CF1 - compare 0x8007, 3 + compare SPECIALVAR_7, 3 goto_if_eq EventScript_1A2CF1 - compare 0x8007, 4 + compare SPECIALVAR_7, 4 goto_if_eq EventScript_1A2CF1 - compare 0x8007, 5 + compare SPECIALVAR_7, 5 goto_if_eq EventScript_1A2D49 - compare 0x8007, 6 + compare SPECIALVAR_7, 6 goto_if_eq EventScript_1A2DA1 end @@ -3861,14 +3860,14 @@ SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68 LittlerootTown_MaysHouse_2F_EventScript_1A2F68:: @ 81A2F68 SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 - setvar 0x8004, 0 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 0 special sub_80BBDD0 setvar VAR_0x4089, 1 end gUnknown_081A2F7B:: @ 81A2F7B - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 goto EventScript_1A2F86 end @@ -3877,7 +3876,7 @@ EventScript_1A2F86: end gUnknown_081A2F8A:: @ 81A2F8A - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto EventScript_1A2F95 end @@ -3885,11 +3884,11 @@ EventScript_1A2F95: special sub_8100A7C compare RESULT, 1 goto_if_eq EventScript_1A2FBF - addvar 0x8004, 1 - compare 0x8005, 0 + addvar SPECIALVAR_4, 1 + compare SPECIALVAR_5, 0 goto_if_eq EventScript_1A2F95 - removeobject 0x8006 - setflag 0x8005 + removeobject SPECIALVAR_6 + setflag SPECIALVAR_5 goto EventScript_1A2F95 end @@ -3921,25 +3920,25 @@ SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 special sub_80BCE90 - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3032 - compare 0x8004, 1 + compare SPECIALVAR_4, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30AE - compare 0x8004, 2 + compare SPECIALVAR_4, 2 goto_if_eq SecretBase_RedCave1_EventScript_1A312A - compare 0x8004, 3 + compare SPECIALVAR_4, 3 goto_if_eq SecretBase_RedCave1_EventScript_1A31A6 - compare 0x8004, 4 + compare SPECIALVAR_4, 4 goto_if_eq SecretBase_RedCave1_EventScript_1A3222 - compare 0x8004, 5 + compare SPECIALVAR_4, 5 goto_if_eq SecretBase_RedCave1_EventScript_1A329E - compare 0x8004, 6 + compare SPECIALVAR_4, 6 goto_if_eq SecretBase_RedCave1_EventScript_1A331A - compare 0x8004, 7 + compare SPECIALVAR_4, 7 goto_if_eq SecretBase_RedCave1_EventScript_1A3396 - compare 0x8004, 8 + compare SPECIALVAR_4, 8 goto_if_eq SecretBase_RedCave1_EventScript_1A3412 - compare 0x8004, 9 + compare SPECIALVAR_4, 9 goto_if_eq SecretBase_RedCave1_EventScript_1A348E end @@ -4295,8 +4294,8 @@ SecretBase_RedCave1_EventScript_1A3501:: @ 81A3501 SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A special sub_80BCE1C - setvar 0x8004, 1 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 0 special sub_813556C waitstate special ScrSpecial_HealPlayerParty @@ -4390,11 +4389,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 end SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 - copyvar 0x8009, 0x8006 + copyvar SPECIALVAR_9, SPECIALVAR_6 msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 @@ -4404,9 +4403,9 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 msgbox SlateportCity_PokemonFanClub_Text_1A87CA, 4 - setvar 0x8004, 5 - copyvar 0x8005, 0x8009 - setvar 0x8006, 1 + setvar SPECIALVAR_4, 5 + copyvar SPECIALVAR_5, SPECIALVAR_9 + setvar SPECIALVAR_6, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer @@ -4423,7 +4422,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9 SlateportCity_PokemonFanClub_EventScript_1ADEC3:: @ 81ADEC3 msgbox SlateportCity_PokemonFanClub_Text_1A8818, 4 - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 goto SlateportCity_PokemonFanClub_EventScript_1ADE46 end @@ -4435,11 +4434,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADED6:: @ 81ADED6 SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 lock faceplayer - setvar 0x8005, 2 + setvar SPECIALVAR_5, 2 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 - copyvar 0x8009, 0x8006 + copyvar SPECIALVAR_9, SPECIALVAR_6 checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER @@ -4460,9 +4459,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 msgbox SlateportCity_OceanicMuseum_1F_Text_1A93D1, 4 - setvar 0x8004, 5 - copyvar 0x8005, 0x8009 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 5 + copyvar SPECIALVAR_5, SPECIALVAR_9 + setvar SPECIALVAR_6, 0 call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3 lock faceplayer @@ -4479,7 +4478,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79 SlateportCity_OceanicMuseum_1F_EventScript_1ADF83:: @ 81ADF83 msgbox SlateportCity_OceanicMuseum_1F_Text_1A949A, 4 - setvar 0x8005, 2 + setvar SPECIALVAR_5, 2 goto SlateportCity_OceanicMuseum_1F_EventScript_1ADE46 end @@ -4494,11 +4493,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 specialvar RESULT, sub_80BF544 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D - setvar 0x8005, 3 + setvar SPECIALVAR_5, 3 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC - copyvar 0x8009, 0x8006 + copyvar SPECIALVAR_9, SPECIALVAR_6 msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 @@ -4509,7 +4508,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9 msgbox SlateportCity_PokemonFanClub_Text_1A83D0, 4 random 3 - copyvar 0x800a, RESULT + copyvar SPECIALVAR_A, RESULT switch RESULT case 0, SlateportCity_PokemonFanClub_EventScript_1AE020 case 1, SlateportCity_PokemonFanClub_EventScript_1AE02E @@ -4532,24 +4531,24 @@ SlateportCity_PokemonFanClub_EventScript_1AE03C:: @ 81AE03C end SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A - setvar 0x8004, 7 - copyvar 0x8005, 0x8009 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 7 + copyvar SPECIALVAR_5, SPECIALVAR_9 + setvar SPECIALVAR_6, 0 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4 - setvar 0x8006, 1 + setvar SPECIALVAR_6, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4 - copyvar 0x8007, 0x800a - setvar 0x8005, 3 + copyvar SPECIALVAR_7, SPECIALVAR_A + setvar SPECIALVAR_5, 3 goto SlateportCity_PokemonFanClub_EventScript_1ADE46 end @@ -4571,11 +4570,11 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 faceplayer checkflag FLAG_TEMP_2 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E - setvar 0x8005, 6 + setvar SPECIALVAR_5, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E - copyvar 0x8009, 0x8006 + copyvar SPECIALVAR_9, SPECIALVAR_6 msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 @@ -4585,9 +4584,9 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 msgbox FallarborTown_ContestLobby_Text_1A704E, 4 - setvar 0x8004, 11 - copyvar 0x8005, 0x8009 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 11 + copyvar SPECIALVAR_5, SPECIALVAR_9 + setvar SPECIALVAR_6, 0 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer @@ -4603,12 +4602,12 @@ FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D end FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 - setvar 0x8004, 24 + setvar SPECIALVAR_4, 24 special SetContestCategoryStringVarForInterview msgbox FallarborTown_ContestLobby_Text_1A70A5, 4 - setvar 0x8004, 11 - copyvar 0x8005, 0x8009 - setvar 0x8006, 1 + setvar SPECIALVAR_4, 11 + copyvar SPECIALVAR_5, SPECIALVAR_9 + setvar SPECIALVAR_6, 1 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer @@ -4616,7 +4615,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 setflag FLAG_TEMP_2 - setvar 0x8005, 6 + setvar SPECIALVAR_5, 6 goto FallarborTown_ContestLobby_EventScript_1ADE46 end @@ -4631,7 +4630,7 @@ SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE - setvar 0x8005, 6 + setvar SPECIALVAR_5, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE @@ -4668,11 +4667,11 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF faceplayer checkflag FLAG_TEMP_2 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 - setvar 0x8005, 7 + setvar SPECIALVAR_5, 7 special sub_80BF2C4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 - copyvar 0x8009, 0x8006 + copyvar SPECIALVAR_9, SPECIALVAR_6 msgbox BattleTower_Lobby_Text_1A776D, 5 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE241 @@ -4684,14 +4683,14 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 message BattleTower_Lobby_Text_1A7823 waitmessage multichoice 19, 8, 45, 1 - copyvar 0x8008, RESULT + copyvar SPECIALVAR_8, RESULT compare RESULT, 0 call_if 1, BattleTower_Lobby_EventScript_1AE2A1 compare RESULT, 1 call_if 1, BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 - setvar 0x8004, 12 - copyvar 0x8005, 0x8009 + setvar SPECIALVAR_4, 12 + copyvar SPECIALVAR_5, SPECIALVAR_9 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer @@ -4719,8 +4718,8 @@ BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 setflag FLAG_TEMP_2 - copyvar 0x8004, 0x8008 - setvar 0x8005, 7 + copyvar SPECIALVAR_4, SPECIALVAR_8 + setvar SPECIALVAR_5, 7 goto BattleTower_Lobby_EventScript_1ADE46 end @@ -4737,7 +4736,7 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F - setvar 0x8005, 7 + setvar SPECIALVAR_5, 7 special sub_80BF2C4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F @@ -4803,11 +4802,11 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 getpricereduction 2 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA - addvar 0x8004, 128 + addvar SPECIALVAR_4, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA end @@ -4815,11 +4814,11 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 getpricereduction 2 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA - addvar 0x8004, 128 + addvar SPECIALVAR_4, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index ab700cbc3..94a52b66c 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,6 +1,6 @@ S_BerryTree:: @ 81A14DD special FieldObjectInteractionGetBerryTreeData - switch 0x8004 + switch SPECIALVAR_4 case 255, Route102_EventScript_1A1533 case 0, Route102_EventScript_1A153D case 1, Route102_EventScript_1A1595 @@ -82,9 +82,9 @@ Route102_EventScript_1A15BC:: @ 81A15BC goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE - compare 0x8005, 0 + compare SPECIALVAR_5, 0 goto_if_eq Route102_EventScript_1A15F2 - compare 0x8005, 4 + compare SPECIALVAR_5, 4 goto_if_eq Route102_EventScript_1A15EB bufferstring 1, Route102_Text_1A17B7 return @@ -98,7 +98,7 @@ Route102_EventScript_1A15F2:: @ 81A15F2 return Route102_EventScript_1A15F9:: @ 81A15F9 - buffernumberstring 1, 0x8006 + buffernumberstring 1, SPECIALVAR_6 lock faceplayer msgbox Route102_Text_1A17C0, 5 @@ -109,7 +109,7 @@ Route102_EventScript_1A15F9:: @ 81A15F9 Route102_EventScript_1A161D:: @ 81A161D special FieldObjectInteractionPickBerryTree - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index d8aee8038..46ef01ed0 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -21,7 +21,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_1A3D2D:: @ 81A3D2D - turnobject 0x8007, 4 + turnobject SPECIALVAR_7, 4 end DewfordTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 @@ -90,9 +90,9 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 setvar VAR_CABLE_CLUB_STATE, 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - compare 0x8007, 0 + compare SPECIALVAR_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 - applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 @@ -101,13 +101,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - compare 0x8007, 0 + compare SPECIALVAR_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C - applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 return @@ -128,11 +128,11 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - compare 0x8007, 0 + compare SPECIALVAR_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 waitmovement 0 - applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 message OldaleTown_PokemonCenter_2F_Text_1A4E50 waitmessage @@ -141,7 +141,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 waitmessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 return @@ -176,7 +176,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 - copyvar 0x8007, LAST_TALKED + copyvar SPECIALVAR_7, LAST_TALKED lock faceplayer message OldaleTown_PokemonCenter_2F_Text_1A4510 @@ -195,7 +195,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waitmessage @@ -218,7 +218,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E special ScrSpecial_HealPlayerParty special SavePlayerParty special LoadPlayerBag - copyvar VAR_CABLE_CLUB_STATE, 0x8004 + copyvar VAR_CABLE_CLUB_STATE, SPECIALVAR_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 5, 3, 514, 0 @@ -237,7 +237,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E closedoor 5, 1 waitdooranim release - compare 0x8004, 5 + compare SPECIALVAR_4, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 @@ -272,18 +272,18 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FEF:: @ 81A3FEF case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4036 OldaleTown_PokemonCenter_2F_EventScript_1A4036:: @ 81A4036 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 return OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 return OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons compare RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 return OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 @@ -293,11 +293,11 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF OldaleTown_PokemonCenter_2F_EventScript_1A4062:: @ 81A4062 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 return OldaleTown_PokemonCenter_2F_EventScript_1A4068:: @ 81A4068 - switch 0x8004 + switch SPECIALVAR_4 case 1, OldaleTown_PokemonCenter_2F_EventScript_1A40B1 case 2, OldaleTown_PokemonCenter_2F_EventScript_1A40A2 case 5, OldaleTown_PokemonCenter_2F_EventScript_1A4093 @@ -348,7 +348,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 - copyvar 0x8007, LAST_TALKED + copyvar SPECIALVAR_7, LAST_TALKED lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, 5 @@ -382,8 +382,8 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 - setvar 0x8004, 3 - copyvar VAR_CABLE_CLUB_STATE, 0x8004 + setvar SPECIALVAR_4, 3 + copyvar VAR_CABLE_CLUB_STATE, SPECIALVAR_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 8, 3, 514, 0 @@ -445,7 +445,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB checkflag FLAG_VISITED_MAUVILLE_CITY goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B - copyvar 0x8007, LAST_TALKED + copyvar SPECIALVAR_7, LAST_TALKED lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, 5 @@ -480,8 +480,8 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42E9 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 - setvar 0x8004, 4 - copyvar VAR_CABLE_CLUB_STATE, 0x8004 + setvar SPECIALVAR_4, 4 + copyvar VAR_CABLE_CLUB_STATE, SPECIALVAR_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 11, 3, 514, 0 @@ -604,13 +604,13 @@ gUnknown_081A4363:: @ 81A4363 end SingleBattleColosseum_EventScript_1A436F:: @ 81A436F - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 special sub_8083B90 waitstate end SingleBattleColosseum_EventScript_1A4379:: @ 81A4379 - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 special sub_8083B90 waitstate end @@ -621,7 +621,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 special sub_8083B90 waitstate end @@ -632,7 +632,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 special sub_8083B90 waitstate end @@ -643,7 +643,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar 0x8005, 2 + setvar SPECIALVAR_5, 2 special sub_8083B90 waitstate end @@ -654,7 +654,7 @@ DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4 waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar 0x8005, 3 + setvar SPECIALVAR_5, 3 special sub_8083B90 waitstate end @@ -663,31 +663,31 @@ DoubleBattleColosseum_EventScript_1A43EF:: @ 81A43EF end TradeCenter_EventScript_1A43F0:: @ 81A43F0 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 special sub_8083B5C waitstate end TradeCenter_EventScript_1A43FA:: @ 81A43FA - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 special sub_8083B5C waitstate end @ 81A4404 - setvar 0x8005, 2 + setvar SPECIALVAR_5, 2 special sub_8083B5C waitstate end @ 81A440E - setvar 0x8005, 3 + setvar SPECIALVAR_5, 3 special sub_8083B5C waitstate end RecordCorner_EventScript_1A4418:: @ 81A4418 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -695,7 +695,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 end RecordCorner_EventScript_1A442D:: @ 81A442D - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -703,7 +703,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D end RecordCorner_EventScript_1A4442:: @ 81A4442 - setvar 0x8005, 2 + setvar SPECIALVAR_5, 2 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -711,7 +711,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 end RecordCorner_EventScript_1A4457:: @ 81A4457 - setvar 0x8005, 3 + setvar SPECIALVAR_5, 3 special sub_80B929C waitstate compare VAR_TEMP_1, 0 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index f13e2647d..ad478b3c7 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F - bufferstdstring 0, 0x800b + bufferstdstring 0, SPECIALVAR_B msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 @@ -120,7 +120,7 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 choosecontestmon - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 compare RESULT, 0 @@ -186,7 +186,7 @@ FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D return LinkContestRoom1_EventScript_1A514D:: @ 81A514D - setvar 0x8006, 0 + setvar SPECIALVAR_6, 0 lockall applymovement 14, LinkContestRoom1_Movement_1A5DBF waitmovement 0 @@ -215,19 +215,19 @@ LinkContestRoom1_EventScript_1A51A0:: @ 81A51A0 return LinkContestRoom1_EventScript_1A51D2:: @ 81A51D2 - setvar 0x8009, 5 + setvar SPECIALVAR_9, 5 return LinkContestRoom1_EventScript_1A51D8:: @ 81A51D8 - setvar 0x8009, 6 + setvar SPECIALVAR_9, 6 return LinkContestRoom1_EventScript_1A51DE:: @ 81A51DE - setvar 0x8009, 7 + setvar SPECIALVAR_9, 7 return LinkContestRoom1_EventScript_1A51E4:: @ 81A51E4 - setvar 0x8009, 8 + setvar SPECIALVAR_9, 8 return LinkContestRoom1_EventScript_1A51EA:: @ 81A51EA @@ -240,28 +240,28 @@ LinkContestRoom1_EventScript_1A51EA:: @ 81A51EA return LinkContestRoom1_EventScript_1A5227:: @ 81A5227 - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 return LinkContestRoom1_EventScript_1A522D:: @ 81A522D - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 return LinkContestRoom1_EventScript_1A5233:: @ 81A5233 - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 return LinkContestRoom1_EventScript_1A5239:: @ 81A5239 - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 return LinkContestRoom1_EventScript_1A523F:: @ 81A523F - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 return LinkContestRoom1_EventScript_1A5245:: @ 81A5245 - bufferstdstring 1, 0x8008 - bufferstdstring 2, 0x8009 + bufferstdstring 1, SPECIALVAR_8 + bufferstdstring 2, SPECIALVAR_9 call LinkContestRoom1_EventScript_1A525F lockall applymovement 1, LinkContestRoom1_Movement_1A5D87 @@ -286,21 +286,21 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A5455 call LinkContestRoom1_EventScript_1A53E5 call LinkContestRoom1_EventScript_1A5880 - addvar 0x8006, 1 - compare 0x8006, 4 + addvar SPECIALVAR_6, 1 + compare SPECIALVAR_6, 4 goto_if 5, LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE - compare 0x8006, 0 + compare SPECIALVAR_6, 0 goto_if_eq LinkContestRoom1_EventScript_1A52DB - compare 0x8006, 1 + compare SPECIALVAR_6, 1 goto_if_eq LinkContestRoom1_EventScript_1A52ED - compare 0x8006, 2 + compare SPECIALVAR_6, 2 goto_if_eq LinkContestRoom1_EventScript_1A52FF - compare 0x8006, 3 + compare SPECIALVAR_6, 3 goto_if_eq LinkContestRoom1_EventScript_1A5311 return @@ -309,7 +309,7 @@ LinkContestRoom1_EventScript_1A52DB:: @ 81A52DB applymovement 3, LinkContestRoom1_Movement_1A5DCE waitmovement 0 releaseall - setvar 0x800b, 3 + setvar SPECIALVAR_B, 3 return LinkContestRoom1_EventScript_1A52ED:: @ 81A52ED @@ -317,7 +317,7 @@ LinkContestRoom1_EventScript_1A52ED:: @ 81A52ED applymovement 4, LinkContestRoom1_Movement_1A5DDA waitmovement 0 releaseall - setvar 0x800b, 4 + setvar SPECIALVAR_B, 4 return LinkContestRoom1_EventScript_1A52FF:: @ 81A52FF @@ -325,7 +325,7 @@ LinkContestRoom1_EventScript_1A52FF:: @ 81A52FF applymovement 5, LinkContestRoom1_Movement_1A5DE2 waitmovement 0 releaseall - setvar 0x800b, 5 + setvar SPECIALVAR_B, 5 return LinkContestRoom1_EventScript_1A5311:: @ 81A5311 @@ -333,24 +333,24 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 applymovement 14, LinkContestRoom1_Movement_1A5DEA waitmovement 0 releaseall - setvar 0x800b, 14 + setvar SPECIALVAR_B, 14 return LinkContestRoom1_EventScript_1A5323:: @ 81A5323 special sub_80C4C64 - addvar 0x8006, 1 - buffernumberstring 1, 0x8006 + addvar SPECIALVAR_6, 1 + buffernumberstring 1, SPECIALVAR_6 lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C + applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall addobject 13 playse 10 lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5D9C + applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall - addvar 0x8006, -1 + addvar SPECIALVAR_6, -1 playse 15 special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E @@ -486,101 +486,101 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB return LinkContestRoom1_EventScript_1A555A:: @ 81A555A - compare 0x8004, 80 + compare SPECIALVAR_4, 80 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 70 + compare SPECIALVAR_4, 70 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 60 + compare SPECIALVAR_4, 60 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 50 + compare SPECIALVAR_4, 50 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 40 + compare SPECIALVAR_4, 40 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 30 + compare SPECIALVAR_4, 30 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 20 + compare SPECIALVAR_4, 20 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 10 + compare SPECIALVAR_4, 10 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 - compare 0x8004, 230 + compare SPECIALVAR_4, 230 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 210 + compare SPECIALVAR_4, 210 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 190 + compare SPECIALVAR_4, 190 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 170 + compare SPECIALVAR_4, 170 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 150 + compare SPECIALVAR_4, 150 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 130 + compare SPECIALVAR_4, 130 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 110 + compare SPECIALVAR_4, 110 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 90 + compare SPECIALVAR_4, 90 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 - compare 0x8004, 380 + compare SPECIALVAR_4, 380 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 350 + compare SPECIALVAR_4, 350 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 320 + compare SPECIALVAR_4, 320 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 290 + compare SPECIALVAR_4, 290 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 260 + compare SPECIALVAR_4, 260 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 230 + compare SPECIALVAR_4, 230 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 200 + compare SPECIALVAR_4, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 170 + compare SPECIALVAR_4, 170 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 - compare 0x8004, 600 + compare SPECIALVAR_4, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 560 + compare SPECIALVAR_4, 560 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 520 + compare SPECIALVAR_4, 520 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 480 + compare SPECIALVAR_4, 480 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 440 + compare SPECIALVAR_4, 440 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 400 + compare SPECIALVAR_4, 400 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 360 + compare SPECIALVAR_4, 360 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 320 + compare SPECIALVAR_4, 320 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 - compare 0x8004, 600 + compare SPECIALVAR_4, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare 0x8004, 550 + compare SPECIALVAR_4, 550 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare 0x8004, 500 + compare SPECIALVAR_4, 500 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare 0x8004, 450 + compare SPECIALVAR_4, 450 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare 0x8004, 400 + compare SPECIALVAR_4, 400 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare 0x8004, 300 + compare SPECIALVAR_4, 300 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare 0x8004, 200 + compare SPECIALVAR_4, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare 0x8004, 100 + compare SPECIALVAR_4, 100 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return @@ -726,7 +726,7 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 release removeobject 13 special sub_80C5164 - switch 0x8006 + switch SPECIALVAR_6 case 0, LinkContestRoom1_EventScript_1A58BA case 1, LinkContestRoom1_EventScript_1A58C7 case 2, LinkContestRoom1_EventScript_1A58D4 @@ -735,28 +735,28 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 LinkContestRoom1_EventScript_1A58BA:: @ 81A58BA lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5DD4 + applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DD4 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58C7:: @ 81A58C7 lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5DDE + applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DDE waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58D4:: @ 81A58D4 lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5DE6 + applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DE6 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58E1:: @ 81A58E1 lockall - applymovement 0x800b, LinkContestRoom1_Movement_1A5DF0 + applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DF0 waitmovement 0 releaseall return @@ -858,7 +858,7 @@ LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC special sub_80C47C0 - switch 0x8005 + switch SPECIALVAR_5 case 0, LinkContestRoom1_EventScript_1A5A31 case 1, LinkContestRoom1_EventScript_1A5A37 case 2, LinkContestRoom1_EventScript_1A5A3D @@ -884,9 +884,9 @@ LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43 LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 special sub_80C47F0 special sub_80C4858 - addvar 0x8005, 1 - buffernumberstring 1, 0x8005 - addvar 0x8005, -1 + addvar SPECIALVAR_5, 1 + buffernumberstring 1, SPECIALVAR_5 + addvar SPECIALVAR_5, -1 call LinkContestRoom1_EventScript_1A5A75 applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 @@ -1007,7 +1007,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB call LinkContestRoom1_EventScript_1A5A90 delay 30 special sub_80C4CF8 - compare 0x8004, 1 + compare SPECIALVAR_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return @@ -1016,7 +1016,7 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 msgbox LinkContestRoom1_Text_1A6DF1, 3 delay 90 special sub_80C4CF8 - compare 0x8004, 1 + compare SPECIALVAR_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return @@ -1028,7 +1028,7 @@ LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 special sub_80C47C0 - compare 0x8005, 3 + compare SPECIALVAR_5, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C32 return @@ -1053,7 +1053,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C delay 60 call LinkContestRoom1_EventScript_1A5C6A special sub_80C4CF8 - compare 0x8004, 1 + compare SPECIALVAR_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C64 closemessage return @@ -1065,7 +1065,7 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A special sub_80C496C special sub_80C47C0 - compare 0x8004, 0x8005 + compare SPECIALVAR_4, SPECIALVAR_5 goto_if_eq LinkContestRoom1_EventScript_1A5C7C return @@ -1074,7 +1074,7 @@ LinkContestRoom1_EventScript_1A5C7C:: @ 81A5C7C return LinkContestRoom1_EventScript_1A5C7F:: @ 81A5C7F - switch 0x8005 + switch SPECIALVAR_5 case 0, LinkContestRoom1_EventScript_1A5CB1 case 1, LinkContestRoom1_EventScript_1A5CBE case 2, LinkContestRoom1_EventScript_1A5CCB @@ -1111,7 +1111,7 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 special sub_80C47C0 - compare 0x8005, 3 + compare SPECIALVAR_5, 3 goto_if_eq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index fd3273c78..5868fec76 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -59,7 +59,7 @@ Route117_EventScript_1B22DE:: @ 81B22DE Route117_EventScript_1B22E7:: @ 81B22E7 special GetDaycareMonNicknames msgbox Route117_Text_1B2710, 4 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 call Route117_EventScript_1B22CD release end @@ -71,9 +71,9 @@ Route117_EventScript_1B22FE:: @ 81B22FE special ShowFieldMessageStringVar4 waitmessage waitbuttonpress - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 call Route117_EventScript_1B22CD - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 call Route117_EventScript_1B22CD release end @@ -103,14 +103,14 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C fadescreen 1 special ChooseSendDaycareMon waitstate - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 specialvar RESULT, sub_8095C10 compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD - specialvar 0x8005, GetSelectedDaycareMonNickname + specialvar SPECIALVAR_5, GetSelectedDaycareMonNickname waitse - playmoncry 0x8005, 0 + playmoncry SPECIALVAR_5, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 waitmoncry special StoreSelectedPokemonInDaycare @@ -160,7 +160,7 @@ Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B msgbox Route117_PokemonDayCare_Text_1B2A88, 4 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B29AD, 5 compare RESULT, 1 @@ -176,12 +176,12 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 compare RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 specialvar RESULT, GetDaycareState - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 special ShowDaycareLevelMenu waitstate - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 goto Route117_PokemonDayCare_EventScript_1B24A8 @@ -259,9 +259,9 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543 Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 msgbox Route117_PokemonDayCare_Text_1B2A88, 4 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 call Route117_PokemonDayCare_EventScript_1B241A - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 compare RESULT, 1 @@ -275,7 +275,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 waitstate compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT specialvar RESULT, TakePokemonFromDaycare msgbox Route117_PokemonDayCare_Text_1B2B75, 4 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index a3d79d09e..0c81be439 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -215,19 +215,19 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 end Route111_EventScript_1AE5E0:: @ 81AE5E0 - applymovement 0x8004, Route111_Movement_1AE699 + applymovement SPECIALVAR_4, Route111_Movement_1AE699 waitmovement 0 return Route111_EventScript_1AE5EB:: @ 81AE5EB - applymovement 0x8004, Route111_Movement_1AE69B - applymovement 0x8005, Route111_Movement_1A0841 + applymovement SPECIALVAR_4, Route111_Movement_1AE69B + applymovement SPECIALVAR_5, Route111_Movement_1A0841 waitmovement 0 return Route111_EventScript_1AE5FD:: @ 81AE5FD - applymovement 0x8004, Route111_Movement_1AE69D - applymovement 0x8005, Route111_Movement_1A083F + applymovement SPECIALVAR_4, Route111_Movement_1AE69D + applymovement SPECIALVAR_5, Route111_Movement_1A083F waitmovement 0 return @@ -303,7 +303,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 call Route111_EventScript_1A00F3 lock faceplayer diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 0535af6f3..534e91341 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -9,14 +9,14 @@ AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 playse 21 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0833 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0841 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0841 .endif waitmovement 0 setvar VAR_TEMP_1, 1 @@ -31,37 +31,37 @@ MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 end AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 .ifdef SAPPHIRE - setvar 0x8009, 4 + setvar SPECIALVAR_9, 4 .else - setvar 0x8009, 3 + setvar SPECIALVAR_9, 3 .endif .ifdef SAPPHIRE - applymovement 0x8008, Movement_1A083F + applymovement SPECIALVAR_8, Movement_1A083F .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 .endif waitmovement 0 delay 20 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 closemessage .ifdef SAPPHIRE - applymovement 0x8008, Movement_1A083F + applymovement SPECIALVAR_8, Movement_1A083F .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 .endif .ifdef SAPPHIRE - applymovement 0x8009, AquaHideout_B2F_Movement_15D958 + applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D958 .else - applymovement 0x8009, AquaHideout_B2F_Movement_15D95D + applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - removeobject 0x8009 + removeobject SPECIALVAR_9 delay 20 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 7259e8305..42e0a8821 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -21,25 +21,25 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA waitmessage closemessage special ScrSpecial_HealPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 0 special sub_813556C waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 5 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 5 special sub_8135668 - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 special sub_8135668 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 - setvar 0x8004, 6 + setvar SPECIALVAR_4, 6 special sub_8135668 switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 @@ -89,23 +89,23 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 4 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 4 special sub_8135668 - setvar 0x8004, 2 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 1 special sub_8135668 - setvar 0x8004, 7 + setvar SPECIALVAR_4, 7 special sub_8135668 - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 special sub_8135668 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 special sub_8135BA0 message BattleTower_BattleRoom_Text_1C6CE1 delay 60 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index b0e957e6b..4261f8457 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare 0x8006, 1 + compare SPECIALVAR_6, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmetatile 12, 0, 519, 0 setmetatile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar VAR_TEMP_0, 1 - compare 0x8006, 1 + compare SPECIALVAR_6, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 applymovement 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 902ffd4ba..684bdc6bb 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -11,22 +11,22 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 end BattleTower_Lobby_EventScript_16029C:: @ 816029C - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 special sub_8135668 checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialvar 0x8007, sub_810F404 - compare 0x8007, 50 + specialvar SPECIALVAR_7, sub_810F404 + compare SPECIALVAR_7, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialvar 0x8007, sub_810F404 - compare 0x8007, 100 + specialvar SPECIALVAR_7, sub_810F404 + compare SPECIALVAR_7, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC @@ -75,7 +75,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 faceplayer message BattleTower_Lobby_Text_19A487 waitmessage - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D @@ -89,23 +89,23 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 msgbox BattleTower_Lobby_Text_19A719, 4 BattleTower_Lobby_EventScript_16037D:: @ 816037D - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 special sub_81358A4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 special sub_8135668 special DetermineBattleTowerPrize - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 special sub_8135BA0 playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD - setvar 0x8004, 0 - setvar 0x8005, 3 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 3 special sub_8135668 message BattleTower_Lobby_Text_19A4BB waitmessage @@ -116,7 +116,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitmessage playfanfare 370 waitfanfare - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 special sub_81358A4 compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 @@ -144,9 +144,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 waitmessage message BattleTower_Lobby_Text_19A589 waitmessage - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 special sub_8135668 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_8135BA0 playse 55 waitse @@ -164,12 +164,12 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waitmessage message BattleTower_Lobby_Text_19A5CE waitmessage - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 special sub_8135BA0 playse 55 waitse - setvar 0x8004, 8 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 8 + setvar SPECIALVAR_5, 0 special sub_8135668 setvar VAR_TEMP_0, 5 special SavePlayerParty @@ -184,7 +184,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 @@ -209,11 +209,11 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare 0x8004, 1 + compare SPECIALVAR_4, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D - setvar 0x8004, 1 - copyvar 0x8005, RESULT - copyvar 0x8006, RESULT + setvar SPECIALVAR_4, 1 + copyvar SPECIALVAR_5, RESULT + copyvar SPECIALVAR_6, RESULT special sub_8135668 msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 @@ -228,16 +228,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 127, BattleTower_Lobby_EventScript_16064F BattleTower_Lobby_EventScript_160587:: @ 8160587 - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 special sub_8135668 setvar VAR_TEMP_0, 0 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 special sub_8135668 - setvar 0x8004, 0 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 1 special sub_8135668 - setvar 0x8004, 8 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 8 + setvar SPECIALVAR_5, 0 special sub_8135668 special LoadPlayerParty closemessage @@ -276,7 +276,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160642:: @ 8160642 - setvar 0x8004, 12 + setvar SPECIALVAR_4, 12 special sub_8135668 goto BattleTower_Lobby_EventScript_160652 @@ -285,7 +285,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 special sub_8135668 BattleTower_Lobby_EventScript_160662:: @ 8160662 @@ -343,7 +343,7 @@ BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 BattleTower_Lobby_EventScript_1606CC:: @ 81606CC msgbox BattleTower_Lobby_Text_19A7C3, 4 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer @@ -392,7 +392,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 - setvar 0x8008, DECOR_SILVER_SHIELD + setvar SPECIALVAR_8, DECOR_SILVER_SHIELD givedecoration_std DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF @@ -406,7 +406,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 - setvar 0x8008, DECOR_GOLD_SHIELD + setvar SPECIALVAR_8, DECOR_GOLD_SHIELD givedecoration_std DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - bufferdecorationname 1, 0x8008 + bufferdecorationname 1, SPECIALVAR_8 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 69c160562..c766eed38 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -68,7 +68,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 waitmovement 0 delay 30 hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index c2e03bc38..9bc51f7d1 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -143,7 +143,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 waitstate release end @@ -181,7 +181,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 @@ -612,7 +612,7 @@ DewfordTown_EventScript_14E439:: @ 814E439 DewfordTown_EventScript_14E443:: @ 814E443 msgbox DewfordTown_Text_16BADC, 4 - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 call DewfordTown_EventScript_1A00F3 lock faceplayer @@ -624,7 +624,7 @@ DewfordTown_EventScript_14E443:: @ 814E443 DewfordTown_EventScript_14E46E:: @ 814E46E incrementgamestat GAME_STAT_STARTED_TRENDS - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 42f1fccb1..797a79af0 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -10,12 +10,12 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 checktrainerflag OPPONENT_BRAWLY goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 - copyvar 0x8001, 0x8000 - compare 0x8000, 0 + copyvar SPECIALVAR_1, SPECIALVAR_0 + compare SPECIALVAR_0, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare 0x8000, 1 + compare SPECIALVAR_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare 0x8000, 2 + compare SPECIALVAR_0, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -42,14 +42,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - compare 0x8000, 0x8001 + compare SPECIALVAR_0, SPECIALVAR_1 goto_if_eq DewfordTown_Gym_EventScript_1530F5 - copyvar 0x8001, 0x8000 - compare 0x8000, 1 + copyvar SPECIALVAR_1, SPECIALVAR_0 + compare SPECIALVAR_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare 0x8000, 2 + compare SPECIALVAR_0, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare 0x8000, 3 + compare SPECIALVAR_0, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -80,20 +80,20 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 return DewfordTown_Gym_EventScript_153122:: @ 8153122 - setvar 0x8000, 0 + setvar SPECIALVAR_0, 0 checktrainerflag OPPONENT_HIDEKI goto_if 0, DewfordTown_Gym_EventScript_153135 - addvar 0x8000, 1 + addvar SPECIALVAR_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA goto_if 0, DewfordTown_Gym_EventScript_153143 - addvar 0x8000, 1 + addvar SPECIALVAR_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA goto_if 0, DewfordTown_Gym_EventScript_153151 - addvar 0x8000, 1 + addvar SPECIALVAR_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return @@ -117,7 +117,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index a3830ebb8..e2521f5e8 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -121,13 +121,13 @@ DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_1533FE:: @ 81533FE lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto DewfordTown_Hall_EventScript_15340A end @@ -191,9 +191,9 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD applymovement 8, DewfordTown_Hall_Movement_153599 waitmovement 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare 0x8008, 1 + compare SPECIALVAR_8, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end @@ -210,9 +210,9 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 applymovement 7, DewfordTown_Hall_Movement_15359B waitmovement 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index c1288078f..1bbcda5db 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A end DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index ec18ff9b5..2f0e2ea5f 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -55,7 +55,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B end EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_810FF60 setflag FLAG_DEFEATED_ELITE_4_DRAKE call EverGrandeCity_DrakesRoom_EventScript_1A0693 diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 018658416..a9a13246b 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 63bb4cac3..6e029a91f 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -15,7 +15,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B return EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 0e47f9859..c88471656 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -7,7 +7,7 @@ FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 end FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD - setvar 0x800b, 6 + setvar SPECIALVAR_B, 6 setvar CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 17267f926..7f3b750a9 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -28,7 +28,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B - setvar 0x8004, 280 + setvar SPECIALVAR_4, 280 call FallarborTown_House1_EventScript_1A067F setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_177910, 4 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 001863d5c..7b222e671 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special sub_80F9A4C waitstate - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare 0x8005, 0 + compare SPECIALVAR_5, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special sub_8132670 waitstate - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 takeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index dd6e83be3..cf8f778fb 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 end FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 5cacc8bf3..4e300e66c 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 msgbox FortreeCity_Gym_Text_185E73, 4 setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET - setvar 0x8008, 6 + setvar SPECIALVAR_8, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 14b9b2c31..71a8f6378 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -6,29 +6,29 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 faceplayer checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED goto_if_eq FortreeCity_House1_EventScript_157EAD - setvar 0x8008, 1 - copyvar 0x8004, 0x8008 + setvar SPECIALVAR_8, 1 + copyvar SPECIALVAR_4, SPECIALVAR_8 specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + copyvar SPECIALVAR_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar SPECIALVAR_A, SPECIALVAR_4 + compare SPECIALVAR_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_5, SPECIALVAR_A specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar SPECIALVAR_B, RESULT + compare RESULT, SPECIALVAR_9 goto_if 5, FortreeCity_House1_EventScript_157E9F - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar SPECIALVAR_5, SPECIALVAR_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox FortreeCity_House1_Text_1856F7, 4 setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox FortreeCity_House1_Text_185737, 4 release end diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index b82927be1..22c3f0248 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 344ccd479..b19ac6635 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -5,7 +5,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA lock faceplayer msgbox GraniteCave_StevensRoom_Text_194AE5, 4 - setvar 0x8004, ITEM_LETTER + setvar SPECIALVAR_4, ITEM_LETTER call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 4ef3ae82c..cfcf29ecc 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -28,7 +28,7 @@ LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 opendoor 12, 15 waitdooranim addobject 8 @@ -48,7 +48,7 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LavaridgeTown_EventScript_14E68F checkplayergender compare RESULT, 0 @@ -68,7 +68,7 @@ LavaridgeTown_EventScript_14E570:: @ 814E570 LavaridgeTown_EventScript_14E575:: @ 814E575 lock faceplayer - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 checkplayergender compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B @@ -99,22 +99,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closemessage - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm - compare 0x8008, 0 + compare SPECIALVAR_8, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 044f72d11..3a5bbf20b 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -86,7 +86,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar VAR_LAVARIDGE_RIVAL_STATE, 1 diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index 0efda9c1e..b395ce744 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 end LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 33c81b108..4e27e0240 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -172,8 +172,8 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79 LilycoveCity_EventScript_14CC82:: @ 814CC82 lockall - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar SPECIALVAR_4, sub_80C4D50 + switch SPECIALVAR_4 case 0, LilycoveCity_EventScript_14CCA2 msgbox LilycoveCity_Text_168EA4, 4 releaseall diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index bc61c5ecd..976e0c89e 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -87,8 +87,8 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar SPECIALVAR_4, sub_80C4D50 + switch SPECIALVAR_4 case 1, LilycoveCity_ContestLobby_EventScript_1589D6 case 2, LilycoveCity_ContestLobby_EventScript_1589DA case 3, LilycoveCity_ContestLobby_EventScript_1589DE @@ -361,7 +361,7 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestmon - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 compare RESULT, 0 @@ -392,7 +392,7 @@ LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 end LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 - copyvar 0x8008, 0x8004 + copyvar SPECIALVAR_8, SPECIALVAR_4 message LilycoveCity_ContestLobby_Text_1A67A3 waitmessage yesnobox 20, 8 @@ -417,7 +417,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 message LilycoveCity_ContestLobby_Text_1887C7 waitmessage - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT special sub_808363C waitstate compare RESULT, 3 @@ -429,7 +429,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 messageautoscroll LilycoveCity_ContestLobby_Text_18872A waitmessage contestlinktransfer - switch 0x8004 + switch SPECIALVAR_4 case 0, LilycoveCity_ContestLobby_EventScript_158DD1 case 1, LilycoveCity_ContestLobby_EventScript_158D82 case 2, LilycoveCity_ContestLobby_EventScript_158DC3 @@ -471,11 +471,11 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C - addvar 0x8004, 1 + addvar SPECIALVAR_4, 1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar 0x8004, 65535 + addvar SPECIALVAR_4, 65535 goto LilycoveCity_ContestLobby_EventScript_158DEE end @@ -571,7 +571,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 - setvar 0x800b, 8 + setvar SPECIALVAR_B, 8 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 @@ -586,7 +586,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 - setvar 0x800b, 8 + setvar SPECIALVAR_B, 8 setvar CONTEST_RANK, 3 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index c25a014f3..c58f484e2 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C faceplayer checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF - copyvar 0x8005, VAR_DEPT_STORE_FLOOR + copyvar SPECIALVAR_5, VAR_DEPT_STORE_FLOOR special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 6cdb3367e..08f99f04e 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -20,7 +20,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waitmessage special RetrieveLotteryNumber - copyvar 0x8008, RESULT + copyvar SPECIALVAR_8, RESULT special sub_810F9AC msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 @@ -33,23 +33,23 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmovement 0 - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY - compare 0x8006, 0 + compare SPECIALVAR_6, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare 0x8006, 1 + compare SPECIALVAR_6, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitemname 0, 0x8005 - compare 0x8004, 1 + bufferitemname 0, SPECIALVAR_5 + compare SPECIALVAR_4, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare 0x8004, 2 + compare SPECIALVAR_4, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare 0x8004, 3 + compare SPECIALVAR_4, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare 0x8004, 4 + compare SPECIALVAR_4, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem_std 0x8005 + giveitem_std SPECIALVAR_5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E @@ -100,7 +100,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 return LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C - copyvar VAR_LOTTERY_PRIZE, 0x8005 + copyvar VAR_LOTTERY_PRIZE, SPECIALVAR_5 goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index d1ac96d93..9805da6e7 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -86,7 +86,7 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -136,7 +136,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE delay 30 hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 call LilycoveCity_Harbor_EventScript_1A040E warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 74c53591d..f7a5dafad 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -98,8 +98,8 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall checkflag FLAG_RECEIVED_GLASS_ORNAMENT goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar SPECIALVAR_4, sub_80C4D50 + switch SPECIALVAR_4 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 02558e9d3..a6b500c15 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,7 +16,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special sub_80F9A0C waitstate - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 compare RESULT, 1 @@ -28,7 +28,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE fadescreen 1 special sub_80F9EEC fadescreen 0 - compare 0x8005, 4 + compare SPECIALVAR_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 38428311b..c86fb3dbc 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 31f849b9f..3b63b2cd2 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -69,35 +69,35 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED - setvar 0x8004, 12 + setvar SPECIALVAR_4, 12 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 - setvar 0x8004, 15 + setvar SPECIALVAR_4, 15 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D @@ -146,7 +146,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C @@ -186,7 +186,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 @@ -226,7 +226,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613 LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A @@ -266,7 +266,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 @@ -306,7 +306,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701 LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -339,7 +339,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763 LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer - setvar 0x8004, 12 + setvar SPECIALVAR_4, 12 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -372,7 +372,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5 LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -405,7 +405,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827 LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer - setvar 0x8004, 15 + setvar SPECIALVAR_4, 15 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index cd0a61fef..8dcb712dd 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -77,8 +77,8 @@ LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 LittlerootTown_EventScript_14D5EF:: @ 814D5EF lockall - setvar 0x8004, 5 - setvar 0x8005, 8 + setvar SPECIALVAR_4, 5 + setvar SPECIALVAR_5, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 @@ -88,8 +88,8 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF LittlerootTown_EventScript_14D60D:: @ 814D60D lockall - setvar 0x8004, 14 - setvar 0x8005, 8 + setvar SPECIALVAR_4, 14 + setvar SPECIALVAR_5, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_MAY warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 @@ -102,12 +102,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B playse 10 applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 - opendoor 0x8004, 0x8005 + opendoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 - closedoor 0x8004, 0x8005 + closedoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim delay 10 applymovement 4, LittlerootTown_Movement_14D6AE @@ -117,7 +117,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 - opendoor 0x8004, 0x8005 + opendoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD @@ -125,7 +125,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B setflag FLAG_HIDE_MOM_LITTLEROOT setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat 255, MAP_PETALBURG_CITY - closedoor 0x8004, 0x8005 + closedoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT clearflag FLAG_SPECIAL_FLAG_0 @@ -369,39 +369,39 @@ LittlerootTown_EventScript_14D857:: @ 814D857 LittlerootTown_EventScript_14D860:: @ 814D860 lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D886:: @ 814D886 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D892:: @ 814D892 lockall - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D89E:: @ 814D89E lockall - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8AA:: @ 814D8AA lockall - setvar 0x8008, 5 + setvar SPECIALVAR_8, 5 goto LittlerootTown_EventScript_14D8B6 end @@ -433,13 +433,13 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6 end LittlerootTown_EventScript_14D926:: @ 814D926 - setvar 0x8009, 5 - setvar 0x800a, 8 + setvar SPECIALVAR_9, 5 + setvar SPECIALVAR_A, 8 return LittlerootTown_EventScript_14D931:: @ 814D931 - setvar 0x8009, 14 - setvar 0x800a, 8 + setvar SPECIALVAR_9, 14 + setvar SPECIALVAR_A, 8 return LittlerootTown_EventScript_14D93C:: @ 814D93C @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DC50 return @@ -595,96 +595,96 @@ LittlerootTown_EventScript_14DB3B:: @ 814DB3B LittlerootTown_EventScript_14DB46:: @ 814DB46 applymovement 4, LittlerootTown_Movement_14DCB4 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DB6C:: @ 814DB6C applymovement 4, LittlerootTown_Movement_14DCBA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DB92:: @ 814DB92 applymovement 4, LittlerootTown_Movement_14DCC1 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 applymovement 4, LittlerootTown_Movement_14DCC5 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DBDE:: @ 814DBDE applymovement 4, LittlerootTown_Movement_14DCCA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DC04:: @ 814DC04 applymovement 4, LittlerootTown_Movement_14DCCF waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DC2A:: @ 814DC2A applymovement 4, LittlerootTown_Movement_14DCD3 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DC50:: @ 814DC50 applymovement 4, LittlerootTown_Movement_14DCDA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return @@ -849,12 +849,12 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim goto LittlerootTown_EventScript_14DD2B end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index ba530cefc..b017f0254 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -76,15 +76,15 @@ LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall - setvar 0x8004, 1 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 end LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 lockall - setvar 0x8004, 0 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 1 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF end @@ -116,9 +116,9 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall - setvar 0x8004, 1 - setvar 0x8005, 0 - applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 0 + applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index e7f3b6b62..db1261736 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -58,7 +58,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E end LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 @@ -68,7 +68,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 end gBrendanHouse_TurnPCOff:: @ 8152850 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index e3255b289..f48e84252 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -76,15 +76,15 @@ LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall - setvar 0x8004, 1 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 end LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 lockall - setvar 0x8004, 1 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E end @@ -163,9 +163,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 lockall - setvar 0x8004, 1 - setvar 0x8005, 1 - applymovement 0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 + applymovement SPECIALVAR_4, LittlerootTown_MaysHouse_1F_Movement_1A0843 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index ee449d263..778ce6846 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -206,7 +206,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 end LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C end gMayHouse_TurnPCOff:: @ 8152C75 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 35478a445..51fb1614d 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -37,7 +37,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE end LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678 goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 7dc063149..7c071477d 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -524,7 +524,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -535,7 +535,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -546,7 +546,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -557,7 +557,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -568,7 +568,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -579,7 +579,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -590,7 +590,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 6 + setvar SPECIALVAR_4, 6 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -601,7 +601,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 7 + setvar SPECIALVAR_4, 7 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -612,7 +612,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -623,7 +623,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -634,7 +634,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -645,7 +645,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 4e4d5cf31..b8be1d0ac 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -46,19 +46,19 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B end MauvilleCity_Gym_EventScript_15657D:: @ 815657D - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end @@ -87,7 +87,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView @@ -116,7 +116,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 1 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto MauvilleCity_Gym_EventScript_1566BA end @@ -127,7 +127,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 2 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto MauvilleCity_Gym_EventScript_1566BA end @@ -138,7 +138,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 3 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto MauvilleCity_Gym_EventScript_1566BA end diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index de30e21cd..c16b66482 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -13,7 +13,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 end MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 9d4f26cfa..6d8aeee21 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -18,8 +18,8 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special PrintEReaderTrainerGreeting msgbox gStringVar4, 4 closemessage - setvar 0x8004, 2 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 0 special sub_813556C waitstate compare RESULT, 3 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index b1550a4c1..a1afd4e82 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -65,7 +65,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setflag FLAG_BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 - setvar 0x8008, 7 + setvar SPECIALVAR_8, 7 call MossdeepCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR goto MossdeepCity_Gym_EventScript_15A5C6 diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index c26238102..7f6220aa9 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index a11b12fcc..5f26583c9 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -77,7 +77,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C getpartysize compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT removeobject 2 playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 7b71ebd76..eac29a855 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -44,7 +44,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 34828f415..2cf8b7b8e 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -8,19 +8,19 @@ MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto MtPyre_Summit_EventScript_15D4E1 end @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -196,7 +196,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A end MtPyre_Summit_EventScript_15D669:: @ 815D669 - setvar 0x8004, ITEM_RED_OR_BLUE_ORB + setvar SPECIALVAR_4, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F closemessage applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 @@ -246,19 +246,19 @@ MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto MtPyre_Summit_EventScript_15D6F2 end @@ -268,11 +268,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,11 +280,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D795 removeobject 2 setvar VAR_MT_PYRE_STATE, 3 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index cbf3acd27..da913f4bd 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E end OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 624a221d5..2717be669 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -6,29 +6,29 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E faceplayer checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED goto_if_eq PacifidlogTown_House3_EventScript_154338 - setvar 0x8008, 2 - copyvar 0x8004, 0x8008 + setvar SPECIALVAR_8, 2 + copyvar SPECIALVAR_4, SPECIALVAR_8 specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + copyvar SPECIALVAR_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar SPECIALVAR_A, SPECIALVAR_4 + compare SPECIALVAR_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_5, SPECIALVAR_A specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar SPECIALVAR_B, RESULT + compare RESULT, SPECIALVAR_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar SPECIALVAR_5, SPECIALVAR_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index 95d5448e8..fa19f9d76 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 end @ 8154109 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index caec9b4a2..31e01f8ab 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -156,25 +156,25 @@ PetalburgCity_EventScript_14B82D:: @ 814B82D PetalburgCity_EventScript_14B836:: @ 814B836 lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B842:: @ 814B842 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B84E:: @ 814B84E lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B85A:: @ 814B85A lockall - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto PetalburgCity_EventScript_14B866 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 727818f34..2d95958a2 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -13,7 +13,7 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 call PetalburgCity_Gym_EventScript_154F9A checktrainerflag OPPONENT_RANDALL call_if 1, PetalburgCity_Gym_EventScript_154FBB @@ -32,7 +32,7 @@ PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 call PetalburgCity_Gym_EventScript_154F9A call PetalburgCity_Gym_EventScript_154FBB call PetalburgCity_Gym_EventScript_154FDC @@ -122,87 +122,87 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 end PetalburgCity_Gym_EventScript_15463D:: @ 815463D - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154648:: @ 8154648 - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154653:: @ 8154653 - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_15465E:: @ 815465E - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse 8 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 playbgm 420, 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 @@ -403,7 +403,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE - setvar 0x8008, 5 + setvar SPECIALVAR_8, 5 call PetalburgCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL call PetalburgCity_Gym_EventScript_1544ED @@ -594,8 +594,8 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 85 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -624,8 +624,8 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 98 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -637,8 +637,8 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall checktrainerflag OPPONENT_RANDALL goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 46 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -650,8 +650,8 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall checktrainerflag OPPONENT_RANDALL goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 59 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -663,8 +663,8 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall checktrainerflag OPPONENT_MARY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 59 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -676,8 +676,8 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall checktrainerflag OPPONENT_MARY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 72 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -689,8 +689,8 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall checktrainerflag OPPONENT_PARKER goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 20 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -702,8 +702,8 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall checktrainerflag OPPONENT_LORI goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 20 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -715,8 +715,8 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall checktrainerflag OPPONENT_LORI goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 33 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -728,8 +728,8 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall checktrainerflag OPPONENT_GEORGE goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 33 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -741,8 +741,8 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall checktrainerflag OPPONENT_JODY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 7 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -754,8 +754,8 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall checktrainerflag OPPONENT_BERKE goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 7 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -771,7 +771,7 @@ PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 end PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_154FBB special DrawWholeMapView release @@ -789,7 +789,7 @@ PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 end PetalburgCity_Gym_EventScript_154E56:: @ 8154E56 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_154FFD special DrawWholeMapView release @@ -807,7 +807,7 @@ PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E end PetalburgCity_Gym_EventScript_154E92:: @ 8154E92 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_15503F special DrawWholeMapView release @@ -825,7 +825,7 @@ PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA end PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_155081 special DrawWholeMapView release @@ -843,7 +843,7 @@ PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 end PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_154FDC special DrawWholeMapView release @@ -861,7 +861,7 @@ PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 end PetalburgCity_Gym_EventScript_154F46:: @ 8154F46 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_15501E special DrawWholeMapView release @@ -879,7 +879,7 @@ PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E end PetalburgCity_Gym_EventScript_154F82:: @ 8154F82 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_155060 special DrawWholeMapView release @@ -890,73 +890,73 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 end PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A - setvar 0x8004, 1 - compare 0x8005, 0 + setvar SPECIALVAR_4, 1 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB - setvar 0x8004, 2 - compare 0x8005, 0 + setvar SPECIALVAR_4, 2 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC - setvar 0x8004, 3 - compare 0x8005, 0 + setvar SPECIALVAR_4, 3 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD - setvar 0x8004, 4 - compare 0x8005, 0 + setvar SPECIALVAR_4, 4 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E - setvar 0x8004, 5 - compare 0x8005, 0 + setvar SPECIALVAR_4, 5 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F - setvar 0x8004, 6 - compare 0x8005, 0 + setvar SPECIALVAR_4, 6 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 - setvar 0x8004, 7 - compare 0x8005, 0 + setvar SPECIALVAR_4, 7 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 - setvar 0x8004, 8 - compare 0x8005, 0 + setvar SPECIALVAR_4, 8 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 25af3e1cb..cb79bdf86 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A end PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 1bf579d77..4d3f03cd1 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -153,7 +153,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 61ad2bddd..35e59cdff 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -54,7 +54,7 @@ Route109_EventScript_14F548:: @ 814F548 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 9d6cc22d3..e409a3cd6 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -309,17 +309,17 @@ Route110_EventScript_14FD09:: @ 814FD09 return Route110_EventScript_14FD13:: @ 814FD13 - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD1E:: @ 814FD1E - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD29:: @ 814FD29 - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto Route110_EventScript_14FD34 end @@ -337,11 +337,11 @@ Route110_EventScript_14FD34:: @ 814FD34 applymovement 28, Route110_Movement_1A0835 waitmovement 0 delay 30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route110_EventScript_14FF14 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route110_EventScript_14FF1F - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, Route110_EventScript_14FF2A checkplayergender compare RESULT, 0 @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closemessage - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route110_EventScript_14FF56 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route110_EventScript_14FF5E - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, Route110_EventScript_14FF66 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route110_EventScript_14FF35 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route110_EventScript_14FF40 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, Route110_EventScript_14FF4B removeobject 29 setvar VAR_ROUTE110_STATE, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 05b570482..5dad15672 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -736,23 +736,23 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 end Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 - setvar 0x8004, 6 - setvar 0x8005, 3 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 6 + setvar SPECIALVAR_5, 3 + setvar SPECIALVAR_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6 - setvar 0x8004, 11 - setvar 0x8005, 5 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 11 + setvar SPECIALVAR_5, 5 + setvar SPECIALVAR_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B - setvar 0x8004, 9 - setvar 0x8005, 2 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 9 + setvar SPECIALVAR_5, 2 + setvar SPECIALVAR_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 17d4f91c6..2463feb9c 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -140,25 +140,25 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto Route111_EventScript_15013A end @ 815012E lockall - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 goto Route111_EventScript_15013A end @@ -173,13 +173,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage - compare 0x8004, 0 + compare SPECIALVAR_4, 0 call_if 1, Route111_EventScript_150188 - compare 0x8004, 1 + compare SPECIALVAR_4, 1 call_if 1, Route111_EventScript_150193 - compare 0x8004, 2 + compare SPECIALVAR_4, 2 call_if 1, Route111_EventScript_15019E - compare 0x8004, 3 + compare SPECIALVAR_4, 3 call_if 1, Route111_EventScript_1501A9 releaseall end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 981971e41..32f8e41a3 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -4,7 +4,7 @@ Route111_WinstrateFamilysHouse_MapScripts:: @ 815BF24 Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 lock faceplayer - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -12,7 +12,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 @@ -31,7 +31,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72 Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 lock faceplayer - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 msgbox Route111_WinstrateFamilysHouse_Text_192190, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -39,7 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 checkflag FLAG_TEMP_4 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 @@ -54,7 +54,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 closemessage - applymovement 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D + applymovement SPECIALVAR_8, Route111_WinstrateFamilysHouse_Movement_1A083D waitmovement 0 release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 9c572c0ca..fcdd565bc 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -45,7 +45,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD applymovement 1, Route112_CableCarStation_Movement_15C0E6 applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 3424fbb6f..887f019f3 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -51,7 +51,7 @@ Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 end Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE - setvar 0x8009, 0 + setvar SPECIALVAR_9, 0 special ShowGlassWorkshopMenu waitstate switch RESULT @@ -67,9 +67,9 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar 0x8008, 39 - bufferitemname 0, 0x8008 - setvar 0x800a, 250 + setvar SPECIALVAR_8, 39 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -81,9 +81,9 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C - setvar 0x8008, 40 - bufferitemname 0, 0x8008 - setvar 0x800a, 500 + setvar SPECIALVAR_8, 40 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -95,9 +95,9 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 - setvar 0x8008, 41 - bufferitemname 0, 0x8008 - setvar 0x800a, 500 + setvar SPECIALVAR_8, 41 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -109,9 +109,9 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 - setvar 0x8008, 43 - bufferitemname 0, 0x8008 - setvar 0x800a, 1000 + setvar SPECIALVAR_8, 43 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -123,9 +123,9 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 - setvar 0x8008, 42 - bufferitemname 0, 0x8008 - setvar 0x800a, 1000 + setvar SPECIALVAR_8, 42 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -137,10 +137,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 end Route113_GlassWorkshop_EventScript_16378C:: @ 816378C - setvar 0x8009, 1 - setvar 0x8008, 13 - bufferdecorationname 0, 0x8008 - setvar 0x800a, 6000 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 13 + bufferdecorationname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -152,10 +152,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C end Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD - setvar 0x8009, 1 - setvar 0x8008, 6 - bufferdecorationname 0, 0x8008 - setvar 0x800a, 8000 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 6 + bufferdecorationname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -172,15 +172,15 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E end Route113_GlassWorkshop_EventScript_163818:: @ 8163818 - setvar 0x800a, 250 - subvar 0x800a, 16456 + setvar SPECIALVAR_A, 250 + subvar SPECIALVAR_A, 16456 buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 - subvar 0x800a, 16456 + subvar SPECIALVAR_A, 16456 buffernumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage @@ -201,22 +201,22 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare 0x8009, 0 + compare SPECIALVAR_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare SPECIALVAR_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem_std 0x8008 + giveitem_std SPECIALVAR_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration_std 0x8008 + givedecoration_std SPECIALVAR_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -245,59 +245,59 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 end Route113_GlassWorkshop_EventScript_163925:: @ 8163925 - setvar 0x8009, 0 - setvar 0x8008, 39 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 39 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 - setvar 0x8009, 0 - setvar 0x8008, 40 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 40 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D - setvar 0x8009, 0 - setvar 0x8008, 41 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 41 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 - setvar 0x8009, 0 - setvar 0x8008, 43 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 43 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 - setvar 0x8009, 0 - setvar 0x8008, 42 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 42 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 - setvar 0x8009, 1 - setvar 0x8008, 13 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 13 bufferdecorationname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D - setvar 0x8009, 1 - setvar 0x8008, 6 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 6 bufferdecorationname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare 0x8009, 0 + compare SPECIALVAR_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare SPECIALVAR_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index bc2ab0a51..051b30d54 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -50,7 +50,7 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_151069 @@ -60,7 +60,7 @@ Route118_EventScript_150FAE:: @ 8150FAE Route118_EventScript_150FCE:: @ 8150FCE lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 applymovement 255, Route118_Movement_1A0841 waitmovement 0 goto Route118_EventScript_151004 @@ -68,7 +68,7 @@ Route118_EventScript_150FCE:: @ 8150FCE Route118_EventScript_150FE4:: @ 8150FE4 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_15106B @@ -83,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 delay 30 msgbox Route118_Text_170D66, 4 closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, Route118_EventScript_151048 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route118_EventScript_151053 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route118_EventScript_15105E setvar VAR_ROUTE118_STATE, 1 removeobject 19 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index ca9acd2d5..85938be18 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare 0x8004, 6 + compare SPECIALVAR_4, 6 call_if 1, Route119_EventScript_151193 - compare 0x8004, 7 + compare SPECIALVAR_4, 7 call_if 1, Route119_EventScript_151197 return diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 98c0cf20d..da0a65af1 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare 0x8004, 0 + compare SPECIALVAR_4, 0 call_if 1, Route120_EventScript_15166B - compare 0x8004, 1 + compare SPECIALVAR_4, 1 call_if 1, Route120_EventScript_151672 - compare 0x8004, 2 + compare SPECIALVAR_4, 2 call_if 1, Route120_EventScript_151676 - compare 0x8004, 3 + compare SPECIALVAR_4, 3 call_if 1, Route120_EventScript_15167A - compare 0x8004, 4 + compare SPECIALVAR_4, 4 call_if 1, Route120_EventScript_15167E - compare 0x8004, 5 + compare SPECIALVAR_4, 5 call_if 1, Route120_EventScript_151682 return @@ -135,32 +135,32 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar 0x8004, ITEM_FIGY_BERRY + setvar SPECIALVAR_4, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar 0x8004, ITEM_WIKI_BERRY + setvar SPECIALVAR_4, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar 0x8004, ITEM_MAGO_BERRY + setvar SPECIALVAR_4, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar 0x8004, ITEM_AGUAV_BERRY + setvar SPECIALVAR_4, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar 0x8004, ITEM_IAPAPA_BERRY + setvar SPECIALVAR_4, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem_std 0x8004 + giveitem_std SPECIALVAR_4 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 @@ -226,7 +226,7 @@ Route120_EventScript_15189D:: @ 815189D delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 6948bff87..0dbf1d345 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -43,7 +43,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare 0x8004, 1 + compare SPECIALVAR_4, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare 0x8004, 2 + compare SPECIALVAR_4, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare 0x8004, 3 + compare SPECIALVAR_4, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare 0x8004, 4 + compare SPECIALVAR_4, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare 0x8004, 5 + compare SPECIALVAR_4, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 04da2d9c7..6d0bcc2c6 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -224,43 +224,43 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 - setvar 0x8008, 48 - setvar 0x8009, 95 + setvar SPECIALVAR_8, 48 + setvar SPECIALVAR_9, 95 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar 0x8008, 50 - setvar 0x8009, 96 + setvar SPECIALVAR_8, 50 + setvar SPECIALVAR_9, 96 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar 0x8008, 49 - setvar 0x8009, 97 + setvar SPECIALVAR_8, 49 + setvar SPECIALVAR_9, 97 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar 0x8008, 51 - setvar 0x8009, 98 + setvar SPECIALVAR_8, 51 + setvar SPECIALVAR_9, 98 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitemname 0, 0x8008 - bufferitemname 1, 0x8009 + bufferitemname 0, SPECIALVAR_8 + bufferitemname 1, SPECIALVAR_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F - checkitemspace 0x8009, 1 + checkitemspace SPECIALVAR_9, 1 compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 - checkitem 0x8008, 2 + checkitem SPECIALVAR_8, 2 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - takeitem 0x8008, 1 - giveitem_std 0x8009 + takeitem SPECIALVAR_8, 1 + giveitem_std SPECIALVAR_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare VAR_TEMP_1, 0 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index efe390f8a..e4cef9fa4 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -126,7 +126,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto RustboroCity_EventScript_14C4F4 end @@ -134,7 +134,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto RustboroCity_EventScript_14C4F4 end @@ -142,7 +142,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto RustboroCity_EventScript_14C4F4 end @@ -150,7 +150,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 goto RustboroCity_EventScript_14C4F4 end @@ -158,7 +158,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 goto RustboroCity_EventScript_14C4F4 end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 71fc9731d..2e18bc55e 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -137,7 +137,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 @@ -157,7 +157,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 7ed47d35c..ef4d6fad1 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -18,7 +18,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setflag FLAG_BADGE01_GET setvar VAR_RUSTBORO_STATE, 1 addvar VAR_PETALBURG_GYM_STATE, 1 - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 call RustboroCity_Gym_EventScript_1A01C0 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 0cad33204..8761d3898 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -6,25 +6,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D faceplayer checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED goto_if_eq RustboroCity_House1_EventScript_157D13 - setvar 0x8008, 0 - copyvar 0x8004, 0x8008 + setvar SPECIALVAR_8, 0 + copyvar SPECIALVAR_4, SPECIALVAR_8 specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + copyvar SPECIALVAR_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar SPECIALVAR_A, SPECIALVAR_4 + compare SPECIALVAR_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_5, SPECIALVAR_A specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar SPECIALVAR_B, RESULT + compare RESULT, SPECIALVAR_9 goto_if 5, RustboroCity_House1_EventScript_157D05 - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar SPECIALVAR_5, SPECIALVAR_A special sub_804DB68 special sub_804E174 waitstate @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index a1c0ac31b..c9a2a48a4 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F end RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index f9bf888e2..fb332fbff 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -14,10 +14,10 @@ SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA lockall - setvar 0x8004, 2 - setvar 0x8005, 3 - setvar 0x8006, 4 - setvar 0x8007, 5 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 3 + setvar SPECIALVAR_6, 4 + setvar SPECIALVAR_7, 5 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 applymovement 255, SeafloorCavern_Room9_Movement_15DD68 @@ -28,24 +28,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif closemessage - addobject 0x8004 + addobject SPECIALVAR_4 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 - applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD36 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD36 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41D5, 4 .else msgbox SeafloorCavern_Room9_Text_1B486C, 4 .endif - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4201, 4 .else msgbox SeafloorCavern_Room9_Text_1B4897, 4 .endif - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0839 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0839 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4289, 4 @@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA playfanfare 388 playse 107 special sub_80818A4 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 delay 150 @@ -104,23 +104,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA waitmovement 0 special sub_80818FC waitstate - setvar 0x8004, 1 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 special sub_810F758 waitstate applymovement 1, SeafloorCavern_Room9_Movement_15DD57 waitmovement 0 removeobject 1 delay 4 - setvar 0x8004, 2 - setvar 0x8005, 2 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 2 special sub_810F758 waitstate delay 30 - setvar 0x8004, 2 - setvar 0x8005, 3 - setvar 0x8006, 4 - setvar 0x8007, 5 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 3 + setvar SPECIALVAR_6, 4 + setvar SPECIALVAR_7, 5 .ifdef SAPPHIRE msgbox UnknownString_81B43F2, 4 .else @@ -135,7 +135,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 .endif closemessage - applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD41 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD41 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B447A, 4 @@ -145,7 +145,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA closemessage playse 3 delay 20 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0845 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0845 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B45C6, 4 @@ -153,14 +153,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif closemessage - addobject 0x8005 - addobject 0x8006 - addobject 0x8007 - applymovement 0x8007, SeafloorCavern_Room9_Movement_15DD63 - applymovement 0x8006, SeafloorCavern_Room9_Movement_15DD63 - applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD5A + addobject SPECIALVAR_5 + addobject SPECIALVAR_6 + addobject SPECIALVAR_7 + applymovement SPECIALVAR_7, SeafloorCavern_Room9_Movement_15DD63 + applymovement SPECIALVAR_6, SeafloorCavern_Room9_Movement_15DD63 + applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD5A waitmovement 0 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A083F + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B464D, 4 @@ -168,9 +168,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif playse 21 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0833 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0835 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0835 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4723, 4 @@ -183,8 +183,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif closemessage - applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD60 - applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD46 + applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD60 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD46 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4818, 4 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 0e64282e4..c481a0461 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -7,7 +7,7 @@ SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417 end SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D - setvar 0x800b, 7 + setvar SPECIALVAR_B, 7 setvar CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 call SlateportCity_ContestLobby_EventScript_155448 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index c13dbaf9c..b8547fda9 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -24,25 +24,25 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 applymovement 255, SlateportCity_Harbor_Movement_1560C2 waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 @@ -63,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 7 removeobject 8 setvar VAR_SLATEPORT_HARBOR_STATE, 2 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage @@ -229,7 +229,7 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 call SlateportCity_Harbor_EventScript_1A040E return diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index c72aa229a..80522f4c1 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special sub_80F9A0C waitstate - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 7fcd0fff1..c261f3e83 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -78,7 +78,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 - setvar 0x8004, 269 + setvar SPECIALVAR_4, 269 call SlateportCity_OceanicMuseum_2F_EventScript_1A067F msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index ac4e8f240..f9b7c7fb3 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 end SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 90748bbf5..b7f0f996b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -102,7 +102,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET - setvar 0x8008, 8 + setvar SPECIALVAR_8, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 end diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index bdff79375..a9810ed16 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -8,7 +8,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 msgbox SootopolisCity_House8_Text_1900F7, 4 special sub_80F9A0C waitstate - copyvar RESULT, 0x8004 + copyvar RESULT, SPECIALVAR_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize @@ -57,7 +57,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 msgbox SootopolisCity_House8_Text_190431, 4 special sub_80F9A0C waitstate - copyvar RESULT, 0x8004 + copyvar RESULT, SPECIALVAR_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 7b87bc7fc..1bbd30364 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 end @ 815B19A - setvar 0x800B, 1 + setvar SPECIALVAR_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index f62becf08..7624b3da3 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -18,7 +18,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 call SouthernIsland_Exterior_EventScript_1A047C warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 6386c3b82..63fd57a20 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -39,7 +39,7 @@ SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B lockall - setvar 0x8008, 12 + setvar SPECIALVAR_8, 12 goto SouthernIsland_Interior_EventScript_160BA7 end diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index cb5c713ee..54a614576 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -3,10 +3,10 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 .byte 0 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 - getplayerxy 0x8004, 0x8005 - compare 0x8004, 12 + getplayerxy SPECIALVAR_4, SPECIALVAR_5 + compare SPECIALVAR_4, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare 0x8005, 44 + compare SPECIALVAR_5, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 11568ad22..83298dba6 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -7,7 +7,7 @@ VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70 end VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 - setvar 0x800b, 5 + setvar SPECIALVAR_B, 5 setvar CONTEST_RANK, 0 call VerdanturfTown_ContestLobby_EventScript_1A4E92 call VerdanturfTown_ContestLobby_EventScript_153DA1 diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index 598c3f60b..2323c139a 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 3ccfbeb29..690e7c94e 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -26,7 +26,7 @@ SpeakToBard: end yes_hear_song: - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 @ Give the player ear rape special ScrSpecial_PlayBardSong delay 60 @@ -52,14 +52,14 @@ prompt_write_lyrics: end write_lyrics: - setvar 0x8004, 6 + setvar SPECIALVAR_4, 6 call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer compare RESULT, NO goto_if_eq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 @ Give the player ear rape again special ScrSpecial_PlayBardSong delay 60 @@ -139,9 +139,9 @@ already_traded: do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq cancelled_get_menu - compare 0x8004, 65535 + compare SPECIALVAR_4, 65535 goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO compare RESULT, NO @@ -176,9 +176,9 @@ do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration waitstate - compare 0x8006, 0 + compare SPECIALVAR_6, 0 goto_if_eq cancelled_give_menu - compare 0x8006, 65535 + compare SPECIALVAR_6, 65535 goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull compare RESULT, 1 @@ -211,10 +211,10 @@ decorations_full: .include "data/text/storyteller.inc" SpeakToStoryteller: - setvar 0x8008, 0 - setvar 0x8009, 0 - setvar 0x800a, 0 - setvar 0x800b, 0 + setvar SPECIALVAR_8, 0 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_A, 0 + setvar SPECIALVAR_B, 0 lock faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO @@ -230,7 +230,7 @@ choose_story: waitstate compare RESULT, FALSE goto_if_eq cancel_story_menu - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 special ScrSpecial_StorytellerDisplayStory waitmessage waitbuttonpress @@ -239,7 +239,7 @@ choose_story: goto_if_eq no_stat_update goto stat_update cancel_story_menu: - compare 0x8008, 0 + compare SPECIALVAR_8, 0 goto_if_eq dont_hear_story goto yes_hear_story no_stat_update: diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index d8f628709..74f8987d2 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -25,11 +25,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B6C:: @ 81B1B6C PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, 4 closemessage - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare 0x8004, 1 + compare SPECIALVAR_4, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 @@ -43,7 +43,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1 end PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_80EB7C4 waitmessage delay 80 @@ -79,11 +79,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C28:: @ 81B1C28 PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, 4 closemessage - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare 0x8004, 1 + compare SPECIALVAR_4, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 21ba933ce..504454dcf 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -6,17 +6,17 @@ LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950 LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956 LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 - applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 - compare 0x8005, 0 + compare SPECIALVAR_5, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 - applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 waitmovement 0 releaseall end @@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 msgbox LittlerootTown_BrendansHouse_1F_Text_172531, 4 closemessage - applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC waitmovement 0 releaseall @@ -47,13 +47,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_BrendansHouse_2F_EventScript_1B69D3:: @ 81B69D3 lockall - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto LittlerootTown_BrendansHouse_2F_EventScript_1B69EB end LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF lockall - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto LittlerootTown_MaysHouse_2F_EventScript_1B69EB end @@ -74,33 +74,33 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse 9 - removeobject 0x8008 + removeobject SPECIALVAR_8 releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 - setvar 0x8008, 14 - addobject 0x8008 - applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 + setvar SPECIALVAR_8, 14 + addobject SPECIALVAR_8 + applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 closemessage - applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 + applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 - setvar 0x8008, 14 - addobject 0x8008 - applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD + setvar SPECIALVAR_8, 14 + addobject SPECIALVAR_8 + applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 closemessage - applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 + applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 waitmovement 0 return @@ -155,7 +155,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 end LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF - applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0843 + applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1A0843 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC @@ -163,7 +163,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF playbgm 453, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4 closemessage - applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB + applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 waitmovement 0 @@ -174,13 +174,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4 closemessage setvar VAR_TEMP_1, 1 - applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 + applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8 end LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E - applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1A083F + applymovement SPECIALVAR_5, LittlerootTown_MaysHouse_1F_Movement_1A083F waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 @@ -188,7 +188,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E playbgm 453, 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4 closemessage - applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE + applymovement SPECIALVAR_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA waitmovement 0 @@ -199,7 +199,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4 closemessage setvar VAR_TEMP_1, 1 - applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 + applymovement SPECIALVAR_5, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B6AB8 end @@ -207,9 +207,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D playse 21 - applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 - applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, 4 closemessage @@ -366,38 +366,38 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 playse 21 - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 delay 20 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse 8 - removeobject 0x8009 + removeobject SPECIALVAR_9 setflag FLAG_RECEIVED_SS_TICKET setvar VAR_LITTLEROOT_HOUSES_STATE, 4 setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 @@ -405,46 +405,46 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE end LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD:: @ 81B6DAD - setvar 0x8008, 0 - setvar 0x8009, 5 - setvar 0x800a, 1 + setvar SPECIALVAR_8, 0 + setvar SPECIALVAR_9, 5 + setvar SPECIALVAR_A, 1 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD:: @ 81B6DBD - setvar 0x8008, 1 - setvar 0x8009, 5 - setvar 0x800a, 1 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 5 + setvar SPECIALVAR_A, 1 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD:: @ 81B6DCD - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 + applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8:: @ 81B6DD8 - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 + applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3:: @ 81B6DE3 - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 + applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE:: @ 81B6DEE - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3B + applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3B waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9:: @ 81B6DF9 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D + applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B:: @ 81B6E0B applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F - applymovement 0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 + applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 waitmovement 0 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 42e73e17c..12ee04d3c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,34 +1,34 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 - setvar 0x8008, 4 - setvar 0x8009, 1 - applymovement 0x8008, FallarborTown_ContestLobby_Movement_1B7821 + setvar SPECIALVAR_8, 4 + setvar SPECIALVAR_9, 1 + applymovement SPECIALVAR_8, FallarborTown_ContestLobby_Movement_1B7821 waitmovement 0 goto FallarborTown_ContestLobby_EventScript_1B7681 end SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E - setvar 0x8008, 2 - setvar 0x8009, 2 + setvar SPECIALVAR_8, 2 + setvar SPECIALVAR_9, 2 applymovement 6, SlateportCity_ContestLobby_Movement_1A083D - applymovement 0x8008, SlateportCity_ContestLobby_Movement_1B7821 + applymovement SPECIALVAR_8, SlateportCity_ContestLobby_Movement_1B7821 waitmovement 0 goto SlateportCity_ContestLobby_EventScript_1B7681 end VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F - setvar 0x8008, 2 - setvar 0x8009, 1 - applymovement 0x8008, VerdanturfTown_ContestLobby_Movement_1B7821 + setvar SPECIALVAR_8, 2 + setvar SPECIALVAR_9, 1 + applymovement SPECIALVAR_8, VerdanturfTown_ContestLobby_Movement_1B7821 waitmovement 0 goto VerdanturfTown_ContestLobby_EventScript_1B7681 end LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 - setvar 0x8008, 3 - setvar 0x8009, 3 + setvar SPECIALVAR_8, 3 + setvar SPECIALVAR_9, 3 applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D - applymovement 0x8008, LilycoveCity_ContestLobby_Movement_1B7821 + applymovement SPECIALVAR_8, LilycoveCity_ContestLobby_Movement_1B7821 waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 end @@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 end FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 - copyvar 0x8004, 0x8009 + copyvar SPECIALVAR_4, SPECIALVAR_9 fadescreen 1 special sub_804E538 waitstate @@ -122,22 +122,22 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 end FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 goto FallarborTown_ContestLobby_EventScript_1B77B6 end SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto SlateportCity_ContestLobby_EventScript_1B77B6 end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto VerdanturfTown_ContestLobby_EventScript_1B77B6 end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto LilycoveCity_ContestLobby_EventScript_1B77B6 end @@ -270,7 +270,7 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F end FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 fadescreen 1 removeobject 240 removeobject 239 @@ -322,15 +322,15 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 fadescreen 1 specialvar RESULT, GetLinkPartnerNames - copyvar 0x8008, RESULT - copyvar 0x8004, 0x8008 + copyvar SPECIALVAR_8, RESULT + copyvar SPECIALVAR_4, SPECIALVAR_8 special SpawnBerryBlenderLinkPlayerSprites goto FallarborTown_ContestLobby_EventScript_1B799A end FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A fadescreen 0 - switch 0x8008 + switch SPECIALVAR_8 case 2, FallarborTown_ContestLobby_EventScript_1B78F3 case 3, FallarborTown_ContestLobby_EventScript_1B7901 case 4, FallarborTown_ContestLobby_EventScript_1B790F diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index cf5fb26c5..23ed463d9 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -18,13 +18,13 @@ Event_TV:: @ 81A6E72 end EventScript_1A6EBB: - specialvar 0x8004, special_0x44 - compare 0x8004, 255 + specialvar SPECIALVAR_4, special_0x44 + compare SPECIALVAR_4, 255 goto_if_eq EventScript_1A6F3F specialvar RESULT, special_0x4a compare RESULT, 255 goto_if_eq EventScript_1A6F3F - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT specialvar RESULT, sub_80BDA0C compare RESULT, 0 goto_if 5, EventScript_1A6F21 -- cgit v1.2.3 From 2c4d972f7c5a79ca94dca599b6e7b9e2c769cf70 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Dec 2017 14:00:44 -0600 Subject: 'VAR_SPECIAL_X' instead of 'SPECIALVAR_X' --- data/event_scripts.s | 308 ++++++++++----------- data/scripts/berry_tree.inc | 10 +- data/scripts/cable_club.inc | 76 ++--- data/scripts/contest_hall.inc | 170 ++++++------ data/scripts/day_care.inc | 24 +- data/scripts/gabby_and_ty.inc | 12 +- data/scripts/maps/AquaHideout_B2F.inc | 32 +-- data/scripts/maps/BattleTower_BattleRoom.inc | 30 +- data/scripts/maps/BattleTower_Corridor.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 68 ++--- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/DewfordTown.inc | 8 +- data/scripts/maps/DewfordTown_Gym.inc | 28 +- data/scripts/maps/DewfordTown_Hall.inc | 12 +- data/scripts/maps/DewfordTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- .../maps/EverGrandeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 2 +- data/scripts/maps/FallarborTown_House2.inc | 6 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 24 +- data/scripts/maps/FortreeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 16 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 20 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 2 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 22 +- data/scripts/maps/LilycoveCity_Harbor.inc | 4 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 4 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 4 +- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 32 +-- data/scripts/maps/LittlerootTown.inc | 120 ++++---- .../maps/LittlerootTown_BrendansHouse_1F.inc | 14 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 4 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 14 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 4 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 24 +- data/scripts/maps/MauvilleCity_Gym.inc | 14 +- .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 4 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- .../scripts/maps/MossdeepCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 38 +-- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PacifidlogTown_House3.inc | 24 +- .../maps/PacifidlogTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 24 +- data/scripts/maps/PetalburgCity_Gym.inc | 172 ++++++------ .../maps/PetalburgCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/Route104.inc | 2 +- data/scripts/maps/Route109.inc | 2 +- data/scripts/maps/Route110.inc | 24 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 18 +- data/scripts/maps/Route111.inc | 16 +- .../maps/Route111_WinstrateFamilysHouse.inc | 10 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/scripts/maps/Route113_GlassWorkshop.inc | 104 +++---- data/scripts/maps/Route118.inc | 12 +- data/scripts/maps/Route119.inc | 4 +- data/scripts/maps/Route120.inc | 26 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 14 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 28 +- data/scripts/maps/RustboroCity.inc | 10 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 4 +- data/scripts/maps/RustboroCity_Gym.inc | 2 +- data/scripts/maps/RustboroCity_House1.inc | 22 +- .../scripts/maps/RustboroCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 60 ++-- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 18 +- data/scripts/maps/SlateportCity_House1.inc | 4 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 2 +- .../maps/SlateportCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SootopolisCity_House8.inc | 4 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 6 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- .../maps/VerdanturfTown_PokemonCenter_1F.inc | 2 +- data/scripts/mauville_man.inc | 26 +- data/scripts/mystery_event_club.inc | 10 +- data/scripts/players_house.inc | 96 +++---- data/scripts/pokeblocks.inc | 42 +-- data/scripts/tv.inc | 6 +- 96 files changed, 1007 insertions(+), 1007 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 5170a0707..7b69ac338 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1453,11 +1453,11 @@ do_heal_party:: @ 819FD7C incrementgamestat GAME_STAT_USED_POKECENTER message gText_NurseJoy_OkayIllTakeYourPokemon waitmessage - applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_1A083F + applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A083F waitmovement 0 dofieldeffect 25 waitfieldeffect 25 - applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_1A0845 + applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty checkflag FLAG_POKERUS_EXPLAINED @@ -1468,7 +1468,7 @@ do_heal_party:: @ 819FD7C OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 message gText_NurseJoy_ThankYouForWaiting waitmessage - applymovement SPECIALVAR_B, OldaleTown_PokemonCenter_1F_Movement_19FDF4 + applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_19FDF4 waitmovement 0 message gText_NurseJoy_WeHopeToSeeYouAgain waitmessage @@ -1499,18 +1499,18 @@ OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 step_end Std_ObtainItem: @ 819FDF7 - giveitem SPECIALVAR_0, SPECIALVAR_1 - copyvar SPECIALVAR_7, RESULT + giveitem VAR_SPECIAL_0, VAR_SPECIAL_1 + copyvar VAR_SPECIAL_7, RESULT call Std_ObtainItem_ return Std_ObtainItem_: @ 819FE07 - bufferitemname 1, SPECIALVAR_0 - checkitemtype SPECIALVAR_0 + bufferitemname 1, VAR_SPECIAL_0 + checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket - compare SPECIALVAR_7, 0x1 + compare VAR_SPECIAL_7, 0x1 call_if 1, Std_ObtainItem_Success - compare SPECIALVAR_7, 0x0 + compare VAR_SPECIAL_7, 0x0 call_if 1, Std_ObtainItem_Fail return @@ -1525,31 +1525,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstdstring 2, 0xE - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstdstring 2, 0xF - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstdstring 2, 0x10 - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstdstring 2, 0x11 - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstdstring 2, 0x12 - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, PlayGetItemFanfare return @@ -1574,16 +1574,16 @@ PlayGetTMHMFanfare: return Std_ObtainDecoration: @ 819FEDA - givedecoration SPECIALVAR_0 - copyvar SPECIALVAR_7, RESULT + givedecoration VAR_SPECIAL_0 + copyvar VAR_SPECIAL_7, RESULT call Std_ObtainDecoration_ return Std_ObtainDecoration_: @ 819FEE8 - bufferdecorationname 1, SPECIALVAR_0 - compare SPECIALVAR_7, 1 + bufferdecorationname 1, VAR_SPECIAL_0 + compare VAR_SPECIAL_7, 1 call_if 1, Std_ObtainDecoration_Success - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 call_if 1, Std_ObtainDecoration_Fail return @@ -1604,14 +1604,14 @@ Std_FindItem: @ 819FF21 lock faceplayer waitse - giveitem SPECIALVAR_0, SPECIALVAR_1 - copyvar SPECIALVAR_7, RESULT - bufferitemname 1, SPECIALVAR_0 - checkitemtype SPECIALVAR_0 + giveitem VAR_SPECIAL_0, VAR_SPECIAL_1 + copyvar VAR_SPECIAL_7, RESULT + bufferitemname 1, VAR_SPECIAL_0 + checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 call_if 1, Std_FindItem_Success - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 call_if 1, Std_FindItem_Fail release return @@ -1633,14 +1633,14 @@ Std_FindItem_Fail: @ 819FF65 HiddenItemScript:: @ 819FF7B lockall waitse - giveitem SPECIALVAR_5, 1 - copyvar SPECIALVAR_7, RESULT - bufferitemname 0x1, SPECIALVAR_5 - checkitemtype SPECIALVAR_5 + giveitem VAR_SPECIAL_5, 1 + copyvar VAR_SPECIAL_7, RESULT + bufferitemname 0x1, VAR_SPECIAL_5 + checkitemtype VAR_SPECIAL_5 call GetItem_HandlePocket - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq HiddenItemScript_Success - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq HiddenItemScript_Fail end @@ -1683,7 +1683,7 @@ UnusedMixRecordsScript_Done: @ 81A0000 gUnknown_081A0009:: @ 81A0009 lockall - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special DoPCTurnOnEffect playse 4 msgbox UnknownString_81A09EC, 4 @@ -1736,7 +1736,7 @@ EventScript_1A00B5: return EventScript_1A00BE: - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 playse 3 special DoPCTurnOffEffect releaseall @@ -1808,14 +1808,14 @@ RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 dodailyevents - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_80FA5BC return DewfordTown_EventScript_1A010C:: @ 81A010C Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C Route109_EventScript_1A010C:: @ 81A010C - copyvar SPECIALVAR_8, VAR_BRINEY_LOCATION + copyvar VAR_SPECIAL_8, VAR_BRINEY_LOCATION setvar VAR_BRINEY_LOCATION, 0 return @@ -1937,7 +1937,7 @@ MossdeepCity_Gym_EventScript_1A01C0:: @ 81A01C0 PetalburgCity_Gym_EventScript_1A01C0:: @ 81A01C0 RustboroCity_Gym_EventScript_1A01C0:: @ 81A01C0 SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 - switch SPECIALVAR_8 + switch VAR_SPECIAL_8 case 1, DewfordTown_Gym_EventScript_1A021E case 2, DewfordTown_Gym_EventScript_1A0225 case 3, DewfordTown_Gym_EventScript_1A022F @@ -2205,7 +2205,7 @@ Route101_EventScript_1A039B:: @ 81A039B end Route101_EventScript_1A03A5:: @ 81A03A5 - copyvar SPECIALVAR_4, SPECIALVAR_9 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 special ShowPokedexRatingMessage waitmessage waitbuttonpress @@ -2213,23 +2213,23 @@ Route101_EventScript_1A03A5:: @ 81A03A5 EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0 Route101_EventScript_1A03B0:: @ 81A03B0 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 specialvar RESULT, ScriptGetPokedexInfo - copyvar SPECIALVAR_8, SPECIALVAR_5 - copyvar SPECIALVAR_9, SPECIALVAR_6 - copyvar SPECIALVAR_A, RESULT - buffernumberstring 0, SPECIALVAR_8 - buffernumberstring 1, SPECIALVAR_9 + copyvar VAR_SPECIAL_8, VAR_SPECIAL_5 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 + copyvar VAR_SPECIAL_A, RESULT + buffernumberstring 0, VAR_SPECIAL_8 + buffernumberstring 1, VAR_SPECIAL_9 msgbox Route101_Text_1C44DC, 4 call Route101_EventScript_1A03A5 - compare SPECIALVAR_A, 0 + compare VAR_SPECIAL_A, 0 goto_if_eq Route101_EventScript_1A14DC - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 specialvar RESULT, ScriptGetPokedexInfo - copyvar SPECIALVAR_8, SPECIALVAR_5 - copyvar SPECIALVAR_9, SPECIALVAR_6 - buffernumberstring 0, SPECIALVAR_8 - buffernumberstring 1, SPECIALVAR_9 + copyvar VAR_SPECIAL_8, VAR_SPECIAL_5 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 + buffernumberstring 0, VAR_SPECIAL_8 + buffernumberstring 1, VAR_SPECIAL_9 msgbox Route101_Text_1C4B05, 4 return @@ -2237,7 +2237,7 @@ BattleTower_Outside_EventScript_1A040E:: @ 81A040E LilycoveCity_Harbor_EventScript_1A040E:: @ 81A040E SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E delay 60 - applymovement SPECIALVAR_4, SlateportCity_Harbor_Movement_1A041C + applymovement VAR_SPECIAL_4, SlateportCity_Harbor_Movement_1A041C waitmovement 0 return @@ -2331,8 +2331,8 @@ CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3 CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3 - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 special sub_810F758 waitstate releaseall @@ -2385,49 +2385,49 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B Route120_EventScript_1A0539:: @ 81A0539 lock faceplayer - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0546:: @ 81A0546 lock faceplayer - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0553:: @ 81A0553 lock faceplayer - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 goto Route120_EventScript_1A0594 end Route120_EventScript_1A0560:: @ 81A0560 lock faceplayer - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 goto Route120_EventScript_1A0594 end Route120_EventScript_1A056D:: @ 81A056D lock faceplayer - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 goto Route120_EventScript_1A0594 end Route119_EventScript_1A057A:: @ 81A057A lock faceplayer - setvar SPECIALVAR_4, 6 + setvar VAR_SPECIAL_4, 6 goto Route119_EventScript_1A0594 end Route119_EventScript_1A0587:: @ 81A0587 lock faceplayer - setvar SPECIALVAR_4, 7 + setvar VAR_SPECIAL_4, 7 goto Route119_EventScript_1A0594 end @@ -2459,19 +2459,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route119_EventScript_1A0646 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route119_EventScript_1A064A - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route119_EventScript_1A064E - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 call_if 1, Route119_EventScript_1A0652 - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 call_if 1, Route119_EventScript_1A0656 - compare SPECIALVAR_4, 6 + compare VAR_SPECIAL_4, 6 call_if 1, Route119_EventScript_1A065A - compare SPECIALVAR_4, 7 + compare VAR_SPECIAL_4, 7 call_if 1, Route119_EventScript_1A065E setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -2546,12 +2546,12 @@ FallarborTown_House1_EventScript_1A067F:: @ 81A067F GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F - bufferitemname 0, SPECIALVAR_4 + bufferitemname 0, VAR_SPECIAL_4 playfanfare 372 message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare - takeitem SPECIALVAR_4, 1 + takeitem VAR_SPECIAL_4, 1 return EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693 @@ -3612,17 +3612,17 @@ gUnknown_081A2C51:: @ 81A2C51 checkpartymove MOVE_SECRET_POWER setfieldeffectargument 0, RESULT buffermovename 1, MOVE_SECRET_POWER - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 2 + compare VAR_SPECIAL_7, 2 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 3 + compare VAR_SPECIAL_7, 3 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 4 + compare VAR_SPECIAL_7, 4 goto_if_eq EventScript_1A2CB0 - compare SPECIALVAR_7, 5 + compare VAR_SPECIAL_7, 5 goto_if_eq EventScript_1A2D08 - compare SPECIALVAR_7, 6 + compare VAR_SPECIAL_7, 6 goto_if_eq EventScript_1A2D60 end @@ -3726,8 +3726,8 @@ EventScript_1A2DB8: setflag FLAG_DECORATION_1 special sub_80BB8CC special sub_80BBAF0 - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 special sub_80BBDD0 setvar VAR_0x4089, 1 waitstate @@ -3782,7 +3782,7 @@ EventScript_1A2E45: compare RESULT, 6 goto_if_eq EventScript_1A2EF7 setfieldeffectargument 0, RESULT - setorcopyvar SPECIALVAR_4, RESULT + setorcopyvar VAR_SPECIAL_4, RESULT lockall special GetSecretBaseNearbyMapName msgbox UnknownString_81A3C71, 5 @@ -3798,38 +3798,38 @@ EventScript_1A2E45: msgbox UnknownString_81A3CC9, 5 compare RESULT, 0 goto_if_eq EventScript_1A2F3A - bufferpartymonnick 0, SPECIALVAR_4 + bufferpartymonnick 0, VAR_SPECIAL_4 buffermovename 1, MOVE_SECRET_POWER msgbox UsedCutRockSmashText, 4 closemessage closemessage - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 2 + compare VAR_SPECIAL_7, 2 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 3 + compare VAR_SPECIAL_7, 3 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 4 + compare VAR_SPECIAL_7, 4 goto_if_eq gUnknown_081A2CE6 - compare SPECIALVAR_7, 5 + compare VAR_SPECIAL_7, 5 goto_if_eq gUnknown_081A2D3E - compare SPECIALVAR_7, 6 + compare VAR_SPECIAL_7, 6 goto_if_eq gUnknown_081A2D96 releaseall end EventScript_1A2EF7:: - compare SPECIALVAR_7, 1 + compare VAR_SPECIAL_7, 1 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 2 + compare VAR_SPECIAL_7, 2 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 3 + compare VAR_SPECIAL_7, 3 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 4 + compare VAR_SPECIAL_7, 4 goto_if_eq EventScript_1A2CF1 - compare SPECIALVAR_7, 5 + compare VAR_SPECIAL_7, 5 goto_if_eq EventScript_1A2D49 - compare SPECIALVAR_7, 6 + compare VAR_SPECIAL_7, 6 goto_if_eq EventScript_1A2DA1 end @@ -3860,14 +3860,14 @@ SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68 LittlerootTown_MaysHouse_2F_EventScript_1A2F68:: @ 81A2F68 SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68 - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 special sub_80BBDD0 setvar VAR_0x4089, 1 end gUnknown_081A2F7B:: @ 81A2F7B - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 goto EventScript_1A2F86 end @@ -3876,7 +3876,7 @@ EventScript_1A2F86: end gUnknown_081A2F8A:: @ 81A2F8A - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto EventScript_1A2F95 end @@ -3884,11 +3884,11 @@ EventScript_1A2F95: special sub_8100A7C compare RESULT, 1 goto_if_eq EventScript_1A2FBF - addvar SPECIALVAR_4, 1 - compare SPECIALVAR_5, 0 + addvar VAR_SPECIAL_4, 1 + compare VAR_SPECIAL_5, 0 goto_if_eq EventScript_1A2F95 - removeobject SPECIALVAR_6 - setflag SPECIALVAR_5 + removeobject VAR_SPECIAL_6 + setflag VAR_SPECIAL_5 goto EventScript_1A2F95 end @@ -3920,25 +3920,25 @@ SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0 SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 special sub_80BCE90 - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq SecretBase_RedCave1_EventScript_1A3032 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30AE - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 goto_if_eq SecretBase_RedCave1_EventScript_1A312A - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 goto_if_eq SecretBase_RedCave1_EventScript_1A31A6 - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 goto_if_eq SecretBase_RedCave1_EventScript_1A3222 - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 goto_if_eq SecretBase_RedCave1_EventScript_1A329E - compare SPECIALVAR_4, 6 + compare VAR_SPECIAL_4, 6 goto_if_eq SecretBase_RedCave1_EventScript_1A331A - compare SPECIALVAR_4, 7 + compare VAR_SPECIAL_4, 7 goto_if_eq SecretBase_RedCave1_EventScript_1A3396 - compare SPECIALVAR_4, 8 + compare VAR_SPECIAL_4, 8 goto_if_eq SecretBase_RedCave1_EventScript_1A3412 - compare SPECIALVAR_4, 9 + compare VAR_SPECIAL_4, 9 goto_if_eq SecretBase_RedCave1_EventScript_1A348E end @@ -4294,8 +4294,8 @@ SecretBase_RedCave1_EventScript_1A3501:: @ 81A3501 SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A special sub_80BCE1C - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 special sub_813556C waitstate special ScrSpecial_HealPlayerParty @@ -4389,11 +4389,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 end SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 @@ -4403,9 +4403,9 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84 msgbox SlateportCity_PokemonFanClub_Text_1A87CA, 4 - setvar SPECIALVAR_4, 5 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 1 + setvar VAR_SPECIAL_4, 5 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer @@ -4422,7 +4422,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9 SlateportCity_PokemonFanClub_EventScript_1ADEC3:: @ 81ADEC3 msgbox SlateportCity_PokemonFanClub_Text_1A8818, 4 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 goto SlateportCity_PokemonFanClub_EventScript_1ADE46 end @@ -4434,11 +4434,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADED6:: @ 81ADED6 SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 lock faceplayer - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER @@ -4459,9 +4459,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44 msgbox SlateportCity_OceanicMuseum_1F_Text_1A93D1, 4 - setvar SPECIALVAR_4, 5 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 5 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 0 call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3 lock faceplayer @@ -4478,7 +4478,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79 SlateportCity_OceanicMuseum_1F_EventScript_1ADF83:: @ 81ADF83 msgbox SlateportCity_OceanicMuseum_1F_Text_1A949A, 4 - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 goto SlateportCity_OceanicMuseum_1F_EventScript_1ADE46 end @@ -4493,11 +4493,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 specialvar RESULT, sub_80BF544 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_5, 3 special sub_80BF2C4 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 @@ -4508,7 +4508,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9 msgbox SlateportCity_PokemonFanClub_Text_1A83D0, 4 random 3 - copyvar SPECIALVAR_A, RESULT + copyvar VAR_SPECIAL_A, RESULT switch RESULT case 0, SlateportCity_PokemonFanClub_EventScript_1AE020 case 1, SlateportCity_PokemonFanClub_EventScript_1AE02E @@ -4531,24 +4531,24 @@ SlateportCity_PokemonFanClub_EventScript_1AE03C:: @ 81AE03C end SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A - setvar SPECIALVAR_4, 7 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 7 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 0 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4 - setvar SPECIALVAR_6, 1 + setvar VAR_SPECIAL_6, 1 call SlateportCity_PokemonFanClub_EventScript_1A00F3 lock faceplayer compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4 - copyvar SPECIALVAR_7, SPECIALVAR_A - setvar SPECIALVAR_5, 3 + copyvar VAR_SPECIAL_7, VAR_SPECIAL_A + setvar VAR_SPECIAL_5, 3 goto SlateportCity_PokemonFanClub_EventScript_1ADE46 end @@ -4570,11 +4570,11 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 faceplayer checkflag FLAG_TEMP_2 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E - setvar SPECIALVAR_5, 6 + setvar VAR_SPECIAL_5, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 @@ -4584,9 +4584,9 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8 msgbox FallarborTown_ContestLobby_Text_1A704E, 4 - setvar SPECIALVAR_4, 11 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 11 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 0 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer @@ -4602,12 +4602,12 @@ FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D end FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 - setvar SPECIALVAR_4, 24 + setvar VAR_SPECIAL_4, 24 special SetContestCategoryStringVarForInterview msgbox FallarborTown_ContestLobby_Text_1A70A5, 4 - setvar SPECIALVAR_4, 11 - copyvar SPECIALVAR_5, SPECIALVAR_9 - setvar SPECIALVAR_6, 1 + setvar VAR_SPECIAL_4, 11 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 + setvar VAR_SPECIAL_6, 1 call FallarborTown_ContestLobby_EventScript_1A00F3 lock faceplayer @@ -4615,7 +4615,7 @@ FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D msgbox FallarborTown_ContestLobby_Text_1A7153, 4 setflag FLAG_TEMP_2 - setvar SPECIALVAR_5, 6 + setvar VAR_SPECIAL_5, 6 goto FallarborTown_ContestLobby_EventScript_1ADE46 end @@ -4630,7 +4630,7 @@ SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE - setvar SPECIALVAR_5, 6 + setvar VAR_SPECIAL_5, 6 special sub_80BF2C4 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE @@ -4667,11 +4667,11 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF faceplayer checkflag FLAG_TEMP_2 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 - setvar SPECIALVAR_5, 7 + setvar VAR_SPECIAL_5, 7 special sub_80BF2C4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 - copyvar SPECIALVAR_9, SPECIALVAR_6 + copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 msgbox BattleTower_Lobby_Text_1A776D, 5 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE241 @@ -4683,14 +4683,14 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 message BattleTower_Lobby_Text_1A7823 waitmessage multichoice 19, 8, 45, 1 - copyvar SPECIALVAR_8, RESULT + copyvar VAR_SPECIAL_8, RESULT compare RESULT, 0 call_if 1, BattleTower_Lobby_EventScript_1AE2A1 compare RESULT, 1 call_if 1, BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 - setvar SPECIALVAR_4, 12 - copyvar SPECIALVAR_5, SPECIALVAR_9 + setvar VAR_SPECIAL_4, 12 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer @@ -4718,8 +4718,8 @@ BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3 goto_if_eq BattleTower_Lobby_EventScript_1AE2D9 msgbox BattleTower_Lobby_Text_1A7A6E, 4 setflag FLAG_TEMP_2 - copyvar SPECIALVAR_4, SPECIALVAR_8 - setvar SPECIALVAR_5, 7 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + setvar VAR_SPECIAL_5, 7 goto BattleTower_Lobby_EventScript_1ADE46 end @@ -4736,7 +4736,7 @@ BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3 BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F - setvar SPECIALVAR_5, 7 + setvar VAR_SPECIAL_5, 7 special sub_80BF2C4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F @@ -4802,11 +4802,11 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 getpricereduction 2 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA - addvar SPECIALVAR_4, 128 + addvar VAR_SPECIAL_4, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA end @@ -4814,11 +4814,11 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 getpricereduction 2 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA - addvar SPECIALVAR_4, 128 + addvar VAR_SPECIAL_4, 128 goto MauvilleCity_GameCorner_EventScript_1C40DA end diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 94a52b66c..55b8e2439 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,6 +1,6 @@ S_BerryTree:: @ 81A14DD special FieldObjectInteractionGetBerryTreeData - switch SPECIALVAR_4 + switch VAR_SPECIAL_4 case 255, Route102_EventScript_1A1533 case 0, Route102_EventScript_1A153D case 1, Route102_EventScript_1A1595 @@ -82,9 +82,9 @@ Route102_EventScript_1A15BC:: @ 81A15BC goto Route102_EventScript_1A165F Route102_EventScript_1A15CE:: @ 81A15CE - compare SPECIALVAR_5, 0 + compare VAR_SPECIAL_5, 0 goto_if_eq Route102_EventScript_1A15F2 - compare SPECIALVAR_5, 4 + compare VAR_SPECIAL_5, 4 goto_if_eq Route102_EventScript_1A15EB bufferstring 1, Route102_Text_1A17B7 return @@ -98,7 +98,7 @@ Route102_EventScript_1A15F2:: @ 81A15F2 return Route102_EventScript_1A15F9:: @ 81A15F9 - buffernumberstring 1, SPECIALVAR_6 + buffernumberstring 1, VAR_SPECIAL_6 lock faceplayer msgbox Route102_Text_1A17C0, 5 @@ -109,7 +109,7 @@ Route102_EventScript_1A15F9:: @ 81A15F9 Route102_EventScript_1A161D:: @ 81A161D special FieldObjectInteractionPickBerryTree - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 46ef01ed0..b3926af65 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -21,7 +21,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03:: @ 81A3D03 .2byte 0 OldaleTown_PokemonCenter_2F_EventScript_1A3D2D:: @ 81A3D2D - turnobject SPECIALVAR_7, 4 + turnobject VAR_SPECIAL_7, 4 end DewfordTown_PokemonCenter_2F_MapScript1_1A3D32:: @ 81A3D32 @@ -90,9 +90,9 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2 setvar VAR_CABLE_CLUB_STATE, 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9 - applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 @@ -101,13 +101,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DD9:: @ 81A3DD9 OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C - applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 return @@ -128,11 +128,11 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17 OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 special CloseLink setvar VAR_CABLE_CLUB_STATE, 0 - compare SPECIALVAR_7, 0 + compare VAR_SPECIAL_7, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361 waitmovement 0 - applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4356 waitmovement 0 message OldaleTown_PokemonCenter_2F_Text_1A4E50 waitmessage @@ -141,7 +141,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 waitmessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 waitmovement 0 - applymovement SPECIALVAR_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 + applymovement VAR_SPECIAL_7, OldaleTown_PokemonCenter_2F_Movement_1A4354 waitmovement 0 return @@ -176,7 +176,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 - copyvar SPECIALVAR_7, LAST_TALKED + copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer message OldaleTown_PokemonCenter_2F_Text_1A4510 @@ -195,7 +195,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 compare RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C waitmessage @@ -218,7 +218,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E special ScrSpecial_HealPlayerParty special SavePlayerParty special LoadPlayerBag - copyvar VAR_CABLE_CLUB_STATE, SPECIALVAR_4 + copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 5, 3, 514, 0 @@ -237,7 +237,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E closedoor 5, 1 waitdooranim release - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD special SetCableClubWarp warp MAP_SINGLE_BATTLE_COLOSSEUM, 255, 6, 8 @@ -272,18 +272,18 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FEF:: @ 81A3FEF case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4036 OldaleTown_PokemonCenter_2F_EventScript_1A4036:: @ 81A4036 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 return OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 return OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons compare RESULT, 0 goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 return OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 @@ -293,11 +293,11 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056 goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF OldaleTown_PokemonCenter_2F_EventScript_1A4062:: @ 81A4062 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 return OldaleTown_PokemonCenter_2F_EventScript_1A4068:: @ 81A4068 - switch SPECIALVAR_4 + switch VAR_SPECIAL_4 case 1, OldaleTown_PokemonCenter_2F_EventScript_1A40B1 case 2, OldaleTown_PokemonCenter_2F_EventScript_1A40A2 case 5, OldaleTown_PokemonCenter_2F_EventScript_1A4093 @@ -348,7 +348,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 - copyvar SPECIALVAR_7, LAST_TALKED + copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, 5 @@ -382,8 +382,8 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 - setvar SPECIALVAR_4, 3 - copyvar VAR_CABLE_CLUB_STATE, SPECIALVAR_4 + setvar VAR_SPECIAL_4, 3 + copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 8, 3, 514, 0 @@ -445,7 +445,7 @@ SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB checkflag FLAG_VISITED_MAUVILLE_CITY goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B - copyvar SPECIALVAR_7, LAST_TALKED + copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, 5 @@ -480,8 +480,8 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A42E9 OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294 - setvar SPECIALVAR_4, 4 - copyvar VAR_CABLE_CLUB_STATE, SPECIALVAR_4 + setvar VAR_SPECIAL_4, 4 + copyvar VAR_CABLE_CLUB_STATE, VAR_SPECIAL_4 messageautoscroll OldaleTown_PokemonCenter_2F_Text_1A4A22 waitmessage setmetatile 11, 3, 514, 0 @@ -604,13 +604,13 @@ gUnknown_081A4363:: @ 81A4363 end SingleBattleColosseum_EventScript_1A436F:: @ 81A436F - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 special sub_8083B90 waitstate end SingleBattleColosseum_EventScript_1A4379:: @ 81A4379 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_8083B90 waitstate end @@ -621,7 +621,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383 waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 special sub_8083B90 waitstate end @@ -632,7 +632,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_8083B90 waitstate end @@ -643,7 +643,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9 waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 special sub_8083B90 waitstate end @@ -654,7 +654,7 @@ DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4 waitstate compare RESULT, 0 goto_if_eq DoubleBattleColosseum_EventScript_1A43EF - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_5, 3 special sub_8083B90 waitstate end @@ -663,31 +663,31 @@ DoubleBattleColosseum_EventScript_1A43EF:: @ 81A43EF end TradeCenter_EventScript_1A43F0:: @ 81A43F0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 special sub_8083B5C waitstate end TradeCenter_EventScript_1A43FA:: @ 81A43FA - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_8083B5C waitstate end @ 81A4404 - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 special sub_8083B5C waitstate end @ 81A440E - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_5, 3 special sub_8083B5C waitstate end RecordCorner_EventScript_1A4418:: @ 81A4418 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -695,7 +695,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 end RecordCorner_EventScript_1A442D:: @ 81A442D - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -703,7 +703,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D end RecordCorner_EventScript_1A4442:: @ 81A4442 - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_5, 2 special sub_80B929C waitstate compare VAR_TEMP_1, 0 @@ -711,7 +711,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 end RecordCorner_EventScript_1A4457:: @ 81A4457 - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_5, 3 special sub_80B929C waitstate compare VAR_TEMP_1, 0 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index ad478b3c7..9c5c246e2 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F - bufferstdstring 0, SPECIALVAR_B + bufferstdstring 0, VAR_SPECIAL_B msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 @@ -120,7 +120,7 @@ FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048 msgbox FallarborTown_ContestLobby_Text_1A6319, 4 choosecontestmon - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097 special sub_80C43F4 compare RESULT, 0 @@ -186,7 +186,7 @@ FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D return LinkContestRoom1_EventScript_1A514D:: @ 81A514D - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_6, 0 lockall applymovement 14, LinkContestRoom1_Movement_1A5DBF waitmovement 0 @@ -215,19 +215,19 @@ LinkContestRoom1_EventScript_1A51A0:: @ 81A51A0 return LinkContestRoom1_EventScript_1A51D2:: @ 81A51D2 - setvar SPECIALVAR_9, 5 + setvar VAR_SPECIAL_9, 5 return LinkContestRoom1_EventScript_1A51D8:: @ 81A51D8 - setvar SPECIALVAR_9, 6 + setvar VAR_SPECIAL_9, 6 return LinkContestRoom1_EventScript_1A51DE:: @ 81A51DE - setvar SPECIALVAR_9, 7 + setvar VAR_SPECIAL_9, 7 return LinkContestRoom1_EventScript_1A51E4:: @ 81A51E4 - setvar SPECIALVAR_9, 8 + setvar VAR_SPECIAL_9, 8 return LinkContestRoom1_EventScript_1A51EA:: @ 81A51EA @@ -240,28 +240,28 @@ LinkContestRoom1_EventScript_1A51EA:: @ 81A51EA return LinkContestRoom1_EventScript_1A5227:: @ 81A5227 - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 return LinkContestRoom1_EventScript_1A522D:: @ 81A522D - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 return LinkContestRoom1_EventScript_1A5233:: @ 81A5233 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 return LinkContestRoom1_EventScript_1A5239:: @ 81A5239 - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 return LinkContestRoom1_EventScript_1A523F:: @ 81A523F - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 return LinkContestRoom1_EventScript_1A5245:: @ 81A5245 - bufferstdstring 1, SPECIALVAR_8 - bufferstdstring 2, SPECIALVAR_9 + bufferstdstring 1, VAR_SPECIAL_8 + bufferstdstring 2, VAR_SPECIAL_9 call LinkContestRoom1_EventScript_1A525F lockall applymovement 1, LinkContestRoom1_Movement_1A5D87 @@ -286,21 +286,21 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A5455 call LinkContestRoom1_EventScript_1A53E5 call LinkContestRoom1_EventScript_1A5880 - addvar SPECIALVAR_6, 1 - compare SPECIALVAR_6, 4 + addvar VAR_SPECIAL_6, 1 + compare VAR_SPECIAL_6, 4 goto_if 5, LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_1A52AE:: @ 81A52AE - compare SPECIALVAR_6, 0 + compare VAR_SPECIAL_6, 0 goto_if_eq LinkContestRoom1_EventScript_1A52DB - compare SPECIALVAR_6, 1 + compare VAR_SPECIAL_6, 1 goto_if_eq LinkContestRoom1_EventScript_1A52ED - compare SPECIALVAR_6, 2 + compare VAR_SPECIAL_6, 2 goto_if_eq LinkContestRoom1_EventScript_1A52FF - compare SPECIALVAR_6, 3 + compare VAR_SPECIAL_6, 3 goto_if_eq LinkContestRoom1_EventScript_1A5311 return @@ -309,7 +309,7 @@ LinkContestRoom1_EventScript_1A52DB:: @ 81A52DB applymovement 3, LinkContestRoom1_Movement_1A5DCE waitmovement 0 releaseall - setvar SPECIALVAR_B, 3 + setvar VAR_SPECIAL_B, 3 return LinkContestRoom1_EventScript_1A52ED:: @ 81A52ED @@ -317,7 +317,7 @@ LinkContestRoom1_EventScript_1A52ED:: @ 81A52ED applymovement 4, LinkContestRoom1_Movement_1A5DDA waitmovement 0 releaseall - setvar SPECIALVAR_B, 4 + setvar VAR_SPECIAL_B, 4 return LinkContestRoom1_EventScript_1A52FF:: @ 81A52FF @@ -325,7 +325,7 @@ LinkContestRoom1_EventScript_1A52FF:: @ 81A52FF applymovement 5, LinkContestRoom1_Movement_1A5DE2 waitmovement 0 releaseall - setvar SPECIALVAR_B, 5 + setvar VAR_SPECIAL_B, 5 return LinkContestRoom1_EventScript_1A5311:: @ 81A5311 @@ -333,24 +333,24 @@ LinkContestRoom1_EventScript_1A5311:: @ 81A5311 applymovement 14, LinkContestRoom1_Movement_1A5DEA waitmovement 0 releaseall - setvar SPECIALVAR_B, 14 + setvar VAR_SPECIAL_B, 14 return LinkContestRoom1_EventScript_1A5323:: @ 81A5323 special sub_80C4C64 - addvar SPECIALVAR_6, 1 - buffernumberstring 1, SPECIALVAR_6 + addvar VAR_SPECIAL_6, 1 + buffernumberstring 1, VAR_SPECIAL_6 lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5D9C + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall addobject 13 playse 10 lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5D9C + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall - addvar SPECIALVAR_6, -1 + addvar VAR_SPECIAL_6, -1 playse 15 special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E @@ -486,101 +486,101 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB return LinkContestRoom1_EventScript_1A555A:: @ 81A555A - compare SPECIALVAR_4, 80 + compare VAR_SPECIAL_4, 80 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare SPECIALVAR_4, 70 + compare VAR_SPECIAL_4, 70 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare SPECIALVAR_4, 60 + compare VAR_SPECIAL_4, 60 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare SPECIALVAR_4, 50 + compare VAR_SPECIAL_4, 50 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare SPECIALVAR_4, 40 + compare VAR_SPECIAL_4, 40 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare SPECIALVAR_4, 30 + compare VAR_SPECIAL_4, 30 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare SPECIALVAR_4, 20 + compare VAR_SPECIAL_4, 20 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare SPECIALVAR_4, 10 + compare VAR_SPECIAL_4, 10 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 - compare SPECIALVAR_4, 230 + compare VAR_SPECIAL_4, 230 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare SPECIALVAR_4, 210 + compare VAR_SPECIAL_4, 210 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare SPECIALVAR_4, 190 + compare VAR_SPECIAL_4, 190 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare SPECIALVAR_4, 170 + compare VAR_SPECIAL_4, 170 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare SPECIALVAR_4, 150 + compare VAR_SPECIAL_4, 150 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare SPECIALVAR_4, 130 + compare VAR_SPECIAL_4, 130 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare SPECIALVAR_4, 110 + compare VAR_SPECIAL_4, 110 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare SPECIALVAR_4, 90 + compare VAR_SPECIAL_4, 90 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 - compare SPECIALVAR_4, 380 + compare VAR_SPECIAL_4, 380 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare SPECIALVAR_4, 350 + compare VAR_SPECIAL_4, 350 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare SPECIALVAR_4, 320 + compare VAR_SPECIAL_4, 320 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare SPECIALVAR_4, 290 + compare VAR_SPECIAL_4, 290 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare SPECIALVAR_4, 260 + compare VAR_SPECIAL_4, 260 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare SPECIALVAR_4, 230 + compare VAR_SPECIAL_4, 230 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare SPECIALVAR_4, 200 + compare VAR_SPECIAL_4, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare SPECIALVAR_4, 170 + compare VAR_SPECIAL_4, 170 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 - compare SPECIALVAR_4, 600 + compare VAR_SPECIAL_4, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare SPECIALVAR_4, 560 + compare VAR_SPECIAL_4, 560 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare SPECIALVAR_4, 520 + compare VAR_SPECIAL_4, 520 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare SPECIALVAR_4, 480 + compare VAR_SPECIAL_4, 480 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare SPECIALVAR_4, 440 + compare VAR_SPECIAL_4, 440 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare SPECIALVAR_4, 400 + compare VAR_SPECIAL_4, 400 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare SPECIALVAR_4, 360 + compare VAR_SPECIAL_4, 360 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare SPECIALVAR_4, 320 + compare VAR_SPECIAL_4, 320 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 - compare SPECIALVAR_4, 600 + compare VAR_SPECIAL_4, 600 goto_if 2, LinkContestRoom1_EventScript_1A575A - compare SPECIALVAR_4, 550 + compare VAR_SPECIAL_4, 550 goto_if 2, LinkContestRoom1_EventScript_1A5754 - compare SPECIALVAR_4, 500 + compare VAR_SPECIAL_4, 500 goto_if 2, LinkContestRoom1_EventScript_1A574E - compare SPECIALVAR_4, 450 + compare VAR_SPECIAL_4, 450 goto_if 2, LinkContestRoom1_EventScript_1A5748 - compare SPECIALVAR_4, 400 + compare VAR_SPECIAL_4, 400 goto_if 2, LinkContestRoom1_EventScript_1A5742 - compare SPECIALVAR_4, 300 + compare VAR_SPECIAL_4, 300 goto_if 2, LinkContestRoom1_EventScript_1A573C - compare SPECIALVAR_4, 200 + compare VAR_SPECIAL_4, 200 goto_if 2, LinkContestRoom1_EventScript_1A5736 - compare SPECIALVAR_4, 100 + compare VAR_SPECIAL_4, 100 goto_if 2, LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return @@ -726,7 +726,7 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 release removeobject 13 special sub_80C5164 - switch SPECIALVAR_6 + switch VAR_SPECIAL_6 case 0, LinkContestRoom1_EventScript_1A58BA case 1, LinkContestRoom1_EventScript_1A58C7 case 2, LinkContestRoom1_EventScript_1A58D4 @@ -735,28 +735,28 @@ LinkContestRoom1_EventScript_1A5880:: @ 81A5880 LinkContestRoom1_EventScript_1A58BA:: @ 81A58BA lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DD4 + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DD4 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58C7:: @ 81A58C7 lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DDE + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DDE waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58D4:: @ 81A58D4 lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DE6 + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DE6 waitmovement 0 releaseall return LinkContestRoom1_EventScript_1A58E1:: @ 81A58E1 lockall - applymovement SPECIALVAR_B, LinkContestRoom1_Movement_1A5DF0 + applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5DF0 waitmovement 0 releaseall return @@ -858,7 +858,7 @@ LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2 LinkContestRoom1_EventScript_1A59FC:: @ 81A59FC special sub_80C47C0 - switch SPECIALVAR_5 + switch VAR_SPECIAL_5 case 0, LinkContestRoom1_EventScript_1A5A31 case 1, LinkContestRoom1_EventScript_1A5A37 case 2, LinkContestRoom1_EventScript_1A5A3D @@ -884,9 +884,9 @@ LinkContestRoom1_EventScript_1A5A43:: @ 81A5A43 LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 special sub_80C47F0 special sub_80C4858 - addvar SPECIALVAR_5, 1 - buffernumberstring 1, SPECIALVAR_5 - addvar SPECIALVAR_5, -1 + addvar VAR_SPECIAL_5, 1 + buffernumberstring 1, VAR_SPECIAL_5 + addvar VAR_SPECIAL_5, -1 call LinkContestRoom1_EventScript_1A5A75 applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 @@ -1007,7 +1007,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB call LinkContestRoom1_EventScript_1A5A90 delay 30 special sub_80C4CF8 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return @@ -1016,7 +1016,7 @@ LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6 msgbox LinkContestRoom1_Text_1A6DF1, 3 delay 90 special sub_80C4CF8 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C46 return @@ -1028,7 +1028,7 @@ LinkContestRoom1_EventScript_1A5C12:: @ 81A5C12 LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23 special sub_80C47C0 - compare SPECIALVAR_5, 3 + compare VAR_SPECIAL_5, 3 goto_if_eq LinkContestRoom1_EventScript_1A5C32 return @@ -1053,7 +1053,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C delay 60 call LinkContestRoom1_EventScript_1A5C6A special sub_80C4CF8 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A5C64 closemessage return @@ -1065,7 +1065,7 @@ LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64 LinkContestRoom1_EventScript_1A5C6A:: @ 81A5C6A special sub_80C496C special sub_80C47C0 - compare SPECIALVAR_4, SPECIALVAR_5 + compare VAR_SPECIAL_4, VAR_SPECIAL_5 goto_if_eq LinkContestRoom1_EventScript_1A5C7C return @@ -1074,7 +1074,7 @@ LinkContestRoom1_EventScript_1A5C7C:: @ 81A5C7C return LinkContestRoom1_EventScript_1A5C7F:: @ 81A5C7F - switch SPECIALVAR_5 + switch VAR_SPECIAL_5 case 0, LinkContestRoom1_EventScript_1A5CB1 case 1, LinkContestRoom1_EventScript_1A5CBE case 2, LinkContestRoom1_EventScript_1A5CCB @@ -1111,7 +1111,7 @@ LinkContestRoom1_EventScript_1A5CD8:: @ 81A5CD8 LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 special sub_80C47C0 - compare SPECIALVAR_5, 3 + compare VAR_SPECIAL_5, 3 goto_if_eq LinkContestRoom1_EventScript_1A5CFC msgbox LinkContestRoom1_Text_1A6DF1, 3 return diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 5868fec76..7664a14ca 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -59,7 +59,7 @@ Route117_EventScript_1B22DE:: @ 81B22DE Route117_EventScript_1B22E7:: @ 81B22E7 special GetDaycareMonNicknames msgbox Route117_Text_1B2710, 4 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call Route117_EventScript_1B22CD release end @@ -71,9 +71,9 @@ Route117_EventScript_1B22FE:: @ 81B22FE special ShowFieldMessageStringVar4 waitmessage waitbuttonpress - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call Route117_EventScript_1B22CD - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 call Route117_EventScript_1B22CD release end @@ -103,14 +103,14 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C fadescreen 1 special ChooseSendDaycareMon waitstate - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 specialvar RESULT, sub_8095C10 compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD - specialvar SPECIALVAR_5, GetSelectedDaycareMonNickname + specialvar VAR_SPECIAL_5, GetSelectedDaycareMonNickname waitse - playmoncry SPECIALVAR_5, 0 + playmoncry VAR_SPECIAL_5, 0 msgbox Route117_PokemonDayCare_Text_1B296E, 4 waitmoncry special StoreSelectedPokemonInDaycare @@ -160,7 +160,7 @@ Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B msgbox Route117_PokemonDayCare_Text_1B2A88, 4 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B29AD, 5 compare RESULT, 1 @@ -176,12 +176,12 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 compare RESULT, 6 goto_if_eq Route117_PokemonDayCare_EventScript_1B2539 specialvar RESULT, GetDaycareState - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B24A8 special ShowDaycareLevelMenu waitstate - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 goto Route117_PokemonDayCare_EventScript_1B24A8 @@ -259,9 +259,9 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543 Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 msgbox Route117_PokemonDayCare_Text_1B2A88, 4 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call Route117_PokemonDayCare_EventScript_1B241A - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 call Route117_PokemonDayCare_EventScript_1B241A msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 compare RESULT, 1 @@ -275,7 +275,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 waitstate compare RESULT, 2 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT specialvar RESULT, TakePokemonFromDaycare msgbox Route117_PokemonDayCare_Text_1B2B75, 4 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 0c81be439..ff45d2cff 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -215,19 +215,19 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 end Route111_EventScript_1AE5E0:: @ 81AE5E0 - applymovement SPECIALVAR_4, Route111_Movement_1AE699 + applymovement VAR_SPECIAL_4, Route111_Movement_1AE699 waitmovement 0 return Route111_EventScript_1AE5EB:: @ 81AE5EB - applymovement SPECIALVAR_4, Route111_Movement_1AE69B - applymovement SPECIALVAR_5, Route111_Movement_1A0841 + applymovement VAR_SPECIAL_4, Route111_Movement_1AE69B + applymovement VAR_SPECIAL_5, Route111_Movement_1A0841 waitmovement 0 return Route111_EventScript_1AE5FD:: @ 81AE5FD - applymovement SPECIALVAR_4, Route111_Movement_1AE69D - applymovement SPECIALVAR_5, Route111_Movement_1A083F + applymovement VAR_SPECIAL_4, Route111_Movement_1AE69D + applymovement VAR_SPECIAL_5, Route111_Movement_1A083F waitmovement 0 return @@ -303,7 +303,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 call Route111_EventScript_1A00F3 lock faceplayer diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 534e91341..5ec8197f9 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -9,14 +9,14 @@ AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 playse 21 - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0833 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 .else - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0841 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0841 .endif waitmovement 0 setvar VAR_TEMP_1, 1 @@ -31,37 +31,37 @@ MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 end AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 .ifdef SAPPHIRE - setvar SPECIALVAR_9, 4 + setvar VAR_SPECIAL_9, 4 .else - setvar SPECIALVAR_9, 3 + setvar VAR_SPECIAL_9, 3 .endif .ifdef SAPPHIRE - applymovement SPECIALVAR_8, Movement_1A083F + applymovement VAR_SPECIAL_8, Movement_1A083F .else - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 .endif waitmovement 0 delay 20 - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 closemessage .ifdef SAPPHIRE - applymovement SPECIALVAR_8, Movement_1A083F + applymovement VAR_SPECIAL_8, Movement_1A083F .else - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 .endif .ifdef SAPPHIRE - applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D958 + applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D958 .else - applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D95D + applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - removeobject SPECIALVAR_9 + removeobject VAR_SPECIAL_9 delay 20 - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 42e0a8821..87ba8c01a 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -21,25 +21,25 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA waitmessage closemessage special ScrSpecial_HealPlayerParty - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 special sub_813556C waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 5 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 5 special sub_8135668 - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 special sub_8135668 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 - setvar SPECIALVAR_4, 6 + setvar VAR_SPECIAL_4, 6 special sub_8135668 switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 @@ -89,23 +89,23 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 4 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 4 special sub_8135668 - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 1 special sub_8135668 - setvar SPECIALVAR_4, 7 + setvar VAR_SPECIAL_4, 7 special sub_8135668 - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 special sub_8135668 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 special sub_8135BA0 message BattleTower_BattleRoom_Text_1C6CE1 delay 60 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 4261f8457..965da8d9c 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare SPECIALVAR_6, 1 + compare VAR_SPECIAL_6, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmetatile 12, 0, 519, 0 setmetatile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar VAR_TEMP_0, 1 - compare SPECIALVAR_6, 1 + compare VAR_SPECIAL_6, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 applymovement 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 684bdc6bb..527bae389 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -11,22 +11,22 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 end BattleTower_Lobby_EventScript_16029C:: @ 816029C - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 special sub_8135668 checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialvar SPECIALVAR_7, sub_810F404 - compare SPECIALVAR_7, 50 + specialvar VAR_SPECIAL_7, sub_810F404 + compare VAR_SPECIAL_7, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialvar SPECIALVAR_7, sub_810F404 - compare SPECIALVAR_7, 100 + specialvar VAR_SPECIAL_7, sub_810F404 + compare VAR_SPECIAL_7, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC @@ -75,7 +75,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 faceplayer message BattleTower_Lobby_Text_19A487 waitmessage - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D @@ -89,23 +89,23 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 msgbox BattleTower_Lobby_Text_19A719, 4 BattleTower_Lobby_EventScript_16037D:: @ 816037D - setvar SPECIALVAR_4, 8 + setvar VAR_SPECIAL_4, 8 special sub_81358A4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 special sub_8135668 special DetermineBattleTowerPrize - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 special sub_8135BA0 playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 3 special sub_8135668 message BattleTower_Lobby_Text_19A4BB waitmessage @@ -116,7 +116,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitmessage playfanfare 370 waitfanfare - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 special sub_81358A4 compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 @@ -144,9 +144,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 waitmessage message BattleTower_Lobby_Text_19A589 waitmessage - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 special sub_8135668 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_8135BA0 playse 55 waitse @@ -164,12 +164,12 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waitmessage message BattleTower_Lobby_Text_19A5CE waitmessage - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 special sub_8135BA0 playse 55 waitse - setvar SPECIALVAR_4, 8 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 8 + setvar VAR_SPECIAL_5, 0 special sub_8135668 setvar VAR_TEMP_0, 5 special SavePlayerParty @@ -184,7 +184,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 @@ -209,11 +209,11 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D - setvar SPECIALVAR_4, 1 - copyvar SPECIALVAR_5, RESULT - copyvar SPECIALVAR_6, RESULT + setvar VAR_SPECIAL_4, 1 + copyvar VAR_SPECIAL_5, RESULT + copyvar VAR_SPECIAL_6, RESULT special sub_8135668 msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 @@ -228,16 +228,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 127, BattleTower_Lobby_EventScript_16064F BattleTower_Lobby_EventScript_160587:: @ 8160587 - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 special sub_8135668 setvar VAR_TEMP_0, 0 - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 special sub_8135668 - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 1 special sub_8135668 - setvar SPECIALVAR_4, 8 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 8 + setvar VAR_SPECIAL_5, 0 special sub_8135668 special LoadPlayerParty closemessage @@ -276,7 +276,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160642:: @ 8160642 - setvar SPECIALVAR_4, 12 + setvar VAR_SPECIAL_4, 12 special sub_8135668 goto BattleTower_Lobby_EventScript_160652 @@ -285,7 +285,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 special sub_8135668 BattleTower_Lobby_EventScript_160662:: @ 8160662 @@ -343,7 +343,7 @@ BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 BattleTower_Lobby_EventScript_1606CC:: @ 81606CC msgbox BattleTower_Lobby_Text_19A7C3, 4 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer @@ -392,7 +392,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 - setvar SPECIALVAR_8, DECOR_SILVER_SHIELD + setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD givedecoration_std DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF @@ -406,7 +406,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 - setvar SPECIALVAR_8, DECOR_GOLD_SHIELD + setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD givedecoration_std DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - bufferdecorationname 1, SPECIALVAR_8 + bufferdecorationname 1, VAR_SPECIAL_8 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index c766eed38..3992ffd2c 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -68,7 +68,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 waitmovement 0 delay 30 hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 9bc51f7d1..dc733071f 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -143,7 +143,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 waitstate release end @@ -181,7 +181,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage - copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 @@ -612,7 +612,7 @@ DewfordTown_EventScript_14E439:: @ 814E439 DewfordTown_EventScript_14E443:: @ 814E443 msgbox DewfordTown_Text_16BADC, 4 - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 call DewfordTown_EventScript_1A00F3 lock faceplayer @@ -624,7 +624,7 @@ DewfordTown_EventScript_14E443:: @ 814E443 DewfordTown_EventScript_14E46E:: @ 814E46E incrementgamestat GAME_STAT_STARTED_TRENDS - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 797a79af0..ee7d77d6b 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -10,12 +10,12 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 checktrainerflag OPPONENT_BRAWLY goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 - copyvar SPECIALVAR_1, SPECIALVAR_0 - compare SPECIALVAR_0, 0 + copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 + compare VAR_SPECIAL_0, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare SPECIALVAR_0, 1 + compare VAR_SPECIAL_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare SPECIALVAR_0, 2 + compare VAR_SPECIAL_0, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -42,14 +42,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - compare SPECIALVAR_0, SPECIALVAR_1 + compare VAR_SPECIAL_0, VAR_SPECIAL_1 goto_if_eq DewfordTown_Gym_EventScript_1530F5 - copyvar SPECIALVAR_1, SPECIALVAR_0 - compare SPECIALVAR_0, 1 + copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 + compare VAR_SPECIAL_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare SPECIALVAR_0, 2 + compare VAR_SPECIAL_0, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare SPECIALVAR_0, 3 + compare VAR_SPECIAL_0, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -80,20 +80,20 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 return DewfordTown_Gym_EventScript_153122:: @ 8153122 - setvar SPECIALVAR_0, 0 + setvar VAR_SPECIAL_0, 0 checktrainerflag OPPONENT_HIDEKI goto_if 0, DewfordTown_Gym_EventScript_153135 - addvar SPECIALVAR_0, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA goto_if 0, DewfordTown_Gym_EventScript_153143 - addvar SPECIALVAR_0, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA goto_if 0, DewfordTown_Gym_EventScript_153151 - addvar SPECIALVAR_0, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return @@ -117,7 +117,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index e2521f5e8..e54ef8e50 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -121,13 +121,13 @@ DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_1533FE:: @ 81533FE lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto DewfordTown_Hall_EventScript_15340A end @@ -191,9 +191,9 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD applymovement 8, DewfordTown_Hall_Movement_153599 waitmovement 0 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end @@ -210,9 +210,9 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 applymovement 7, DewfordTown_Hall_Movement_15359B waitmovement 0 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index 1bbcda5db..33d14e770 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A end DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 2f0e2ea5f..d83745593 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -55,7 +55,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B end EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_810FF60 setflag FLAG_DEFEATED_ELITE_4_DRAKE call EverGrandeCity_DrakesRoom_EventScript_1A0693 diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index a9a13246b..374ef9472 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 6e029a91f..5957508ae 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -15,7 +15,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B return EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index c88471656..a0fd0ac3d 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -7,7 +7,7 @@ FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 end FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD - setvar SPECIALVAR_B, 6 + setvar VAR_SPECIAL_B, 6 setvar CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 7f3b750a9..3c5345f8f 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -28,7 +28,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B - setvar SPECIALVAR_4, 280 + setvar VAR_SPECIAL_4, 280 call FallarborTown_House1_EventScript_1A067F setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_177910, 4 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 7b222e671..081850326 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special sub_80F9A4C waitstate - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare SPECIALVAR_5, 0 + compare VAR_SPECIAL_5, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special sub_8132670 waitstate - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 takeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index cf8f778fb..0c9880137 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 end FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 4e300e66c..9217ba8f4 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 msgbox FortreeCity_Gym_Text_185E73, 4 setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET - setvar SPECIALVAR_8, 6 + setvar VAR_SPECIAL_8, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 71a8f6378..aee4141a8 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -6,29 +6,29 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 faceplayer checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED goto_if_eq FortreeCity_House1_EventScript_157EAD - setvar SPECIALVAR_8, 1 - copyvar SPECIALVAR_4, SPECIALVAR_8 + setvar VAR_SPECIAL_8, 1 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, sub_804D89C - copyvar SPECIALVAR_9, RESULT + copyvar VAR_SPECIAL_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate - copyvar SPECIALVAR_A, SPECIALVAR_4 - compare SPECIALVAR_4, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A specialvar RESULT, sub_804DB2C - copyvar SPECIALVAR_B, RESULT - compare RESULT, SPECIALVAR_9 + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, FortreeCity_House1_EventScript_157E9F - copyvar SPECIALVAR_4, SPECIALVAR_8 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_9 msgbox FortreeCity_House1_Text_1856F7, 4 setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_9 msgbox FortreeCity_House1_Text_185737, 4 release end diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index 22c3f0248..6d847d7cc 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index b19ac6635..3d4a57c13 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -5,7 +5,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA lock faceplayer msgbox GraniteCave_StevensRoom_Text_194AE5, 4 - setvar SPECIALVAR_4, ITEM_LETTER + setvar VAR_SPECIAL_4, ITEM_LETTER call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index cfcf29ecc..43a8ed7cd 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -28,7 +28,7 @@ LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 opendoor 12, 15 waitdooranim addobject 8 @@ -48,7 +48,7 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LavaridgeTown_EventScript_14E68F checkplayergender compare RESULT, 0 @@ -68,7 +68,7 @@ LavaridgeTown_EventScript_14E570:: @ 814E570 LavaridgeTown_EventScript_14E575:: @ 814E575 lock faceplayer - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 checkplayergender compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B @@ -99,22 +99,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closemessage - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 3a5bbf20b..1bbad53bf 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -86,7 +86,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar VAR_LAVARIDGE_RIVAL_STATE, 1 diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index b395ce744..4e9c51380 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 end LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 4e27e0240..5c05639fd 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -172,8 +172,8 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79 LilycoveCity_EventScript_14CC82:: @ 814CC82 lockall - specialvar SPECIALVAR_4, sub_80C4D50 - switch SPECIALVAR_4 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_4 case 0, LilycoveCity_EventScript_14CCA2 msgbox LilycoveCity_Text_168EA4, 4 releaseall diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 976e0c89e..7a13b1c48 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -87,8 +87,8 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 - specialvar SPECIALVAR_4, sub_80C4D50 - switch SPECIALVAR_4 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_4 case 1, LilycoveCity_ContestLobby_EventScript_1589D6 case 2, LilycoveCity_ContestLobby_EventScript_1589DA case 3, LilycoveCity_ContestLobby_EventScript_1589DE @@ -361,7 +361,7 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestmon - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 compare RESULT, 0 @@ -392,7 +392,7 @@ LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 end LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 - copyvar SPECIALVAR_8, SPECIALVAR_4 + copyvar VAR_SPECIAL_8, VAR_SPECIAL_4 message LilycoveCity_ContestLobby_Text_1A67A3 waitmessage yesnobox 20, 8 @@ -417,7 +417,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 message LilycoveCity_ContestLobby_Text_1887C7 waitmessage - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT special sub_808363C waitstate compare RESULT, 3 @@ -429,7 +429,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 messageautoscroll LilycoveCity_ContestLobby_Text_18872A waitmessage contestlinktransfer - switch SPECIALVAR_4 + switch VAR_SPECIAL_4 case 0, LilycoveCity_ContestLobby_EventScript_158DD1 case 1, LilycoveCity_ContestLobby_EventScript_158D82 case 2, LilycoveCity_ContestLobby_EventScript_158DC3 @@ -471,11 +471,11 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C - addvar SPECIALVAR_4, 1 + addvar VAR_SPECIAL_4, 1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar SPECIALVAR_4, 65535 + addvar VAR_SPECIAL_4, 65535 goto LilycoveCity_ContestLobby_EventScript_158DEE end @@ -571,7 +571,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 - setvar SPECIALVAR_B, 8 + setvar VAR_SPECIAL_B, 8 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 @@ -586,7 +586,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 - setvar SPECIALVAR_B, 8 + setvar VAR_SPECIAL_B, 8 setvar CONTEST_RANK, 3 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index c58f484e2..8233504dd 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C faceplayer checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF - copyvar SPECIALVAR_5, VAR_DEPT_STORE_FLOOR + copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 08f99f04e..a9680e3a5 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -20,7 +20,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waitmessage special RetrieveLotteryNumber - copyvar SPECIALVAR_8, RESULT + copyvar VAR_SPECIAL_8, RESULT special sub_810F9AC msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 @@ -33,23 +33,23 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmovement 0 - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY - compare SPECIALVAR_6, 0 + compare VAR_SPECIAL_6, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare SPECIALVAR_6, 1 + compare VAR_SPECIAL_6, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitemname 0, SPECIALVAR_5 - compare SPECIALVAR_4, 1 + bufferitemname 0, VAR_SPECIAL_5 + compare VAR_SPECIAL_4, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem_std SPECIALVAR_5 + giveitem_std VAR_SPECIAL_5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E @@ -100,7 +100,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 return LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C - copyvar VAR_LOTTERY_PRIZE, SPECIALVAR_5 + copyvar VAR_LOTTERY_PRIZE, VAR_SPECIAL_5 goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 9805da6e7..9554b8fa4 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -86,7 +86,7 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -136,7 +136,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE delay 30 hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 call LilycoveCity_Harbor_EventScript_1A040E warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index f7a5dafad..120054e91 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -98,8 +98,8 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall checkflag FLAG_RECEIVED_GLASS_ORNAMENT goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 - specialvar SPECIALVAR_4, sub_80C4D50 - switch SPECIALVAR_4 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_4 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index a6b500c15..1024d30e9 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,7 +16,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special sub_80F9A0C waitstate - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 compare RESULT, 1 @@ -28,7 +28,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE fadescreen 1 special sub_80F9EEC fadescreen 0 - compare SPECIALVAR_5, 4 + compare VAR_SPECIAL_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index c86fb3dbc..f6eb35c98 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 3b63b2cd2..2db702ffc 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -69,35 +69,35 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 - setvar SPECIALVAR_4, 8 + setvar VAR_SPECIAL_4, 8 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED - setvar SPECIALVAR_4, 12 + setvar VAR_SPECIAL_4, 12 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 - setvar SPECIALVAR_4, 15 + setvar VAR_SPECIAL_4, 15 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D @@ -146,7 +146,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C @@ -186,7 +186,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer - setvar SPECIALVAR_4, 8 + setvar VAR_SPECIAL_4, 8 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 @@ -226,7 +226,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613 LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A @@ -266,7 +266,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 @@ -306,7 +306,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701 LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -339,7 +339,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763 LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer - setvar SPECIALVAR_4, 12 + setvar VAR_SPECIAL_4, 12 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -372,7 +372,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5 LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -405,7 +405,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827 LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer - setvar SPECIALVAR_4, 15 + setvar VAR_SPECIAL_4, 15 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 8dcb712dd..c11546bb5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -77,8 +77,8 @@ LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 LittlerootTown_EventScript_14D5EF:: @ 814D5EF lockall - setvar SPECIALVAR_4, 5 - setvar SPECIALVAR_5, 8 + setvar VAR_SPECIAL_4, 5 + setvar VAR_SPECIAL_5, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 @@ -88,8 +88,8 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF LittlerootTown_EventScript_14D60D:: @ 814D60D lockall - setvar SPECIALVAR_4, 14 - setvar SPECIALVAR_5, 8 + setvar VAR_SPECIAL_4, 14 + setvar VAR_SPECIAL_5, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_MAY warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 @@ -102,12 +102,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B playse 10 applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 - opendoor SPECIALVAR_4, SPECIALVAR_5 + opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 - closedoor SPECIALVAR_4, SPECIALVAR_5 + closedoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim delay 10 applymovement 4, LittlerootTown_Movement_14D6AE @@ -117,7 +117,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 - opendoor SPECIALVAR_4, SPECIALVAR_5 + opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD @@ -125,7 +125,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B setflag FLAG_HIDE_MOM_LITTLEROOT setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat 255, MAP_PETALBURG_CITY - closedoor SPECIALVAR_4, SPECIALVAR_5 + closedoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT clearflag FLAG_SPECIAL_FLAG_0 @@ -369,39 +369,39 @@ LittlerootTown_EventScript_14D857:: @ 814D857 LittlerootTown_EventScript_14D860:: @ 814D860 lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D886:: @ 814D886 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D892:: @ 814D892 lockall - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D89E:: @ 814D89E lockall - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8AA:: @ 814D8AA lockall - setvar SPECIALVAR_8, 5 + setvar VAR_SPECIAL_8, 5 goto LittlerootTown_EventScript_14D8B6 end @@ -433,13 +433,13 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6 end LittlerootTown_EventScript_14D926:: @ 814D926 - setvar SPECIALVAR_9, 5 - setvar SPECIALVAR_A, 8 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 8 return LittlerootTown_EventScript_14D931:: @ 814D931 - setvar SPECIALVAR_9, 14 - setvar SPECIALVAR_A, 8 + setvar VAR_SPECIAL_9, 14 + setvar VAR_SPECIAL_A, 8 return LittlerootTown_EventScript_14D93C:: @ 814D93C @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DC50 return @@ -595,96 +595,96 @@ LittlerootTown_EventScript_14DB3B:: @ 814DB3B LittlerootTown_EventScript_14DB46:: @ 814DB46 applymovement 4, LittlerootTown_Movement_14DCB4 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DB6C:: @ 814DB6C applymovement 4, LittlerootTown_Movement_14DCBA waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DB92:: @ 814DB92 applymovement 4, LittlerootTown_Movement_14DCC1 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 applymovement 4, LittlerootTown_Movement_14DCC5 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DBDE:: @ 814DBDE applymovement 4, LittlerootTown_Movement_14DCCA waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC04:: @ 814DC04 applymovement 4, LittlerootTown_Movement_14DCCF waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC2A:: @ 814DC2A applymovement 4, LittlerootTown_Movement_14DCD3 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC50:: @ 814DC50 applymovement 4, LittlerootTown_Movement_14DCDA waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return @@ -849,12 +849,12 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim goto LittlerootTown_EventScript_14DD2B end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index b017f0254..4ce1e277a 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -76,15 +76,15 @@ LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 end LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 lockall - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 1 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF end @@ -116,9 +116,9 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 0 - applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 + applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index db1261736..e0e1a1086 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -58,7 +58,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E end LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 @@ -68,7 +68,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 end gBrendanHouse_TurnPCOff:: @ 8152850 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index f48e84252..af7a2976b 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -76,15 +76,15 @@ LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 end LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E end @@ -163,9 +163,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 - applymovement SPECIALVAR_4, LittlerootTown_MaysHouse_1F_Movement_1A0843 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 + applymovement VAR_SPECIAL_4, LittlerootTown_MaysHouse_1F_Movement_1A0843 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 778ce6846..8bd9a01d2 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -206,7 +206,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 end LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C end gMayHouse_TurnPCOff:: @ 8152C75 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 51fb1614d..44adab6f1 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -37,7 +37,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE end LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678 goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 7c071477d..6befb5fb9 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -524,7 +524,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -535,7 +535,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -546,7 +546,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -557,7 +557,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -568,7 +568,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -579,7 +579,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -590,7 +590,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 6 + setvar VAR_SPECIAL_4, 6 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -601,7 +601,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 7 + setvar VAR_SPECIAL_4, 7 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -612,7 +612,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 8 + setvar VAR_SPECIAL_4, 8 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -623,7 +623,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -634,7 +634,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -645,7 +645,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index b8be1d0ac..05287c7de 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -46,19 +46,19 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B end MauvilleCity_Gym_EventScript_15657D:: @ 815657D - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end @@ -87,7 +87,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView @@ -116,7 +116,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 1 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto MauvilleCity_Gym_EventScript_1566BA end @@ -127,7 +127,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 2 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto MauvilleCity_Gym_EventScript_1566BA end @@ -138,7 +138,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 3 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto MauvilleCity_Gym_EventScript_1566BA end diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index c16b66482..85590f9c2 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -13,7 +13,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 end MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 6d8aeee21..9395633e7 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -18,8 +18,8 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special PrintEReaderTrainerGreeting msgbox gStringVar4, 4 closemessage - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 0 special sub_813556C waitstate compare RESULT, 3 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index a1afd4e82..54a9546c4 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -65,7 +65,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setflag FLAG_BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 - setvar SPECIALVAR_8, 7 + setvar VAR_SPECIAL_8, 7 call MossdeepCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR goto MossdeepCity_Gym_EventScript_15A5C6 diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index 7f6220aa9..a722e666b 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 5f26583c9..eababfa6c 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -77,7 +77,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C getpartysize compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT removeobject 2 playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index eac29a855..6b919f2ca 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -44,7 +44,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 2cf8b7b8e..9cd4eecd1 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -8,19 +8,19 @@ MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto MtPyre_Summit_EventScript_15D4E1 end @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -196,7 +196,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A end MtPyre_Summit_EventScript_15D669:: @ 815D669 - setvar SPECIALVAR_4, ITEM_RED_OR_BLUE_ORB + setvar VAR_SPECIAL_4, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F closemessage applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 @@ -246,19 +246,19 @@ MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto MtPyre_Summit_EventScript_15D6F2 end @@ -268,11 +268,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,11 +280,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D795 removeobject 2 setvar VAR_MT_PYRE_STATE, 3 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index da913f4bd..d94e02227 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E end OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 2717be669..b65c2e67d 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -6,29 +6,29 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E faceplayer checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED goto_if_eq PacifidlogTown_House3_EventScript_154338 - setvar SPECIALVAR_8, 2 - copyvar SPECIALVAR_4, SPECIALVAR_8 + setvar VAR_SPECIAL_8, 2 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, sub_804D89C - copyvar SPECIALVAR_9, RESULT + copyvar VAR_SPECIAL_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate - copyvar SPECIALVAR_A, SPECIALVAR_4 - compare SPECIALVAR_4, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A specialvar RESULT, sub_804DB2C - copyvar SPECIALVAR_B, RESULT - compare RESULT, SPECIALVAR_9 + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A - copyvar SPECIALVAR_4, SPECIALVAR_8 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_9 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_9 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index fa19f9d76..557b6497e 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 end @ 8154109 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 31e01f8ab..2ac3f35f9 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -156,25 +156,25 @@ PetalburgCity_EventScript_14B82D:: @ 814B82D PetalburgCity_EventScript_14B836:: @ 814B836 lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B842:: @ 814B842 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B84E:: @ 814B84E lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B85A:: @ 814B85A lockall - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto PetalburgCity_EventScript_14B866 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 2d95958a2..1bd1649cf 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -13,7 +13,7 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A checktrainerflag OPPONENT_RANDALL call_if 1, PetalburgCity_Gym_EventScript_154FBB @@ -32,7 +32,7 @@ PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A call PetalburgCity_Gym_EventScript_154FBB call PetalburgCity_Gym_EventScript_154FDC @@ -122,87 +122,87 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 end PetalburgCity_Gym_EventScript_15463D:: @ 815463D - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154648:: @ 8154648 - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154653:: @ 8154653 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_15465E:: @ 815465E - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse 8 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 playbgm 420, 0 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 @@ -403,7 +403,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE - setvar SPECIALVAR_8, 5 + setvar VAR_SPECIAL_8, 5 call PetalburgCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL call PetalburgCity_Gym_EventScript_1544ED @@ -594,8 +594,8 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 85 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -624,8 +624,8 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 98 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -637,8 +637,8 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall checktrainerflag OPPONENT_RANDALL goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 46 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -650,8 +650,8 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall checktrainerflag OPPONENT_RANDALL goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 59 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -663,8 +663,8 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall checktrainerflag OPPONENT_MARY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 59 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -676,8 +676,8 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall checktrainerflag OPPONENT_MARY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 72 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -689,8 +689,8 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall checktrainerflag OPPONENT_PARKER goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 20 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -702,8 +702,8 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall checktrainerflag OPPONENT_LORI goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 20 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -715,8 +715,8 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall checktrainerflag OPPONENT_LORI goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 33 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -728,8 +728,8 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall checktrainerflag OPPONENT_GEORGE goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 33 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -741,8 +741,8 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall checktrainerflag OPPONENT_JODY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 7 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -754,8 +754,8 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall checktrainerflag OPPONENT_BERKE goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 7 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -771,7 +771,7 @@ PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 end PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_154FBB special DrawWholeMapView release @@ -789,7 +789,7 @@ PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 end PetalburgCity_Gym_EventScript_154E56:: @ 8154E56 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_154FFD special DrawWholeMapView release @@ -807,7 +807,7 @@ PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E end PetalburgCity_Gym_EventScript_154E92:: @ 8154E92 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_15503F special DrawWholeMapView release @@ -825,7 +825,7 @@ PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA end PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_155081 special DrawWholeMapView release @@ -843,7 +843,7 @@ PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 end PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_154FDC special DrawWholeMapView release @@ -861,7 +861,7 @@ PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 end PetalburgCity_Gym_EventScript_154F46:: @ 8154F46 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_15501E special DrawWholeMapView release @@ -879,7 +879,7 @@ PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E end PetalburgCity_Gym_EventScript_154F82:: @ 8154F82 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_155060 special DrawWholeMapView release @@ -890,73 +890,73 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 end PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A - setvar SPECIALVAR_4, 1 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 1 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB - setvar SPECIALVAR_4, 2 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 2 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC - setvar SPECIALVAR_4, 3 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 3 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD - setvar SPECIALVAR_4, 4 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 4 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E - setvar SPECIALVAR_4, 5 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 5 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F - setvar SPECIALVAR_4, 6 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 6 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 - setvar SPECIALVAR_4, 7 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 7 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 - setvar SPECIALVAR_4, 8 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 8 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index cb79bdf86..8dda62ea1 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A end PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 4d3f03cd1..b97d92c7d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -153,7 +153,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 35e59cdff..f56081097 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -54,7 +54,7 @@ Route109_EventScript_14F548:: @ 814F548 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage - copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index e409a3cd6..2b4293ed4 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -309,17 +309,17 @@ Route110_EventScript_14FD09:: @ 814FD09 return Route110_EventScript_14FD13:: @ 814FD13 - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD1E:: @ 814FD1E - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD29:: @ 814FD29 - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto Route110_EventScript_14FD34 end @@ -337,11 +337,11 @@ Route110_EventScript_14FD34:: @ 814FD34 applymovement 28, Route110_Movement_1A0835 waitmovement 0 delay 30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF14 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF1F - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, Route110_EventScript_14FF2A checkplayergender compare RESULT, 0 @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closemessage - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF56 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF5E - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, Route110_EventScript_14FF66 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF35 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF40 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, Route110_EventScript_14FF4B removeobject 29 setvar VAR_ROUTE110_STATE, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 5dad15672..8a8dd2763 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -736,23 +736,23 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 end Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 - setvar SPECIALVAR_4, 6 - setvar SPECIALVAR_5, 3 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 6 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6 - setvar SPECIALVAR_4, 11 - setvar SPECIALVAR_5, 5 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 11 + setvar VAR_SPECIAL_5, 5 + setvar VAR_SPECIAL_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B - setvar SPECIALVAR_4, 9 - setvar SPECIALVAR_5, 2 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 9 + setvar VAR_SPECIAL_5, 2 + setvar VAR_SPECIAL_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 2463feb9c..aa136559b 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -140,25 +140,25 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto Route111_EventScript_15013A end @ 815012E lockall - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 goto Route111_EventScript_15013A end @@ -173,13 +173,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 call_if 1, Route111_EventScript_150188 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route111_EventScript_150193 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route111_EventScript_15019E - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route111_EventScript_1501A9 releaseall end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 32f8e41a3..8352db786 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -4,7 +4,7 @@ Route111_WinstrateFamilysHouse_MapScripts:: @ 815BF24 Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 lock faceplayer - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -12,7 +12,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 @@ -31,7 +31,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72 Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 lock faceplayer - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 msgbox Route111_WinstrateFamilysHouse_Text_192190, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -39,7 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 checkflag FLAG_TEMP_4 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 @@ -54,7 +54,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 closemessage - applymovement SPECIALVAR_8, Route111_WinstrateFamilysHouse_Movement_1A083D + applymovement VAR_SPECIAL_8, Route111_WinstrateFamilysHouse_Movement_1A083D waitmovement 0 release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index fcdd565bc..cba6c33e8 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -45,7 +45,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD applymovement 1, Route112_CableCarStation_Movement_15C0E6 applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 887f019f3..bc32449cd 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -51,7 +51,7 @@ Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 end Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE - setvar SPECIALVAR_9, 0 + setvar VAR_SPECIAL_9, 0 special ShowGlassWorkshopMenu waitstate switch RESULT @@ -67,9 +67,9 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar SPECIALVAR_8, 39 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 250 + setvar VAR_SPECIAL_8, 39 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -81,9 +81,9 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C - setvar SPECIALVAR_8, 40 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 500 + setvar VAR_SPECIAL_8, 40 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -95,9 +95,9 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 - setvar SPECIALVAR_8, 41 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 500 + setvar VAR_SPECIAL_8, 41 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -109,9 +109,9 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 - setvar SPECIALVAR_8, 43 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 1000 + setvar VAR_SPECIAL_8, 43 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -123,9 +123,9 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 - setvar SPECIALVAR_8, 42 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 1000 + setvar VAR_SPECIAL_8, 42 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -137,10 +137,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 end Route113_GlassWorkshop_EventScript_16378C:: @ 816378C - setvar SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 13 - bufferdecorationname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 6000 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 13 + bufferdecorationname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -152,10 +152,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C end Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD - setvar SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 6 - bufferdecorationname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 8000 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 6 + bufferdecorationname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -172,15 +172,15 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E end Route113_GlassWorkshop_EventScript_163818:: @ 8163818 - setvar SPECIALVAR_A, 250 - subvar SPECIALVAR_A, 16456 + setvar VAR_SPECIAL_A, 250 + subvar VAR_SPECIAL_A, 16456 buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 - subvar SPECIALVAR_A, 16456 + subvar VAR_SPECIAL_A, 16456 buffernumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage @@ -201,22 +201,22 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare SPECIALVAR_9, 0 + compare VAR_SPECIAL_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare SPECIALVAR_9, 1 + compare VAR_SPECIAL_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem_std SPECIALVAR_8 + giveitem_std VAR_SPECIAL_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration_std SPECIALVAR_8 + givedecoration_std VAR_SPECIAL_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -245,59 +245,59 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 end Route113_GlassWorkshop_EventScript_163925:: @ 8163925 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 39 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 39 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 40 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 40 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 41 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 41 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 43 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 43 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 42 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 42 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 - setvar SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 13 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 13 bufferdecorationname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D - setvar SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 6 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 6 bufferdecorationname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare SPECIALVAR_9, 0 + compare VAR_SPECIAL_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare SPECIALVAR_9, 1 + compare VAR_SPECIAL_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 051b30d54..b34c22a50 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -50,7 +50,7 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_151069 @@ -60,7 +60,7 @@ Route118_EventScript_150FAE:: @ 8150FAE Route118_EventScript_150FCE:: @ 8150FCE lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 applymovement 255, Route118_Movement_1A0841 waitmovement 0 goto Route118_EventScript_151004 @@ -68,7 +68,7 @@ Route118_EventScript_150FCE:: @ 8150FCE Route118_EventScript_150FE4:: @ 8150FE4 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_15106B @@ -83,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 delay 30 msgbox Route118_Text_170D66, 4 closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, Route118_EventScript_151048 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route118_EventScript_151053 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route118_EventScript_15105E setvar VAR_ROUTE118_STATE, 1 removeobject 19 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 85938be18..95edf346c 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare SPECIALVAR_4, 6 + compare VAR_SPECIAL_4, 6 call_if 1, Route119_EventScript_151193 - compare SPECIALVAR_4, 7 + compare VAR_SPECIAL_4, 7 call_if 1, Route119_EventScript_151197 return diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index da0a65af1..9e5ff95be 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 call_if 1, Route120_EventScript_15166B - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route120_EventScript_151672 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route120_EventScript_151676 - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route120_EventScript_15167A - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 call_if 1, Route120_EventScript_15167E - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 call_if 1, Route120_EventScript_151682 return @@ -135,32 +135,32 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar SPECIALVAR_4, ITEM_FIGY_BERRY + setvar VAR_SPECIAL_4, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar SPECIALVAR_4, ITEM_WIKI_BERRY + setvar VAR_SPECIAL_4, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar SPECIALVAR_4, ITEM_MAGO_BERRY + setvar VAR_SPECIAL_4, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar SPECIALVAR_4, ITEM_AGUAV_BERRY + setvar VAR_SPECIAL_4, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar SPECIALVAR_4, ITEM_IAPAPA_BERRY + setvar VAR_SPECIAL_4, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem_std SPECIALVAR_4 + giveitem_std VAR_SPECIAL_4 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 @@ -226,7 +226,7 @@ Route120_EventScript_15189D:: @ 815189D delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 0dbf1d345..26edb6fbb 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -43,7 +43,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 6d0bcc2c6..4061dcd7e 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -224,43 +224,43 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 - setvar SPECIALVAR_8, 48 - setvar SPECIALVAR_9, 95 + setvar VAR_SPECIAL_8, 48 + setvar VAR_SPECIAL_9, 95 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar SPECIALVAR_8, 50 - setvar SPECIALVAR_9, 96 + setvar VAR_SPECIAL_8, 50 + setvar VAR_SPECIAL_9, 96 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar SPECIALVAR_8, 49 - setvar SPECIALVAR_9, 97 + setvar VAR_SPECIAL_8, 49 + setvar VAR_SPECIAL_9, 97 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar SPECIALVAR_8, 51 - setvar SPECIALVAR_9, 98 + setvar VAR_SPECIAL_8, 51 + setvar VAR_SPECIAL_9, 98 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitemname 0, SPECIALVAR_8 - bufferitemname 1, SPECIALVAR_9 + bufferitemname 0, VAR_SPECIAL_8 + bufferitemname 1, VAR_SPECIAL_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F - checkitemspace SPECIALVAR_9, 1 + checkitemspace VAR_SPECIAL_9, 1 compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 - checkitem SPECIALVAR_8, 2 + checkitem VAR_SPECIAL_8, 2 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - takeitem SPECIALVAR_8, 1 - giveitem_std SPECIALVAR_9 + takeitem VAR_SPECIAL_8, 1 + giveitem_std VAR_SPECIAL_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare VAR_TEMP_1, 0 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index e4cef9fa4..47d216d9f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -126,7 +126,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto RustboroCity_EventScript_14C4F4 end @@ -134,7 +134,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto RustboroCity_EventScript_14C4F4 end @@ -142,7 +142,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto RustboroCity_EventScript_14C4F4 end @@ -150,7 +150,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 goto RustboroCity_EventScript_14C4F4 end @@ -158,7 +158,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 goto RustboroCity_EventScript_14C4F4 end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 2e18bc55e..c997935cc 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -137,7 +137,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 @@ -157,7 +157,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index ef4d6fad1..1e2256b47 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -18,7 +18,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setflag FLAG_BADGE01_GET setvar VAR_RUSTBORO_STATE, 1 addvar VAR_PETALBURG_GYM_STATE, 1 - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 call RustboroCity_Gym_EventScript_1A01C0 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 8761d3898..cf91c31bd 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -6,25 +6,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D faceplayer checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED goto_if_eq RustboroCity_House1_EventScript_157D13 - setvar SPECIALVAR_8, 0 - copyvar SPECIALVAR_4, SPECIALVAR_8 + setvar VAR_SPECIAL_8, 0 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, sub_804D89C - copyvar SPECIALVAR_9, RESULT + copyvar VAR_SPECIAL_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate - copyvar SPECIALVAR_A, SPECIALVAR_4 - compare SPECIALVAR_4, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A specialvar RESULT, sub_804DB2C - copyvar SPECIALVAR_B, RESULT - compare RESULT, SPECIALVAR_9 + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, RustboroCity_House1_EventScript_157D05 - copyvar SPECIALVAR_4, SPECIALVAR_8 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special sub_804DB68 special sub_804E174 waitstate @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_9 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index c9a2a48a4..653cceb25 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F end RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index fb332fbff..574c7412e 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -14,10 +14,10 @@ SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA lockall - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 3 - setvar SPECIALVAR_6, 4 - setvar SPECIALVAR_7, 5 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 4 + setvar VAR_SPECIAL_7, 5 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 applymovement 255, SeafloorCavern_Room9_Movement_15DD68 @@ -28,24 +28,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif closemessage - addobject SPECIALVAR_4 + addobject VAR_SPECIAL_4 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD36 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD36 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41D5, 4 .else msgbox SeafloorCavern_Room9_Text_1B486C, 4 .endif - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4201, 4 .else msgbox SeafloorCavern_Room9_Text_1B4897, 4 .endif - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0839 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0839 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4289, 4 @@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA playfanfare 388 playse 107 special sub_80818A4 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 delay 150 @@ -104,23 +104,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA waitmovement 0 special sub_80818FC waitstate - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 special sub_810F758 waitstate applymovement 1, SeafloorCavern_Room9_Movement_15DD57 waitmovement 0 removeobject 1 delay 4 - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 2 special sub_810F758 waitstate delay 30 - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 3 - setvar SPECIALVAR_6, 4 - setvar SPECIALVAR_7, 5 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 4 + setvar VAR_SPECIAL_7, 5 .ifdef SAPPHIRE msgbox UnknownString_81B43F2, 4 .else @@ -135,7 +135,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 .endif closemessage - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD41 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD41 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B447A, 4 @@ -145,7 +145,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA closemessage playse 3 delay 20 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0845 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B45C6, 4 @@ -153,14 +153,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif closemessage - addobject SPECIALVAR_5 - addobject SPECIALVAR_6 - addobject SPECIALVAR_7 - applymovement SPECIALVAR_7, SeafloorCavern_Room9_Movement_15DD63 - applymovement SPECIALVAR_6, SeafloorCavern_Room9_Movement_15DD63 - applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD5A + addobject VAR_SPECIAL_5 + addobject VAR_SPECIAL_6 + addobject VAR_SPECIAL_7 + applymovement VAR_SPECIAL_7, SeafloorCavern_Room9_Movement_15DD63 + applymovement VAR_SPECIAL_6, SeafloorCavern_Room9_Movement_15DD63 + applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD5A waitmovement 0 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A083F + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B464D, 4 @@ -168,9 +168,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif playse 21 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0833 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0835 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4723, 4 @@ -183,8 +183,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif closemessage - applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD60 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD46 + applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD60 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD46 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4818, 4 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index c481a0461..72528a929 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -7,7 +7,7 @@ SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417 end SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D - setvar SPECIALVAR_B, 7 + setvar VAR_SPECIAL_B, 7 setvar CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 call SlateportCity_ContestLobby_EventScript_155448 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index b8547fda9..72f2d0382 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -24,25 +24,25 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 applymovement 255, SlateportCity_Harbor_Movement_1560C2 waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 @@ -63,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 7 removeobject 8 setvar VAR_SLATEPORT_HARBOR_STATE, 2 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage @@ -229,7 +229,7 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 call SlateportCity_Harbor_EventScript_1A040E return diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 80522f4c1..e760beab5 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special sub_80F9A0C waitstate - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index c261f3e83..007e42f90 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -78,7 +78,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 - setvar SPECIALVAR_4, 269 + setvar VAR_SPECIAL_4, 269 call SlateportCity_OceanicMuseum_2F_EventScript_1A067F msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index f9b7c7fb3..37b2b95ab 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 end SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index b7f0f996b..9f2d6c35b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -102,7 +102,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET - setvar SPECIALVAR_8, 8 + setvar VAR_SPECIAL_8, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 end diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index a9810ed16..6a72ec1da 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -8,7 +8,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 msgbox SootopolisCity_House8_Text_1900F7, 4 special sub_80F9A0C waitstate - copyvar RESULT, SPECIALVAR_4 + copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize @@ -57,7 +57,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 msgbox SootopolisCity_House8_Text_190431, 4 special sub_80F9A0C waitstate - copyvar RESULT, SPECIALVAR_4 + copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 1bbd30364..9eb5b4a57 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 end @ 815B19A - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 7624b3da3..ab2a73460 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -18,7 +18,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 call SouthernIsland_Exterior_EventScript_1A047C warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 63fd57a20..cbc451a18 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -39,7 +39,7 @@ SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B lockall - setvar SPECIALVAR_8, 12 + setvar VAR_SPECIAL_8, 12 goto SouthernIsland_Interior_EventScript_160BA7 end diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 54a614576..8d3e8e723 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -3,10 +3,10 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 .byte 0 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 - getplayerxy SPECIALVAR_4, SPECIALVAR_5 - compare SPECIALVAR_4, 12 + getplayerxy VAR_SPECIAL_4, VAR_SPECIAL_5 + compare VAR_SPECIAL_4, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare SPECIALVAR_5, 44 + compare VAR_SPECIAL_5, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 83298dba6..568d9b207 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -7,7 +7,7 @@ VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70 end VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 - setvar SPECIALVAR_B, 5 + setvar VAR_SPECIAL_B, 5 setvar CONTEST_RANK, 0 call VerdanturfTown_ContestLobby_EventScript_1A4E92 call VerdanturfTown_ContestLobby_EventScript_153DA1 diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index 2323c139a..956a28ac5 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 690e7c94e..58dacb2f3 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -26,7 +26,7 @@ SpeakToBard: end yes_hear_song: - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 @ Give the player ear rape special ScrSpecial_PlayBardSong delay 60 @@ -52,14 +52,14 @@ prompt_write_lyrics: end write_lyrics: - setvar SPECIALVAR_4, 6 + setvar VAR_SPECIAL_4, 6 call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer compare RESULT, NO goto_if_eq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 @ Give the player ear rape again special ScrSpecial_PlayBardSong delay 60 @@ -139,9 +139,9 @@ already_traded: do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq cancelled_get_menu - compare SPECIALVAR_4, 65535 + compare VAR_SPECIAL_4, 65535 goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO compare RESULT, NO @@ -176,9 +176,9 @@ do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration waitstate - compare SPECIALVAR_6, 0 + compare VAR_SPECIAL_6, 0 goto_if_eq cancelled_give_menu - compare SPECIALVAR_6, 65535 + compare VAR_SPECIAL_6, 65535 goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull compare RESULT, 1 @@ -211,10 +211,10 @@ decorations_full: .include "data/text/storyteller.inc" SpeakToStoryteller: - setvar SPECIALVAR_8, 0 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_A, 0 - setvar SPECIALVAR_B, 0 + setvar VAR_SPECIAL_8, 0 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_A, 0 + setvar VAR_SPECIAL_B, 0 lock faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO @@ -230,7 +230,7 @@ choose_story: waitstate compare RESULT, FALSE goto_if_eq cancel_story_menu - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 special ScrSpecial_StorytellerDisplayStory waitmessage waitbuttonpress @@ -239,7 +239,7 @@ choose_story: goto_if_eq no_stat_update goto stat_update cancel_story_menu: - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq dont_hear_story goto yes_hear_story no_stat_update: diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 74f8987d2..b02ab4faa 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -25,11 +25,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B6C:: @ 81B1B6C PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, 4 closemessage - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 @@ -43,7 +43,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1 end PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_80EB7C4 waitmessage delay 80 @@ -79,11 +79,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C28:: @ 81B1C28 PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, 4 closemessage - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3 lock faceplayer - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 504454dcf..d93ff7660 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -6,17 +6,17 @@ LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950 LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956 LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 - applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 - compare SPECIALVAR_5, 0 + compare VAR_SPECIAL_5, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5 - applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 waitmovement 0 releaseall end @@ -39,7 +39,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 msgbox LittlerootTown_BrendansHouse_1F_Text_172531, 4 closemessage - applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 + applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0841 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC waitmovement 0 releaseall @@ -47,13 +47,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_BrendansHouse_2F_EventScript_1B69D3:: @ 81B69D3 lockall - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto LittlerootTown_BrendansHouse_2F_EventScript_1B69EB end LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF lockall - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto LittlerootTown_MaysHouse_2F_EventScript_1B69EB end @@ -74,33 +74,33 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse 9 - removeobject SPECIALVAR_8 + removeobject VAR_SPECIAL_8 releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31 - setvar SPECIALVAR_8, 14 - addobject SPECIALVAR_8 - applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 + setvar VAR_SPECIAL_8, 14 + addobject VAR_SPECIAL_8 + applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2 waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 closemessage - applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 + applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9 waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 - setvar SPECIALVAR_8, 14 - addobject SPECIALVAR_8 - applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD + setvar VAR_SPECIAL_8, 14 + addobject VAR_SPECIAL_8 + applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4 closemessage - applymovement SPECIALVAR_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 + applymovement VAR_SPECIAL_8, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4 waitmovement 0 return @@ -155,7 +155,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 end LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF - applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1A0843 + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0843 waitmovement 0 call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC @@ -163,7 +163,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF playbgm 453, 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4 closemessage - applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB waitmovement 0 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2 waitmovement 0 @@ -174,13 +174,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4 closemessage setvar VAR_TEMP_1, 1 - applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1 waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8 end LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E - applymovement SPECIALVAR_5, LittlerootTown_MaysHouse_1F_Movement_1A083F + applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1A083F waitmovement 0 call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 @@ -188,7 +188,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E playbgm 453, 0 msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4 closemessage - applymovement SPECIALVAR_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE + applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE waitmovement 0 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA waitmovement 0 @@ -199,7 +199,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4 closemessage setvar VAR_TEMP_1, 1 - applymovement SPECIALVAR_5, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 + applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BE5 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B6AB8 end @@ -207,9 +207,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D playse 21 - applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 - applymovement SPECIALVAR_5, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, 4 closemessage @@ -366,38 +366,38 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 playse 21 - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0835 waitmovement 0 delay 20 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse 8 - removeobject SPECIALVAR_9 + removeobject VAR_SPECIAL_9 setflag FLAG_RECEIVED_SS_TICKET setvar VAR_LITTLEROOT_HOUSES_STATE, 4 setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 @@ -405,46 +405,46 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE end LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD:: @ 81B6DAD - setvar SPECIALVAR_8, 0 - setvar SPECIALVAR_9, 5 - setvar SPECIALVAR_A, 1 + setvar VAR_SPECIAL_8, 0 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 1 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD:: @ 81B6DBD - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 5 - setvar SPECIALVAR_A, 1 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 1 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD:: @ 81B6DCD - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E33 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8:: @ 81B6DD8 - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E36 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3:: @ 81B6DE3 - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E39 waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE:: @ 81B6DEE - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3B + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3B waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9:: @ 81B6DF9 applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D waitmovement 0 return LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B:: @ 81B6E0B applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F - applymovement SPECIALVAR_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 + applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1B6E43 waitmovement 0 return diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 12ee04d3c..4a659f469 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,34 +1,34 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 - setvar SPECIALVAR_8, 4 - setvar SPECIALVAR_9, 1 - applymovement SPECIALVAR_8, FallarborTown_ContestLobby_Movement_1B7821 + setvar VAR_SPECIAL_8, 4 + setvar VAR_SPECIAL_9, 1 + applymovement VAR_SPECIAL_8, FallarborTown_ContestLobby_Movement_1B7821 waitmovement 0 goto FallarborTown_ContestLobby_EventScript_1B7681 end SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E - setvar SPECIALVAR_8, 2 - setvar SPECIALVAR_9, 2 + setvar VAR_SPECIAL_8, 2 + setvar VAR_SPECIAL_9, 2 applymovement 6, SlateportCity_ContestLobby_Movement_1A083D - applymovement SPECIALVAR_8, SlateportCity_ContestLobby_Movement_1B7821 + applymovement VAR_SPECIAL_8, SlateportCity_ContestLobby_Movement_1B7821 waitmovement 0 goto SlateportCity_ContestLobby_EventScript_1B7681 end VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F - setvar SPECIALVAR_8, 2 - setvar SPECIALVAR_9, 1 - applymovement SPECIALVAR_8, VerdanturfTown_ContestLobby_Movement_1B7821 + setvar VAR_SPECIAL_8, 2 + setvar VAR_SPECIAL_9, 1 + applymovement VAR_SPECIAL_8, VerdanturfTown_ContestLobby_Movement_1B7821 waitmovement 0 goto VerdanturfTown_ContestLobby_EventScript_1B7681 end LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 - setvar SPECIALVAR_8, 3 - setvar SPECIALVAR_9, 3 + setvar VAR_SPECIAL_8, 3 + setvar VAR_SPECIAL_9, 3 applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D - applymovement SPECIALVAR_8, LilycoveCity_ContestLobby_Movement_1B7821 + applymovement VAR_SPECIAL_8, LilycoveCity_ContestLobby_Movement_1B7821 waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 end @@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 end FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 - copyvar SPECIALVAR_4, SPECIALVAR_9 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 fadescreen 1 special sub_804E538 waitstate @@ -122,22 +122,22 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 end FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 goto FallarborTown_ContestLobby_EventScript_1B77B6 end SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto SlateportCity_ContestLobby_EventScript_1B77B6 end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto VerdanturfTown_ContestLobby_EventScript_1B77B6 end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto LilycoveCity_ContestLobby_EventScript_1B77B6 end @@ -270,7 +270,7 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F end FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 fadescreen 1 removeobject 240 removeobject 239 @@ -322,15 +322,15 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 fadescreen 1 specialvar RESULT, GetLinkPartnerNames - copyvar SPECIALVAR_8, RESULT - copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar VAR_SPECIAL_8, RESULT + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 special SpawnBerryBlenderLinkPlayerSprites goto FallarborTown_ContestLobby_EventScript_1B799A end FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A fadescreen 0 - switch SPECIALVAR_8 + switch VAR_SPECIAL_8 case 2, FallarborTown_ContestLobby_EventScript_1B78F3 case 3, FallarborTown_ContestLobby_EventScript_1B7901 case 4, FallarborTown_ContestLobby_EventScript_1B790F diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 23ed463d9..4b55e505f 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -18,13 +18,13 @@ Event_TV:: @ 81A6E72 end EventScript_1A6EBB: - specialvar SPECIALVAR_4, special_0x44 - compare SPECIALVAR_4, 255 + specialvar VAR_SPECIAL_4, special_0x44 + compare VAR_SPECIAL_4, 255 goto_if_eq EventScript_1A6F3F specialvar RESULT, special_0x4a compare RESULT, 255 goto_if_eq EventScript_1A6F3F - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT specialvar RESULT, sub_80BDA0C compare RESULT, 0 goto_if 5, EventScript_1A6F21 -- cgit v1.2.3 From 6000e19e94c36b5d4b8c45b829b0506191282b44 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 25 Dec 2017 14:56:02 -0600 Subject: Add coord_weather_event macro, and define COORD_EVENT_WEATHER_* constants --- data/battle_ai_scripts.s | 36 ++++++++++++++++---------------- data/map_events.s | 1 + data/maps/events/JaggedPass.inc | 10 ++++----- data/maps/events/Route113.inc | 38 +++++++++++++++++----------------- data/maps/events/Route119.inc | 46 ++++++++++++++++++++--------------------- data/maps/events/Route120.inc | 38 +++++++++++++++++----------------- data/maps/events/Route123.inc | 44 +++++++++++++++++++-------------------- 7 files changed, 107 insertions(+), 106 deletions(-) (limited to 'data') diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 7c58160f6..270386359 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -439,7 +439,7 @@ AI_CBM_PerishSong: @ 81DA6BB AI_CBM_Sandstorm: @ 81DA6C6 get_weather - if_equal WEATHER_SANDSTORM, Score_Down8 + if_equal BATTLE_WEATHER_SANDSTORM, Score_Down8 end AI_CBM_Attract: @ 81DA6CE @@ -479,12 +479,12 @@ AI_CBM_BatonPass: @ 81DA729 AI_CBM_RainDance: @ 81DA732 get_weather - if_equal WEATHER_RAIN, Score_Down8 + if_equal BATTLE_WEATHER_RAIN, Score_Down8 end AI_CBM_SunnyDay: @ 81DA73A get_weather - if_equal WEATHER_SUN, Score_Down8 + if_equal BATTLE_WEATHER_SUN, Score_Down8 end AI_CBM_FutureSight: @ 81DA742 @@ -509,7 +509,7 @@ AI_CBM_SpitUpAndSwallow: @ 81DA75F AI_CBM_Hail: @ 81DA76E get_weather - if_equal WEATHER_HAIL, Score_Down8 + if_equal BATTLE_WEATHER_HAIL, Score_Down8 end AI_CBM_Torment: @ 81DA776 @@ -1361,9 +1361,9 @@ AI_CV_Conversion_End: @ 81DB190 AI_CV_HealWeather: @ 81DB191 get_weather - if_equal WEATHER_HAIL, AI_CV_HealWeather_ScoreDown2 - if_equal WEATHER_RAIN, AI_CV_HealWeather_ScoreDown2 - if_equal WEATHER_SANDSTORM, AI_CV_HealWeather_ScoreDown2 + if_equal BATTLE_WEATHER_HAIL, AI_CV_HealWeather_ScoreDown2 + if_equal BATTLE_WEATHER_RAIN, AI_CV_HealWeather_ScoreDown2 + if_equal BATTLE_WEATHER_SANDSTORM, AI_CV_HealWeather_ScoreDown2 jump AI_CV_Heal AI_CV_HealWeather_ScoreDown2: @ 81DB1A9 @@ -2107,9 +2107,9 @@ AI_CV_RainDance: @ 81DB8E9 AI_CV_RainDance2: @ 81DB8F7 if_hp_less_than USER, 40, AI_CV_RainDance_ScoreDown1 get_weather - if_equal WEATHER_HAIL, AI_CV_RainDance3 - if_equal WEATHER_SUN, AI_CV_RainDance3 - if_equal WEATHER_SANDSTORM, AI_CV_RainDance3 + if_equal BATTLE_WEATHER_HAIL, AI_CV_RainDance3 + if_equal BATTLE_WEATHER_SUN, AI_CV_RainDance3 + if_equal BATTLE_WEATHER_SANDSTORM, AI_CV_RainDance3 get_ability USER if_equal ABILITY_RAIN_DISH, AI_CV_RainDance3 jump AI_CV_RainDance_End @@ -2127,9 +2127,9 @@ AI_CV_RainDance_End: @ 81DB927 AI_CV_SunnyDay: @ 81DB928 if_hp_less_than USER, 40, AI_CV_SunnyDay_ScoreDown1 get_weather - if_equal WEATHER_HAIL, AI_CV_SunnyDay2 - if_equal WEATHER_RAIN, AI_CV_SunnyDay2 - if_equal WEATHER_SANDSTORM, AI_CV_SunnyDay2 + if_equal BATTLE_WEATHER_HAIL, AI_CV_SunnyDay2 + if_equal BATTLE_WEATHER_RAIN, AI_CV_SunnyDay2 + if_equal BATTLE_WEATHER_SANDSTORM, AI_CV_SunnyDay2 jump AI_CV_SunnyDay_End AI_CV_SunnyDay2: @ 81DB947 @@ -2264,8 +2264,8 @@ AI_CV_Fly2: @ 81DBA9F if_status2 TARGET, S_CURSED, AI_CV_Fly6 if_status3 TARGET, S_LEECH_SEED, AI_CV_Fly6 get_weather - if_equal WEATHER_HAIL, AI_CV_Fly3 - if_equal WEATHER_SANDSTORM, AI_CV_Fly4 + if_equal BATTLE_WEATHER_HAIL, AI_CV_Fly3 + if_equal BATTLE_WEATHER_SANDSTORM, AI_CV_Fly4 jump AI_CV_Fly5 AI_CV_Fly3: @ 81DBACF @@ -2317,9 +2317,9 @@ AI_CV_SpitUp_End: @ 81DBB2E AI_CV_Hail: @ 81DBB2F if_hp_less_than USER, 40, AI_CV_Hail_ScoreDown1 get_weather - if_equal WEATHER_SUN, AI_CV_Hail2 - if_equal WEATHER_RAIN, AI_CV_Hail2 - if_equal WEATHER_SANDSTORM, AI_CV_Hail2 + if_equal BATTLE_WEATHER_SUN, AI_CV_Hail2 + if_equal BATTLE_WEATHER_RAIN, AI_CV_Hail2 + if_equal BATTLE_WEATHER_SANDSTORM, AI_CV_Hail2 jump AI_CV_Hail_End AI_CV_Hail2: @ 81DBB4E diff --git a/data/map_events.s b/data/map_events.s index 0a2a25fb0..6bfcc0292 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -3,6 +3,7 @@ #include "constants/map_objects.h" #include "constants/maps.h" #include "constants/vars.h" +#include "constants/weather.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index 654cbb9ae..a41d8ac7d 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -11,11 +11,11 @@ JaggedPass_MapWarps:: @ 838C67C warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY JaggedPass_MapCoordEvents:: @ 838C69C - coord_event 13, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 21, 12, 3, 0, 8, 0, 0, 0x0 - coord_event 14, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 18, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 22, 19, 3, 0, 2, 0, 0, 0x0 + coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 18, 17, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 22, 19, 3, COORD_EVENT_WEATHER_SUNNY JaggedPass_MapBGEvents:: @ 838C6EC bg_event 8, 10, 3, 7, 0, ITEM_FULL_HEAL, 77, 0 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index dec48e2e1..7a39850fd 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -15,25 +15,25 @@ Route113_MapWarps:: @ 8382AA8 warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP Route113_MapCoordEvents:: @ 8382AB0 - coord_event 19, 11, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 10, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 12, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 13, 3, 0, 8, 0, 0, 0x0 - coord_event 87, 9, 3, 0, 8, 0, 0, 0x0 - coord_event 86, 10, 3, 0, 8, 0, 0, 0x0 - coord_event 86, 11, 3, 0, 8, 0, 0, 0x0 - coord_event 14, 10, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 11, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 12, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 13, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 8, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 9, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 10, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 11, 0, 0, 2, 0, 0, 0x0 - coord_event 19, 14, 3, 0, 8, 0, 0, 0x0 - coord_event 88, 8, 3, 0, 8, 0, 0, 0x0 - coord_event 88, 6, 3, 0, 8, 0, 0, 0x0 - coord_event 88, 7, 3, 0, 8, 0, 0, 0x0 + coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 87, 9, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 86, 10, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 86, 11, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 14, 10, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 14, 11, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 14, 12, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 14, 13, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 8, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 9, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 11, 0, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 88, 8, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 88, 6, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 88, 7, 3, COORD_EVENT_WEATHER_ASH Route113_MapBGEvents:: @ 8382BE0 bg_event 85, 6, 0, 0, 0, Route113_EventScript_150617 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index ae3cdce20..889f1b000 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -44,29 +44,29 @@ Route119_MapWarps:: @ 8383C8C Route119_MapCoordEvents:: @ 8383C9C coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5 coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0 - coord_event 28, 13, 0, 0, 20, 0, 0, 0x0 - coord_event 29, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 30, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 31, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 32, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 33, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 15, 133, 3, 0, 20, 0, 0, 0x0 - coord_event 16, 132, 3, 0, 20, 0, 0, 0x0 - coord_event 17, 131, 3, 0, 20, 0, 0, 0x0 - coord_event 18, 130, 3, 0, 20, 0, 0, 0x0 - coord_event 19, 131, 3, 0, 20, 0, 0, 0x0 - coord_event 20, 132, 3, 0, 20, 0, 0, 0x0 - coord_event 21, 133, 3, 0, 20, 0, 0, 0x0 - coord_event 36, 6, 3, 0, 2, 0, 0, 0x0 - coord_event 36, 7, 3, 0, 2, 0, 0, 0x0 - coord_event 35, 8, 3, 0, 2, 0, 0, 0x0 - coord_event 35, 9, 3, 0, 2, 0, 0, 0x0 - coord_event 34, 10, 3, 0, 2, 0, 0, 0x0 - coord_event 16, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 17, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 18, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 19, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 20, 137, 3, 0, 2, 0, 0, 0x0 + coord_weather_event 28, 13, 0, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 31, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 32, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 33, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 15, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 16, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 17, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 18, 130, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 19, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 20, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 21, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 36, 6, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 36, 7, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 35, 8, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 35, 9, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 34, 10, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 16, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 17, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 18, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 19, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY Route119_MapBGEvents:: @ 8383E2C bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 4ddfe4978..65fa580b3 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -46,25 +46,25 @@ Route120_MapWarps:: @ 8384308 warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB Route120_MapCoordEvents:: @ 8384318 - coord_event 7, 15, 0, 0, 3, 0, 0, 0x0 - coord_event 7, 16, 0, 0, 3, 0, 0, 0x0 - coord_event 22, 61, 3, 0, 3, 0, 0, 0x0 - coord_event 12, 64, 3, 0, 3, 0, 0, 0x0 - coord_event 35, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 36, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 37, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 38, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 32, 88, 5, 0, 1, 0, 0, 0x0 - coord_event 28, 15, 0, 0, 2, 0, 0, 0x0 - coord_event 28, 16, 0, 0, 2, 0, 0, 0x0 - coord_event 28, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 32, 89, 5, 0, 1, 0, 0, 0x0 - coord_event 32, 90, 5, 0, 1, 0, 0, 0x0 - coord_event 32, 91, 5, 0, 1, 0, 0, 0x0 - coord_event 10, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 11, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 12, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 13, 75, 3, 0, 1, 0, 0, 0x0 + coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 12, 64, 3, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 35, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 36, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 37, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 38, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 32, 88, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 28, 15, 0, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 28, 16, 0, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 28, 17, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 32, 89, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 32, 90, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 32, 91, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 10, 75, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 11, 75, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS Route120_MapBGEvents:: @ 8384448 bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index ff4f066b8..a861aa4fc 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -38,28 +38,28 @@ Route123_MapWarps:: @ 8384B28 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE Route123_MapCoordEvents:: @ 8384B30 - coord_event 90, 16, 3, 0, 21, 0, 0, 0x0 - coord_event 92, 9, 3, 0, 21, 0, 0, 0x0 - coord_event 93, 12, 3, 0, 21, 0, 0, 0x0 - coord_event 92, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 91, 14, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 12, 3, 0, 21, 0, 0, 0x0 - coord_event 34, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 14, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 15, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 16, 3, 0, 21, 0, 0, 0x0 - coord_event 108, 14, 3, 0, 2, 0, 0, 0x0 - coord_event 109, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 110, 16, 3, 0, 2, 0, 0, 0x0 - coord_event 111, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 112, 18, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 12, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 13, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 14, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 16, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 10, 3, 0, 21, 0, 0, 0x0 + coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 92, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 91, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 15, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 108, 14, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 109, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 110, 16, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 111, 17, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 112, 18, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 12, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 13, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 14, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE Route123_MapBGEvents:: @ 8384C90 bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF -- cgit v1.2.3 From 80cddf0cd4946d85e5e23ec90c530ca2ea54732d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 26 Dec 2017 14:03:01 -0600 Subject: Add bg_hidden_item_event macro, and define hidden item flags --- data/maps/events/AbandonedShip_HiddenFloorRooms.inc | 8 ++++---- data/maps/events/FallarborTown.inc | 2 +- data/maps/events/GraniteCave_B2F.inc | 4 ++-- data/maps/events/JaggedPass.inc | 4 ++-- data/maps/events/LavaridgeTown.inc | 2 +- data/maps/events/LilycoveCity.inc | 6 +++--- data/maps/events/MtPyre_Exterior.inc | 4 ++-- data/maps/events/MtPyre_Summit.inc | 4 ++-- data/maps/events/PetalburgCity.inc | 2 +- data/maps/events/PetalburgWoods.inc | 8 ++++---- data/maps/events/Route104.inc | 10 +++++----- data/maps/events/Route105.inc | 2 +- data/maps/events/Route106.inc | 6 +++--- data/maps/events/Route108.inc | 2 +- data/maps/events/Route109.inc | 12 ++++++------ data/maps/events/Route110.inc | 8 ++++---- data/maps/events/Route110_TrickHouseEnd.inc | 2 +- data/maps/events/Route111.inc | 6 +++--- data/maps/events/Route113.inc | 4 ++-- data/maps/events/Route114.inc | 4 ++-- data/maps/events/Route115.inc | 2 +- data/maps/events/Route116.inc | 4 ++-- data/maps/events/Route117.inc | 2 +- data/maps/events/Route118.inc | 4 ++-- data/maps/events/Route119.inc | 8 ++++---- data/maps/events/Route120.inc | 8 ++++---- data/maps/events/Route121.inc | 6 +++--- data/maps/events/Route123.inc | 6 +++--- data/maps/events/Route128.inc | 6 +++--- data/maps/events/SSTidalLowerDeck.inc | 2 +- data/maps/events/Underwater1.inc | 14 +++++++------- data/maps/events/Underwater2.inc | 16 ++++++++-------- data/maps/events/Underwater3.inc | 8 ++++---- data/maps/events/Underwater4.inc | 4 ++-- data/maps/events/VictoryRoad_1F.inc | 2 +- data/maps/events/VictoryRoad_B2F.inc | 4 ++-- data/scripts/maps/Route116.inc | 4 ++-- data/specials.inc | 2 +- 38 files changed, 101 insertions(+), 101 deletions(-) (limited to 'data') diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index 2e6bb9a3f..998e4eeac 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -16,10 +16,10 @@ AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8 - bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0 - bg_event 20, 5, 3, 7, 0, ITEM_ROOM_2_KEY, 32, 0 - bg_event 1, 12, 3, 7, 0, ITEM_ROOM_4_KEY, 33, 0 - bg_event 1, 2, 0, 7, 0, ITEM_ROOM_6_KEY, 34, 0 + bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_1F + bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_20 + bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_21 + bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_22 bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index 755f205bc..025843194 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -19,7 +19,7 @@ FallarborTown_MapBGEvents:: @ 8380E8C bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_14E842 bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_14E84B - bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0 + bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C FallarborTown_MapEvents:: @ 8380EEC map_events FallarborTown_MapObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index c8a7c5554..e251b3bef 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -17,8 +17,8 @@ GraniteCave_B2F_MapWarps:: @ 838C0C4 warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F GraniteCave_B2F_MapBGEvents:: @ 838C0EC - bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0 - bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0 + bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_30 + bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_31 GraniteCave_B2F_MapEvents:: @ 838C104 map_events GraniteCave_B2F_MapObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index a41d8ac7d..e1103c816 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -18,8 +18,8 @@ JaggedPass_MapCoordEvents:: @ 838C69C coord_weather_event 22, 19, 3, COORD_EVENT_WEATHER_SUNNY JaggedPass_MapBGEvents:: @ 838C6EC - bg_event 8, 10, 3, 7, 0, ITEM_FULL_HEAL, 77, 0 - bg_event 7, 29, 3, 7, 0, ITEM_GREAT_BALL, 76, 0 + bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_4D + bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_4C JaggedPass_MapEvents:: @ 838C704 map_events JaggedPass_MapObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index c064f7823..27acd168f 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -28,7 +28,7 @@ LavaridgeTown_MapBGEvents:: @ 8380D90 bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA - bg_event 4, 5, 3, 7, 0, ITEM_ICE_HEAL, 0, 0 + bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_0 LavaridgeTown_MapEvents:: @ 8380DF0 map_events LavaridgeTown_MapObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index 0822ded72..4f6acdcb2 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -45,9 +45,9 @@ LilycoveCity_MapBGEvents:: @ 838037C bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_14CCAC bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_14CCCA bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_14CCDC - bg_event 36, 31, 3, 7, 0, ITEM_HEART_SCALE, 27, 0 - bg_event 61, 7, 0, 7, 0, ITEM_PP_UP, 43, 0 - bg_event 64, 31, 0, 7, 0, ITEM_POKE_BALL, 75, 0 + bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_1B + bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_2B + bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_4B LilycoveCity_MapEvents:: @ 8380418 map_events LilycoveCity_MapObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index 71cb2095a..77668758d 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -15,8 +15,8 @@ MtPyre_Exterior_MapCoordEvents:: @ 838CB5C coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 MtPyre_Exterior_MapBGEvents:: @ 838CBAC - bg_event 9, 8, 0, 7, 0, ITEM_ULTRA_BALL, 29, 0 - bg_event 16, 22, 0, 7, 0, ITEM_MAX_ETHER, 78, 0 + bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_1D + bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_4E MtPyre_Exterior_MapEvents:: @ 838CBC4 map_events MtPyre_Exterior_MapObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 3aaf21244..64399add8 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -20,8 +20,8 @@ MtPyre_Summit_MapCoordEvents:: @ 838CC80 coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6 MtPyre_Summit_MapBGEvents:: @ 838CCE0 - bg_event 9, 25, 0, 7, 0, ITEM_ZINC, 79, 0 - bg_event 37, 7, 3, 7, 0, ITEM_RARE_CANDY, 80, 0 + bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_4F + bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_50 MtPyre_Summit_MapEvents:: @ 838CCF8 map_events MtPyre_Summit_MapObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 4b169abac..3b22cca9b 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -31,7 +31,7 @@ PetalburgCity_MapBGEvents:: @ 837F738 bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_14B82D - bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0 + bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_5F PetalburgCity_MapEvents:: @ 837F798 map_events PetalburgCity_MapObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 4094fc103..91e59d6c5 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -27,10 +27,10 @@ PetalburgWoods_MapCoordEvents:: @ 838C2B4 PetalburgWoods_MapBGEvents:: @ 838C2D4 bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15 - bg_event 39, 35, 3, 7, 0, ITEM_POTION, 58, 0 - bg_event 26, 6, 3, 7, 0, ITEM_TINY_MUSHROOM, 59, 0 - bg_event 40, 29, 3, 7, 0, ITEM_TINY_MUSHROOM, 60, 0 - bg_event 4, 19, 3, 7, 0, ITEM_POKE_BALL, 61, 0 + bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_3A + bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3B + bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3C + bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3D bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E PetalburgWoods_MapEvents:: @ 838C31C diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index f7034ff26..dfbd27da2 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -48,11 +48,11 @@ Route104_MapBGEvents:: @ 83817C8 bg_event 23, 5, 0, 0, 0, Route104_EventScript_14EF66 bg_event 7, 20, 0, 0, 0, Route104_EventScript_14EF6F bg_event 17, 23, 3, 0, 0, Route104_EventScript_14EF78 - bg_event 7, 6, 3, 7, 0, ITEM_SUPER_POTION, 44, 0 - bg_event 3, 9, 3, 7, 0, ITEM_POKE_BALL, 62, 0 - bg_event 14, 55, 3, 7, 0, ITEM_POTION, 37, 0 - bg_event 16, 72, 3, 7, 0, ITEM_ANTIDOTE, 85, 0 - bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0 + bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2C + bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3E + bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_25 + bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_55 + bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_58 Route104_MapEvents:: @ 8381840 map_events Route104_MapObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index 45c0866e3..5707106bd 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -10,7 +10,7 @@ Route105_MapWarps:: @ 83818E4 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE Route105_MapBGEvents:: @ 83818EC - bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0 + bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_59 Route105_MapEvents:: @ 83818F8 map_events Route105_MapObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc index 991e12f74..7c326ceea 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -9,9 +9,9 @@ Route106_MapWarps:: @ 8381984 warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F Route106_MapBGEvents:: @ 838198C - bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0 - bg_event 53, 12, 0, 7, 0, ITEM_STARDUST, 46, 0 - bg_event 68, 15, 3, 7, 0, ITEM_HEART_SCALE, 47, 0 + bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3F + bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2E + bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_2F bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F Route106_MapEvents:: @ 83819BC diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc index ad695e8b9..7b6471080 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -8,7 +8,7 @@ Route108_MapWarps:: @ 8381AD4 warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK Route108_MapBGEvents:: @ 8381ADC - bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 + bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_56 Route108_MapEvents:: @ 8381AE8 map_events Route108_MapObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index 5924bc0d2..95a635a6e 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -26,12 +26,12 @@ Route109_MapWarps:: @ 8381CDC Route109_MapBGEvents:: @ 8381CE4 bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B bg_event 29, 10, 3, 0, 0, Route109_EventScript_14F7A4 - bg_event 16, 23, 3, 7, 0, ITEM_REVIVE, 50, 0 - bg_event 33, 5, 3, 7, 0, ITEM_HEART_SCALE, 52, 0 - bg_event 9, 10, 3, 7, 0, ITEM_GREAT_BALL, 51, 0 - bg_event 28, 20, 3, 7, 0, ITEM_ETHER, 64, 0 - bg_event 13, 16, 3, 7, 0, ITEM_HEART_SCALE, 90, 0 - bg_event 8, 42, 3, 7, 0, ITEM_HEART_SCALE, 91, 0 + bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_32 + bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_34 + bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_33 + bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_40 + bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5A + bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5B Route109_MapEvents:: @ 8381D44 map_events Route109_MapObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 278fee52b..0a3569f6c 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -59,10 +59,10 @@ Route110_MapBGEvents:: @ 83820C0 bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25 bg_event 32, 93, 0, 0, 0, Route110_EventScript_14FA2E - bg_event 26, 40, 3, 7, 0, ITEM_REVIVE, 54, 0 - bg_event 34, 42, 3, 7, 0, ITEM_GREAT_BALL, 53, 0 - bg_event 4, 35, 3, 7, 0, ITEM_POKE_BALL, 65, 0 - bg_event 37, 67, 3, 7, 0, ITEM_FULL_HEAL, 55, 0 + bg_hidden_item_event 26, 40, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_36 + bg_hidden_item_event 34, 42, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_35 + bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_41 + bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_37 bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6 Route110_MapEvents:: @ 838218C diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index e3b83d48f..ee4e5952e 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -9,7 +9,7 @@ Route110_TrickHouseEnd_MapCoordEvents:: @ 83921F8 coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 - bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 + bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1 Route110_TrickHouseEnd_MapEvents:: @ 8392214 map_events Route110_TrickHouseEnd_MapObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index e3ae3bb04..62256e1f7 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -88,13 +88,13 @@ Route111_MapBGEvents:: @ 8382738 bg_event 25, 19, 0, 0, 0, Route111_EventScript_150383 bg_event 35, 1, 0, 8, 0, ITEM_POTION, 0, 0 bg_event 35, 31, 0, 8, 0, ITEM_POMEG_BERRY, 0, 0 - bg_event 26, 70, 0, 7, 0, ITEM_STARDUST, 2, 0 + bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2 bg_event 27, 27, 3, 8, 0, ITEM_REVIVAL_HERB, 0, 0 bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C bg_event 14, 19, 0, 8, 0, ITEM_PAMTRE_BERRY, 0, 0 bg_event 13, 19, 0, 8, 0, ITEM_RABUTA_BERRY, 0, 0 - bg_event 19, 55, 0, 7, 0, ITEM_PROTEIN, 56, 0 - bg_event 35, 66, 0, 7, 0, ITEM_RARE_CANDY, 57, 0 + bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_38 + bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_39 Route111_MapEvents:: @ 8382804 map_events Route111_MapObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index 7a39850fd..13ac20534 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -41,8 +41,8 @@ Route113_MapBGEvents:: @ 8382BE0 bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632 bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629 bg_event 49, 8, 0, 8, 0, ITEM_GREAT_BALL, 0, 0 - bg_event 72, 4, 3, 7, 0, ITEM_ETHER, 3, 0 - bg_event 22, 5, 3, 7, 0, ITEM_TM32, 30, 0 + bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3 + bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_1E Route113_MapEvents:: @ 8382C34 map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index 0e4097651..f701b2cfa 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -38,9 +38,9 @@ Route114_MapBGEvents:: @ 8382E88 bg_event 11, 27, 0, 8, 0, ITEM_EXP_SHARE, 0, 0 bg_event 12, 27, 0, 8, 0, ITEM_DEEP_SEA_TOOTH, 0, 0 bg_event 25, 38, 3, 0, 0, Route114_EventScript_1507E8 - bg_event 20, 57, 3, 7, 0, ITEM_CARBOS, 4, 0 + bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4 bg_event 32, 57, 0, 8, 0, ITEM_GUARD_SPEC, 0, 0 - bg_event 7, 30, 3, 7, 0, ITEM_REVIVE, 42, 0 + bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A Route114_MapEvents:: @ 8382F18 map_events Route114_MapObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index 83c7e97b8..7b8d48758 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -33,7 +33,7 @@ Route115_MapBGEvents:: @ 83830B4 bg_event 8, 20, 0, 8, 0, ITEM_QUICK_CLAW, 0, 0 bg_event 25, 24, 0, 8, 0, ITEM_HP_UP, 0, 0 bg_event 20, 53, 0, 8, 0, ITEM_HYPER_POTION, 0, 0 - bg_event 15, 49, 3, 7, 0, ITEM_HEART_SCALE, 97, 0 + bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_61 Route115_MapEvents:: @ 838315C map_events Route115_MapObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 3b1858f33..0acd83d88 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -40,8 +40,8 @@ Route116_MapBGEvents:: @ 83833A8 bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54 bg_event 56, 6, 0, 8, 0, 102, 0, 0 bg_event 55, 15, 0, 8, 0, 112, 0, 0 - bg_event 22, 9, 3, 7, 0, ITEM_SUPER_POTION, 45, 0 - bg_event 70, 13, 3, 7, 0, ITEM_BLACK_GLASSES, 96, 0 + bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D + bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_60 Route116_MapEvents:: @ 838342C map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index 90f3e1f8f..ff5c81ead 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -28,7 +28,7 @@ Route117_MapBGEvents:: @ 8383640 bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72 bg_event 49, 12, 0, 0, 0, Route117_EventScript_150D7B bg_event 49, 5, 0, 0, 0, Route117_EventScript_150D84 - bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0 + bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_48 Route117_MapEvents:: @ 8383670 map_events Route117_MapObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 154b96b75..60e8f27f0 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -33,8 +33,8 @@ Route118_MapBGEvents:: @ 8383894 bg_event 29, 5, 0, 8, 0, ITEM_HARBOR_MAIL, 0, 0 bg_event 47, 5, 0, 8, 0, ITEM_SPELON_BERRY, 0, 0 bg_event 46, 5, 0, 8, 0, ITEM_PETAYA_BERRY, 0, 0 - bg_event 31, 13, 3, 7, 0, ITEM_IRON, 67, 0 - bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0 + bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_43 + bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_42 Route118_MapEvents:: @ 8383900 map_events Route118_MapObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 889f1b000..c3d75ff52 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -79,15 +79,15 @@ Route119_MapBGEvents:: @ 8383E2C bg_event 31, 73, 3, 8, 0, 231, 0, 0 bg_event 16, 81, 0, 8, 0, ITEM_TINY_MUSHROOM, 0, 0 bg_event 16, 28, 0, 8, 0, 113, 0, 0 - bg_event 17, 82, 3, 7, 0, ITEM_CALCIUM, 5, 0 - bg_event 38, 63, 3, 7, 0, ITEM_ULTRA_BALL, 6, 0 + bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_5 + bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_6 bg_event 26, 81, 0, 8, 0, ITEM_FULL_HEAL, 0, 0 bg_event 19, 76, 0, 8, 0, ITEM_LANSAT_BERRY, 0, 0 bg_event 18, 76, 0, 8, 0, ITEM_DEEP_SEA_SCALE, 0, 0 bg_event 4, 15, 0, 8, 0, ITEM_METAL_POWDER, 0, 0 bg_event 6, 2, 0, 8, 0, 233, 0, 0 - bg_event 26, 120, 3, 7, 0, ITEM_FULL_HEAL, 68, 0 - bg_event 20, 29, 3, 7, 0, ITEM_MAX_ETHER, 87, 0 + bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_44 + bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57 bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605 Route119_MapEvents:: @ 8383F1C diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 65fa580b3..b326c703a 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -76,10 +76,10 @@ Route120_MapBGEvents:: @ 8384448 bg_event 18, 12, 0, 8, 0, ITEM_SUN_STONE, 0, 0 bg_event 38, 54, 0, 8, 0, ITEM_SOFT_SAND, 0, 0 bg_event 31, 23, 0, 8, 0, ITEM_SPELL_TAG, 0, 0 - bg_event 9, 1, 3, 7, 0, ITEM_RARE_CANDY, 71, 0 - bg_event 31, 11, 3, 7, 0, ITEM_REVIVE, 84, 0 - bg_event 0, 86, 3, 7, 0, ITEM_RARE_CANDY, 69, 0 - bg_event 24, 42, 3, 7, 0, ITEM_ZINC, 70, 0 + bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_47 + bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_54 + bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_45 + bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_46 bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0 Route120_MapEvents:: @ 83844F0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index 0aae42562..a475d78a2 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -38,9 +38,9 @@ Route121_MapBGEvents:: @ 838475C bg_event 43, 7, 0, 8, 0, ITEM_NOMEL_BERRY, 0, 0 bg_event 42, 7, 0, 8, 0, ITEM_APICOT_BERRY, 0, 0 bg_event 39, 6, 0, 0, 0, Route121_EventScript_151B1C - bg_event 23, 10, 3, 7, 0, ITEM_HP_UP, 39, 0 - bg_event 58, 3, 3, 7, 0, ITEM_NUGGET, 40, 0 - bg_event 72, 5, 3, 7, 0, ITEM_FULL_HEAL, 73, 0 + bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27 + bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28 + bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_49 Route121_MapEvents:: @ 83847C8 map_events Route121_MapObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index a861aa4fc..291deb4e1 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -66,11 +66,11 @@ Route123_MapBGEvents:: @ 8384C90 bg_event 47, 3, 0, 8, 0, 82, 0, 0 bg_event 49, 3, 0, 8, 0, 92, 0, 0 bg_event 10, 12, 3, 0, 0, Route123_EventScript_151CB6 - bg_event 75, 1, 3, 7, 0, ITEM_SUPER_REPEL, 7, 0 + bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7 bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8 bg_event 57, 5, 0, 8, 0, ITEM_SUPER_REPEL, 0, 0 - bg_event 12, 1, 3, 7, 0, ITEM_REVIVE, 41, 0 - bg_event 91, 15, 3, 7, 0, ITEM_HYPER_POTION, 74, 0 + bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29 + bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A Route123_MapEvents:: @ 8384CFC map_events Route123_MapObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc index 555101a97..2bef2e3ed 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -9,9 +9,9 @@ Route128_MapObjects:: @ 83850D0 object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 47, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route128_EventScript_152320, 0, 0, 0 Route128_MapBGEvents:: @ 8385190 - bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 - bg_event 57, 21, 3, 7, 0, ITEM_HEART_SCALE, 93, 0 - bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0 + bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5C + bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5D + bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5E Route128_MapEvents:: @ 83851B4 map_events Route128_MapObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc index 74c8458ce..59d783f61 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -6,7 +6,7 @@ SSTidalLowerDeck_MapWarps:: @ 8391874 warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR SSTidalLowerDeck_MapBGEvents:: @ 839187C - bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0 + bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_23 SSTidalLowerDeck_MapEvents:: @ 8391888 map_events SSTidalLowerDeck_MapObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/events/Underwater1.inc b/data/maps/events/Underwater1.inc index e67181a50..12b3cf72b 100644 --- a/data/maps/events/Underwater1.inc +++ b/data/maps/events/Underwater1.inc @@ -1,11 +1,11 @@ Underwater1_MapBGEvents:: @ 8385518 - bg_event 42, 51, 0, 7, 0, ITEM_CARBOS, 8, 0 - bg_event 14, 40, 0, 7, 0, ITEM_GREEN_SHARD, 9, 0 - bg_event 66, 34, 3, 7, 0, ITEM_PEARL, 10, 0 - bg_event 64, 54, 3, 7, 0, ITEM_BIG_PEARL, 11, 0 - bg_event 70, 64, 3, 7, 0, ITEM_HEART_SCALE, 13, 0 - bg_event 42, 5, 3, 7, 0, ITEM_CALCIUM, 36, 0 - bg_event 45, 36, 3, 7, 0, ITEM_HEART_SCALE, 38, 0 + bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_8 + bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_9 + bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_A + bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_B + bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_D + bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_24 + bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_26 Underwater1_MapEvents:: @ 838556C map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents diff --git a/data/maps/events/Underwater2.inc b/data/maps/events/Underwater2.inc index 89b36919b..a628cf972 100644 --- a/data/maps/events/Underwater2.inc +++ b/data/maps/events/Underwater2.inc @@ -2,14 +2,14 @@ Underwater2_MapWarps:: @ 8385580 warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY Underwater2_MapBGEvents:: @ 8385588 - bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0 - bg_event 41, 19, 3, 7, 0, ITEM_ULTRA_BALL, 15, 0 - bg_event 63, 19, 3, 7, 0, ITEM_STARDUST, 16, 0 - bg_event 10, 36, 3, 7, 0, ITEM_PEARL, 17, 0 - bg_event 11, 39, 3, 7, 0, ITEM_IRON, 19, 0 - bg_event 12, 35, 3, 7, 0, ITEM_YELLOW_SHARD, 18, 0 - bg_event 65, 60, 3, 7, 0, ITEM_BIG_PEARL, 20, 0 - bg_event 9, 77, 3, 7, 0, ITEM_BLUE_SHARD, 12, 0 + bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_E + bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_F + bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_10 + bg_hidden_item_event 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_11 + bg_hidden_item_event 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_13 + bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_12 + bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_14 + bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_C Underwater2_MapEvents:: @ 83855E8 map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents diff --git a/data/maps/events/Underwater3.inc b/data/maps/events/Underwater3.inc index 1e0925650..62518bafa 100644 --- a/data/maps/events/Underwater3.inc +++ b/data/maps/events/Underwater3.inc @@ -1,8 +1,8 @@ Underwater3_MapBGEvents:: @ 83855FC - bg_event 12, 42, 3, 7, 0, ITEM_STAR_PIECE, 21, 0 - bg_event 50, 36, 3, 7, 0, ITEM_HP_UP, 22, 0 - bg_event 34, 72, 3, 7, 0, ITEM_HEART_SCALE, 23, 0 - bg_event 72, 20, 3, 7, 0, ITEM_RED_SHARD, 24, 0 + bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_15 + bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_16 + bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_17 + bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_18 Underwater3_MapEvents:: @ 838562C map_events 0x0, 0x0, 0x0, Underwater3_MapBGEvents diff --git a/data/maps/events/Underwater4.inc b/data/maps/events/Underwater4.inc index 1d3938031..fad99382b 100644 --- a/data/maps/events/Underwater4.inc +++ b/data/maps/events/Underwater4.inc @@ -2,8 +2,8 @@ Underwater4_MapWarps:: @ 8385640 warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN Underwater4_MapBGEvents:: @ 8385648 - bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0 - bg_event 69, 18, 3, 7, 0, ITEM_PEARL, 26, 0 + bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_19 + bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_1A Underwater4_MapEvents:: @ 8385660 map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index c88f9363c..31e1cebb6 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -20,7 +20,7 @@ VictoryRoad_1F_MapCoordEvents:: @ 838D9B4 coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF VictoryRoad_1F_MapBGEvents:: @ 838D9E4 - bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0 + bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_51 VictoryRoad_1F_MapEvents:: @ 838D9F0 map_events VictoryRoad_1F_MapObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index e9d549f04..ffa8252d5 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -12,8 +12,8 @@ VictoryRoad_B2F_MapWarps:: @ 838DC90 warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F VictoryRoad_B2F_MapBGEvents:: @ 838DCB0 - bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0 - bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0 + bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_52 + bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_53 VictoryRoad_B2F_MapEvents:: @ 838DCC8 map_events VictoryRoad_B2F_MapObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index b1b331d00..5fab808bc 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 goto_if_eq Route116_EventScript_150BCA - specialvar RESULT, sub_810F828 + specialvar RESULT, FoundBlackGlasses compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_810F828 + specialvar RESULT, FoundBlackGlasses compare RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 diff --git a/data/specials.inc b/data/specials.inc index 2924f2173..f39af822b 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -323,7 +323,7 @@ gSpecials:: def_special ScrSpecial_StartRegiBattle def_special sub_8082524 def_special DoSealedChamberShakingEffect2 - def_special sub_810F828 + def_special FoundBlackGlasses def_special sub_807E25C def_special sp13E_warp_to_last_warp def_special sp13F_fall_to_last_warp -- cgit v1.2.3 From 82230589d1170e14c48b6d8b5ccadd8ded5465ce Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 26 Dec 2017 16:08:02 -0600 Subject: Add bg_secret_base_event macro, and define secret base id constants --- data/map_events.s | 1 + data/maps/events/Route110.inc | 4 ++-- data/maps/events/Route111.inc | 16 ++++++++-------- data/maps/events/Route113.inc | 2 +- data/maps/events/Route114.inc | 14 +++++++------- data/maps/events/Route115.inc | 22 +++++++++++----------- data/maps/events/Route116.inc | 8 ++++---- data/maps/events/Route118.inc | 10 +++++----- data/maps/events/Route119.inc | 26 +++++++++++++------------- data/maps/events/Route120.inc | 16 ++++++++-------- data/maps/events/Route121.inc | 8 ++++---- data/maps/events/Route123.inc | 6 +++--- data/maps/events/Route125.inc | 8 ++++---- data/maps/events/Route127.inc | 10 +++++----- 14 files changed, 76 insertions(+), 75 deletions(-) (limited to 'data') diff --git a/data/map_events.s b/data/map_events.s index 6bfcc0292..a06eb36d0 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -2,6 +2,7 @@ #include "constants/items.h" #include "constants/map_objects.h" #include "constants/maps.h" +#include "constants/secret_bases.h" #include "constants/vars.h" #include "constants/weather.h" .include "asm/macros.inc" diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 0a3569f6c..229573076 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -53,8 +53,8 @@ Route110_MapBGEvents:: @ 83820C0 bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8 bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A - bg_event 16, 25, 0, 8, 0, ITEM_MACHO_BRACE, 0, 0 - bg_event 17, 25, 0, 8, 0, ITEM_SOUL_DEW, 0, 0 + bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3(1) + bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4(1) bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13 bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25 diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index 62256e1f7..1725e7ff6 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -82,17 +82,17 @@ Route111_MapBGEvents:: @ 8382738 bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371 bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A - bg_event 24, 36, 0, 8, 0, ITEM_FAB_MAIL, 0, 0 - bg_event 34, 50, 0, 8, 0, ITEM_LUM_BERRY, 0, 0 - bg_event 33, 34, 0, 8, 0, ITEM_ORANGE_MAIL, 0, 0 + bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2(1) + bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3(1) + bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1(1) bg_event 25, 19, 0, 0, 0, Route111_EventScript_150383 - bg_event 35, 1, 0, 8, 0, ITEM_POTION, 0, 0 - bg_event 35, 31, 0, 8, 0, ITEM_POMEG_BERRY, 0, 0 + bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2(3) + bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4(3) bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2 - bg_event 27, 27, 3, 8, 0, ITEM_REVIVAL_HERB, 0, 0 + bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4(3) bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C - bg_event 14, 19, 0, 8, 0, ITEM_PAMTRE_BERRY, 0, 0 - bg_event 13, 19, 0, 8, 0, ITEM_RABUTA_BERRY, 0, 0 + bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1(4) + bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1(1) bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_38 bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_39 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index 13ac20534..0f69b0547 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -40,7 +40,7 @@ Route113_MapBGEvents:: @ 8382BE0 bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620 bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632 bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629 - bg_event 49, 8, 0, 8, 0, ITEM_GREAT_BALL, 0, 0 + bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1(3) bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3 bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_1E diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index f701b2cfa..709714072 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -31,15 +31,15 @@ Route114_MapWarps:: @ 8382E70 Route114_MapBGEvents:: @ 8382E88 bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF - bg_event 9, 47, 0, 8, 0, ITEM_RED_FLUTE, 0, 0 - bg_event 30, 51, 0, 8, 0, ITEM_GREEN_SHARD, 0, 0 - bg_event 11, 62, 0, 8, 0, 61, 0, 0 - bg_event 19, 70, 0, 8, 0, ITEM_PP_MAX, 0, 0 - bg_event 11, 27, 0, 8, 0, ITEM_EXP_SHARE, 0, 0 - bg_event 12, 27, 0, 8, 0, ITEM_DEEP_SEA_TOOTH, 0, 0 + bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1(1) + bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2(1) + bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3(1) + bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4(1) + bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3(2) + bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4(2) bg_event 25, 38, 3, 0, 0, Route114_EventScript_1507E8 bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4 - bg_event 32, 57, 0, 8, 0, ITEM_GUARD_SPEC, 0, 0 + bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4(3) bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A Route114_MapEvents:: @ 8382F18 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index 7b8d48758..b19ef6009 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -20,19 +20,19 @@ Route115_MapWarps:: @ 83830AC warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R Route115_MapBGEvents:: @ 83830B4 - bg_event 32, 6, 0, 8, 0, 72, 0, 0 - bg_event 21, 18, 0, 8, 0, 62, 0, 0 + bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4(2) + bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3(2) bg_event 16, 64, 0, 0, 0, Route115_EventScript_150937 bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940 - bg_event 8, 30, 0, 8, 0, ITEM_CHERI_BERRY, 0, 0 - bg_event 32, 39, 0, 8, 0, ITEM_BLACK_FLUTE, 0, 0 - bg_event 26, 15, 0, 8, 0, 52, 0, 0 - bg_event 23, 8, 0, 8, 0, ITEM_WHITE_FLUTE, 0, 0 - bg_event 32, 46, 0, 8, 0, 53, 0, 0 - bg_event 7, 20, 0, 8, 0, ITEM_STARF_BERRY, 0, 0 - bg_event 8, 20, 0, 8, 0, ITEM_QUICK_CLAW, 0, 0 - bg_event 25, 24, 0, 8, 0, ITEM_HP_UP, 0, 0 - bg_event 20, 53, 0, 8, 0, ITEM_HYPER_POTION, 0, 0 + bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2(3) + bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1(2) + bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2(2) + bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1(3) + bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2(3) + bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2(4) + bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3(3) + bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3(3) + bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3(1) bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_61 Route115_MapEvents:: @ 838315C diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 0acd83d88..ff5a842f7 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -34,12 +34,12 @@ Route116_MapBGEvents:: @ 83833A8 bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30 bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39 bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42 - bg_event 71, 4, 0, 8, 0, ITEM_FLUFFY_TAIL, 0, 0 - bg_event 79, 11, 0, 8, 0, 91, 0, 0 + bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1(1) + bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2(1) bg_event 16, 12, 0, 0, 0, Route116_EventScript_150B4B bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54 - bg_event 56, 6, 0, 8, 0, 102, 0, 0 - bg_event 55, 15, 0, 8, 0, 112, 0, 0 + bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3(2) + bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4(2) bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_60 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 60e8f27f0..3c16827a7 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -26,13 +26,13 @@ Route118_MapCoordEvents:: @ 8383864 coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4 Route118_MapBGEvents:: @ 8383894 - bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0 + bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1(1) bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5 - bg_event 67, 6, 0, 8, 0, ITEM_LUXURY_BALL, 0, 0 - bg_event 29, 5, 0, 8, 0, ITEM_HARBOR_MAIL, 0, 0 - bg_event 47, 5, 0, 8, 0, ITEM_SPELON_BERRY, 0, 0 - bg_event 46, 5, 0, 8, 0, ITEM_PETAYA_BERRY, 0, 0 + bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2(1) + bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1(2) + bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1(3) + bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2(1) bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_43 bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_42 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index c3d75ff52..b26f6685e 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -71,21 +71,21 @@ Route119_MapCoordEvents:: @ 8383C9C Route119_MapBGEvents:: @ 8383E2C bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423 - bg_event 5, 2, 0, 8, 0, ITEM_DRAGON_SCALE, 0, 0 - bg_event 4, 89, 0, 8, 0, ITEM_LIGHT_BALL, 0, 0 - bg_event 5, 15, 0, 8, 0, ITEM_POISON_BARB, 0, 0 - bg_event 7, 101, 3, 8, 0, ITEM_NEVER_MELT_ICE, 0, 0 - bg_event 34, 24, 3, 8, 0, ITEM_LAX_INCENSE, 0, 0 - bg_event 31, 73, 3, 8, 0, 231, 0, 0 - bg_event 16, 81, 0, 8, 0, ITEM_TINY_MUSHROOM, 0, 0 - bg_event 16, 28, 0, 8, 0, 113, 0, 0 + bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1(1) + bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1(2) + bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2(1) + bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2(2) + bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3(1) + bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4(1) + bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3(3) + bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4(3) bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_5 bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_6 - bg_event 26, 81, 0, 8, 0, ITEM_FULL_HEAL, 0, 0 - bg_event 19, 76, 0, 8, 0, ITEM_LANSAT_BERRY, 0, 0 - bg_event 18, 76, 0, 8, 0, ITEM_DEEP_SEA_SCALE, 0, 0 - bg_event 4, 15, 0, 8, 0, ITEM_METAL_POWDER, 0, 0 - bg_event 6, 2, 0, 8, 0, 233, 0, 0 + bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3(3) + bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2(3) + bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4(3) + bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3(3) + bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4(3) bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_44 bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57 bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index b326c703a..909882c2d 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -69,18 +69,18 @@ Route120_MapCoordEvents:: @ 8384318 Route120_MapBGEvents:: @ 8384448 bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1 bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA - bg_event 28, 62, 0, 8, 0, 101, 0, 0 - bg_event 30, 62, 0, 8, 0, ITEM_HEART_SCALE, 0, 0 - bg_event 26, 10, 0, 8, 0, ITEM_LUCKY_PUNCH, 0, 0 - bg_event 29, 85, 5, 8, 0, 232, 0, 0 - bg_event 18, 12, 0, 8, 0, ITEM_SUN_STONE, 0, 0 - bg_event 38, 54, 0, 8, 0, ITEM_SOFT_SAND, 0, 0 - bg_event 31, 23, 0, 8, 0, ITEM_SPELL_TAG, 0, 0 + bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3(1) + bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4(1) + bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3(2) + bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4(2) + bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2(3) + bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1(3) + bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2(3) bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_47 bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_54 bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_45 bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_46 - bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0 + bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1(4) Route120_MapEvents:: @ 83844F0 map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index a475d78a2..f6f0b8962 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -33,10 +33,10 @@ Route121_MapCoordEvents:: @ 838471C Route121_MapBGEvents:: @ 838475C bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13 - bg_event 40, 11, 0, 8, 0, ITEM_PREMIER_BALL, 0, 0 - bg_event 18, 13, 0, 8, 0, ITEM_SUPER_POTION, 0, 0 - bg_event 43, 7, 0, 8, 0, ITEM_NOMEL_BERRY, 0, 0 - bg_event 42, 7, 0, 8, 0, ITEM_APICOT_BERRY, 0, 0 + bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2(2) + bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3(2) + bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1(2) + bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2(2) bg_event 39, 6, 0, 0, 0, Route121_EventScript_151B1C bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27 bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index 291deb4e1..a52b927fc 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -63,12 +63,12 @@ Route123_MapCoordEvents:: @ 8384B30 Route123_MapBGEvents:: @ 8384C90 bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF - bg_event 47, 3, 0, 8, 0, 82, 0, 0 - bg_event 49, 3, 0, 8, 0, 92, 0, 0 + bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1(2) + bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2(2) bg_event 10, 12, 3, 0, 0, Route123_EventScript_151CB6 bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7 bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8 - bg_event 57, 5, 0, 8, 0, ITEM_SUPER_REPEL, 0, 0 + bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1(3) bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29 bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 585296ac3..860992732 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -11,10 +11,10 @@ Route125_MapWarps:: @ 8384ED0 warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM Route125_MapBGEvents:: @ 8384ED8 - bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0 - bg_event 55, 11, 0, 8, 0, ITEM_HEAL_POWDER, 0, 0 - bg_event 7, 25, 0, 8, 0, ITEM_RETRO_MAIL, 0, 0 - bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0 + bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1(2) + bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4(2) + bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2(2) + bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4(2) Route125_MapEvents:: @ 8384F08 map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc index d71b15c74..5d4d7623a 100644 --- a/data/maps/events/Route127.inc +++ b/data/maps/events/Route127.inc @@ -10,11 +10,11 @@ Route127_MapObjects:: @ 8384FA8 object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 63, 0, 63, 0, 3, 1, 17, 0, 1, 0, 3, 0, Route127_EventScript_1520ED, 0, 0, 0 Route127_MapBGEvents:: @ 8385080 - bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0 - bg_event 59, 72, 0, 8, 0, ITEM_SITRUS_BERRY, 0, 0 - bg_event 67, 63, 0, 8, 0, ITEM_WEPEAR_BERRY, 0, 0 - bg_event 61, 21, 0, 8, 0, ITEM_FIGY_BERRY, 0, 0 - bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0 + bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4(1) + bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3(2) + bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4(1) + bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3(3) + bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1(3) Route127_MapEvents:: @ 83850BC map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents -- cgit v1.2.3 From da62907ec54f400646416f38ef02bd7f03d5dbc4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 26 Dec 2017 21:25:47 -0500 Subject: through sub_8103008 --- data/slot_machine.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 827d27747..3d7c6253c 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -30,7 +30,7 @@ gUnknown_083ECB4C:: @ 83ECB4C .4byte sub_810380C .align 1 -gUnknown_083ECB58:: @ 83ECB58 +gUnknown_083ECB58:: @ 83ECB58 (sub_8102F4C) .2byte 2, 4, 4, 4, 8 .align 2 -- cgit v1.2.3 From 0eb231352a820aa6597bb6a69ef920e3864931ab Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 26 Dec 2017 22:24:06 -0600 Subject: Fully enumerate secret base constants --- data/maps/events/Route110.inc | 4 ++-- data/maps/events/Route111.inc | 16 ++++++++-------- data/maps/events/Route113.inc | 2 +- data/maps/events/Route114.inc | 14 +++++++------- data/maps/events/Route115.inc | 22 +++++++++++----------- data/maps/events/Route116.inc | 8 ++++---- data/maps/events/Route118.inc | 10 +++++----- data/maps/events/Route119.inc | 26 +++++++++++++------------- data/maps/events/Route120.inc | 16 ++++++++-------- data/maps/events/Route121.inc | 8 ++++---- data/maps/events/Route123.inc | 6 +++--- data/maps/events/Route125.inc | 8 ++++---- data/maps/events/Route127.inc | 10 +++++----- 13 files changed, 75 insertions(+), 75 deletions(-) (limited to 'data') diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 229573076..436b44e56 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -53,8 +53,8 @@ Route110_MapBGEvents:: @ 83820C0 bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8 bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A - bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3(1) - bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4(1) + bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1 + bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1 bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13 bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25 diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index 1725e7ff6..ef205af37 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -82,17 +82,17 @@ Route111_MapBGEvents:: @ 8382738 bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371 bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A - bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2(1) - bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3(1) - bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1(1) + bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1 + bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1 + bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1 bg_event 25, 19, 0, 0, 0, Route111_EventScript_150383 - bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2(3) - bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4(3) + bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3 + bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3 bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2 - bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4(3) + bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C - bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1(4) - bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1(1) + bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4 + bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1 bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_38 bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_39 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index 0f69b0547..dccaf6e82 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -40,7 +40,7 @@ Route113_MapBGEvents:: @ 8382BE0 bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620 bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632 bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629 - bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1(3) + bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3 bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3 bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_1E diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index 709714072..0687dc0e9 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -31,15 +31,15 @@ Route114_MapWarps:: @ 8382E70 Route114_MapBGEvents:: @ 8382E88 bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF - bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1(1) - bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2(1) - bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3(1) - bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4(1) - bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3(2) - bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4(2) + bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 + bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1 + bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1 + bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1 + bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 + bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 bg_event 25, 38, 3, 0, 0, Route114_EventScript_1507E8 bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4 - bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4(3) + bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A Route114_MapEvents:: @ 8382F18 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index b19ef6009..157dd82eb 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -20,19 +20,19 @@ Route115_MapWarps:: @ 83830AC warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R Route115_MapBGEvents:: @ 83830B4 - bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4(2) - bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3(2) + bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 + bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 bg_event 16, 64, 0, 0, 0, Route115_EventScript_150937 bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940 - bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2(3) - bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1(2) - bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2(2) - bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1(3) - bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2(3) - bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2(4) - bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3(3) - bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3(3) - bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3(1) + bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3 + bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2 + bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2 + bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1_3 + bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2_3 + bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2_4 + bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3 + bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3 + bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1 bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_61 Route115_MapEvents:: @ 838315C diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index ff5a842f7..ef301e51d 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -34,12 +34,12 @@ Route116_MapBGEvents:: @ 83833A8 bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30 bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39 bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42 - bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1(1) - bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2(1) + bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1 + bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1 bg_event 16, 12, 0, 0, 0, Route116_EventScript_150B4B bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54 - bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3(2) - bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4(2) + bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 + bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_60 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 3c16827a7..4d4e3ea9a 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -26,13 +26,13 @@ Route118_MapCoordEvents:: @ 8383864 coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4 Route118_MapBGEvents:: @ 8383894 - bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1(1) + bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5 - bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2(1) - bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1(2) - bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1(3) - bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2(1) + bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1 + bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 + bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 + bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1 bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_43 bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_42 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index b26f6685e..2abacdf27 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -71,21 +71,21 @@ Route119_MapCoordEvents:: @ 8383C9C Route119_MapBGEvents:: @ 8383E2C bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423 - bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1(1) - bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1(2) - bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2(1) - bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2(2) - bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3(1) - bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4(1) - bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3(3) - bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4(3) + bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 + bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2 + bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1 + bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2_2 + bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3_1 + bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1 + bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3 + bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3 bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_5 bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_6 - bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3(3) - bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2(3) - bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4(3) - bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3(3) - bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4(3) + bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3 + bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3 + bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3 + bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3 + bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3 bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_44 bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57 bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 909882c2d..ac0e527c7 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -69,18 +69,18 @@ Route120_MapCoordEvents:: @ 8384318 Route120_MapBGEvents:: @ 8384448 bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1 bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA - bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3(1) - bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4(1) - bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3(2) - bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4(2) - bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2(3) - bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1(3) - bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2(3) + bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 + bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1 + bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2 + bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4_2 + bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3 + bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3 + bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3 bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_47 bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_54 bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_45 bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_46 - bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1(4) + bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 Route120_MapEvents:: @ 83844F0 map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index f6f0b8962..e799115e5 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -33,10 +33,10 @@ Route121_MapCoordEvents:: @ 838471C Route121_MapBGEvents:: @ 838475C bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13 - bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2(2) - bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3(2) - bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1(2) - bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2(2) + bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 + bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 + bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 + bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 bg_event 39, 6, 0, 0, 0, Route121_EventScript_151B1C bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27 bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index a52b927fc..3c50254cb 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -63,12 +63,12 @@ Route123_MapCoordEvents:: @ 8384B30 Route123_MapBGEvents:: @ 8384C90 bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF - bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1(2) - bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2(2) + bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 + bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 bg_event 10, 12, 3, 0, 0, Route123_EventScript_151CB6 bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7 bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8 - bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1(3) + bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29 bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 860992732..82767393d 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -11,10 +11,10 @@ Route125_MapWarps:: @ 8384ED0 warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM Route125_MapBGEvents:: @ 8384ED8 - bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1(2) - bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4(2) - bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2(2) - bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4(2) + bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2 + bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2 + bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2 + bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 Route125_MapEvents:: @ 8384F08 map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc index 5d4d7623a..6b3d396c9 100644 --- a/data/maps/events/Route127.inc +++ b/data/maps/events/Route127.inc @@ -10,11 +10,11 @@ Route127_MapObjects:: @ 8384FA8 object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 63, 0, 63, 0, 3, 1, 17, 0, 1, 0, 3, 0, Route127_EventScript_1520ED, 0, 0, 0 Route127_MapBGEvents:: @ 8385080 - bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4(1) - bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3(2) - bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4(1) - bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3(3) - bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1(3) + bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 + bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 + bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 + bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 + bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 Route127_MapEvents:: @ 83850BC map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents -- cgit v1.2.3 From d34de50d34d18ee64c95232202751532534c2ed9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 27 Dec 2017 09:23:30 -0600 Subject: Use descriptive name for the BLACK GLASSES hidden item flag --- data/maps/events/Route116.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index ef301e51d..ff5ad2643 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -41,7 +41,7 @@ Route116_MapBGEvents:: @ 83833A8 bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D - bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_60 + bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_BLACK_GLASSES Route116_MapEvents:: @ 838342C map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents -- cgit v1.2.3 From 4767f21f2e72ae89ab542d61a86d5fbbe85df1a2 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 27 Dec 2017 15:43:22 -0600 Subject: Port updated battle_script macros from pokeemerald --- data/battle_scripts_1.s | 1729 ++++++++++++++++++++++++----------------------- data/battle_scripts_2.s | 85 +-- 2 files changed, 908 insertions(+), 906 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 4e41bcc20..3041e7a48 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1,7 +1,8 @@ #include "constants/abilities.h" .include "asm/macros.inc" - .include "constants/constants.inc" .include "asm/macros/battle_script.inc" + .include "constants/constants.inc" + .include "constants/battle_script_constants.inc" .section script_data, "aw", %progbits @@ -246,7 +247,7 @@ MoveEffect_Unused8D: @ 81D6F14 MoveEffect_UnusedA3: @ 81D6F14 MoveEffect_VitalThrow: @ 81D6F14 jumpifhalfword 1, gCurrentMove, 57, BattleScript_1D6F3A - jumpifspecialstatusflag TARGET, 0x40000, 1, BattleScript_1D6F3A + jumpifstatus3condition TARGET, 0x40000, 1, BattleScript_1D6F3A orword gHitMarker, 0x40000 setbyte gSharedMem + 0x1601F, 2 @@ -262,28 +263,28 @@ BattleScript_1D6F42: @ 81D6F42 BattleScript_1D6F44:: @ 81D6F44 critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage BattleScript_1D6F48: @ 81D6F48 attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 - seteffectwithchancetarget - faintpokemon TARGET, 0, 0x0 + seteffectwithchance + tryfaintmon TARGET, 0, 0x0 BattleScript_EndTurn:: @ 81D6F62 setbyte gSharedMem + 0x1600C, 0 - atk49 0, 0 + moveend 0, 0 end BattleScript_1D6F6C: @ 81D6F6C @@ -297,49 +298,49 @@ BattleScript_1D6F74:: @ 81D6F74 pause 32 BattleScript_1D6F77: @ 81D6F77 - missmessage + effectivenesssound resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Sleep: @ 81D6F81 attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed jumpifstatus TARGET, SLP, BattleScript_1D6FC4 - jumpifcannotsleep BattleScript_1D6FE0 + jumpifcantmakeasleep BattleScript_1D6FE0 jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpifsideaffecting TARGET, 32, BattleScript_1D9037 attackanimation waitanimation setbyte gUnknown_02024D1F + 0x2, 1 - seteffecttarget - jump BattleScript_EndTurn + seteffectprimary + goto BattleScript_EndTurn BattleScript_1D6FC4: @ 81D6FC4 pause 32 printstring BATTLE_TEXT_DefendingAsleep waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D6FD2: @ 81D6FD2 pause 32 printstring BATTLE_TEXT_WasntAffected waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D6FE0: @ 81D6FE0 pause 32 printfromtable BattleTextList_40156A waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_PoisonHit: @ 81D6FF0 MoveEffect_PoisonTail: @ 81D6FF0 setbyte gUnknown_02024D1F + 0x2, 2 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Absorb: @ 81D6FFB attackcanceler @@ -347,15 +348,15 @@ MoveEffect_Absorb: @ 81D6FFB attackstring ppreduce critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 @@ -365,83 +366,83 @@ MoveEffect_Absorb: @ 81D6FFB orword gHitMarker, 0x100 jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_1D7037 setbyte gUnknown_02024D1F + 0x4, 0 - jump BattleScript_1D703F + goto BattleScript_1D703F BattleScript_1D7037: @ 81D7037 manipulatedamage 0 setbyte gUnknown_02024D1F + 0x4, 1 BattleScript_1D703F: @ 81D703F - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7056 printfromtable BattleTextList_4015D0 waitmessage 64 BattleScript_1D7056: @ 81D7056 - faintpokemon USER, 0, 0x0 - faintpokemon TARGET, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon USER, 0, 0x0 + tryfaintmon TARGET, 0, 0x0 + goto BattleScript_EndTurn MoveEffect_BlazeKick: @ 81D7069 MoveEffect_BurnHit: @ 81D7069 setbyte gUnknown_02024D1F + 0x2, 3 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_FreezeHit: @ 81D7074 setbyte gUnknown_02024D1F + 0x2, 4 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_ParalyzeHit: @ 81D707F setbyte gUnknown_02024D1F + 0x2, 5 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Explosion: @ 81D708A attackcanceler attackstring ppreduce faintifabilitynotdamp - setuserhptozero - waitstateatk + setatkhptozero + waitstate jumpifbyte 5, gBattleMoveFlags, 1, BattleScript_1D70A5 - callatk BattleScript_1D70FB - jump BattleScript_1D70A7 + call BattleScript_1D70FB + goto BattleScript_1D70A7 BattleScript_1D70A5: @ 81D70A5 attackanimation waitanimation BattleScript_1D70A7: @ 81D70A7 - atk25 + movevaluescleanup critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage accuracycheck BattleScript_1D70E0, 0 - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 - faintpokemon TARGET, 0, 0x0 + tryfaintmon TARGET, 0, 0x0 setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jumpwhiletargetvalid BattleScript_1D70A7 - faintpokemon USER, 0, 0x0 + moveend 2, 16 + jumpifnexttargetvalid BattleScript_1D70A7 + tryfaintmon USER, 0, 0x0 end BattleScript_1D70E0: @ 81D70E0 - missmessage + effectivenesssound resultmessage waitmessage 64 setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jumpwhiletargetvalid BattleScript_1D70A7 - faintpokemon USER, 0, 0x0 + moveend 2, 16 + jumpifnexttargetvalid BattleScript_1D70A7 + tryfaintmon USER, 0, 0x0 end BattleScript_1D70FB: @ 81D70FB @@ -453,29 +454,29 @@ BattleScript_1D70FB: @ 81D70FB MoveEffect_DreamEater: @ 81D710A attackcanceler - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D711F + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D711F jumpifstatus TARGET, SLP, BattleScript_1D7129 BattleScript_1D711F: @ 81D711F attackstring ppreduce waitmessage 64 - jump BattleScript_1D6FD2 + goto BattleScript_1D6FD2 BattleScript_1D7129: @ 81D7129 accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 @@ -483,38 +484,38 @@ BattleScript_1D7129: @ 81D7129 waitmessage 64 negativedamage orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7167 printstring BATTLE_TEXT_DreamEaten waitmessage 64 BattleScript_1D7167: @ 81D7167 - faintpokemon TARGET, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon TARGET, 0, 0x0 + goto BattleScript_EndTurn MoveEffect_MirrorMove: @ 81D7173 attackcanceler attackstring pause 64 - jumptolastusedattack + trymirrormove ppreduce orbyte gBattleMoveFlags, 32 printstring BATTLE_TEXT_MirrorFail waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_AttackUp: @ 81D718B setbyte gSharedMem + 0x1601E, 17 - jump BattleScript_1D71B2 + goto BattleScript_1D71B2 MoveEffect_DefenseUp: @ 81D7196 setbyte gSharedMem + 0x1601E, 18 - jump BattleScript_1D71B2 + goto BattleScript_1D71B2 MoveEffect_SpecialAttackUp: @ 81D71A1 setbyte gSharedMem + 0x1601E, 20 - jump BattleScript_1D71B2 + goto BattleScript_1D71B2 MoveEffect_EvasionUp: @ 81D71AC setbyte gSharedMem + 0x1601E, 23 @@ -528,14 +529,14 @@ BattleScript_1D71B3: @ 81D71B3 statbuffchange 65, BattleScript_1D71E0 jumpifbyte 1, gUnknown_02024D1F + 0x4, 2, BattleScript_1D71CE pause 32 - jump BattleScript_1D71D8 + goto BattleScript_1D71D8 BattleScript_1D71CE: @ 81D71CE attackanimation waitanimation BattleScript_1D71D0: @ 81D71D0 - atk47 + setgraphicalstatchangevalues playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 BattleScript_1D71D8: @ 81D71D8 @@ -543,7 +544,7 @@ BattleScript_1D71D8: @ 81D71D8 waitmessage 64 BattleScript_1D71E0: @ 81D71E0 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_StatUp:: @ 81D71E5 playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 @@ -553,26 +554,26 @@ BattleScript_StatUp:: @ 81D71E5 MoveEffect_AttackDown: @ 81D71F5 setbyte gSharedMem + 0x1601E, 145 - jump BattleScript_1D7227 + goto BattleScript_1D7227 MoveEffect_DefenseDown: @ 81D7200 setbyte gSharedMem + 0x1601E, 146 - jump BattleScript_1D7227 + goto BattleScript_1D7227 MoveEffect_SpeedDown: @ 81D720B setbyte gSharedMem + 0x1601E, 147 - jump BattleScript_1D7227 + goto BattleScript_1D7227 MoveEffect_AccuracyDown: @ 81D7216 setbyte gSharedMem + 0x1601E, 150 - jump BattleScript_1D7227 + goto BattleScript_1D7227 MoveEffect_EvasionDown: @ 81D7221 setbyte gSharedMem + 0x1601E, 151 BattleScript_1D7227: @ 81D7227 attackcanceler - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D4 + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D83D4 accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce @@ -580,12 +581,12 @@ BattleScript_1D7227: @ 81D7227 jumpifbyte 3, gUnknown_02024D1F + 0x4, 2, BattleScript_1D725F jumpifbyte 0, gUnknown_02024D1F + 0x4, 3, BattleScript_1D7271 pause 32 - jump BattleScript_1D7269 + goto BattleScript_1D7269 BattleScript_1D725F: @ 81D725F attackanimation waitanimation - atk47 + setgraphicalstatchangevalues playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 BattleScript_1D7269: @ 81D7269 @@ -593,7 +594,7 @@ BattleScript_1D7269: @ 81D7269 waitmessage 64 BattleScript_1D7271: @ 81D7271 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_StatDown:: @ 81D7276 playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 @@ -610,7 +611,7 @@ MoveEffect_Haze: @ 81D7286 normalisebuffs printstring BATTLE_TEXT_StatElim waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Bide: @ 81D7297 attackcanceler @@ -620,25 +621,25 @@ MoveEffect_Bide: @ 81D7297 waitanimation orword gHitMarker, 0x8000000 setbide - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Rampage: @ 81D72AB attackcanceler accuracycheck BattleScript_1D6F72, 0 attackstring - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D72BF + jumpifstatus2 USER, S_CONTINUE, BattleScript_1D72BF ppreduce BattleScript_1D72BF: @ 81D72BF confuseifrepeatingattackends - jump BattleScript_1D6F44 + goto BattleScript_1D6F44 MoveEffect_Roar: @ 81D72C5 attackcanceler attackstring ppreduce jumpifability TARGET, ABILITY_SUCTION_CUPS, BattleScript_1D988D - jumpifspecialstatusflag TARGET, 0x400, 0, BattleScript_1D93EC + jumpifstatus3condition TARGET, 0x400, 0, BattleScript_1D93EC accuracycheck BattleScript_ButItFailed, 65535 accuracycheck BattleScript_1D6F77, 0 forcerandomswitch BattleScript_ButItFailed @@ -648,30 +649,30 @@ MoveEffect_MultiHit: @ 81D72ED accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - setloopcounter 0 - atk8e + setmultihitcounter 0 + initmultihitstring setbyte gSharedMem + 0x16112, 0 BattleScript_1D7300: @ 81D7300 - jumpiffainted USER, BattleScript_1D7396 - jumpiffainted TARGET, BattleScript_1D7377 + jumpifhasnohp USER, BattleScript_1D7396 + jumpifhasnohp TARGET, BattleScript_1D7377 jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7322 jumpifstatus USER, SLP, BattleScript_1D7377 BattleScript_1D7322: @ 81D7322 - atk25 + movevaluescleanup copyarray gUnknown_02024D1F + 0x2, gSharedMem + 0x16112, 1 critcalc - atk5 - atk6 + damagecalc + typecalc jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7374 - atk7 + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 @@ -679,10 +680,10 @@ BattleScript_1D7322: @ 81D7322 waitmessage 1 addbyte gSharedMem + 0x160E4, 1 setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 + moveend 2, 16 jumpifbyte 4, gBattleMoveFlags, 64, BattleScript_1D7377 - atk27 BattleScript_1D7300 - jump BattleScript_1D7377 + decrementmultihit BattleScript_1D7300 + goto BattleScript_1D7377 BattleScript_1D7374: @ 81D7374 pause 32 @@ -696,150 +697,150 @@ BattleScript_1D7377: @ 81D7377 waitmessage 64 BattleScript_1D7396: @ 81D7396 - seteffectwithchancetarget - faintpokemon TARGET, 0, 0x0 + seteffectwithchance + tryfaintmon TARGET, 0, 0x0 setbyte gSharedMem + 0x1600C, 2 - atk49 1, 0 + moveend 1, 0 setbyte gSharedMem + 0x1600C, 4 - atk49 0, 0 + moveend 0, 0 end MoveEffect_Conversion: @ 81D73B1 attackcanceler attackstring ppreduce - changetypestoenemyattacktype BattleScript_ButItFailed + tryconversiontypechange BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_FlinchHit: @ 81D73C6 setbyte gUnknown_02024D1F + 0x2, 8 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_RestoreHp: @ 81D73D1 attackcanceler attackstring ppreduce - setdamageasrestorehalfmaxhp BattleScript_1D83B5, 1 + tryhealhalfhealth BattleScript_1D83B5, 1 attackanimation waitanimation orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_RegainedHealth waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Toxic: @ 81D73F4 attackcanceler attackstring ppreduce jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_1D7463 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed jumpifstatus TARGET, PSN, BattleScript_1D7455 jumpifstatus TARGET, TOX, BattleScript_1D7455 jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed jumpiftype TARGET, TYPE_POISON, BattleScript_1D83E8 jumpiftype TARGET, TYPE_STEEL, BattleScript_1D83E8 accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpifsideaffecting TARGET, 32, BattleScript_1D9037 attackanimation waitanimation setbyte gUnknown_02024D1F + 0x2, 6 - seteffecttarget + seteffectprimary resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D7455: @ 81D7455 pause 64 printstring BATTLE_TEXT_AlreadyPoisoned waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D7463: @ 81D7463 copyarray gEffectBank, gBankTarget, 1 setbyte gUnknown_02024D1F + 0x4, 0 - callatk BattleScript_PSNPrevention - jump BattleScript_EndTurn + call BattleScript_PSNPrevention + goto BattleScript_EndTurn MoveEffect_PayDay: @ 81D747D setbyte gUnknown_02024D1F + 0x2, 11 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_LightScreen: @ 81D7488 attackcanceler attackstring ppreduce setlightscreen - jump BattleScript_1D7786 + goto BattleScript_1D7786 MoveEffect_TriAttack: @ 81D7491 setbyte gUnknown_02024D1F + 0x2, 9 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Rest: @ 81D749C attackcanceler attackstring ppreduce jumpifstatus USER, SLP, BattleScript_1D74D6 - jumpifcannotsleep BattleScript_1D74C6 - setrest BattleScript_1D83B5 + jumpifcantmakeasleep BattleScript_1D74C6 + trysetrest BattleScript_1D83B5 pause 32 printfromtable BattleTextList_401556 waitmessage 64 - atk98 1 - waitstateatk - jump BattleScript_1D839B + updatestatusicon 1 + waitstate + goto BattleScript_1D839B BattleScript_1D74C6: @ 81D74C6 pause 64 printfromtable BattleTextList_40156A waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D74D6: @ 81D74D6 pause 32 printstring BATTLE_TEXT_AttackingAsleep waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Ohko: @ 81D74E4 attackcanceler attackstring ppreduce accuracycheck BattleScript_ButItFailed, 65535 - atk6 + typecalc jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D6F48 - koplussomethings BattleScript_1D7505 - atkab - jump BattleScript_1D6F48 + tryKO BattleScript_1D7505 + trysetdestinybondtohappen + goto BattleScript_1D6F48 BattleScript_1D7505: @ 81D7505 pause 64 printfromtable BattleTextList_4015C8 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_RazorWind: @ 81D7515 - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D + jumpifstatus2 USER, S_CONTINUE, BattleScript_1D753D jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D setbyte gSharedMem + 0x16055, 0 - callatk BattleScript_1D756C - jump BattleScript_EndTurn + call BattleScript_1D756C + goto BattleScript_EndTurn BattleScript_1D753D: @ 81D753D attackcanceler setbyte gUnknown_02024D1F + 0x2, 12 setbyte gSharedMem + 0x16002, 1 - clearstatus USER + clearstatusfromeffect USER orword gHitMarker, 0x800 jumpifhalfword 1, gCurrentMove, 143, BattleScript_1D6F3B setbyte gUnknown_02024D1F + 0x2, 8 - jump BattleScript_1D6F3B + goto BattleScript_1D6F3B BattleScript_1D756C: @ 81D756C attackcanceler @@ -849,7 +850,7 @@ BattleScript_1D756C: @ 81D756C waitanimation orword gHitMarker, 0x8000000 setbyte gUnknown_02024D1F + 0x2, 76 - seteffecttarget + seteffectprimary copyarray gUnknown_02024D1F + 0x4, gSharedMem + 0x16055, 1 printfromtable BattleTextList_401584 waitmessage 64 @@ -860,49 +861,49 @@ MoveEffect_SuperFang: @ 81D7596 accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - atk6 + typecalc bicbyte gBattleMoveFlags, 6 - gethalfcurrentenemyhp - jump BattleScript_1D6F48 + damagetohalftargethp + goto BattleScript_1D6F48 MoveEffect_DragonRage: @ 81D75AD attackcanceler accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - atk6 + typecalc bicbyte gBattleMoveFlags, 6 setbyte gBattleMoveDamage, 40 setbyte gBattleMoveDamage + 0x1, 0 setbyte gBattleMoveDamage + 0x2, 0 setbyte gBattleMoveDamage + 0x3, 0 - atk69 - jump BattleScript_1D6F48 + adjustsetdamage + goto BattleScript_1D6F48 MoveEffect_Trap: @ 81D75DC jumpifhalfword 1, gCurrentMove, 250, BattleScript_1D7602 - jumpifspecialstatusflag TARGET, 0x40000, 1, BattleScript_1D7602 + jumpifstatus3condition TARGET, 0x40000, 1, BattleScript_1D7602 orword gHitMarker, 0x40000 setbyte gSharedMem + 0x1601F, 2 BattleScript_1D7602: @ 81D7602 setbyte gUnknown_02024D1F + 0x2, 13 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_DoubleHit: @ 81D760D attackcanceler accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - setloopcounter 2 - atk8e + setmultihitcounter 2 + initmultihitstring setbyte gSharedMem + 0x16112, 0 - jump BattleScript_1D7300 + goto BattleScript_1D7300 MoveEffect_RecoilIfMiss: @ 81D7625 attackcanceler accuracycheck BattleScript_1D7632, 0 - jump BattleScript_1D6F42 + goto BattleScript_1D6F42 BattleScript_1D7632: @ 81D7632 attackstring @@ -913,89 +914,89 @@ BattleScript_1D7632: @ 81D7632 jumpifbyte 4, gBattleMoveFlags, 8, BattleScript_EndTurn printstring BATTLE_TEXT_KeptGoingCrash waitmessage 64 - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage manipulatedamage 1 bicbyte gBattleMoveFlags, 1 orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 + tryfaintmon USER, 0, 0x0 orbyte gBattleMoveFlags, 1 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Mist: @ 81D7676 attackcanceler attackstring ppreduce - setmisteffect + setmist attackanimation waitanimation printfromtable BattleTextList_4015A0 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_FocusEnergy: @ 81D7689 attackcanceler attackstring ppreduce - jumpifsecondarytstatus USER, S_FOCUS_ENERGY, BattleScript_ButItFailed - setincreasedcriticalchance + jumpifstatus2 USER, S_FOCUS_ENERGY, BattleScript_ButItFailed + setfocusenergy attackanimation waitanimation printfromtable BattleTextList_4015A4 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Recoil: @ 81D76A6 setbyte gUnknown_02024D1F + 0x2, 206 jumpifhalfword 1, gCurrentMove, 165, BattleScript_1D6F14 - atk60 27 - jump BattleScript_1D6F14 + incrementgamestat 27 + goto BattleScript_1D6F14 MoveEffect_Confuse: @ 81D76BF attackcanceler attackstring ppreduce jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifsecondarytstatus TARGET, S_CONFUSED, BattleScript_1D76FE + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_CONFUSED, BattleScript_1D76FE accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpifsideaffecting TARGET, 32, BattleScript_1D9037 attackanimation waitanimation setbyte gUnknown_02024D1F + 0x2, 7 - seteffecttarget + seteffectprimary resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D76FE: @ 81D76FE pause 32 printstring BATTLE_TEXT_AlreadyConfused waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_AttackUp2: @ 81D770C setbyte gSharedMem + 0x1601E, 33 - jump BattleScript_1D71B2 + goto BattleScript_1D71B2 MoveEffect_DefenseUp2: @ 81D7717 setbyte gSharedMem + 0x1601E, 34 - jump BattleScript_1D71B2 + goto BattleScript_1D71B2 MoveEffect_SpeedUp2: @ 81D7722 setbyte gSharedMem + 0x1601E, 35 - jump BattleScript_1D71B2 + goto BattleScript_1D71B2 MoveEffect_SpecialAttackUp2: @ 81D772D setbyte gSharedMem + 0x1601E, 36 - jump BattleScript_1D71B2 + goto BattleScript_1D71B2 MoveEffect_SpecialDefenseUp2: @ 81D7738 setbyte gSharedMem + 0x1601E, 37 - jump BattleScript_1D71B2 + goto BattleScript_1D71B2 MoveEffect_Transform: @ 81D7743 attackcanceler @@ -1006,23 +1007,23 @@ MoveEffect_Transform: @ 81D7743 waitanimation printfromtable BattleTextList_4015A8 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_AttackDown2: @ 81D7756 setbyte gSharedMem + 0x1601E, 161 - jump BattleScript_1D7227 + goto BattleScript_1D7227 MoveEffect_DefenseDown2: @ 81D7761 setbyte gSharedMem + 0x1601E, 162 - jump BattleScript_1D7227 + goto BattleScript_1D7227 MoveEffect_SpeedDown2: @ 81D776C setbyte gSharedMem + 0x1601E, 163 - jump BattleScript_1D7227 + goto BattleScript_1D7227 MoveEffect_SpecialDefenseDown2: @ 81D7777 setbyte gSharedMem + 0x1601E, 165 - jump BattleScript_1D7227 + goto BattleScript_1D7227 MoveEffect_Reflect: @ 81D7782 attackcanceler @@ -1035,95 +1036,95 @@ BattleScript_1D7786: @ 81D7786 waitanimation printfromtable BattleTextList_401540 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Poison: @ 81D7795 attackcanceler attackstring ppreduce jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_1D7463 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed jumpifstatus TARGET, PSN, BattleScript_1D7455 jumpifstatus TARGET, TOX, BattleScript_1D7455 jumpiftype TARGET, TYPE_POISON, BattleScript_1D83E8 jumpiftype TARGET, TYPE_STEEL, BattleScript_1D83E8 jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpifsideaffecting TARGET, 32, BattleScript_1D9037 attackanimation waitanimation setbyte gUnknown_02024D1F + 0x2, 2 - seteffecttarget + seteffectprimary resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Paralyze: @ 81D77F6 attackcanceler attackstring ppreduce jumpifability TARGET, ABILITY_LIMBER, BattleScript_1D7859 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - atk6 + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + typecalc jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_ButItFailed jumpifstatus TARGET, PAR, BattleScript_1D784B jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpifsideaffecting TARGET, 32, BattleScript_1D9037 attackanimation waitanimation setbyte gUnknown_02024D1F + 0x2, 5 - seteffecttarget + seteffectprimary resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D784B: @ 81D784B pause 32 printstring BATTLE_TEXT_AlreadyParalyzed waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D7859: @ 81D7859 copyarray gEffectBank, gBankTarget, 1 setbyte gUnknown_02024D1F + 0x4, 0 - callatk BattleScript_PRLZPrevention - jump BattleScript_EndTurn + call BattleScript_PRLZPrevention + goto BattleScript_EndTurn MoveEffect_AttackDownHit: @ 81D7873 setbyte gUnknown_02024D1F + 0x2, 22 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_DefenseDownHit: @ 81D787E setbyte gUnknown_02024D1F + 0x2, 23 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_SpeedDownHit: @ 81D7889 setbyte gUnknown_02024D1F + 0x2, 24 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_SpecialAttackDownHit: @ 81D7894 setbyte gUnknown_02024D1F + 0x2, 25 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_SpecialDefenseDownHit: @ 81D789F setbyte gUnknown_02024D1F + 0x2, 26 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_AccuracyDownHit: @ 81D78AA setbyte gUnknown_02024D1F + 0x2, 27 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_SkyAttack: @ 81D78B5 - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D + jumpifstatus2 USER, S_CONTINUE, BattleScript_1D753D jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D setbyte gSharedMem + 0x16055, 3 - callatk BattleScript_1D756C - jump BattleScript_EndTurn + call BattleScript_1D756C + goto BattleScript_EndTurn MoveEffect_ConfuseHit: @ 81D78DD setbyte gUnknown_02024D1F + 0x2, 7 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Twineedle: @ 81D78E8 attackcanceler @@ -1131,74 +1132,74 @@ MoveEffect_Twineedle: @ 81D78E8 setbyte gSharedMem + 0x16112, 2 attackstring ppreduce - setloopcounter 2 - atk8e - jump BattleScript_1D7300 + setmultihitcounter 2 + initmultihitstring + goto BattleScript_1D7300 MoveEffect_Substitute: @ 81D7900 attackcanceler ppreduce attackstring - waitstateatk - jumpifsecondarytstatus USER, S_SUBSTITUTE, BattleScript_1D7935 - setsubstituteeffect + waitstate + jumpifstatus2 USER, S_SUBSTITUTE, BattleScript_1D7935 + setsubstitute jumpifbyte 1, gUnknown_02024D1F + 0x4, 1, BattleScript_1D7922 pause 32 - jump BattleScript_1D7928 + goto BattleScript_1D7928 BattleScript_1D7922: @ 81D7922 attackanimation waitanimation - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER BattleScript_1D7928: @ 81D7928 printfromtable BattleTextList_4015AC waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D7935: @ 81D7935 pause 32 printstring BATTLE_TEXT_SubAlready waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Recharge: @ 81D7943 attackcanceler accuracycheck BattleScript_1D6F72, 0 setbyte gUnknown_02024D1F + 0x2, 221 - jump BattleScript_1D6F42 + goto BattleScript_1D6F42 BattleScript_MoveUsedMustRecharge:: @ 81D7956 printstring BATTLE_TEXT_MustRecharge waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Rage: @ 81D7961 attackcanceler accuracycheck BattleScript_1D797B, 0 setbyte gUnknown_02024D1F + 0x2, 30 - seteffecttarget + seteffectprimary setbyte gUnknown_02024D1F + 0x2, 0 - jump BattleScript_1D6F42 + goto BattleScript_1D6F42 BattleScript_1D797B: @ 81D797B setbyte gUnknown_02024D1F + 0x2, 30 - clearstatus USER - jump BattleScript_1D6F72 + clearstatusfromeffect USER + goto BattleScript_1D6F72 MoveEffect_Mimic: @ 81D7988 attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, 65535 - copyattack BattleScript_ButItFailed + mimicattackcopy BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_LearnedMove2 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Metronome: @ 81D79AE attackcanceler @@ -1208,23 +1209,23 @@ MoveEffect_Metronome: @ 81D79AE waitanimation setbyte gSharedMem + 0x16002, 0 setbyte gSharedMem + 0x160A1, 0 - metronomeeffect + metronome MoveEffect_LeechSeed: @ 81D79C2 attackcanceler attackstring pause 32 ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed accuracycheck BattleScript_1D79D9, 0 BattleScript_1D79D9: @ 81D79D9 - setleechseed + setseeded attackanimation waitanimation printfromtable BattleTextList_40154C waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Splash: @ 81D79E9 attackcanceler @@ -1232,10 +1233,10 @@ MoveEffect_Splash: @ 81D79E9 ppreduce attackanimation waitanimation - atk60 26 + incrementgamestat 26 printstring BATTLE_TEXT_Nothing waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Disable: @ 81D79FB attackcanceler @@ -1247,29 +1248,29 @@ MoveEffect_Disable: @ 81D79FB waitanimation printstring BATTLE_TEXT_MoveWasDisabled waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_LevelDamage: @ 81D7A17 attackcanceler accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - atk6 + typecalc bicbyte gBattleMoveFlags, 6 - nightshadedamageeffect - atk69 - jump BattleScript_1D6F48 + dmgtolevel + adjustsetdamage + goto BattleScript_1D6F48 MoveEffect_Psywave: @ 81D7A2F attackcanceler accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - atk6 + typecalc bicbyte gBattleMoveFlags, 6 psywavedamageeffect - atk69 - jump BattleScript_1D6F48 + adjustsetdamage + goto BattleScript_1D6F48 MoveEffect_Counter: @ 81D7A47 attackcanceler @@ -1277,46 +1278,46 @@ MoveEffect_Counter: @ 81D7A47 accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - damagecalc2 - atk69 - jump BattleScript_1D6F48 + typecalc2 + adjustsetdamage + goto BattleScript_1D6F48 MoveEffect_Encore: @ 81D7A5D attackcanceler accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - setencore BattleScript_ButItFailed + trysetencore BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_EncoreGot waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_PainSplit: @ 81D7A79 attackcanceler attackstring ppreduce accuracycheck BattleScript_ButItFailed, 65535 - painsplitdamagecalculator BattleScript_ButItFailed + painsplitdmgcalc BattleScript_ButItFailed attackanimation waitanimation orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER copyarray gBattleMoveDamage, gSharedMem + 0x16014, 4 - graphicalhpupdate TARGET + healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_PainSplit waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Snore: @ 81D7AB0 attackcanceler jumpifstatus USER, SLP, BattleScript_1D7AC2 attackstring ppreduce - jump BattleScript_ButItFailed + goto BattleScript_ButItFailed BattleScript_1D7AC2: @ 81D7AC2 jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7AD6 @@ -1329,7 +1330,7 @@ BattleScript_1D7AD6: @ 81D7AD6 ppreduce accuracycheck BattleScript_1D6F77, 0 setbyte gUnknown_02024D1F + 0x2, 8 - jump BattleScript_1D6F44 + goto BattleScript_1D6F44 MoveEffect_Conversion2: @ 81D7AEA attackcanceler @@ -1340,39 +1341,39 @@ MoveEffect_Conversion2: @ 81D7AEA waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_LockOn: @ 81D7AFF attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, 0 setalwayshitflag attackanimation waitanimation printstring BATTLE_TEXT_TookAim waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Sketch: @ 81D7B21 attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed copymovepermanently BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_SketchedMove waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_SleepTalk: @ 81D7B40 attackcanceler jumpifstatus USER, SLP, BattleScript_1D7B52 attackstring ppreduce - jump BattleScript_ButItFailed + goto BattleScript_ButItFailed BattleScript_1D7B52: @ 81D7B52 printstring BATTLE_TEXT_FastAsleep @@ -1381,50 +1382,50 @@ BattleScript_1D7B52: @ 81D7B52 attackstring ppreduce orword gHitMarker, 0x800 - selectrandommovefromusermoves BattleScript_1D7B72 + trychoosesleeptalkmove BattleScript_1D7B72 pause 64 - jump BattleScript_ButItFailed + goto BattleScript_ButItFailed BattleScript_1D7B72: @ 81D7B72 attackanimation waitanimation setbyte gSharedMem + 0x16002, 0 setbyte gSharedMem + 0x160A1, 0 - jumptoattack USER + jumptorandomattack USER MoveEffect_DestinyBond: @ 81D7B82 attackcanceler attackstring ppreduce - destinybondeffect + setdestinybond attackanimation waitanimation printstring BATTLE_TEXT_DestinyBondTake waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Flail: @ 81D7B93 remaininghptopower - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Spite: @ 81D7B99 attackcanceler attackstring ppreduce accuracycheck BattleScript_ButItFailed, 0 - reducepprandom BattleScript_ButItFailed + tryspiteppreduce BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_ReducedBy waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_HealBell: @ 81D7BB5 attackcanceler attackstring ppreduce - clearstatusifnotsoundproofed - waitstateatk + healpartystatus + waitstate attackanimation waitanimation printfromtable BattleTextList_4015D8 @@ -1440,9 +1441,9 @@ BattleScript_1D7BE1: @ 81D7BE1 waitmessage 64 BattleScript_1D7BF2: @ 81D7BF2 - atk98 4 - waitstateatk - jump BattleScript_EndTurn + updatestatusicon 4 + waitstate + goto BattleScript_EndTurn MoveEffect_TripleKick: @ 81D7BFA attackcanceler @@ -1450,42 +1451,42 @@ MoveEffect_TripleKick: @ 81D7BFA ppreduce setbyte gSharedMem + 0x160DE, 0 setbyte gSharedMem + 0x160DF, 0 - atk8e - atk26 3 + initmultihitstring + setmultihit 3 BattleScript_1D7C0C: @ 81D7C0C - jumpiffainted USER, BattleScript_1D7CAF - jumpiffainted TARGET, BattleScript_1D7C8D + jumpifhasnohp USER, BattleScript_1D7CAF + jumpifhasnohp TARGET, BattleScript_1D7C8D jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7C2E jumpifstatus USER, SLP, BattleScript_1D7C8D BattleScript_1D7C2E: @ 81D7C2E - atk25 + movevaluescleanup accuracycheck BattleScript_1D7C8D, 0 addbyte gSharedMem + 0x160DE, 10 addbyte gSharedMem + 0x160E4, 1 copyarray gDynamicBasePower, gSharedMem + 0x160DE, 2 critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7C8D attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 + moveend 2, 16 jumpifbyte 4, gBattleMoveFlags, 64, BattleScript_1D7C90 - atk27 BattleScript_1D7C0C - jump BattleScript_1D7C90 + decrementmultihit BattleScript_1D7C0C + goto BattleScript_1D7C90 BattleScript_1D7C8D: @ 81D7C8D pause 32 @@ -1499,53 +1500,53 @@ BattleScript_1D7C90: @ 81D7C90 waitmessage 64 BattleScript_1D7CAF: @ 81D7CAF - seteffectwithchancetarget - faintpokemon TARGET, 0, 0x0 + seteffectwithchance + tryfaintmon TARGET, 0, 0x0 setbyte gSharedMem + 0x1600C, 14 - atk49 0, 0 + moveend 0, 0 end MoveEffect_Thief: @ 81D7CC1 setbyte gUnknown_02024D1F + 0x2, 31 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_MeanLook: @ 81D7CCC attackcanceler attackstring ppreduce accuracycheck BattleScript_ButItFailed, 65534 - jumpifsecondarytstatus TARGET, S_MEAN_LOOK, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_MEAN_LOOK, BattleScript_ButItFailed attackanimation waitanimation setbyte gUnknown_02024D1F + 0x2, 32 - seteffecttarget + seteffectprimary printstring BATTLE_TEXT_CantEscapeNow waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Nightmare: @ 81D7CF4 attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifsecondarytstatus TARGET, S_NIGHTMARE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_NIGHTMARE, BattleScript_ButItFailed jumpifstatus TARGET, SLP, BattleScript_1D7D1A - jump BattleScript_ButItFailed + goto BattleScript_ButItFailed BattleScript_1D7D1A: @ 81D7D1A attackanimation waitanimation setbyte gUnknown_02024D1F + 0x2, 33 - seteffecttarget + seteffectprimary printstring BATTLE_TEXT_NightmareStart waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Minimize: @ 81D7D2E attackcanceler setminimize setbyte gSharedMem + 0x1601E, 23 - jump BattleScript_1D71B3 + goto BattleScript_1D71B3 MoveEffect_Curse: @ 81D7D3B jumpiftype2 USER, TYPE_GHOST, BattleScript_1D7DB3 @@ -1579,51 +1580,51 @@ BattleScript_1D7D9A: @ 81D7D9A waitmessage 64 BattleScript_1D7DAE: @ 81D7DAE - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D7DB3: @ 81D7DB3 jumpifarraynotequal gBankAttacker, gBankTarget, 1, BattleScript_1D7DC4 - atk76 USER, 3 + getmovetarget USER BattleScript_1D7DC4: @ 81D7DC4 attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed cursetarget BattleScript_ButItFailed orword gHitMarker, 0x100 setbyte gSharedMem + 0x16002, 0 attackanimation waitanimation - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_CurseLay waitmessage 64 - faintpokemon USER, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon USER, 0, 0x0 + goto BattleScript_EndTurn MoveEffect_Endure: @ 81D7DFD MoveEffect_Protect: @ 81D7DFD attackcanceler attackstring ppreduce - setprotect + setprotectlike attackanimation waitanimation printfromtable BattleTextList_40153A waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Spikes: @ 81D7E10 attackcanceler - setspikes BattleScript_1D83D4 + trysetspikes BattleScript_1D83D4 attackstring ppreduce attackanimation waitanimation printstring BATTLE_TEXT_SpikesScattered waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Foresight: @ 81D7E25 attackcanceler @@ -1635,13 +1636,13 @@ MoveEffect_Foresight: @ 81D7E25 waitanimation printstring BATTLE_TEXT_IdentifiedPoke waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_PerishSong: @ 81D7E3D attackcanceler attackstring ppreduce - setperishsong BattleScript_ButItFailed + trysetperishsong BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_PerishSong @@ -1654,57 +1655,57 @@ BattleScript_1D7E53: @ 81D7E53 BattleScript_1D7E5A: @ 81D7E5A addbyte gSharedMem + 0x16003, 1 jumpifarraynotequal gSharedMem + 0x16003, gNoOfAllBanks, 1, BattleScript_1D7E53 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D7E73: @ 81D7E73 printstring BATTLE_TEXT_BlocksOther2 waitmessage 64 - jump BattleScript_1D7E5A + goto BattleScript_1D7E5A MoveEffect_Sandstorm: @ 81D7E7E attackcanceler attackstring ppreduce setsandstorm - jump BattleScript_1D7FFA + goto BattleScript_1D7FFA MoveEffect_Rollout: @ 81D7E87 attackcanceler attackstring - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D7E94 + jumpifstatus2 USER, S_CONTINUE, BattleScript_1D7E94 ppreduce BattleScript_1D7E94: @ 81D7E94 accuracycheck BattleScript_1D7E9B, 0 BattleScript_1D7E9B: @ 81D7E9B - damagecalc2 + typecalc2 rolloutdamagecalculation - jump BattleScript_1D6F44 + goto BattleScript_1D6F44 MoveEffect_Swagger: @ 81D7EA2 attackcanceler - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F6C + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D6F6C accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - jumpifconfusedandattackmaxed 1, BattleScript_ButItFailed + jumpifconfusedandstatmaxed 1, BattleScript_ButItFailed attackanimation waitanimation setbyte gSharedMem + 0x1601E, 33 statbuffchange 1, BattleScript_1D7EE5 jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7EE5 - atk47 + setgraphicalstatchangevalues playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D7EE5: @ 81D7EE5 jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpifsideaffecting TARGET, 32, BattleScript_1D9037 setbyte gUnknown_02024D1F + 0x2, 7 - seteffecttarget - jump BattleScript_EndTurn + seteffectprimary + goto BattleScript_EndTurn MoveEffect_FuryCutter: @ 81D7F00 attackcanceler @@ -1713,39 +1714,39 @@ MoveEffect_FuryCutter: @ 81D7F00 accuracycheck BattleScript_1D7F0A, 0 BattleScript_1D7F0A: @ 81D7F0A - furycutterdamagecalculation + furycuttercalc critcalc - atk5 - atk6 + damagecalc + typecalc jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7F0A - atk7 - jump BattleScript_1D6F48 + adjustnormaldamage + goto BattleScript_1D6F48 MoveEffect_Attract: @ 81D7F1F attackcanceler attackstring ppreduce accuracycheck BattleScript_ButItFailed, 0 - tryinfatuatetarget BattleScript_ButItFailed + tryinfatuating BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_FellLove waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Frustration: @ 81D7F3B MoveEffect_Return: @ 81D7F3B attackcanceler accuracycheck BattleScript_1D6F72, 0 happinesstodamagecalculation - jump BattleScript_1D6F42 + goto BattleScript_1D6F42 MoveEffect_Present: @ 81D7F49 attackcanceler accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - atk6 + typecalc presentdamagecalculation MoveEffect_Safeguard: @ 81D7F55 @@ -1753,61 +1754,61 @@ MoveEffect_Safeguard: @ 81D7F55 attackstring ppreduce setsafeguard - jump BattleScript_1D7786 + goto BattleScript_1D7786 MoveEffect_ThawHit: @ 81D7F5E setbyte gUnknown_02024D1F + 0x2, 3 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Magnitude: @ 81D7F69 attackcanceler attackstring ppreduce - selectnexttarget + selectfirstvalidtarget magnitudedamagecalculation pause 32 printstring BATTLE_TEXT_MagnitudeCount waitmessage 64 - jump BattleScript_1D80FD + goto BattleScript_1D80FD MoveEffect_BatonPass: @ 81D7F7C attackcanceler attackstring ppreduce - jumpifcannotswitch 129, BattleScript_ButItFailed + jumpifcantswitch 129, BattleScript_ButItFailed attackanimation waitanimation openpartyscreen USER, BattleScript_ButItFailed - atke2 USER - waitstateatk - atk51 USER, 2 - atk58 USER - switch1 USER - switch2 USER - atk73 USER + switchoutabilities USER + waitstate + switchhandleorder USER, 2 + returntoball USER + getswitchedmondata USER + switchindataupdate USER + hpthresholds USER printstring 3 - switch3 USER, 1 - waitstateatk - atk52 USER - jump BattleScript_EndTurn + switchinanim USER, 1 + waitstate + switchineffects USER + goto BattleScript_EndTurn MoveEffect_RapidSpin: @ 81D7FA9 setbyte gUnknown_02024D1F + 0x2, 163 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Sonicboom: @ 81D7FB4 attackcanceler accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - atk6 + typecalc bicbyte gBattleMoveFlags, 6 setbyte gBattleMoveDamage, 20 setbyte gBattleMoveDamage + 0x1, 0 setbyte gBattleMoveDamage + 0x2, 0 setbyte gBattleMoveDamage + 0x3, 0 - atk69 - jump BattleScript_1D6F48 + adjustsetdamage + goto BattleScript_1D6F48 MoveEffect_Moonlight: @ 81D7FE3 MoveEffect_MorningSun: @ 81D7FE3 @@ -1816,11 +1817,11 @@ MoveEffect_Synthesis: @ 81D7FE3 attackstring ppreduce recoverbasedonsunlight BattleScript_1D83B5 - jump BattleScript_1D839B + goto BattleScript_1D839B MoveEffect_HiddenPower: @ 81D7FF0 - hiddenpowerdamagecalculation - jump BattleScript_1D6F14 + hiddenpowercalc + goto BattleScript_1D6F14 MoveEffect_RainDance: @ 81D7FF6 attackcanceler @@ -1833,27 +1834,27 @@ BattleScript_1D7FFA: @ 81D7FFA waitanimation printfromtable BattleTextList_40151C waitmessage 64 - callatk BattleScript_1D9761 - jump BattleScript_EndTurn + call BattleScript_1D9761 + goto BattleScript_EndTurn MoveEffect_SunnyDay: @ 81D800E attackcanceler attackstring ppreduce setsunny - jump BattleScript_1D7FFA + goto BattleScript_1D7FFA MoveEffect_DefenseUpHit: @ 81D8017 setbyte gUnknown_02024D1F + 0x2, 80 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_AttackUpHit: @ 81D8022 setbyte gUnknown_02024D1F + 0x2, 79 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_AllStatsUpHit: @ 81D802D setbyte gUnknown_02024D1F + 0x2, 98 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_BellyDrum: @ 81D8038 attackcanceler @@ -1863,11 +1864,11 @@ MoveEffect_BellyDrum: @ 81D8038 orword gHitMarker, 0x100 attackanimation waitanimation - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_CutHPMaxATK waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_PsychUp: @ 81D805A attackcanceler @@ -1878,7 +1879,7 @@ MoveEffect_PsychUp: @ 81D805A waitanimation printstring BATTLE_TEXT_CopyStatChanges waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_MirrorCoat: @ 81D806F attackcanceler @@ -1886,47 +1887,47 @@ MoveEffect_MirrorCoat: @ 81D806F accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - damagecalc2 - atk69 - jump BattleScript_1D6F48 + typecalc2 + adjustsetdamage + goto BattleScript_1D6F48 MoveEffect_SkullBash: @ 81D8085 - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D + jumpifstatus2 USER, S_CONTINUE, BattleScript_1D753D jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D setbyte gSharedMem + 0x16055, 2 - callatk BattleScript_1D756C + call BattleScript_1D756C setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D80CF jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D80CF - atk47 + setgraphicalstatchangevalues playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D80CF: @ 81D80CF - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Twister: @ 81D80D4 - jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D80EE + jumpifstatus3condition TARGET, 0x40, 1, BattleScript_1D80EE orword gHitMarker, 0x10000 setbyte gSharedMem + 0x1601F, 2 BattleScript_1D80EE: @ 81D80EE setbyte gUnknown_02024D1F + 0x2, 8 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Earthquake: @ 81D80F9 attackcanceler attackstring ppreduce - selectnexttarget + selectfirstvalidtarget BattleScript_1D80FD: @ 81D80FD - atk25 - jumpifspecialstatusflag TARGET, 0x80, 1, BattleScript_1D811D + movevaluescleanup + jumpifstatus3condition TARGET, 0x80, 1, BattleScript_1D811D orword gHitMarker, 0x20000 setbyte gSharedMem + 0x1601F, 2 - jump BattleScript_1D812C + goto BattleScript_1D812C BattleScript_1D811D: @ 81D811D bicword gHitMarker, 0x20000 @@ -1935,15 +1936,15 @@ BattleScript_1D811D: @ 81D811D BattleScript_1D812C: @ 81D812C accuracycheck BattleScript_1D8165, 0 critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 @@ -1951,44 +1952,44 @@ BattleScript_1D812C: @ 81D812C waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - faintpokemon TARGET, 0, 0x0 + tryfaintmon TARGET, 0, 0x0 setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jumpwhiletargetvalid BattleScript_1D80FD + moveend 2, 16 + jumpifnexttargetvalid BattleScript_1D80FD end BattleScript_1D8165: @ 81D8165 pause 32 - atk6 - missmessage + typecalc + effectivenesssound resultmessage waitmessage 64 setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jumpwhiletargetvalid BattleScript_1D80FD + moveend 2, 16 + jumpifnexttargetvalid BattleScript_1D80FD end MoveEffect_FutureSight: @ 81D817D attackcanceler attackstring ppreduce - setfutureattack BattleScript_ButItFailed + trysetfutureattack BattleScript_ButItFailed attackanimation waitanimation printfromtable BattleTextList_4015E2 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Gust: @ 81D8194 - jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D6F14 + jumpifstatus3condition TARGET, 0x40, 1, BattleScript_1D6F14 orword gHitMarker, 0x10000 setbyte gSharedMem + 0x1601F, 2 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_FlinchHit2: @ 81D81B3 - jumpifspecialstatusflag TARGET, 0x100, 1, BattleScript_1D80EE + jumpifstatus3condition TARGET, 0x100, 1, BattleScript_1D80EE setbyte gSharedMem + 0x1601F, 2 - jump BattleScript_1D80EE + goto BattleScript_1D80EE MoveEffect_Solarbeam: @ 81D81C9 jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_1D81E1 @@ -1996,30 +1997,30 @@ MoveEffect_Solarbeam: @ 81D81C9 jumpifhalfword 4, gBattleWeather, 96, BattleScript_1D8209 BattleScript_1D81E1: @ 81D81E1 - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D + jumpifstatus2 USER, S_CONTINUE, BattleScript_1D753D jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D setbyte gSharedMem + 0x16055, 1 - callatk BattleScript_1D756C - jump BattleScript_EndTurn + call BattleScript_1D756C + goto BattleScript_EndTurn BattleScript_1D8209: @ 81D8209 orword gHitMarker, 0x8000000 setbyte gUnknown_02024D1F + 0x2, 76 - seteffecttarget + seteffectprimary ppreduce - jump BattleScript_1D753D + goto BattleScript_1D753D MoveEffect_Thunder: @ 81D821F setbyte gUnknown_02024D1F + 0x2, 5 orword gHitMarker, 0x10000 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Teleport: @ 81D8233 attackcanceler attackstring ppreduce jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_ButItFailed - atk76 USER, 2 + getifcantrunfrombattle USER jumpifbyte 0, gBattleCommunication, 1, BattleScript_ButItFailed jumpifbyte 0, gBattleCommunication, 2, BattleScript_1D8839 attackanimation @@ -2027,7 +2028,7 @@ MoveEffect_Teleport: @ 81D8233 printstring BATTLE_TEXT_FledBattle waitmessage 64 setbyte gBattleOutcome, 5 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_BeatUp: @ 81D826E attackcanceler @@ -2038,82 +2039,82 @@ MoveEffect_BeatUp: @ 81D826E setbyte gBattleCommunication, 0 BattleScript_1D8281: @ 81D8281 - atk25 - beatupcalculation BattleScript_1D82C4, BattleScript_ButItFailed + movevaluescleanup + trydobeatup BattleScript_1D82C4, BattleScript_ButItFailed printstring BATTLE_TEXT_PokeAttack critcalc jumpifbyte 1, gCritMultiplier, 2, BattleScript_1D829C manipulatedamage 2 BattleScript_1D829C: @ 81D829C - atk7 + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 - faintpokemon TARGET, 0, 0x0 + tryfaintmon TARGET, 0, 0x0 setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 - jump BattleScript_1D8281 + moveend 2, 16 + goto BattleScript_1D8281 BattleScript_1D82C4: @ 81D82C4 end MoveEffect_Fly: @ 81D82C5 - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D8333 + jumpifstatus2 USER, S_CONTINUE, BattleScript_1D8333 jumpifword 4, gHitMarker, 0x200, BattleScript_1D8333 jumpifhalfword 0, gCurrentMove, 19, BattleScript_1D8322 jumpifhalfword 0, gCurrentMove, 291, BattleScript_1D8317 jumpifhalfword 0, gCurrentMove, 340, BattleScript_1D830C setbyte gSharedMem + 0x16055, 5 - jump BattleScript_1D8328 + goto BattleScript_1D8328 BattleScript_1D830C: @ 81D830C setbyte gSharedMem + 0x16055, 7 - jump BattleScript_1D8328 + goto BattleScript_1D8328 BattleScript_1D8317: @ 81D8317 setbyte gSharedMem + 0x16055, 6 - jump BattleScript_1D8328 + goto BattleScript_1D8328 BattleScript_1D8322: @ 81D8322 setbyte gSharedMem + 0x16055, 4 BattleScript_1D8328: @ 81D8328 - callatk BattleScript_1D756C - hidepreattack - jump BattleScript_EndTurn + call BattleScript_1D756C + setsemiinvulnerablebit + goto BattleScript_EndTurn BattleScript_1D8333: @ 81D8333 attackcanceler setbyte gUnknown_02024D1F + 0x2, 12 setbyte gSharedMem + 0x16002, 1 - clearstatus USER + clearstatusfromeffect USER orword gHitMarker, 0x800 jumpifhalfword 1, gCurrentMove, 340, BattleScript_1D835D setbyte gUnknown_02024D1F + 0x2, 5 BattleScript_1D835D: @ 81D835D accuracycheck BattleScript_1D836A, 0 - unhidepostattack - jump BattleScript_1D6F42 + clearsemiinvulnerablebit + goto BattleScript_1D6F42 BattleScript_1D836A: @ 81D836A - unhidepostattack - jump BattleScript_1D6F72 + clearsemiinvulnerablebit + goto BattleScript_1D6F72 MoveEffect_DefenseCurl: @ 81D8370 attackcanceler attackstring ppreduce - setcurled + setdefensecurlbit setbyte gSharedMem + 0x1601E, 18 statbuffchange 65, BattleScript_1D838D jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D71D8 @@ -2121,35 +2122,35 @@ MoveEffect_DefenseCurl: @ 81D8370 waitanimation BattleScript_1D838D: @ 81D838D - jump BattleScript_1D71D0 + goto BattleScript_1D71D0 MoveEffect_Softboiled: @ 81D8392 attackcanceler attackstring ppreduce - setdamageasrestorehalfmaxhp BattleScript_1D83B5, 0 + tryhealhalfhealth BattleScript_1D83B5, 0 BattleScript_1D839B:: @ 81D839B attackanimation waitanimation orword gHitMarker, 0x100 - graphicalhpupdate TARGET + healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D83B5:: @ 81D83B5 pause 32 printstring BATTLE_TEXT_HPFull waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_FakeOut: @ 81D83C3 attackcanceler jumpifnotfirstturn BattleScript_1D83D4 setbyte gUnknown_02024D1F + 0x2, 136 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 BattleScript_1D83D4: @ 81D83D4 attackstring @@ -2162,26 +2163,26 @@ BattleScript_ButItFailed:: @ 81D83D6 orbyte gBattleMoveFlags, 32 resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D83E8: @ 81D83E8 pause 32 orbyte gBattleMoveFlags, 8 resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Uproar: @ 81D83FA attackcanceler accuracycheck BattleScript_1D6F72, 0 setbyte gUnknown_02024D1F + 0x2, 74 attackstring - jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D8414 + jumpifstatus2 USER, S_CONTINUE, BattleScript_1D8414 ppreduce BattleScript_1D8414: @ 81D8414 - nop3 - jump BattleScript_1D6F44 + nop + goto BattleScript_1D6F44 MoveEffect_Stockpile: @ 81D841A attackcanceler @@ -2192,7 +2193,7 @@ MoveEffect_Stockpile: @ 81D841A waitanimation printfromtable BattleTextList_40155E waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_SpitUp: @ 81D842D attackcanceler @@ -2201,15 +2202,15 @@ MoveEffect_SpitUp: @ 81D842D ppreduce accuracycheck BattleScript_1D6F72, 0 stockpiletobasedamage BattleScript_1D844E - atk6 - atk69 - jump BattleScript_1D6F48 + typecalc + adjustsetdamage + goto BattleScript_1D6F48 BattleScript_1D844E: @ 81D844E pause 32 printstring BATTLE_TEXT_SpitUpFail waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D845C: @ 81D845C attackstring @@ -2218,27 +2219,27 @@ BattleScript_1D845C: @ 81D845C stockpiletobasedamage BattleScript_1D844E resultmessage waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Swallow: @ 81D846F attackcanceler attackstring ppreduce - stockpiletohprecovery BattleScript_1D847C - jump BattleScript_1D839B + stockpiletohpheal BattleScript_1D847C + goto BattleScript_1D839B BattleScript_1D847C: @ 81D847C pause 32 printfromtable BattleTextList_401566 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Hail: @ 81D848C attackcanceler attackstring ppreduce sethail - jump BattleScript_1D7FFA + goto BattleScript_1D7FFA MoveEffect_Torment: @ 81D8495 attackcanceler @@ -2250,60 +2251,60 @@ MoveEffect_Torment: @ 81D8495 waitanimation printstring BATTLE_TEXT_TormentSubject waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Flatter: @ 81D84B1 attackcanceler - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F6C + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D6F6C accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - jumpifconfusedandattackmaxed 4, BattleScript_ButItFailed + jumpifconfusedandstatmaxed 4, BattleScript_ButItFailed attackanimation waitanimation setbyte gSharedMem + 0x1601E, 20 statbuffchange 1, BattleScript_1D84F4 jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D84F4 - atk47 + setgraphicalstatchangevalues playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 BattleScript_1D84F4: @ 81D84F4 jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpifsideaffecting TARGET, 32, BattleScript_1D9037 setbyte gUnknown_02024D1F + 0x2, 7 - seteffecttarget - jump BattleScript_EndTurn + seteffectprimary + goto BattleScript_EndTurn MoveEffect_WillOWisp: @ 81D850F attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed jumpifstatus TARGET, BRN, BattleScript_1D8575 jumpiftype TARGET, TYPE_FIRE, BattleScript_1D83E8 jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_1D855B jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, 0 - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpifsideaffecting TARGET, 32, BattleScript_1D9037 attackanimation waitanimation setbyte gUnknown_02024D1F + 0x2, 3 - seteffecttarget - jump BattleScript_EndTurn + seteffectprimary + goto BattleScript_EndTurn BattleScript_1D855B: @ 81D855B copyarray gEffectBank, gBankTarget, 1 setbyte gUnknown_02024D1F + 0x4, 0 - callatk BattleScript_BRNPrevention - jump BattleScript_EndTurn + call BattleScript_BRNPrevention + goto BattleScript_EndTurn BattleScript_1D8575: @ 81D8575 pause 32 printstring BATTLE_TEXT_AlreadyBurned waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Memento: @ 81D8583 attackcanceler @@ -2311,10 +2312,10 @@ MoveEffect_Memento: @ 81D8583 attackstring ppreduce jumpifattackandspecialattackcannotfall BattleScript_ButItFailed - setuserhptozero + setatkhptozero attackanimation waitanimation - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D85FF + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D85FF setbyte gSharedMem + 0x160DC, 0 playstatchangeanimation TARGET, 18, 7 playstatchangeanimation TARGET, 2, 3 @@ -2333,13 +2334,13 @@ BattleScript_1D85D0: @ 81D85D0 waitmessage 64 BattleScript_1D85F3: @ 81D85F3 - faintpokemon USER, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon USER, 0, 0x0 + goto BattleScript_EndTurn BattleScript_1D85FF: @ 81D85FF printstring BATTLE_TEXT_NoEffect waitmessage 64 - jump BattleScript_1D85F3 + goto BattleScript_1D85F3 BattleScript_1D860A: @ 81D860A attackstring @@ -2347,21 +2348,21 @@ BattleScript_1D860A: @ 81D860A jumpifattackandspecialattackcannotfall BattleScript_1D8611 BattleScript_1D8611: @ 81D8611 - setuserhptozero + setatkhptozero pause 64 - missmessage + effectivenesssound resultmessage waitmessage 64 - faintpokemon USER, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon USER, 0, 0x0 + goto BattleScript_EndTurn MoveEffect_Facade: @ 81D8626 jumpifstatus USER, PSN | BRN | PAR | TOX, BattleScript_1D8635 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 BattleScript_1D8635: @ 81D8635 setbyte gSharedMem + 0x1601F, 2 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_FocusPunch: @ 81D8640 attackcanceler @@ -2369,17 +2370,17 @@ MoveEffect_FocusPunch: @ 81D8640 ppreduce printstring BATTLE_TEXT_LostFocus waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Smellingsalt: @ 81D8652 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F14 + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D6F14 setbyte gUnknown_02024D1F + 0x2, 164 jumpifstatus TARGET, PAR, BattleScript_1D8671 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 BattleScript_1D8671: @ 81D8671 setbyte gSharedMem + 0x1601F, 2 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_FollowMe: @ 81D867C attackcanceler @@ -2390,7 +2391,7 @@ MoveEffect_FollowMe: @ 81D867C waitanimation printstring BATTLE_TEXT_CenterAttention waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_NaturePower: @ 81D868D attackcanceler @@ -2410,7 +2411,7 @@ MoveEffect_Charge: @ 81D869A waitanimation printstring BATTLE_TEXT_ChargingPower waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Taunt: @ 81D86AB attackcanceler @@ -2422,54 +2423,54 @@ MoveEffect_Taunt: @ 81D86AB waitanimation printstring BATTLE_TEXT_TauntFell waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_HelpingHand: @ 81D86C7 attackcanceler attackstring ppreduce - sethelpinghand BattleScript_ButItFailed + trysethelpinghand BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_ReadyToHelp waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Trick: @ 81D86DC attackcanceler attackstring ppreduce - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed accuracycheck BattleScript_ButItFailed, 0 - itemswap BattleScript_ButItFailed + tryswapitems BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_SwitchedItems waitmessage 64 printfromtable BattleTextList_401642 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_RolePlay: @ 81D870A attackcanceler attackstring ppreduce accuracycheck BattleScript_ButItFailed, 65535 - copyability BattleScript_ButItFailed + trycopyability BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_CopiedObject waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Wish: @ 81D8726 attackcanceler attackstring ppreduce - atkd4 0, BattleScript_ButItFailed + trywish 0, BattleScript_ButItFailed attackanimation waitanimation - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Assist: @ 81D8736 attackcanceler @@ -2479,59 +2480,59 @@ MoveEffect_Assist: @ 81D8736 waitanimation setbyte gSharedMem + 0x16002, 0 setbyte gSharedMem + 0x160A1, 0 - jumptoattack USER + jumptorandomattack USER MoveEffect_Ingrain: @ 81D874D attackcanceler attackstring ppreduce - setroots BattleScript_ButItFailed + trysetroots BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_PlantedRoots waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Superpower: @ 81D8762 setbyte gUnknown_02024D1F + 0x2, 229 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_MagicCoat: @ 81D876D attackcanceler - setmagiccoat BattleScript_1D83D4 + trysetmagiccoat BattleScript_1D83D4 attackstring ppreduce attackanimation waitanimation printstring BATTLE_TEXT_ShroudedItself waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Recycle: @ 81D8782 attackcanceler attackstring ppreduce - recycleitem BattleScript_ButItFailed + tryrecycleitem BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_FoundOne waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Revenge: @ 81D8797 doubledamagedealtifdamaged - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_BrickBreak: @ 81D879D attackcanceler accuracycheck BattleScript_1D6F72, 0 attackstring ppreduce - removereflectlightscreen + removelightscreenreflect critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage jumpifbyte 0, gSharedMem + 0x16002, 0, BattleScript_1D87BD bicbyte gBattleMoveFlags, 9 @@ -2543,19 +2544,19 @@ BattleScript_1D87BD: @ 81D87BD waitmessage 64 BattleScript_1D87D0: @ 81D87D0 - damagecalc2 - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + typecalc2 + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 - seteffectwithchancetarget - faintpokemon TARGET, 0, 0x0 - jump BattleScript_EndTurn + seteffectwithchance + tryfaintmon TARGET, 0, 0x0 + goto BattleScript_EndTurn MoveEffect_Yawn: @ 81D87EE attackcanceler @@ -2563,16 +2564,16 @@ MoveEffect_Yawn: @ 81D87EE ppreduce jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_1D882F jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_1D882F - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifhalverset TARGET, 32, BattleScript_1D9037 + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifsideaffecting TARGET, 32, BattleScript_1D9037 accuracycheck BattleScript_ButItFailed, 65535 - jumpifcannotsleep BattleScript_ButItFailed + jumpifcantmakeasleep BattleScript_ButItFailed setyawn BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_DrowsyMade waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D882F: @ 81D882F copyarray gSharedMem + 0x16003, gSharedMem + 0x160F8, 1 @@ -2581,11 +2582,11 @@ BattleScript_1D8839: @ 81D8839 pause 32 printstring BATTLE_TEXT_MadeIneffective2 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_KnockOff: @ 81D8847 setbyte gUnknown_02024D1F + 0x2, 54 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Endeavor: @ 81D8852 attackcanceler @@ -2594,39 +2595,39 @@ MoveEffect_Endeavor: @ 81D8852 setdamagetohealthdifference BattleScript_ButItFailed copyarray gHP_dealt, gBattleMoveDamage, 4 accuracycheck BattleScript_1D6F77, 0 - atk6 + typecalc jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D6F48 bicbyte gBattleMoveFlags, 6 copyarray gBattleMoveDamage, gHP_dealt, 4 - atk69 - jump BattleScript_1D6F48 + adjustsetdamage + goto BattleScript_1D6F48 MoveEffect_Eruption: @ 81D888D scaledamagebyhealthratio - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_SkillSwap: @ 81D8893 attackcanceler attackstring ppreduce accuracycheck BattleScript_ButItFailed, 65535 - abilityswap BattleScript_ButItFailed + tryswapabilities BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_AbilitySwap waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Imprison: @ 81D88AF attackcanceler attackstring ppreduce - imprisoneffect BattleScript_ButItFailed + tryimprision BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_SealedMove waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Refresh: @ 81D88C4 attackcanceler @@ -2637,23 +2638,23 @@ MoveEffect_Refresh: @ 81D88C4 waitanimation printstring BATTLE_TEXT_StatusNormal waitmessage 64 - atk98 1 - jump BattleScript_EndTurn + updatestatusicon 1 + goto BattleScript_EndTurn MoveEffect_Grudge: @ 81D88DB attackcanceler attackstring ppreduce - setgrudge BattleScript_ButItFailed + trysetgrudge BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_GrudgeBear waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Snatch: @ 81D88F0 attackcanceler - setstealstatchange BattleScript_1D83D4 + trysetsnatch BattleScript_1D83D4 attackstring ppreduce attackanimation @@ -2661,7 +2662,7 @@ MoveEffect_Snatch: @ 81D88F0 pause 32 printstring BATTLE_TEXT_AwaitMove waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_LowKick: @ 81D8908 attackcanceler @@ -2669,15 +2670,15 @@ MoveEffect_LowKick: @ 81D8908 ppreduce weightdamagecalculation accuracycheck BattleScript_1D6F77, 0 - jump BattleScript_1D6F44 + goto BattleScript_1D6F44 MoveEffect_SecretPower: @ 81D8918 - naturepowereffect - jump BattleScript_1D6F14 + getsecretpowereffect + goto BattleScript_1D6F14 MoveEffect_DoubleEdge: @ 81D891E setbyte gUnknown_02024D1F + 0x2, 230 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_TeeterDance: @ 81D8929 attackcanceler @@ -2686,23 +2687,23 @@ MoveEffect_TeeterDance: @ 81D8929 setbyte gBankTarget, 0 BattleScript_1D8932: @ 81D8932 - atk25 + movevaluescleanup setbyte gUnknown_02024D1F + 0x2, 7 jumpifarrayequal gBankAttacker, gBankTarget, 1, BattleScript_1D8978 jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D8996 - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D89B2 - jumpifsecondarytstatus TARGET, S_CONFUSED, BattleScript_1D89C0 + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D89B2 + jumpifstatus2 TARGET, S_CONFUSED, BattleScript_1D89C0 accuracycheck BattleScript_1D89CE, 0 - jumpifhalverset TARGET, 32, BattleScript_1D89A4 + jumpifsideaffecting TARGET, 32, BattleScript_1D89A4 attackanimation waitanimation - seteffecttarget + seteffectprimary resultmessage waitmessage 64 BattleScript_1D8978: @ 81D8978 setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 + moveend 2, 16 addbyte gBankTarget, 1 jumpifarraynotequal gBankTarget, gNoOfAllBanks, 1, BattleScript_1D8932 end @@ -2711,30 +2712,30 @@ BattleScript_1D8996: @ 81D8996 pause 32 printstring BATTLE_TEXT_PreventedConfusion waitmessage 64 - jump BattleScript_1D8978 + goto BattleScript_1D8978 BattleScript_1D89A4: @ 81D89A4 pause 32 printstring BATTLE_TEXT_SafeguardActive waitmessage 64 - jump BattleScript_1D8978 + goto BattleScript_1D8978 BattleScript_1D89B2: @ 81D89B2 pause 32 printstring BATTLE_TEXT_Failed waitmessage 64 - jump BattleScript_1D8978 + goto BattleScript_1D8978 BattleScript_1D89C0: @ 81D89C0 pause 32 printstring BATTLE_TEXT_AlreadyConfused waitmessage 64 - jump BattleScript_1D8978 + goto BattleScript_1D8978 BattleScript_1D89CE: @ 81D89CE resultmessage waitmessage 64 - jump BattleScript_1D8978 + goto BattleScript_1D8978 MoveEffect_MudSport: @ 81D89D7 MoveEffect_WaterSport: @ 81D89D7 @@ -2746,19 +2747,19 @@ MoveEffect_WaterSport: @ 81D89D7 waitanimation printfromtable BattleTextList_4015D4 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_PoisonFang: @ 81D89EE setbyte gUnknown_02024D1F + 0x2, 6 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_WeatherBall: @ 81D89F9 - seteffectbyweather - jump BattleScript_1D6F14 + setweatherballtype + goto BattleScript_1D6F14 MoveEffect_Overheat: @ 81D89FF setbyte gUnknown_02024D1F + 0x2, 251 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_Tickle: @ 81D8A0A attackcanceler @@ -2789,14 +2790,14 @@ BattleScript_1D8A55: @ 81D8A55 waitmessage 64 BattleScript_1D8A78: @ 81D8A78 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D8A7D: @ 81D8A7D pause 32 orbyte gBattleMoveFlags, 32 printstring BATTLE_TEXT_StatNoLower waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_CosmicPower: @ 81D8A91 attackcanceler @@ -2824,11 +2825,11 @@ BattleScript_1D8AD1: @ 81D8AD1 waitmessage 64 BattleScript_1D8AF0: @ 81D8AF0 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_SkyUppercut: @ 81D8AF5 orword gHitMarker, 0x10000 - jump BattleScript_1D6F14 + goto BattleScript_1D6F14 MoveEffect_BulkUp: @ 81D8B03 attackcanceler @@ -2856,7 +2857,7 @@ BattleScript_1D8B43: @ 81D8B43 waitmessage 64 BattleScript_1D8B62: @ 81D8B62 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_CalmMind: @ 81D8B67 attackcanceler @@ -2884,14 +2885,14 @@ BattleScript_1D8BA7: @ 81D8BA7 waitmessage 64 BattleScript_1D8BC6: @ 81D8BC6 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D8BCB: @ 81D8BCB pause 32 orbyte gBattleMoveFlags, 32 printstring BATTLE_TEXT_StatNoHigher waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_DragonDance: @ 81D8BDF attackcanceler @@ -2919,7 +2920,7 @@ BattleScript_1D8C1F: @ 81D8C1F waitmessage 64 BattleScript_1D8C3E: @ 81D8C3E - jump BattleScript_EndTurn + goto BattleScript_EndTurn MoveEffect_Camouflage: @ 81D8C43 attackcanceler @@ -2930,27 +2931,27 @@ MoveEffect_Camouflage: @ 81D8C43 waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn gUnknown_081D8C58:: @ 81D8C58 - atk56 1 + playfaintcry 1 pause 64 - atk1a 1 - atk1b 1 + dofaintanimation 1 + cleareffectsonfaint 1 printstring BATTLE_TEXT_AttackingFainted return gUnknown_081D8C65:: @ 81D8C65 - atk56 0 + playfaintcry 0 pause 64 - atk1a 0 - atk1b 0 + dofaintanimation 0 + cleareffectsonfaint 0 printstring BATTLE_TEXT_DefendingFainted return gUnknown_081D8C72:: @ 81D8C72 setbyte gSharedMem + 0x1600F, 0 - atk23 0 + getexp 0 end2 gUnknown_081D8C7B:: @ 81D8C7B @@ -2960,60 +2961,60 @@ gUnknown_081D8C7B:: @ 81D8C7B jumpifword 5, gHitMarker, 0x400000, BattleScript_1D8CC2 printstring BATTLE_TEXT_UseNext setbyte gBattleCommunication, 0 - atk67 + yesnobox jumpifbyte 0, gUnknown_02024D1F, 0, BattleScript_1D8CC2 - atk72 BattleScript_1D8D86 + jumpifplayerran BattleScript_1D8D86 printstring BATTLE_TEXT_CantEscape BattleScript_1D8CC2: @ 81D8CC2 openpartyscreen 3, BattleScript_1D8D86 - atk51 3, 2 + switchhandleorder 3, 2 jumpifhalfword 5, gBattleTypeFlags, 8, BattleScript_1D8D66 jumpifhalfword 4, gBattleTypeFlags, 2, BattleScript_1D8D66 jumpifhalfword 4, gBattleTypeFlags, 256, BattleScript_1D8D66 jumpifhalfword 4, gBattleTypeFlags, 1, BattleScript_1D8D66 jumpifword 4, gHitMarker, 0x400000, BattleScript_1D8D66 jumpifbyte 0, gSharedMem + 0x16084, 1, BattleScript_1D8D66 - jumpifcannotswitch USER, BattleScript_1D8D66 + jumpifcantswitch USER, BattleScript_1D8D66 printstring BATTLE_TEXT_WillSwitch setbyte gBattleCommunication, 0 - atk67 + yesnobox jumpifbyte 0, gUnknown_02024D1F, 1, BattleScript_1D8D66 - atk6e + setatktoplayer0 openpartyscreen 129, BattleScript_1D8D66 - atk51 USER, 2 + switchhandleorder USER, 2 jumpifbyte 0, gBattleCommunication, 6, BattleScript_1D8D66 - atk6b - atk76 USER, 5 - atk74 1 + atknameinbuff1 + resetintrimidatetracebits USER + hpthresholds2 1 printstring 2 - atke2 USER - waitstateatk - atk4b - waitstateatk - atk61 1 - switch1 USER - switch2 USER - atk73 USER + switchoutabilities USER + waitstate + returnatktoball + waitstate + drawpartystatussummary 1 + getswitchedmondata USER + switchindataupdate USER + hpthresholds USER printstring 3 atk62 1 - switch3 USER, 0 - waitstateatk - atk52 USER - atk6d + switchinanim USER, 0 + waitstate + switchineffects USER + resetsentmonsvalue BattleScript_1D8D66: @ 81D8D66 - atk61 3 - switch1 3 - switch2 3 - atk73 3 + drawpartystatussummary 3 + getswitchedmondata 3 + switchindataupdate 3 + hpthresholds 3 printstring 3 atk62 3 - switch3 3, 0 - waitstateatk - atk52 3 + switchinanim 3, 0 + waitstate + switchineffects 3 jumpifhalfword 4, gBattleTypeFlags, 1, BattleScript_1D8D86 - atk68 + cancelallactions BattleScript_1D8D86: @ 81D8D86 end2 @@ -3022,21 +3023,21 @@ BattleScript_1D8D87: @ 81D8D87 openpartyscreen 5, BattleScript_1D8D8D BattleScript_1D8D8D: @ 81D8D8D - atk51 3, 0 + switchhandleorder 3, 0 openpartyscreen 6, BattleScript_1D8DBD - atk51 3, 0 + switchhandleorder 3, 0 BattleScript_1D8D99: @ 81D8D99 - atk51 3, 2 - atk61 3 - switch1 3 - switch2 3 - atk73 3 + switchhandleorder 3, 2 + drawpartystatussummary 3 + getswitchedmondata 3 + switchindataupdate 3 + hpthresholds 3 printstring 3 atk62 3 - switch3 3, 0 - waitstateatk - atk52 5 + switchinanim 3, 0 + waitstate + switchineffects 5 jumpifarraynotequal gBank1, gNoOfAllBanks, 1, BattleScript_1D8D99 BattleScript_1D8DBD: @ 81D8DBD @@ -3044,16 +3045,16 @@ BattleScript_1D8DBD: @ 81D8DBD gUnknown_081D8DBE:: @ 81D8DBE printstring BATTLE_TEXT_PlayerDefeatedTrainer2 - atk53 1 - waitstateatk + trainerslidein 1 + waitstate printstring BATTLE_TEXT_UnknownString - atk5d + getmoneyreward printstring BATTLE_TEXT_WinningPrize waitmessage 64 gUnknown_081D8DCE:: @ 81D8DCE - givemoney - pickupitemcalculation + givepaydaymoney + pickup end2 gUnknown_081D8DD1:: @ 81D8DD1 @@ -3077,8 +3078,8 @@ gUnknown_081D8E02:: @ 81D8E02 gUnknown_081D8E0D:: @ 81D8E0D printstring BATTLE_TEXT_PlayerDefeatedTrainer2 - atk53 1 - waitstateatk + trainerslidein 1 + waitstate end2 gUnknown_081D8E14:: @ 81D8E14 @@ -3112,51 +3113,51 @@ gUnknown_081D8E3B:: @ 81D8E3B end2 gUnknown_081D8E44:: @ 81D8E44 - printfromtable2 BattleTextList_401512 - atk44 + printselectionstringfromtable BattleTextList_401512 + endselectionscript gUnknown_081D8E4A:: @ 81D8E4A - printstring2 BATTLE_TEXT_BoxFull - atk44 + printselectionstring BATTLE_TEXT_BoxFull + endselectionscript gUnknown_081D8E4E:: @ 81D8E4E - atk74 1 + hpthresholds2 1 printstring 2 setbyte gSharedMem + 0x1601F, 2 jumpifbyte 4, gBattleTypeFlags, 1, BattleScript_1D8E6B - atk26 1 - jump BattleScript_1D8E6D + setmultihit 1 + goto BattleScript_1D8E6D BattleScript_1D8E6B: @ 81D8E6B - atk26 2 + setmultihit 2 BattleScript_1D8E6D: @ 81D8E6D - atkba BattleScript_1D8E7A + jumpifnopursuitswitchdmg BattleScript_1D8E7A atk5f - atkab - callatk BattleScript_1D8EAD + trysetdestinybondtohappen + call BattleScript_1D8EAD atk5f BattleScript_1D8E7A: @ 81D8E7A - atk27 BattleScript_1D8E6D - atke2 USER - waitstateatk - atk4b - waitstateatk - atk61 1 - atk51 USER, 1 - switch1 USER - switch2 USER - atk73 USER + decrementmultihit BattleScript_1D8E6D + switchoutabilities USER + waitstate + returnatktoball + waitstate + drawpartystatussummary 1 + switchhandleorder USER, 1 + getswitchedmondata USER + switchindataupdate USER + hpthresholds USER printstring 3 atk62 1 - switch3 USER, 0 - waitstateatk - atk52 USER + switchinanim USER, 0 + waitstate + switchineffects USER setbyte gSharedMem + 0x1600C, 4 - atk49 1, 0 + moveend 1, 0 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 + moveend 1, 0 end2 BattleScript_1D8EAD: @ 81D8EAD @@ -3164,27 +3165,27 @@ BattleScript_1D8EAD: @ 81D8EAD attackstring ppreduce critcalc - atk5 - atk6 - atk7 + damagecalc + typecalc + adjustnormaldamage attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET critmessage waitmessage 64 resultmessage waitmessage 64 - faintpokemon TARGET, 0, 0x0 + tryfaintmon TARGET, 0, 0x0 setbyte gSharedMem + 0x1600C, 3 - atk49 2, 6 - atk76 TARGET, 4 + moveend 2, 6 + various TARGET, 4 jumpifbyte 0, gBattleCommunication, 0, BattleScript_1D8EEE setbyte gSharedMem + 0x1600F, 0 - atk23 0 + getexp 0 BattleScript_1D8EEE: @ 81D8EEE return @@ -3194,30 +3195,30 @@ BattleScript_Pausex20:: @ 81D8EEF return BattleScript_LevelUp:: @ 81D8EF3 - atk55 0xe10016f + fanfare 0xe10016f attackcanceler setbyte gSharedMem + 0x1609C, 0 - atk6c - checkiflearnmoveinbattle BattleScript_1D8F4F, BattleScript_1D8F61, 1 - jump BattleScript_1D8F19 + drawlvlupbox + handlelearnnewmove BattleScript_1D8F4F, BattleScript_1D8F61, 1 + goto BattleScript_1D8F19 BattleScript_1D8F0F: @ 81D8F0F - checkiflearnmoveinbattle BattleScript_1D8F4F, BattleScript_1D8F61, 0 + handlelearnnewmove BattleScript_1D8F4F, BattleScript_1D8F61, 0 BattleScript_1D8F19: @ 81D8F19 - atk71 + buffermovetolearn printstring BATTLE_TEXT_TryingToLearnMove printstring BATTLE_TEXT_CantLearnMore printstring BATTLE_TEXT_DeleteMove - waitstateatk + waitstate setbyte gSharedMem + 0x1601A, 0 - atk5a BattleScript_1D8F46 + yesnoboxlearnmove BattleScript_1D8F46 printstring BATTLE_TEXT_StopLearning - waitstateatk + waitstate setbyte gSharedMem + 0x1601A, 0 - atk5b BattleScript_1D8F19 + yesnoboxstoplearningmove BattleScript_1D8F19 printstring BATTLE_TEXT_DidNotLearn - jump BattleScript_1D8F0F + goto BattleScript_1D8F0F BattleScript_1D8F46: @ 81D8F46 printstring BATTLE_TEXT_MoveForget123 @@ -3225,12 +3226,12 @@ BattleScript_1D8F46: @ 81D8F46 printstring BATTLE_TEXT_MoveForgetAnd BattleScript_1D8F4F: @ 81D8F4F - atk71 - atk55 0xf10016f + buffermovetolearn + fanfare 0xf10016f attackcanceler waitmessage 64 - atk76 USER, 6 - jump BattleScript_1D8F0F + updatechoicemoveonlvlup USER + goto BattleScript_1D8F0F BattleScript_1D8F61: @ 81D8F61 return @@ -3247,21 +3248,21 @@ BattleScript_1D8F7C: @ 81D8F7C gUnknown_081D8F7D:: @ 81D8F7D printfromtable BattleTextList_401528 waitmessage 64 - atk46 1, gSharedMem + 0x160A4, 0x0 + playanimation2 1, gSharedMem + 0x160A4, 0x0 setbyte gBattleCommunication, 0 BattleScript_1D8F95: @ 81D8F95 - atk32 gBankAttacker, gTurnOrder, gBattleCommunication, 1 + copyarraywithindex gBankAttacker, gTurnOrder, gBattleCommunication, 1 weatherdamage jumpifword 0, gBattleMoveDamage, 0x0, BattleScript_1D8FD6 printfromtable BattleTextList_40152C waitmessage 64 orword gHitMarker, 0x1100120 - missmessage - atk5c USER - graphicalhpupdate USER + effectivenesssound + hitanimation USER + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 + tryfaintmon USER, 0, 0x0 atk24 BattleScript_1D8FD6 BattleScript_1D8FD6: @ 81D8FD6 @@ -3292,7 +3293,7 @@ gUnknown_081D9016:: @ 81D9016 gUnknown_081D901D:: @ 81D901D printfromtable BattleTextList_4015EE waitmessage 64 - atk46 1, gSharedMem + 0x160A4, 0x0 + playanimation2 1, gSharedMem + 0x160A4, 0x0 end3 gUnknown_081D9030:: @ 81D9030 @@ -3315,76 +3316,76 @@ gUnknown_081D9041:: @ 81D9041 BattleScript_LeechSeedTurnDrain:: @ 81D904B playanimation USER, B_ANIM_LEECH_SEED_DRAIN, gSharedMem + 0x160A4 orword gHitMarker, 0x100100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER copyarray gBattleMoveDamage, gHP_dealt, 4 jumpifability USER, ABILITY_LIQUID_OOZE, BattleScript_1D907D manipulatedamage 0 setbyte gUnknown_02024D1F + 0x4, 3 - jump BattleScript_1D9083 + goto BattleScript_1D9083 BattleScript_1D907D: @ 81D907D setbyte gUnknown_02024D1F + 0x4, 4 BattleScript_1D9083: @ 81D9083 orword gHitMarker, 0x100100 - graphicalhpupdate TARGET + healthbarupdate TARGET datahpupdate TARGET printfromtable BattleTextList_40154C waitmessage 64 - faintpokemon USER, 0, 0x0 - faintpokemon TARGET, 0, 0x0 + tryfaintmon USER, 0, 0x0 + tryfaintmon TARGET, 0, 0x0 end2 BattleScript_BideStoringEnergy:: @ 81D90A7 printstring BATTLE_TEXT_StoringEnergy waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_BideAttack:: @ 81D90B2 printstring BATTLE_TEXT_UnleashedEnergy waitmessage 64 accuracycheck BattleScript_1D6F77, 0 - atk6 + typecalc bicbyte gBattleMoveFlags, 6 copyarray gBattleMoveDamage, gSharedMem + 0x16090, 4 - atk69 + adjustsetdamage setbyte gSharedMem + 0x16002, 1 attackanimation waitanimation - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET resultmessage waitmessage 64 - faintpokemon TARGET, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon TARGET, 0, 0x0 + goto BattleScript_EndTurn BattleScript_BideNoEnergyToAttack:: @ 81D90F1 printstring BATTLE_TEXT_UnleashedEnergy waitmessage 64 - jump BattleScript_ButItFailed + goto BattleScript_ButItFailed gUnknown_081D90FC:: @ 81D90FC attackanimation waitanimation - atke2 TARGET - atk58 TARGET - waitstateatk + switchoutabilities TARGET + returntoball TARGET + waitstate jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_1D9116 setbyte gBattleOutcome, 5 - atkf6 + finishaction BattleScript_1D9116: @ 81D9116 - switch1 TARGET - switch2 TARGET - switch3 TARGET, 0 - waitstateatk + getswitchedmondata TARGET + switchindataupdate TARGET + switchinanim TARGET, 0 + waitstate printstring BATTLE_TEXT_DraggedOut - atk52 TARGET - jump BattleScript_EndTurn + switchineffects TARGET + goto BattleScript_EndTurn BattleScript_MistProtected:: @ 81D9128 pause 32 @@ -3400,11 +3401,11 @@ gUnknown_081D9132:: @ 81D9132 BattleScript_MoveUsedIsDisabled:: @ 81D9139 printstring BATTLE_TEXT_MoveIsDisabled waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_MoveSelectionDisabledMove:: @ 81D9144 - printstring2 BATTLE_TEXT_MoveIsDisabled - atk44 + printselectionstring BATTLE_TEXT_MoveIsDisabled + endselectionscript BattleScript_DisabledNoMore:: @ 81D9148 printstring BATTLE_TEXT_DisabledNoMore @@ -3420,52 +3421,52 @@ gUnknown_081D9156:: @ 81D9156 printstring BATTLE_TEXT_DestinyBondTaken waitmessage 64 orword gHitMarker, 0x100100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 + tryfaintmon USER, 0, 0x0 return gUnknown_081D9171:: @ 81D9171 orword gHitMarker, 0x100100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER - callatk BattleScript_1D91FB - faintpokemon USER, 0, 0x0 - faintpokemon USER, 1, BattleScript_1D9192 + call BattleScript_1D91FB + tryfaintmon USER, 0, 0x0 + tryfaintmon USER, 1, BattleScript_1D9192 return BattleScript_1D9192: @ 81D9192 setbyte gSharedMem + 0x1600F, 0 - atk23 1 - jump gUnknown_081D8C7B + getexp 1 + goto gUnknown_081D8C7B gUnknown_081D919F:: @ 81D919F orword gHitMarker, 0x100100 - graphicalhpupdate TARGET + healthbarupdate TARGET datahpupdate TARGET - callatk BattleScript_1D91FB - faintpokemon TARGET, 0, 0x0 - faintpokemon TARGET, 1, BattleScript_1D91C0 + call BattleScript_1D91FB + tryfaintmon TARGET, 0, 0x0 + tryfaintmon TARGET, 1, BattleScript_1D91C0 return BattleScript_1D91C0: @ 81D91C0 setbyte gSharedMem + 0x1600F, 0 - atk23 0 - jump gUnknown_081D8C7B + getexp 0 + goto gUnknown_081D8C7B gUnknown_081D91CD:: @ 81D91CD orword gHitMarker, 0x100100 - graphicalhpupdate 3 + healthbarupdate 3 datahpupdate 3 - callatk BattleScript_1D91FB - faintpokemon 3, 0, 0x0 - faintpokemon 3, 1, BattleScript_1D91EE + call BattleScript_1D91FB + tryfaintmon 3, 0, 0x0 + tryfaintmon 3, 1, BattleScript_1D91EE return BattleScript_1D91EE: @ 81D91EE setbyte gSharedMem + 0x1600F, 0 - atk23 3 - jump gUnknown_081D8C7B + getexp 3 + goto gUnknown_081D8C7B BattleScript_1D91FB: @ 81D91FB printstring BATTLE_TEXT_SpikesHurt @@ -3476,9 +3477,9 @@ BattleScript_PerishSongHits:: @ 81D9202 printstring BATTLE_TEXT_PerishSongFell waitmessage 64 orword gHitMarker, 0x100100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 + tryfaintmon USER, 0, 0x0 end2 BattleScript_PerishSongTimerGoesDown:: @ 81D921D @@ -3529,7 +3530,7 @@ BattleScript_1D92BF: @ 81D92BF return BattleScript_RapidSpinAway:: @ 81D92C0 - breakfree + rapidspinfree return BattleScript_WrapFree:: @ 81D92C2 @@ -3552,36 +3553,36 @@ BattleScript_FutureSightHits:: @ 81D92D7 waitmessage 64 jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D92F4 accuracycheck BattleScript_1D934B, 248 - jump BattleScript_1D92FB + goto BattleScript_1D92FB BattleScript_1D92F4: @ 81D92F4 accuracycheck BattleScript_1D934B, 353 BattleScript_1D92FB: @ 81D92FB - atk8 + adjustnormaldamage2 jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D9313 playanimation USER, B_ANIM_FUTURE_SIGHT_HIT, 0x0 - jump BattleScript_1D931A + goto BattleScript_1D931A BattleScript_1D9313: @ 81D9313 playanimation USER, B_ANIM_DOOM_DESIRE_HIT, 0x0 BattleScript_1D931A: @ 81D931A - missmessage - atk5c TARGET - waitstateatk - graphicalhpupdate TARGET + effectivenesssound + hitanimation TARGET + waitstate + healthbarupdate TARGET datahpupdate TARGET resultmessage waitmessage 64 - faintpokemon TARGET, 0, 0x0 + tryfaintmon TARGET, 0, 0x0 atk24 BattleScript_1D9332 BattleScript_1D9332: @ 81D9332 setbyte gSharedMem + 0x1600C, 0 - atk49 1, 0 + moveend 1, 0 setbyte gSharedMem + 0x1600C, 8 - atk49 2, 14 + moveend 2, 14 setbyte gBattleMoveFlags, 0 end2 @@ -3595,43 +3596,43 @@ BattleScript_1D934B: @ 81D934B end2 BattleScript_NoMovesLeft:: @ 81D9365 - printstring2 BATTLE_TEXT_NoMovesLeft - atk44 + printselectionstring BATTLE_TEXT_NoMovesLeft + endselectionscript BattleScript_MoveSelectionNoPP:: @ 81D9369 - printstring2 BATTLE_TEXT_NoPP1 - atk44 + printselectionstring BATTLE_TEXT_NoPP1 + endselectionscript BattleScript_NoPPForMove:: @ 81D936D attackstring pause 32 printstring BATTLE_TEXT_NoPP2 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_MoveSelectionTormented:: @ 81D937C - printstring2 BATTLE_TEXT_TormentNoUse - atk44 + printselectionstring BATTLE_TEXT_TormentNoUse + endselectionscript printstring BATTLE_TEXT_TormentNoUse waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_MoveSelectionTaunted:: @ 81D938B - printstring2 BATTLE_TEXT_TauntNoUse - atk44 + printselectionstring BATTLE_TEXT_TauntNoUse + endselectionscript BattleScript_MoveUsedIsTaunted:: @ 81D938F printstring BATTLE_TEXT_TauntNoUse waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_WishComesTrue:: @ 81D939A - atkd4 1, BattleScript_1D93C1 + trywish 1, BattleScript_1D93C1 playanimation TARGET, B_ANIM_WISH_HEAL, 0x0 printstring BATTLE_TEXT_WishTrue waitmessage 64 orword gHitMarker, 0x100 - graphicalhpupdate TARGET + healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth waitmessage 64 @@ -3650,7 +3651,7 @@ BattleScript_IngrainTurnHeal:: @ 81D93D1 printstring BATTLE_TEXT_AbsorbNutrients waitmessage 64 orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER end2 @@ -3658,7 +3659,7 @@ BattleScript_1D93EC: @ 81D93EC pause 32 printstring BATTLE_TEXT_AnchoredItself waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_AtkDefDown:: @ 81D93FA setbyte gSharedMem + 0x160DC, 0 @@ -3690,11 +3691,11 @@ BattleScript_KnockedOff:: @ 81D944B BattleScript_MoveUsedIsImprisoned:: @ 81D9459 printstring BATTLE_TEXT_SealedNoUse waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_MoveSelectionImprisoned:: @ 81D9464 - printstring2 BATTLE_TEXT_SealedNoUse - atk44 + printselectionstring BATTLE_TEXT_SealedNoUse + endselectionscript gUnknown_081D9468:: @ 81D9468 printstring BATTLE_TEXT_GrudgeLosePP @@ -3708,13 +3709,13 @@ BattleScript_MagicCoatBounce:: @ 81D946F printstring BATTLE_TEXT_MagicCoatBounce waitmessage 64 orword gHitMarker, 0x800c00 - atk76 USER, 1 + setmagiccoattarget USER return BattleScript_SnatchedMove:: @ 81D9487 attackstring ppreduce - snatchmove + snatchsetbanks playanimation TARGET, B_ANIM_SNATCH_MOVE, 0x0 printstring BATTLE_TEXT_SnatchedMove waitmessage 64 @@ -3756,19 +3757,19 @@ BattleScript_MoveUsedIsAsleep:: @ 81D94EE printstring BATTLE_TEXT_FastAsleep waitmessage 64 statusanimation USER - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_MoveUsedWokeUp:: @ 81D94FB bicword gHitMarker, 0x10 printfromtable BattleTextList_401562 waitmessage 64 - atk98 1 + updatestatusicon 1 return gUnknown_081D950F:: @ 81D950F printstring BATTLE_TEXT_UproarWoke waitmessage 64 - atk98 1 + updatestatusicon 1 end2 BattleScript_PoisonTurnDmg:: @ 81D9518 @@ -3780,9 +3781,9 @@ BattleScript_1D951E: @ 81D951E BattleScript_1D9520: @ 81D9520 orword gHitMarker, 0x100100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 + tryfaintmon USER, 0, 0x0 atk24 BattleScript_1D9539 BattleScript_1D9539: @ 81D9539 @@ -3791,36 +3792,36 @@ BattleScript_1D9539: @ 81D9539 BattleScript_BurnTurnDmg:: @ 81D953A printstring BATTLE_TEXT_BurnHurt waitmessage 64 - jump BattleScript_1D951E + goto BattleScript_1D951E BattleScript_MoveUsedIsFrozen:: @ 81D9545 printstring BATTLE_TEXT_FrozenSolid waitmessage 64 statusanimation USER - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_MoveUsedUnfroze:: @ 81D9552 printfromtable BattleTextList_4015C4 waitmessage 64 - atk98 1 + updatestatusicon 1 return gUnknown_081D955D:: @ 81D955D printstring BATTLE_TEXT_DefendingDefrosted waitmessage 64 - atk98 0 + updatestatusicon 0 return BattleScript_MoveUsedIsParalyzed:: @ 81D9566 printstring BATTLE_TEXT_Paralyzed3 waitmessage 64 statusanimation USER - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_MoveUsedFlinched:: @ 81D9573 printstring BATTLE_TEXT_Flinched waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn gUnknown_081D957E:: @ 81D957E printfromtable BattleTextList_40155A @@ -3828,7 +3829,7 @@ gUnknown_081D957E:: @ 81D957E end2 BattleScript_ThrashConfuses:: @ 81D9587 - atk66 1, 1, S_CONFUSED + chosenstatusanimation 1, 1, S_CONFUSED printstring BATTLE_TEXT_FatigueConfuse waitmessage 64 end2 @@ -3836,22 +3837,22 @@ BattleScript_ThrashConfuses:: @ 81D9587 BattleScript_MoveUsedIsConfused:: @ 81D9595 printstring BATTLE_TEXT_Confused waitmessage 64 - atk65 1, 0x7 + status2animation 1, 0x7 jumpifbyte 0, gUnknown_02024D1F + 0x4, 0, BattleScript_1D95D3 BattleScript_1D95AC: @ 81D95AC - atk76 USER, 0 - atk8 + cancelmultiturnmoves USER + adjustnormaldamage2 printstring BATTLE_TEXT_HurtItself waitmessage 64 - missmessage - atk5c USER - waitstateatk + effectivenesssound + hitanimation USER + waitstate orword gHitMarker, 0x100100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER - faintpokemon USER, 0, 0x0 - jump BattleScript_EndTurn + tryfaintmon USER, 0, 0x0 + goto BattleScript_EndTurn BattleScript_1D95D3: @ 81D95D3 return @@ -3870,7 +3871,7 @@ BattleScript_WrapTurnDmg:: @ 81D95E2 playanimation USER, B_ANIM_TURN_TRAP, gSharedMem + 0x160A4 printstring BATTLE_TEXT_HurtBy waitmessage 64 - jump BattleScript_1D9520 + goto BattleScript_1D9520 BattleScript_WrapEnds:: @ 81D95F4 printstring BATTLE_TEXT_FreedFrom @@ -3880,30 +3881,30 @@ BattleScript_WrapEnds:: @ 81D95F4 BattleScript_MoveUsedIsInLove:: @ 81D95FB printstring BATTLE_TEXT_InLoveWith waitmessage 64 - atk65 1, 0xf0000 + status2animation 1, 0xf0000 return BattleScript_MoveUsedIsParalyzedCantAttack:: @ 81D9608 printstring BATTLE_TEXT_ImmobilizedBy waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_NightmareTurnDmg:: @ 81D9613 printstring BATTLE_TEXT_NightmareLock waitmessage 64 - atk65 1, Start - jump BattleScript_1D9520 + status2animation 1, Start + goto BattleScript_1D9520 BattleScript_CurseTurnDmg:: @ 81D9624 printstring BATTLE_TEXT_CurseAfflict waitmessage 64 - atk65 1, 0x10000000 - jump BattleScript_1D9520 + status2animation 1, 0x10000000 + goto BattleScript_1D9520 BattleScript_TargetPRLZHeal:: @ 81D9635 printstring BATTLE_TEXT_ParalysisHealed waitmessage 64 - atk98 0 + updatestatusicon 0 return BattleScript_1D963E:: @ 81D963E @@ -3912,42 +3913,42 @@ BattleScript_1D963E:: @ 81D963E waitmessage 64 BattleScript_1D9648: @ 81D9648 - atk98 2 - waitstateatk + updatestatusicon 2 + waitstate return BattleScript_YawnMakesAsleep:: @ 81D964C statusanimation 2 printstring BATTLE_TEXT_FellAsleep waitmessage 64 - atk98 2 - waitstateatk - atk6f 2 + updatestatusicon 2 + waitstate + makevisible 2 end2 BattleScript_1D965A:: @ 81D965A statusanimation 2 printfromtable BattleTextList_4015B0 waitmessage 64 - jump BattleScript_1D9648 + goto BattleScript_1D9648 BattleScript_1D9669:: @ 81D9669 statusanimation 2 printfromtable BattleTextList_4015BC waitmessage 64 - jump BattleScript_1D9648 + goto BattleScript_1D9648 BattleScript_1D9678:: @ 81D9678 statusanimation 2 printfromtable BattleTextList_4015C0 waitmessage 64 - jump BattleScript_1D9648 + goto BattleScript_1D9648 BattleScript_1D9687:: @ 81D9687 statusanimation 2 printfromtable BattleTextList_4015B4 waitmessage 64 - jump BattleScript_1D9648 + goto BattleScript_1D9648 BattleScript_1D9696:: @ 81D9696 printstring BATTLE_TEXT_UproarCaused @@ -3958,7 +3959,7 @@ BattleScript_1D969D:: @ 81D969D statusanimation 2 printstring BATTLE_TEXT_BadlyPoisoned waitmessage 64 - jump BattleScript_1D9648 + goto BattleScript_1D9648 BattleScript_1D96AA:: @ 81D96AA printstring BATTLE_TEXT_CoinScatter @@ -3971,7 +3972,7 @@ BattleScript_1D96B1:: @ 81D96B1 return BattleScript_1D96BA:: @ 81D96BA - atk66 2, 1, S_CONFUSED + chosenstatusanimation 2, 1, S_CONFUSED printstring BATTLE_TEXT_BecameConfused waitmessage 64 return @@ -3982,11 +3983,11 @@ BattleScript_1D96C8:: @ 81D96C8 BattleScript_1D96DB: @ 81D96DB orword gHitMarker, 0x100100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_HitRecoil waitmessage 64 - faintpokemon USER, 0, 0x0 + tryfaintmon USER, 0, 0x0 BattleScript_1D96F5: @ 81D96F5 return @@ -4000,9 +4001,9 @@ BattleScript_ItemSteal:: @ 81D96F6 BattleScript_DrizzleActivates:: @ 81D9704 pause 32 printstring BATTLE_TEXT_RainMade - waitstateatk + waitstate playanimation 7, B_ANIM_RAIN_CONTINUES, 0x0 - callatk BattleScript_1D9761 + call BattleScript_1D9761 end3 BattleScript_SpeedBoostActivates:: @ 81D9718 @@ -4021,46 +4022,46 @@ BattleScript_RainDishActivates:: @ 81D9730 printstring BATTLE_TEXT_RestoredHPByItem waitmessage 64 orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER end3 BattleScript_SandstreamActivates:: @ 81D9744 pause 32 printstring BATTLE_TEXT_WhipSandstorm - waitstateatk + waitstate playanimation 7, B_ANIM_SANDSTORM_CONTINUES, 0x0 - callatk BattleScript_1D9761 + call BattleScript_1D9761 end3 BattleScript_ShedSkinActivates:: @ 81D9758 printstring BATTLE_TEXT_CuredProblem waitmessage 64 - atk98 1 + updatestatusicon 1 end3 BattleScript_1D9761: @ 81D9761 setbyte gSharedMem + 0x16003, 0 BattleScript_1D9767: @ 81D9767 - castformswitch + trycastformdatachange addbyte gSharedMem + 0x16003, 1 jumpifarraynotequal gSharedMem + 0x16003, gNoOfAllBanks, 1, BattleScript_1D9767 return BattleScript_CastformChange:: @ 81D977D - callatk BattleScript_1D9783 + call BattleScript_1D9783 end3 BattleScript_1D9783: @ 81D9783 - actualcastformswitch - waitstateatk + docastformchangeanimation + waitstate printstring BATTLE_TEXT_Transformed2 waitmessage 64 return gUnknown_081D978C:: @ 81D978C - callatk BattleScript_1D9792 + call BattleScript_1D9792 end3 BattleScript_1D9792: @ 81D9792 @@ -4071,21 +4072,21 @@ gUnknown_081D9795:: @ 81D9795 setbyte gSharedMem + 0x1601E, 145 BattleScript_1D97A1: @ 81D97A1 - atke1 BattleScript_1D97EF - jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D97E4 + trygetintimidatetarget BattleScript_1D97EF + jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D97E4 jumpifability TARGET, ABILITY_CLEAR_BODY, BattleScript_1D97F0 jumpifability TARGET, ABILITY_HYPER_CUTTER, BattleScript_1D97F0 jumpifability TARGET, ABILITY_WHITE_SMOKE, BattleScript_1D97F0 statbuffchange 33, BattleScript_1D97E4 jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D97E4 - atk47 + setgraphicalstatchangevalues playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printstring BATTLE_TEXT_CutsAttack waitmessage 64 BattleScript_1D97E4: @ 81D97E4 addbyte gBankTarget, 1 - jump BattleScript_1D97A1 + goto BattleScript_1D97A1 BattleScript_1D97EF: @ 81D97EF return @@ -4094,14 +4095,14 @@ BattleScript_1D97F0: @ 81D97F0 pause 32 printstring BATTLE_TEXT_PreventedOther waitmessage 64 - jump BattleScript_1D97E4 + goto BattleScript_1D97E4 BattleScript_DroughtActivates:: @ 81D97FE pause 32 printstring BATTLE_TEXT_SunIntensified - waitstateatk + waitstate playanimation 7, B_ANIM_SUN_CONTINUES, 0x0 - callatk BattleScript_1D9761 + call BattleScript_1D9761 end3 BattleScript_TookAttack:: @ 81D9812 @@ -4116,13 +4117,13 @@ gUnknown_081D9826:: @ 81D9826 pause 32 printstring BATTLE_TEXT_ProtectedBy pause 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn gUnknown_081D9834:: @ 81D9834 pause 32 printstring BATTLE_TEXT_PreventedBy pause 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_MoveHPDrain_PPLoss:: @ 81D9842 ppreduce @@ -4131,12 +4132,12 @@ BattleScript_MoveHPDrain:: @ 81D9843 attackstring pause 32 orword gHitMarker, 0x100 - graphicalhpupdate TARGET + healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_HPRestoredUsing waitmessage 64 orbyte gBattleMoveFlags, 8 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_MoveHPDrain_FullHP_PPLoss:: @ 81D9865 ppreduce @@ -4147,7 +4148,7 @@ BattleScript_MoveHPDrain_FullHP:: @ 81D9866 printstring BATTLE_TEXT_MadeUseless waitmessage 64 orbyte gBattleMoveFlags, 8 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_FlashFireBoost_PPLoss:: @ 81D987B ppreduce @@ -4157,13 +4158,13 @@ BattleScript_FlashFireBoost:: @ 81D987C pause 32 printfromtable BattleTextList_401648 waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D988D: @ 81D988D pause 32 printstring BATTLE_TEXT_AnchorsItself waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_AbilityNoStatLoss:: @ 81D989B pause 32 @@ -4193,19 +4194,19 @@ BattleScript_ObliviousPreventsAttraction:: @ 81D98C9 pause 32 printstring BATTLE_TEXT_PreventedRomance waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_FlinchPrevention:: @ 81D98D7 pause 32 printstring BATTLE_TEXT_PreventedFlinching waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_1D98E5: @ 81D98E5 pause 32 printstring BATTLE_TEXT_PreventedConfusion waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_SoundproofProtected:: @ 81D98F3 attackstring @@ -4213,7 +4214,7 @@ BattleScript_SoundproofProtected:: @ 81D98F3 pause 32 printstring BATTLE_TEXT_BlocksOther waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_AbilityNoSpecificStatLoss:: @ 81D9903 pause 32 @@ -4226,7 +4227,7 @@ BattleScript_NoItemSteal:: @ 81D9913 pause 32 printstring BATTLE_TEXT_MadeIneffective waitmessage 64 - jump BattleScript_EndTurn + goto BattleScript_EndTurn BattleScript_ColorChangeActivates:: @ 81D9921 printstring BATTLE_TEXT_MadeType @@ -4235,67 +4236,67 @@ BattleScript_ColorChangeActivates:: @ 81D9921 BattleScript_RoughSkinActivates:: @ 81D9928 orword gHitMarker, 0x100100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_HurtOther waitmessage 64 - faintpokemon USER, 0, 0x0 + tryfaintmon USER, 0, 0x0 return BattleScript_CuteCharmActivates:: @ 81D9943 - atk65 1, 0xf0000 + status2animation 1, 0xf0000 printstring BATTLE_TEXT_InfatuatedPoke waitmessage 64 return BattleScript_ApplySecondaryEffect:: @ 81D9950 - waitstateatk - seteffectuser + waitstate + seteffectsecondary return BattleScript_SynchronizeActivates:: @ 81D9953 - waitstateatk - seteffecttarget + waitstate + seteffectprimary return gUnknown_081D9956:: @ 81D9956 printstring BATTLE_TEXT_CuredOfProblem waitmessage 64 - atk98 10 + updatestatusicon 10 return gUnknown_081D995F:: @ 81D995F printstring BATTLE_TEXT_IgnoredOrdersSLP waitmessage 64 setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 + moveend 2, 16 end gUnknown_081D996F:: @ 81D996F printstring BATTLE_TEXT_IgnoredOrders waitmessage 64 - jumptoattack TARGET + jumptorandomattack TARGET BattleScript_MoveUsedLoafingAround:: @ 81D9977 printfromtable BattleTextList_40160E waitmessage 64 setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 + moveend 2, 16 end gUnknown_081D9989:: @ 81D9989 printstring BATTLE_TEXT_BeganNap waitmessage 64 setbyte gUnknown_02024D1F + 0x2, 65 - seteffecttarget + seteffectprimary setbyte gSharedMem + 0x1600C, 0 - atk49 2, 16 + moveend 2, 16 end gUnknown_081D99A0:: @ 81D99A0 printstring BATTLE_TEXT_WontObey waitmessage 64 - jump BattleScript_1D95AC + goto BattleScript_1D95AC BattleScript_SubstituteFade:: @ 81D99AB playanimation TARGET, B_ANIM_SUBSTITUTE_FADE, 0x0 @@ -4303,67 +4304,67 @@ BattleScript_SubstituteFade:: @ 81D99AB return BattleScript_BerryCurePrlzEnd2:: @ 81D99B6 - callatk BattleScript_BerryCureParRet + call BattleScript_BerryCureParRet end2 BattleScript_BerryCureParRet:: @ 81D99BC playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredParalysis waitmessage 64 - atk98 10 + updatestatusicon 10 removeitem 10 return BattleScript_BerryCurePsnEnd2:: @ 81D99CE - callatk BattleScript_BerryCurePsnRet + call BattleScript_BerryCurePsnRet end2 BattleScript_BerryCurePsnRet:: @ 81D99D4 playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredPoison waitmessage 64 - atk98 10 + updatestatusicon 10 removeitem 10 return BattleScript_BerryCureBrnEnd2:: @ 81D99E6 - callatk BattleScript_BerryCureBrnRet + call BattleScript_BerryCureBrnRet end2 BattleScript_BerryCureBrnRet:: @ 81D99EC playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredBurn waitmessage 64 - atk98 10 + updatestatusicon 10 removeitem 10 return BattleScript_BerryCureFrzEnd2:: @ 81D99FE - callatk BattleScript_BerryCureFrzRet + call BattleScript_BerryCureFrzRet end2 BattleScript_BerryCureFrzRet:: @ 81D9A04 playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredFreeze waitmessage 64 - atk98 10 + updatestatusicon 10 removeitem 10 return BattleScript_BerryCureSlpEnd2:: @ 81D9A16 - callatk BattleScript_BerryCureSlpRet + call BattleScript_BerryCureSlpRet end2 BattleScript_BerryCureSlpRet:: @ 81D9A1C playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredSleep waitmessage 64 - atk98 10 + updatestatusicon 10 removeitem 10 return BattleScript_BerryCureConfusionEnd2:: @ 81D9A2E - callatk BattleScript_BerryCureConfusionRet + call BattleScript_BerryCureConfusionRet end2 BattleScript_BerryCureConfusionRet:: @ 81D9A34 @@ -4374,19 +4375,19 @@ BattleScript_BerryCureConfusionRet:: @ 81D9A34 return gUnknown_081D9A44:: @ 81D9A44 - callatk gUnknown_081D9A4A + call gUnknown_081D9A4A end2 gUnknown_081D9A4A:: @ 81D9A4A playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printfromtable BattleTextList_40162C waitmessage 64 - atk98 10 + updatestatusicon 10 removeitem 10 return BattleScript_WhiteHerbEnd2:: @ 81D9A5E - callatk BattleScript_WhiteHerbRet + call BattleScript_WhiteHerbRet end2 BattleScript_WhiteHerbRet:: @ 81D9A64 @@ -4401,7 +4402,7 @@ BattleScript_ItemHealHP_RemoveItem:: @ 81D9A74 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER removeitem USER end2 @@ -4414,7 +4415,7 @@ BattleScript_BerryPPHealEnd2:: @ 81D9A91 end2 BattleScript_ItemHealHP_End2:: @ 81D9AA1 - callatk BattleScript_ItemHealHP_Ret + call BattleScript_ItemHealHP_Ret end2 BattleScript_ItemHealHP_Ret:: @ 81D9AA7 @@ -4422,13 +4423,13 @@ BattleScript_ItemHealHP_Ret:: @ 81D9AA7 printstring BATTLE_TEXT_RestoredHPLittle waitmessage 64 orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER return BattleScript_MoveSelectionChoiceBanded:: @ 81D9AC2 - printstring2 BATTLE_TEXT_ChoiceBand - atk44 + printselectionstring BATTLE_TEXT_ChoiceBand + endselectionscript BattleScript_HangedOnMsg:: @ 81D9AC6 playanimation TARGET, B_ANIM_HANGED_ON, 0x0 @@ -4441,12 +4442,12 @@ BattleScript_BerryConfuseHealEnd2:: @ 81D9AD4 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_UnknownString2 waitmessage 64 setbyte gUnknown_02024D1F + 0x2, 71 - seteffecttarget + seteffectprimary removeitem USER end2 @@ -4456,7 +4457,7 @@ BattleScript_BerryStatRaiseEnd2:: @ 81D9AFE BattleScript_1D9B0B: @ 81D9B0B setbyte gUnknown_02024D1F + 0x4, 4 - callatk BattleScript_StatUp + call BattleScript_StatUp removeitem USER end2 @@ -4468,8 +4469,8 @@ BattleScript_BerryFocusEnergyEnd2:: @ 81D9B19 end2 gUnknown_081D9B29:: @ 81D9B29 - printstring2 BATTLE_TEXT_CantUseItems - atk44 + printselectionstring BATTLE_TEXT_CantUseItems + endselectionscript gUnknown_081D9B2D:: @ 81D9B2D printstring BATTLE_TEXT_Terminator2 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 22ecc7769..c6112fdd3 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,6 +1,7 @@ .include "asm/macros.inc" - .include "constants/constants.inc" .include "asm/macros/battle_script.inc" + .include "constants/constants.inc" + .include "constants/battle_script_constants.inc" .section script_data, "aw", %progbits @@ -40,46 +41,46 @@ gBattlescriptsForSafariActions:: @ 81D9E98 BattleScript_1D9EA8: @ 81D9EA8 jumpifhalfword 4, gBattleTypeFlags, 512, BattleScript_1D9EB8 printstring BATTLE_TEXT_Used1 - pokemoncatchfunction + handleballthrow BattleScript_1D9EB8: @ 81D9EB8 printstring BATTLE_TEXT_TutorialUsed - pokemoncatchfunction + handleballthrow BattleScript_1D9EBC: @ 81D9EBC printstring BATTLE_TEXT_Used1 - atk98 1 - pokemoncatchfunction + updatestatusicon 1 + handleballthrow BattleScript_SuccessBallThrow:: @ 81D9EC2 jumpifhalfword 0, gLastUsedItem, 5, BattleScript_1D9ED0 - atk60 11 + incrementgamestat 11 BattleScript_1D9ED0: @ 81D9ED0 printstring BATTLE_TEXT_BallCaught1 - capturesomethingf1 BattleScript_1D9EE3 + trysetcaughtmondexflags BattleScript_1D9EE3 printstring BATTLE_TEXT_AddedToDex - waitstateatk + waitstate setbyte gBattleCommunication, 0 - capturesomethingf2 + displaydexinfo BattleScript_1D9EE3: @ 81D9EE3 printstring BATTLE_TEXT_GiveNickname - waitstateatk + waitstate setbyte gBattleCommunication, 0 - capturesomethingf3 BattleScript_1D9EF8 + trygivecaughtmonnick BattleScript_1D9EF8 printstring BATTLE_TEXT_SentToPC waitmessage 64 BattleScript_1D9EF8: @ 81D9EF8 - catchpoke + givecaughtmon setbyte gBattleOutcome, 7 - activesidesomething + finishturn BattleScript_WallyBallThrow:: @ 81D9F00 printstring BATTLE_TEXT_BallCaught2 setbyte gBattleOutcome, 7 - activesidesomething + finishturn BattleScript_ShakeBallThrow:: @ 81D9F0A printfromtable BattleTextList_4015E6 @@ -91,7 +92,7 @@ BattleScript_ShakeBallThrow:: @ 81D9F0A setbyte gBattleOutcome, 8 BattleScript_1D9F34: @ 81D9F34 - atkf6 + finishaction BattleScript_TrainerBallBlock:: @ 81D9F35 waitmessage 64 @@ -99,70 +100,70 @@ BattleScript_TrainerBallBlock:: @ 81D9F35 waitmessage 64 printstring BATTLE_TEXT_DontBeAThief waitmessage 64 - atkf6 + finishaction BattleScript_1D9F45: @ 81D9F45 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 + moveend 1, 0 end BattleScript_1D9F4F: @ 81D9F4F pause 48 - atk54 1 + playse 1 printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 + useitemonopponent orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - atk98 1 + updatestatusicon 1 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + moveend 1, 0 + finishaction BattleScript_1D9F7B: @ 81D9F7B pause 48 - atk54 1 + playse 1 printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 + useitemonopponent printfromtable BattleTextList_401620 waitmessage 64 - atk98 1 + updatestatusicon 1 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + moveend 1, 0 + finishaction BattleScript_1D9F9C: @ 81D9F9C pause 48 - atk54 1 + playse 1 printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 + useitemonopponent printfromtable BattleTextList_401570 waitmessage 64 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + moveend 1, 0 + finishaction BattleScript_1D9FBB: @ 81D9FBB pause 48 - atk54 1 + playse 1 printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 + useitemonopponent printfromtable BattleTextList_4015A0 waitmessage 64 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + moveend 1, 0 + finishaction BattleScript_1D9FDA: @ 81D9FDA - atk54 17 + playse 17 setbyte gBattleOutcome, 4 - activesidesomething + finishturn BattleScript_1D9FE4: @ 81D9FE4 printstring BATTLE_TEXT_WatchingCarefully @@ -185,10 +186,10 @@ BattleScript_1D9FF4: @ 81D9FF4 BattleScript_1DA00A: @ 81DA00A printstring 2 waitmessage 64 - atk4b - waitstateatk - atk53 0 - waitstateatk + returnatktoball + waitstate + trainerslidein 0 + waitstate printstring BATTLE_TEXT_WallyBall waitmessage 64 end2 -- cgit v1.2.3 From cd2b75a677bf15756734222a9a57f0f9153fc918 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 30 Dec 2017 11:03:18 -0600 Subject: Sync battle_script changes with pokeemerald --- data/battle_scripts_1.s | 3592 +++++++++++++++++++++++------------------------ data/battle_scripts_2.s | 145 +- 2 files changed, 1868 insertions(+), 1869 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 3041e7a48..3c255b461 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1,4 +1,7 @@ #include "constants/abilities.h" +#include "constants/battle_constants.h" +#include "constants/moves.h" +#include "constants/songs.h" .include "asm/macros.inc" .include "asm/macros/battle_script.inc" .include "constants/constants.inc" @@ -6,268 +9,268 @@ .section script_data, "aw", %progbits -gBattleScriptsEffectsTable:: @ 81D6BBC - .4byte MoveEffect_Hit - .4byte MoveEffect_Sleep - .4byte MoveEffect_PoisonHit - .4byte MoveEffect_Absorb - .4byte MoveEffect_BurnHit - .4byte MoveEffect_FreezeHit - .4byte MoveEffect_ParalyzeHit - .4byte MoveEffect_Explosion - .4byte MoveEffect_DreamEater - .4byte MoveEffect_MirrorMove - .4byte MoveEffect_AttackUp - .4byte MoveEffect_DefenseUp - .4byte MoveEffect_SpeedUp - .4byte MoveEffect_SpecialAttackUp - .4byte MoveEffect_SpecialDefenseUp - .4byte MoveEffect_AccuracyUp - .4byte MoveEffect_EvasionUp - .4byte MoveEffect_AlwaysHit - .4byte MoveEffect_AttackDown - .4byte MoveEffect_DefenseDown - .4byte MoveEffect_SpeedDown - .4byte MoveEffect_SpecialAttackDown - .4byte MoveEffect_SpecialDefenseDown - .4byte MoveEffect_AccuracyDown - .4byte MoveEffect_EvasionDown - .4byte MoveEffect_Haze - .4byte MoveEffect_Bide - .4byte MoveEffect_Rampage - .4byte MoveEffect_Roar - .4byte MoveEffect_MultiHit - .4byte MoveEffect_Conversion - .4byte MoveEffect_FlinchHit - .4byte MoveEffect_RestoreHp - .4byte MoveEffect_Toxic - .4byte MoveEffect_PayDay - .4byte MoveEffect_LightScreen - .4byte MoveEffect_TriAttack - .4byte MoveEffect_Rest - .4byte MoveEffect_Ohko - .4byte MoveEffect_RazorWind - .4byte MoveEffect_SuperFang - .4byte MoveEffect_DragonRage - .4byte MoveEffect_Trap - .4byte MoveEffect_HighCritical - .4byte MoveEffect_DoubleHit - .4byte MoveEffect_RecoilIfMiss - .4byte MoveEffect_Mist - .4byte MoveEffect_FocusEnergy - .4byte MoveEffect_Recoil - .4byte MoveEffect_Confuse - .4byte MoveEffect_AttackUp2 - .4byte MoveEffect_DefenseUp2 - .4byte MoveEffect_SpeedUp2 - .4byte MoveEffect_SpecialAttackUp2 - .4byte MoveEffect_SpecialDefenseUp2 - .4byte MoveEffect_AccuracyUp2 - .4byte MoveEffect_EvasionUp2 - .4byte MoveEffect_Transform - .4byte MoveEffect_AttackDown2 - .4byte MoveEffect_DefenseDown2 - .4byte MoveEffect_SpeedDown2 - .4byte MoveEffect_SpecialAttackDown2 - .4byte MoveEffect_SpecialDefenseDown2 - .4byte MoveEffect_AccuracyDown2 - .4byte MoveEffect_EvasionDown2 - .4byte MoveEffect_Reflect - .4byte MoveEffect_Poison - .4byte MoveEffect_Paralyze - .4byte MoveEffect_AttackDownHit - .4byte MoveEffect_DefenseDownHit - .4byte MoveEffect_SpeedDownHit - .4byte MoveEffect_SpecialAttackDownHit - .4byte MoveEffect_SpecialDefenseDownHit - .4byte MoveEffect_AccuracyDownHit - .4byte MoveEffect_EvasionDownHit - .4byte MoveEffect_SkyAttack - .4byte MoveEffect_ConfuseHit - .4byte MoveEffect_Twineedle - .4byte MoveEffect_VitalThrow - .4byte MoveEffect_Substitute - .4byte MoveEffect_Recharge - .4byte MoveEffect_Rage - .4byte MoveEffect_Mimic - .4byte MoveEffect_Metronome - .4byte MoveEffect_LeechSeed - .4byte MoveEffect_Splash - .4byte MoveEffect_Disable - .4byte MoveEffect_LevelDamage - .4byte MoveEffect_Psywave - .4byte MoveEffect_Counter - .4byte MoveEffect_Encore - .4byte MoveEffect_PainSplit - .4byte MoveEffect_Snore - .4byte MoveEffect_Conversion2 - .4byte MoveEffect_LockOn - .4byte MoveEffect_Sketch - .4byte MoveEffect_Unused60 - .4byte MoveEffect_SleepTalk - .4byte MoveEffect_DestinyBond - .4byte MoveEffect_Flail - .4byte MoveEffect_Spite - .4byte MoveEffect_FalseSwipe - .4byte MoveEffect_HealBell - .4byte MoveEffect_QuickAttack - .4byte MoveEffect_TripleKick - .4byte MoveEffect_Thief - .4byte MoveEffect_MeanLook - .4byte MoveEffect_Nightmare - .4byte MoveEffect_Minimize - .4byte MoveEffect_Curse - .4byte MoveEffect_Unused6E - .4byte MoveEffect_Protect - .4byte MoveEffect_Spikes - .4byte MoveEffect_Foresight - .4byte MoveEffect_PerishSong - .4byte MoveEffect_Sandstorm - .4byte MoveEffect_Endure - .4byte MoveEffect_Rollout - .4byte MoveEffect_Swagger - .4byte MoveEffect_FuryCutter - .4byte MoveEffect_Attract - .4byte MoveEffect_Return - .4byte MoveEffect_Present - .4byte MoveEffect_Frustration - .4byte MoveEffect_Safeguard - .4byte MoveEffect_ThawHit - .4byte MoveEffect_Magnitude - .4byte MoveEffect_BatonPass - .4byte MoveEffect_Pursuit - .4byte MoveEffect_RapidSpin - .4byte MoveEffect_Sonicboom - .4byte MoveEffect_Unused83 - .4byte MoveEffect_MorningSun - .4byte MoveEffect_Synthesis - .4byte MoveEffect_Moonlight - .4byte MoveEffect_HiddenPower - .4byte MoveEffect_RainDance - .4byte MoveEffect_SunnyDay - .4byte MoveEffect_DefenseUpHit - .4byte MoveEffect_AttackUpHit - .4byte MoveEffect_AllStatsUpHit - .4byte MoveEffect_Unused8D - .4byte MoveEffect_BellyDrum - .4byte MoveEffect_PsychUp - .4byte MoveEffect_MirrorCoat - .4byte MoveEffect_SkullBash - .4byte MoveEffect_Twister - .4byte MoveEffect_Earthquake - .4byte MoveEffect_FutureSight - .4byte MoveEffect_Gust - .4byte MoveEffect_FlinchHit2 - .4byte MoveEffect_Solarbeam - .4byte MoveEffect_Thunder - .4byte MoveEffect_Teleport - .4byte MoveEffect_BeatUp - .4byte MoveEffect_Fly - .4byte MoveEffect_DefenseCurl - .4byte MoveEffect_Softboiled - .4byte MoveEffect_FakeOut - .4byte MoveEffect_Uproar - .4byte MoveEffect_Stockpile - .4byte MoveEffect_SpitUp - .4byte MoveEffect_Swallow - .4byte MoveEffect_UnusedA3 - .4byte MoveEffect_Hail - .4byte MoveEffect_Torment - .4byte MoveEffect_Flatter - .4byte MoveEffect_WillOWisp - .4byte MoveEffect_Memento - .4byte MoveEffect_Facade - .4byte MoveEffect_FocusPunch - .4byte MoveEffect_Smellingsalt - .4byte MoveEffect_FollowMe - .4byte MoveEffect_NaturePower - .4byte MoveEffect_Charge - .4byte MoveEffect_Taunt - .4byte MoveEffect_HelpingHand - .4byte MoveEffect_Trick - .4byte MoveEffect_RolePlay - .4byte MoveEffect_Wish - .4byte MoveEffect_Assist - .4byte MoveEffect_Ingrain - .4byte MoveEffect_Superpower - .4byte MoveEffect_MagicCoat - .4byte MoveEffect_Recycle - .4byte MoveEffect_Revenge - .4byte MoveEffect_BrickBreak - .4byte MoveEffect_Yawn - .4byte MoveEffect_KnockOff - .4byte MoveEffect_Endeavor - .4byte MoveEffect_Eruption - .4byte MoveEffect_SkillSwap - .4byte MoveEffect_Imprison - .4byte MoveEffect_Refresh - .4byte MoveEffect_Grudge - .4byte MoveEffect_Snatch - .4byte MoveEffect_LowKick - .4byte MoveEffect_SecretPower - .4byte MoveEffect_DoubleEdge - .4byte MoveEffect_TeeterDance - .4byte MoveEffect_BlazeKick - .4byte MoveEffect_MudSport - .4byte MoveEffect_PoisonFang - .4byte MoveEffect_WeatherBall - .4byte MoveEffect_Overheat - .4byte MoveEffect_Tickle - .4byte MoveEffect_CosmicPower - .4byte MoveEffect_SkyUppercut - .4byte MoveEffect_BulkUp - .4byte MoveEffect_PoisonTail - .4byte MoveEffect_WaterSport - .4byte MoveEffect_CalmMind - .4byte MoveEffect_DragonDance - .4byte MoveEffect_Camouflage - -BattleScript_1D6F14: @ 81D6F14 -MoveEffect_AccuracyDown2: @ 81D6F14 -MoveEffect_AccuracyUp2: @ 81D6F14 -MoveEffect_AccuracyUp: @ 81D6F14 -MoveEffect_AlwaysHit: @ 81D6F14 -MoveEffect_EvasionDown2: @ 81D6F14 -MoveEffect_EvasionDownHit: @ 81D6F14 -MoveEffect_EvasionUp2: @ 81D6F14 -MoveEffect_FalseSwipe: @ 81D6F14 -MoveEffect_HighCritical: @ 81D6F14 -MoveEffect_Hit: @ 81D6F14 -MoveEffect_Pursuit: @ 81D6F14 -MoveEffect_QuickAttack: @ 81D6F14 -MoveEffect_SpecialAttackDown2: @ 81D6F14 -MoveEffect_SpecialAttackDown: @ 81D6F14 -MoveEffect_SpecialDefenseDown: @ 81D6F14 -MoveEffect_SpecialDefenseUp: @ 81D6F14 -MoveEffect_SpeedUp: @ 81D6F14 -MoveEffect_Unused60: @ 81D6F14 -MoveEffect_Unused6E: @ 81D6F14 -MoveEffect_Unused83: @ 81D6F14 -MoveEffect_Unused8D: @ 81D6F14 -MoveEffect_UnusedA3: @ 81D6F14 -MoveEffect_VitalThrow: @ 81D6F14 - jumpifhalfword 1, gCurrentMove, 57, BattleScript_1D6F3A - jumpifstatus3condition TARGET, 0x40000, 1, BattleScript_1D6F3A - orword gHitMarker, 0x40000 - setbyte gSharedMem + 0x1601F, 2 - -BattleScript_1D6F3A: @ 81D6F3A - attackcanceler - -BattleScript_1D6F3B: @ 81D6F3B - accuracycheck BattleScript_1D6F72, 0 - -BattleScript_1D6F42: @ 81D6F42 - attackstring - ppreduce - -BattleScript_1D6F44:: @ 81D6F44 +gBattleScriptsForMoveEffects:: @ 81D6BBC + .4byte BattleScript_EffectHit + .4byte BattleScript_EffectSleep + .4byte BattleScript_EffectPoisonHit + .4byte BattleScript_EffectAbsorb + .4byte BattleScript_EffectBurnHit + .4byte BattleScript_EffectFreezeHit + .4byte BattleScript_EffectParalyzeHit + .4byte BattleScript_EffectExplosion + .4byte BattleScript_EffectDreamEater + .4byte BattleScript_EffectMirrorMove + .4byte BattleScript_EffectAttackUp + .4byte BattleScript_EffectDefenseUp + .4byte BattleScript_EffectSpeedUp + .4byte BattleScript_EffectSpecialAttackUp + .4byte BattleScript_EffectSpecialDefenseUp + .4byte BattleScript_EffectAccuracyUp + .4byte BattleScript_EffectEvasionUp + .4byte BattleScript_EffectAlwaysHit + .4byte BattleScript_EffectAttackDown + .4byte BattleScript_EffectDefenseDown + .4byte BattleScript_EffectSpeedDown + .4byte BattleScript_EffectSpecialAttackDown + .4byte BattleScript_EffectSpecialDefenseDown + .4byte BattleScript_EffectAccuracyDown + .4byte BattleScript_EffectEvasionDown + .4byte BattleScript_EffectHaze + .4byte BattleScript_EffectBide + .4byte BattleScript_EffectRampage + .4byte BattleScript_EffectRoar + .4byte BattleScript_EffectMultiHit + .4byte BattleScript_EffectConversion + .4byte BattleScript_EffectFlinchHit + .4byte BattleScript_EffectRestoreHp + .4byte BattleScript_EffectToxic + .4byte BattleScript_EffectPayDay + .4byte BattleScript_EffectLightScreen + .4byte BattleScript_EffectTriAttack + .4byte BattleScript_EffectRest + .4byte BattleScript_EffectOHKO + .4byte BattleScript_EffectRazorWind + .4byte BattleScript_EffectSuperFang + .4byte BattleScript_EffectDragonRage + .4byte BattleScript_EffectTrap + .4byte BattleScript_EffectHighCritical + .4byte BattleScript_EffectDoubleHit + .4byte BattleScript_EffectRecoilIfMiss + .4byte BattleScript_EffectMist + .4byte BattleScript_EffectFocusEnergy + .4byte BattleScript_EffectRecoil + .4byte BattleScript_EffectConfuse + .4byte BattleScript_EffectAttackUp2 + .4byte BattleScript_EffectDefenseUp2 + .4byte BattleScript_EffectSpeedUp2 + .4byte BattleScript_EffectSpecialAttackUp2 + .4byte BattleScript_EffectSpecialDefenseUp2 + .4byte BattleScript_EffectAccuracyUp2 + .4byte BattleScript_EffectEvasionUp2 + .4byte BattleScript_EffectTransform + .4byte BattleScript_EffectAttackDown2 + .4byte BattleScript_EffectDefenseDown2 + .4byte BattleScript_EffectSpeedDown2 + .4byte BattleScript_EffectSpecialAttackDown2 + .4byte BattleScript_EffectSpecialDefenseDown2 + .4byte BattleScript_EffectAccuracyDown2 + .4byte BattleScript_EffectEvasionDown2 + .4byte BattleScript_EffectReflect + .4byte BattleScript_EffectPoison + .4byte BattleScript_EffectParalyze + .4byte BattleScript_EffectAttackDownHit + .4byte BattleScript_EffectDefenseDownHit + .4byte BattleScript_EffectSpeedDownHit + .4byte BattleScript_EffectSpecialAttackDownHit + .4byte BattleScript_EffectSpecialDefenseDownHit + .4byte BattleScript_EffectAccuracyDownHit + .4byte BattleScript_EffectEvasionDownHit + .4byte BattleScript_EffectSkyAttack + .4byte BattleScript_EffectConfuseHit + .4byte BattleScript_EffectTwineedle + .4byte BattleScript_EffectVitalThrow + .4byte BattleScript_EffectSubstitute + .4byte BattleScript_EffectRecharge + .4byte BattleScript_EffectRage + .4byte BattleScript_EffectMimic + .4byte BattleScript_EffectMetronome + .4byte BattleScript_EffectLeechSeed + .4byte BattleScript_EffectSplash + .4byte BattleScript_EffectDisable + .4byte BattleScript_EffectLevelDamage + .4byte BattleScript_EffectPsywave + .4byte BattleScript_EffectCounter + .4byte BattleScript_EffectEncore + .4byte BattleScript_EffectPainSplit + .4byte BattleScript_EffectSnore + .4byte BattleScript_EffectConversion2 + .4byte BattleScript_EffectLockOn + .4byte BattleScript_EffectSketch + .4byte BattleScript_EffectUnused60//Thaw + .4byte BattleScript_EffectSleepTalk + .4byte BattleScript_EffectDestinyBond + .4byte BattleScript_EffectFlail + .4byte BattleScript_EffectSpite + .4byte BattleScript_EffectFalseSwipe + .4byte BattleScript_EffectHealBell + .4byte BattleScript_EffectQuickAttack + .4byte BattleScript_EffectTripleKick + .4byte BattleScript_EffectThief + .4byte BattleScript_EffectMeanLook + .4byte BattleScript_EffectNightmare + .4byte BattleScript_EffectMinimize + .4byte BattleScript_EffectCurse + .4byte BattleScript_EffectUnused6E + .4byte BattleScript_EffectProtect + .4byte BattleScript_EffectSpikes + .4byte BattleScript_EffectForesight + .4byte BattleScript_EffectPerishSong + .4byte BattleScript_EffectSandstorm + .4byte BattleScript_EffectEndure + .4byte BattleScript_EffectRollout + .4byte BattleScript_EffectSwagger + .4byte BattleScript_EffectFuryCutter + .4byte BattleScript_EffectAttract + .4byte BattleScript_EffectReturn + .4byte BattleScript_EffectPresent + .4byte BattleScript_EffectFrustration + .4byte BattleScript_EffectSafeguard + .4byte BattleScript_EffectThawHit + .4byte BattleScript_EffectMagnitude + .4byte BattleScript_EffectBatonPass + .4byte BattleScript_EffectPursuit + .4byte BattleScript_EffectRapidSpin + .4byte BattleScript_EffectSonicboom + .4byte BattleScript_EffectUnused83 + .4byte BattleScript_EffectMorningSun + .4byte BattleScript_EffectSynthesis + .4byte BattleScript_EffectMoonlight + .4byte BattleScript_EffectHiddenPower + .4byte BattleScript_EffectRainDance + .4byte BattleScript_EffectSunnyDay + .4byte BattleScript_EffectDefenseUpHit + .4byte BattleScript_EffectAttackUpHit + .4byte BattleScript_EffectAllStatsUpHit + .4byte BattleScript_EffectUnused8D + .4byte BattleScript_EffectBellyDrum + .4byte BattleScript_EffectPsychUp + .4byte BattleScript_EffectMirrorCoat + .4byte BattleScript_EffectSkullBash + .4byte BattleScript_EffectTwister + .4byte BattleScript_EffectEarthquake + .4byte BattleScript_EffectFutureSight + .4byte BattleScript_EffectGust + .4byte BattleScript_EffectStomp + .4byte BattleScript_EffectSolarbeam + .4byte BattleScript_EffectThunder + .4byte BattleScript_EffectTeleport + .4byte BattleScript_EffectBeatUp + .4byte BattleScript_EffectSemiInvulnerable + .4byte BattleScript_EffectDefenseCurl + .4byte BattleScript_EffectSoftboiled + .4byte BattleScript_EffectFakeOut + .4byte BattleScript_EffectUproar + .4byte BattleScript_EffectStockpile + .4byte BattleScript_EffectSpitUp + .4byte BattleScript_EffectSwallow + .4byte BattleScript_EffectUnusedA3 + .4byte BattleScript_EffectHail + .4byte BattleScript_EffectTorment + .4byte BattleScript_EffectFlatter + .4byte BattleScript_EffectWillOWisp + .4byte BattleScript_EffectMemento + .4byte BattleScript_EffectFacade + .4byte BattleScript_EffectFocusPunch + .4byte BattleScript_EffectSmellingsalt + .4byte BattleScript_EffectFollowMe + .4byte BattleScript_EffectNaturePower + .4byte BattleScript_EffectCharge + .4byte BattleScript_EffectTaunt + .4byte BattleScript_EffectHelpingHand + .4byte BattleScript_EffectTrick + .4byte BattleScript_EffectRolePlay + .4byte BattleScript_EffectWish + .4byte BattleScript_EffectAssist + .4byte BattleScript_EffectIngrain + .4byte BattleScript_EffectSuperpower + .4byte BattleScript_EffectMagicCoat + .4byte BattleScript_EffectRecycle + .4byte BattleScript_EffectRevenge + .4byte BattleScript_EffectBrickBreak + .4byte BattleScript_EffectYawn + .4byte BattleScript_EffectKnockOff + .4byte BattleScript_EffectEndeavor + .4byte BattleScript_EffectEruption + .4byte BattleScript_EffectSkillSwap + .4byte BattleScript_EffectImprison + .4byte BattleScript_EffectRefresh + .4byte BattleScript_EffectGrudge + .4byte BattleScript_EffectSnatch + .4byte BattleScript_EffectLowKick + .4byte BattleScript_EffectSecretPower + .4byte BattleScript_EffectDoubleEdge + .4byte BattleScript_EffectTeeterDance + .4byte BattleScript_EffectBlazeKick + .4byte BattleScript_EffectMudSport + .4byte BattleScript_EffectPoisonFang + .4byte BattleScript_EffectWeatherBall + .4byte BattleScript_EffectOverheat + .4byte BattleScript_EffectTickle + .4byte BattleScript_EffectCosmicPower + .4byte BattleScript_EffectSkyUppercut + .4byte BattleScript_EffectBulkUp + .4byte BattleScript_EffectPoisonTail + .4byte BattleScript_EffectWaterSport + .4byte BattleScript_EffectCalmMind + .4byte BattleScript_EffectDragonDance + .4byte BattleScript_EffectCamouflage + +BattleScript_EffectHit: @ 81D6F14 +BattleScript_EffectAccuracyDown2: @ 81D6F14 +BattleScript_EffectAccuracyUp2: @ 81D6F14 +BattleScript_EffectAccuracyUp: @ 81D6F14 +BattleScript_EffectAlwaysHit: @ 81D6F14 +BattleScript_EffectEvasionDown2: @ 81D6F14 +BattleScript_EffectEvasionDownHit: @ 81D6F14 +BattleScript_EffectEvasionUp2: @ 81D6F14 +BattleScript_EffectFalseSwipe: @ 81D6F14 +BattleScript_EffectHighCritical: @ 81D6F14 +BattleScript_EffectHit: @ 81D6F14 +BattleScript_EffectPursuit: @ 81D6F14 +BattleScript_EffectQuickAttack: @ 81D6F14 +BattleScript_EffectSpecialAttackDown2: @ 81D6F14 +BattleScript_EffectSpecialAttackDown: @ 81D6F14 +BattleScript_EffectSpecialDefenseDown: @ 81D6F14 +BattleScript_EffectSpecialDefenseUp: @ 81D6F14 +BattleScript_EffectSpeedUp: @ 81D6F14 +BattleScript_EffectUnused60: @ 81D6F14 +BattleScript_EffectUnused6E: @ 81D6F14 +BattleScript_EffectUnused83: @ 81D6F14 +BattleScript_EffectUnused8D: @ 81D6F14 +BattleScript_EffectUnusedA3: @ 81D6F14 +BattleScript_EffectVitalThrow: @ 81D6F14 + jumpifnotmove MOVE_SURF, BattleScript_HitFromAtkCanceler + jumpifnostatus3 TARGET, STATUS3_UNDERWATER, BattleScript_HitFromAtkCanceler + orword gHitMarker, HITMARKER_IGNORE_UNDERWATER + setbyte sDMG_MULTIPLIER, 2 + +BattleScript_HitFromAtkCanceler: @ 81D6F3A + attackcanceler + +BattleScript_HitFromAccCheck: @ 81D6F3B + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE + +BattleScript_HitFromAtkString: @ 81D6F42 + attackstring + ppreduce + +BattleScript_HitFromCritCalc:: @ 81D6F44 critcalc damagecalc typecalc adjustnormaldamage -BattleScript_1D6F48: @ 81D6F48 +BattleScript_HitFromAtkAnimation: @ 81D6F48 attackanimation waitanimation effectivenesssound @@ -280,71 +283,71 @@ BattleScript_1D6F48: @ 81D6F48 resultmessage waitmessage 64 seteffectwithchance - tryfaintmon TARGET, 0, 0x0 + tryfaintmon TARGET, FALSE, NULL -BattleScript_EndTurn:: @ 81D6F62 - setbyte gSharedMem + 0x1600C, 0 +BattleScript_MoveEnd:: @ 81D6F62 + setbyte sMOVEEND_STATE, 0 moveend 0, 0 end -BattleScript_1D6F6C: @ 81D6F6C - orbyte gBattleMoveFlags, 1 +BattleScript_MakeMoveMissed: @ 81D6F6C + orbyte gBattleMoveFlags, MOVESTATUS_MISSED -BattleScript_1D6F72: @ 81D6F72 +BattleScript_PrintMoveMissed: @ 81D6F72 attackstring ppreduce -BattleScript_1D6F74:: @ 81D6F74 +BattleScript_MoveMissedPause:: @ 81D6F74 pause 32 -BattleScript_1D6F77: @ 81D6F77 +BattleScript_MoveMissed: @ 81D6F77 effectivenesssound resultmessage waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Sleep: @ 81D6F81 +BattleScript_EffectSleep: @ 81D6F81 attackcanceler attackstring ppreduce - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifstatus TARGET, SLP, BattleScript_1D6FC4 - jumpifcantmakeasleep BattleScript_1D6FE0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus TARGET, SLP, BattleScript_AlreadyAsleep + jumpifcantmakeasleep BattleScript_CantMakeAsleep jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 - jumpifsideaffecting TARGET, 32, BattleScript_1D9037 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 1 + setmoveeffect EFFECT_SLEEP seteffectprimary - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D6FC4: @ 81D6FC4 +BattleScript_AlreadyAsleep: @ 81D6FC4 pause 32 printstring BATTLE_TEXT_DefendingAsleep waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D6FD2: @ 81D6FD2 +BattleScript_WasntAffected: @ 81D6FD2 pause 32 printstring BATTLE_TEXT_WasntAffected waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D6FE0: @ 81D6FE0 +BattleScript_CantMakeAsleep: @ 81D6FE0 pause 32 - printfromtable BattleTextList_40156A + printfromtable gUproarAwakeStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PoisonHit: @ 81D6FF0 -MoveEffect_PoisonTail: @ 81D6FF0 - setbyte gUnknown_02024D1F + 0x2, 2 - goto BattleScript_1D6F14 +BattleScript_EffectPoisonHit: @ 81D6FF0 +BattleScript_EffectPoisonTail: @ 81D6FF0 + setmoveeffect EFFECT_POISON + goto BattleScript_EffectHit -MoveEffect_Absorb: @ 81D6FFB +BattleScript_EffectAbsorb: @ 81D6FFB attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce critcalc @@ -363,48 +366,48 @@ MoveEffect_Absorb: @ 81D6FFB resultmessage waitmessage 64 negativedamage - orword gHitMarker, 0x100 - jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_1D7037 - setbyte gUnknown_02024D1F + 0x4, 0 - goto BattleScript_1D703F + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_AbsorbLiquidOoze + setbyte cMULTISTRING_CHOOSER, 0 + goto BattleScript_AbsorbUpdateHp -BattleScript_1D7037: @ 81D7037 +BattleScript_AbsorbLiquidOoze: @ 81D7037 manipulatedamage 0 - setbyte gUnknown_02024D1F + 0x4, 1 + setbyte cMULTISTRING_CHOOSER, 1 -BattleScript_1D703F: @ 81D703F +BattleScript_AbsorbUpdateHp: @ 81D703F healthbarupdate USER datahpupdate USER - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7056 - printfromtable BattleTextList_4015D0 + jumpifmovehadnoeffect BattleScript_AbsorbTryFainting + printfromtable gLeechSeedDrainStringIds waitmessage 64 -BattleScript_1D7056: @ 81D7056 - tryfaintmon USER, 0, 0x0 - tryfaintmon TARGET, 0, 0x0 - goto BattleScript_EndTurn +BattleScript_AbsorbTryFainting: @ 81D7056 + tryfaintmon USER, FALSE, NULL + tryfaintmon TARGET, FALSE, NULL + goto BattleScript_MoveEnd -MoveEffect_BlazeKick: @ 81D7069 -MoveEffect_BurnHit: @ 81D7069 - setbyte gUnknown_02024D1F + 0x2, 3 - goto BattleScript_1D6F14 +BattleScript_EffectBlazeKick: @ 81D7069 +BattleScript_EffectBurnHit: @ 81D7069 + setmoveeffect EFFECT_BURN + goto BattleScript_EffectHit -MoveEffect_FreezeHit: @ 81D7074 - setbyte gUnknown_02024D1F + 0x2, 4 - goto BattleScript_1D6F14 +BattleScript_EffectFreezeHit: @ 81D7074 + setmoveeffect EFFECT_FREEZE + goto BattleScript_EffectHit -MoveEffect_ParalyzeHit: @ 81D707F - setbyte gUnknown_02024D1F + 0x2, 5 - goto BattleScript_1D6F14 +BattleScript_EffectParalyzeHit: @ 81D707F + setmoveeffect EFFECT_PARALYSIS + goto BattleScript_EffectHit -MoveEffect_Explosion: @ 81D708A +BattleScript_EffectExplosion: @ 81D708A attackcanceler attackstring ppreduce faintifabilitynotdamp setatkhptozero waitstate - jumpifbyte 5, gBattleMoveFlags, 1, BattleScript_1D70A5 + jumpifbyte NO_COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED, BattleScript_1D70A5 call BattleScript_1D70FB goto BattleScript_1D70A7 @@ -418,7 +421,7 @@ BattleScript_1D70A7: @ 81D70A7 damagecalc typecalc adjustnormaldamage - accuracycheck BattleScript_1D70E0, 0 + accuracycheck BattleScript_1D70E0, ACC_CURR_MOVE effectivenesssound hitanimation TARGET waitstate @@ -428,43 +431,43 @@ BattleScript_1D70A7: @ 81D70A7 waitmessage 64 resultmessage waitmessage 64 - tryfaintmon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 0 + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 0 moveend 2, 16 jumpifnexttargetvalid BattleScript_1D70A7 - tryfaintmon USER, 0, 0x0 + tryfaintmon USER, FALSE, NULL end BattleScript_1D70E0: @ 81D70E0 effectivenesssound resultmessage waitmessage 64 - setbyte gSharedMem + 0x1600C, 0 + setbyte sMOVEEND_STATE, 0 moveend 2, 16 jumpifnexttargetvalid BattleScript_1D70A7 - tryfaintmon USER, 0, 0x0 + tryfaintmon USER, FALSE, NULL end BattleScript_1D70FB: @ 81D70FB - bicbyte gBattleMoveFlags, 1 + bicbyte gBattleMoveFlags, MOVESTATUS_MISSED attackanimation waitanimation - orbyte gBattleMoveFlags, 1 + orbyte gBattleMoveFlags, MOVESTATUS_MISSED return -MoveEffect_DreamEater: @ 81D710A +BattleScript_EffectDreamEater: @ 81D710A attackcanceler - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D711F + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_1D711F jumpifstatus TARGET, SLP, BattleScript_1D7129 BattleScript_1D711F: @ 81D711F attackstring ppreduce waitmessage 64 - goto BattleScript_1D6FD2 + goto BattleScript_WasntAffected BattleScript_1D7129: @ 81D7129 - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce critcalc @@ -483,126 +486,126 @@ BattleScript_1D7129: @ 81D7129 resultmessage waitmessage 64 negativedamage - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7167 + jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd printstring BATTLE_TEXT_DreamEaten waitmessage 64 -BattleScript_1D7167: @ 81D7167 - tryfaintmon TARGET, 0, 0x0 - goto BattleScript_EndTurn +BattleScript_DreamEaterTryFaintEnd: @ 81D7167 + tryfaintmon TARGET, FALSE, NULL + goto BattleScript_MoveEnd -MoveEffect_MirrorMove: @ 81D7173 +BattleScript_EffectMirrorMove: @ 81D7173 attackcanceler attackstring pause 64 trymirrormove ppreduce - orbyte gBattleMoveFlags, 32 + orbyte gBattleMoveFlags, MOVESTATUS_FAILED printstring BATTLE_TEXT_MirrorFail waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_AttackUp: @ 81D718B - setbyte gSharedMem + 0x1601E, 17 - goto BattleScript_1D71B2 +BattleScript_EffectAttackUp: @ 81D718B + setstatchanger ATTACK, 1, FALSE + goto BattleScript_EffectStatUp -MoveEffect_DefenseUp: @ 81D7196 - setbyte gSharedMem + 0x1601E, 18 - goto BattleScript_1D71B2 +BattleScript_EffectDefenseUp: @ 81D7196 + setstatchanger DEFENSE, 1, FALSE + goto BattleScript_EffectStatUp -MoveEffect_SpecialAttackUp: @ 81D71A1 - setbyte gSharedMem + 0x1601E, 20 - goto BattleScript_1D71B2 +BattleScript_EffectSpecialAttackUp: @ 81D71A1 + setstatchanger SP_ATTACK, 1, FALSE + goto BattleScript_EffectStatUp -MoveEffect_EvasionUp: @ 81D71AC - setbyte gSharedMem + 0x1601E, 23 +BattleScript_EffectEvasionUp: @ 81D71AC + setstatchanger EVASION, 1, FALSE -BattleScript_1D71B2: @ 81D71B2 +BattleScript_EffectStatUp: @ 81D71B2 attackcanceler -BattleScript_1D71B3: @ 81D71B3 +BattleScript_EffectStatUpAfterAtkCanceler: @ 81D71B3 attackstring ppreduce - statbuffchange 65, BattleScript_1D71E0 - jumpifbyte 1, gUnknown_02024D1F + 0x4, 2, BattleScript_1D71CE + statbuffchange AFFECTS_USER | 0x1, BattleScript_StatUpEnd + jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_StatUpAttackAnim pause 32 - goto BattleScript_1D71D8 + goto BattleScript_StatUpPrintString -BattleScript_1D71CE: @ 81D71CE +BattleScript_StatUpAttackAnim: @ 81D71CE attackanimation waitanimation -BattleScript_1D71D0: @ 81D71D0 +BattleScript_StatUpDoAnim: @ 81D71D0 setgraphicalstatchangevalues - playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_STATS_CHANGE, sANIM_ARG1 -BattleScript_1D71D8: @ 81D71D8 - printfromtable BattleTextList_401570 +BattleScript_StatUpPrintString: @ 81D71D8 + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D71E0: @ 81D71E0 - goto BattleScript_EndTurn +BattleScript_StatUpEnd: @ 81D71E0 + goto BattleScript_MoveEnd BattleScript_StatUp:: @ 81D71E5 - playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 - printfromtable BattleTextList_401570 + playanimation 2, B_ANIM_STATS_CHANGE, sANIM_ARG1 + printfromtable gStatUpStringIds waitmessage 64 return -MoveEffect_AttackDown: @ 81D71F5 - setbyte gSharedMem + 0x1601E, 145 - goto BattleScript_1D7227 +BattleScript_EffectAttackDown: @ 81D71F5 + setstatchanger ATTACK, 1, TRUE + goto BattleScript_EffectStatDown -MoveEffect_DefenseDown: @ 81D7200 - setbyte gSharedMem + 0x1601E, 146 - goto BattleScript_1D7227 +BattleScript_EffectDefenseDown: @ 81D7200 + setstatchanger DEFENSE, 1, TRUE + goto BattleScript_EffectStatDown -MoveEffect_SpeedDown: @ 81D720B - setbyte gSharedMem + 0x1601E, 147 - goto BattleScript_1D7227 +BattleScript_EffectSpeedDown: @ 81D720B + setstatchanger SPEED, 1, TRUE + goto BattleScript_EffectStatDown -MoveEffect_AccuracyDown: @ 81D7216 - setbyte gSharedMem + 0x1601E, 150 - goto BattleScript_1D7227 +BattleScript_EffectAccuracyDown: @ 81D7216 + setstatchanger ACCURACY, 1, TRUE + goto BattleScript_EffectStatDown -MoveEffect_EvasionDown: @ 81D7221 - setbyte gSharedMem + 0x1601E, 151 +BattleScript_EffectEvasionDown: @ 81D7221 + setstatchanger EVASION, 1, TRUE -BattleScript_1D7227: @ 81D7227 +BattleScript_EffectStatDown: @ 81D7227 attackcanceler - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D83D4 - accuracycheck BattleScript_1D6F72, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailedAtkStringPpReduce + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - statbuffchange 1, BattleScript_1D7271 - jumpifbyte 3, gUnknown_02024D1F + 0x4, 2, BattleScript_1D725F - jumpifbyte 0, gUnknown_02024D1F + 0x4, 3, BattleScript_1D7271 + statbuffchange 1, BattleScript_StatDownEnd + jumpifbyte LESS_THAN, cMULTISTRING_CHOOSER, 2, BattleScript_StatDownDoAnim + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 3, BattleScript_StatDownEnd pause 32 - goto BattleScript_1D7269 + goto BattleScript_StatDownPrintString -BattleScript_1D725F: @ 81D725F +BattleScript_StatDownDoAnim: @ 81D725F attackanimation waitanimation setgraphicalstatchangevalues - playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 + playanimation TARGET, B_ANIM_STATS_CHANGE, sANIM_ARG1 -BattleScript_1D7269: @ 81D7269 - printfromtable BattleTextList_40157C +BattleScript_StatDownPrintString: @ 81D7269 + printfromtable gStatDownStringIds waitmessage 64 -BattleScript_1D7271: @ 81D7271 - goto BattleScript_EndTurn +BattleScript_StatDownEnd: @ 81D7271 + goto BattleScript_MoveEnd BattleScript_StatDown:: @ 81D7276 - playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 - printfromtable BattleTextList_40157C + playanimation 2, B_ANIM_STATS_CHANGE, sANIM_ARG1 + printfromtable gStatDownStringIds waitmessage 64 return -MoveEffect_Haze: @ 81D7286 +BattleScript_EffectHaze: @ 81D7286 attackcanceler attackstring ppreduce @@ -611,61 +614,61 @@ MoveEffect_Haze: @ 81D7286 normalisebuffs printstring BATTLE_TEXT_StatElim waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Bide: @ 81D7297 +BattleScript_EffectBide: @ 81D7297 attackcanceler attackstring ppreduce attackanimation waitanimation - orword gHitMarker, 0x8000000 + orword gHitMarker, HITMARKER_x8000000 setbide - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Rampage: @ 81D72AB +BattleScript_EffectRampage: @ 81D72AB attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring - jumpifstatus2 USER, S_CONTINUE, BattleScript_1D72BF + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_1D72BF ppreduce BattleScript_1D72BF: @ 81D72BF confuseifrepeatingattackends - goto BattleScript_1D6F44 + goto BattleScript_HitFromCritCalc -MoveEffect_Roar: @ 81D72C5 +BattleScript_EffectRoar: @ 81D72C5 attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_SUCTION_CUPS, BattleScript_1D988D - jumpifstatus3condition TARGET, 0x400, 0, BattleScript_1D93EC - accuracycheck BattleScript_ButItFailed, 65535 - accuracycheck BattleScript_1D6F77, 0 + jumpifability TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut + jumpifstatus3 TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON + accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE forcerandomswitch BattleScript_ButItFailed -MoveEffect_MultiHit: @ 81D72ED +BattleScript_EffectMultiHit: @ 81D72ED attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce setmultihitcounter 0 initmultihitstring - setbyte gSharedMem + 0x16112, 0 + setbyte sMULTIHIT_EFFECT, 0 -BattleScript_1D7300: @ 81D7300 - jumpifhasnohp USER, BattleScript_1D7396 - jumpifhasnohp TARGET, BattleScript_1D7377 - jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7322 - jumpifstatus USER, SLP, BattleScript_1D7377 +BattleScript_MultiHitLoop: @ 81D7300 + jumpifhasnohp USER, BattleScript_MultiHitEnd + jumpifhasnohp TARGET, BattleScript_MultiHitPrintStrings + jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoMultiHit + jumpifstatus USER, SLP, BattleScript_MultiHitPrintStrings -BattleScript_1D7322: @ 81D7322 +BattleScript_DoMultiHit: @ 81D7322 movevaluescleanup - copyarray gUnknown_02024D1F + 0x2, gSharedMem + 0x16112, 1 + copybyte cEFFECT_CHOOSER, sMULTIHIT_EFFECT critcalc damagecalc typecalc - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7374 + jumpifmovehadnoeffect BattleScript_MultiHitNoMoreHits adjustnormaldamage attackanimation waitanimation @@ -678,34 +681,34 @@ BattleScript_1D7322: @ 81D7322 waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - addbyte gSharedMem + 0x160E4, 1 - setbyte gSharedMem + 0x1600C, 0 + addbyte sMULTIHIT_STRING + 4, 1 + setbyte sMOVEEND_STATE, 0 moveend 2, 16 - jumpifbyte 4, gBattleMoveFlags, 64, BattleScript_1D7377 - decrementmultihit BattleScript_1D7300 - goto BattleScript_1D7377 + jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_MultiHitPrintStrings + decrementmultihit BattleScript_MultiHitLoop + goto BattleScript_MultiHitPrintStrings -BattleScript_1D7374: @ 81D7374 +BattleScript_MultiHitNoMoreHits: @ 81D7374 pause 32 -BattleScript_1D7377: @ 81D7377 +BattleScript_MultiHitPrintStrings: @ 81D7377 resultmessage waitmessage 64 - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7396 - copyarray gBattleTextBuff1, gSharedMem + 0x160E0, 6 + jumpifmovehadnoeffect BattleScript_MultiHitEnd + copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 -BattleScript_1D7396: @ 81D7396 +BattleScript_MultiHitEnd: @ 81D7396 seteffectwithchance - tryfaintmon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 2 + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 2 moveend 1, 0 - setbyte gSharedMem + 0x1600C, 4 + setbyte sMOVEEND_STATE, 4 moveend 0, 0 end -MoveEffect_Conversion: @ 81D73B1 +BattleScript_EffectConversion: @ 81D73B1 attackcanceler attackstring ppreduce @@ -714,520 +717,517 @@ MoveEffect_Conversion: @ 81D73B1 waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_FlinchHit: @ 81D73C6 - setbyte gUnknown_02024D1F + 0x2, 8 - goto BattleScript_1D6F14 +BattleScript_EffectFlinchHit: @ 81D73C6 + setmoveeffect EFFECT_FLINCH + goto BattleScript_EffectHit -MoveEffect_RestoreHp: @ 81D73D1 +BattleScript_EffectRestoreHp: @ 81D73D1 attackcanceler attackstring ppreduce - tryhealhalfhealth BattleScript_1D83B5, 1 + tryhealhalfhealth BattleScript_AlreadyAtFullHp, 1 attackanimation waitanimation - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_RegainedHealth waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Toxic: @ 81D73F4 +BattleScript_EffectToxic: @ 81D73F4 attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_1D7463 - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifstatus TARGET, PSN, BattleScript_1D7455 - jumpifstatus TARGET, TOX, BattleScript_1D7455 + jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus TARGET, PSN, BattleScript_AlreadyPoisoned + jumpifstatus TARGET, TOX, BattleScript_AlreadyPoisoned jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed - jumpiftype TARGET, TYPE_POISON, BattleScript_1D83E8 - jumpiftype TARGET, TYPE_STEEL, BattleScript_1D83E8 - accuracycheck BattleScript_ButItFailed, 0 - jumpifsideaffecting TARGET, 32, BattleScript_1D9037 + jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected + jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 6 + setmoveeffect EFFECT_TOXIC seteffectprimary resultmessage waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D7455: @ 81D7455 +BattleScript_AlreadyPoisoned: @ 81D7455 pause 64 printstring BATTLE_TEXT_AlreadyPoisoned waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D7463: @ 81D7463 - copyarray gEffectBank, gBankTarget, 1 - setbyte gUnknown_02024D1F + 0x4, 0 +BattleScript_ImmunityProtected: @ 81D7463 + copybyte gEffectBank, gBankTarget + setbyte cMULTISTRING_CHOOSER, 0 call BattleScript_PSNPrevention - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PayDay: @ 81D747D - setbyte gUnknown_02024D1F + 0x2, 11 - goto BattleScript_1D6F14 +BattleScript_EffectPayDay: @ 81D747D + setmoveeffect EFFECT_PAYDAY + goto BattleScript_EffectHit -MoveEffect_LightScreen: @ 81D7488 +BattleScript_EffectLightScreen: @ 81D7488 attackcanceler attackstring ppreduce setlightscreen - goto BattleScript_1D7786 + goto BattleScript_PrintReflectLightScreenSafeguardString -MoveEffect_TriAttack: @ 81D7491 - setbyte gUnknown_02024D1F + 0x2, 9 - goto BattleScript_1D6F14 +BattleScript_EffectTriAttack: @ 81D7491 + setmoveeffect EFFECT_TRI_ATTACK + goto BattleScript_EffectHit -MoveEffect_Rest: @ 81D749C +BattleScript_EffectRest: @ 81D749C attackcanceler attackstring ppreduce - jumpifstatus USER, SLP, BattleScript_1D74D6 - jumpifcantmakeasleep BattleScript_1D74C6 - trysetrest BattleScript_1D83B5 + jumpifstatus USER, SLP, BattleScript_RestIsAlreadyAsleep + jumpifcantmakeasleep BattleScript_RestCantSleep + trysetrest BattleScript_AlreadyAtFullHp pause 32 - printfromtable BattleTextList_401556 + printfromtable gRestUsedStringIds waitmessage 64 - updatestatusicon 1 + updatestatusicon USER waitstate - goto BattleScript_1D839B + goto BattleScript_PresentHealTarget -BattleScript_1D74C6: @ 81D74C6 +BattleScript_RestCantSleep: @ 81D74C6 pause 64 - printfromtable BattleTextList_40156A + printfromtable gUproarAwakeStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D74D6: @ 81D74D6 +BattleScript_RestIsAlreadyAsleep: @ 81D74D6 pause 32 printstring BATTLE_TEXT_AttackingAsleep waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Ohko: @ 81D74E4 +BattleScript_EffectOHKO: @ 81D74E4 attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 65535 + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON typecalc - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D6F48 - tryKO BattleScript_1D7505 + jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation + tryKO BattleScript_KOFail trysetdestinybondtohappen - goto BattleScript_1D6F48 + goto BattleScript_HitFromAtkAnimation -BattleScript_1D7505: @ 81D7505 +BattleScript_KOFail: @ 81D7505 pause 64 - printfromtable BattleTextList_4015C8 + printfromtable gKOFailedStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_RazorWind: @ 81D7515 - jumpifstatus2 USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D - setbyte gSharedMem + 0x16055, 0 - call BattleScript_1D756C - goto BattleScript_EndTurn +BattleScript_EffectRazorWind: @ 81D7515 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn + jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn + setbyte sTWOTURN_STRINGID, 0 + call BattleScriptFirstChargingTurn + goto BattleScript_MoveEnd -BattleScript_1D753D: @ 81D753D +BattleScript_TwoTurnMovesSecondTurn: @ 81D753D attackcanceler - setbyte gUnknown_02024D1F + 0x2, 12 - setbyte gSharedMem + 0x16002, 1 + setmoveeffect EFFECT_CHARGING + setbyte sANIM_TURN, 1 clearstatusfromeffect USER - orword gHitMarker, 0x800 - jumpifhalfword 1, gCurrentMove, 143, BattleScript_1D6F3B - setbyte gUnknown_02024D1F + 0x2, 8 - goto BattleScript_1D6F3B + orword gHitMarker, HITMARKER_NO_PPDEDUCT + jumpifnotmove MOVE_SKY_ATTACK, BattleScript_HitFromAccCheck + setmoveeffect EFFECT_FLINCH + goto BattleScript_HitFromAccCheck -BattleScript_1D756C: @ 81D756C +BattleScriptFirstChargingTurn: @ 81D756C attackcanceler printstring BATTLE_TEXT_Terminator2 ppreduce attackanimation waitanimation - orword gHitMarker, 0x8000000 - setbyte gUnknown_02024D1F + 0x2, 76 + orword gHitMarker, HITMARKER_x8000000 + setbyte cEFFECT_CHOOSER, 76 seteffectprimary - copyarray gUnknown_02024D1F + 0x4, gSharedMem + 0x16055, 1 - printfromtable BattleTextList_401584 + copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID + printfromtable gFirstTurnOfTwoStringIds waitmessage 64 return -MoveEffect_SuperFang: @ 81D7596 +BattleScript_EffectSuperFang: @ 81D7596 attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce typecalc - bicbyte gBattleMoveFlags, 6 + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE damagetohalftargethp - goto BattleScript_1D6F48 + goto BattleScript_HitFromAtkAnimation -MoveEffect_DragonRage: @ 81D75AD +BattleScript_EffectDragonRage: @ 81D75AD attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce typecalc - bicbyte gBattleMoveFlags, 6 - setbyte gBattleMoveDamage, 40 - setbyte gBattleMoveDamage + 0x1, 0 - setbyte gBattleMoveDamage + 0x2, 0 - setbyte gBattleMoveDamage + 0x3, 0 + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE + setword gBattleMoveDamage, 40 adjustsetdamage - goto BattleScript_1D6F48 + goto BattleScript_HitFromAtkAnimation -MoveEffect_Trap: @ 81D75DC - jumpifhalfword 1, gCurrentMove, 250, BattleScript_1D7602 - jumpifstatus3condition TARGET, 0x40000, 1, BattleScript_1D7602 - orword gHitMarker, 0x40000 - setbyte gSharedMem + 0x1601F, 2 +BattleScript_EffectTrap: @ 81D75DC + jumpifnotmove MOVE_WHIRLPOOL, BattleScript_DoWrapEffect + jumpifnostatus3 TARGET, STATUS3_UNDERWATER, BattleScript_DoWrapEffect + orword gHitMarker, HITMARKER_IGNORE_UNDERWATER + setbyte sDMG_MULTIPLIER, 2 -BattleScript_1D7602: @ 81D7602 - setbyte gUnknown_02024D1F + 0x2, 13 - goto BattleScript_1D6F14 +BattleScript_DoWrapEffect: @ 81D7602 + setmoveeffect EFFECT_WRAP + goto BattleScript_EffectHit -MoveEffect_DoubleHit: @ 81D760D +BattleScript_EffectDoubleHit: @ 81D760D attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce setmultihitcounter 2 initmultihitstring - setbyte gSharedMem + 0x16112, 0 - goto BattleScript_1D7300 + setbyte sMULTIHIT_EFFECT, 0 + goto BattleScript_MultiHitLoop -MoveEffect_RecoilIfMiss: @ 81D7625 +BattleScript_EffectRecoilIfMiss: @ 81D7625 attackcanceler - accuracycheck BattleScript_1D7632, 0 - goto BattleScript_1D6F42 + accuracycheck BattleScript_MoveMissedDoDamage, ACC_CURR_MOVE + goto BattleScript_HitFromAtkString -BattleScript_1D7632: @ 81D7632 +BattleScript_MoveMissedDoDamage: @ 81D7632 attackstring ppreduce pause 64 resultmessage waitmessage 64 - jumpifbyte 4, gBattleMoveFlags, 8, BattleScript_EndTurn + jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_NOTAFFECTED, BattleScript_MoveEnd printstring BATTLE_TEXT_KeptGoingCrash waitmessage 64 damagecalc typecalc adjustnormaldamage manipulatedamage 1 - bicbyte gBattleMoveFlags, 1 - orword gHitMarker, 0x100 + bicbyte gBattleMoveFlags, MOVESTATUS_MISSED + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER - tryfaintmon USER, 0, 0x0 - orbyte gBattleMoveFlags, 1 - goto BattleScript_EndTurn + tryfaintmon USER, FALSE, NULL + orbyte gBattleMoveFlags, MOVESTATUS_MISSED + goto BattleScript_MoveEnd -MoveEffect_Mist: @ 81D7676 +BattleScript_EffectMist: @ 81D7676 attackcanceler attackstring ppreduce setmist attackanimation waitanimation - printfromtable BattleTextList_4015A0 + printfromtable gMistUsedStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_FocusEnergy: @ 81D7689 +BattleScript_EffectFocusEnergy: @ 81D7689 attackcanceler attackstring ppreduce - jumpifstatus2 USER, S_FOCUS_ENERGY, BattleScript_ButItFailed + jumpifstatus2 USER, STATUS2_FOCUS_ENERGY, BattleScript_ButItFailed setfocusenergy attackanimation waitanimation - printfromtable BattleTextList_4015A4 + printfromtable gFocusEnergyUsedStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Recoil: @ 81D76A6 - setbyte gUnknown_02024D1F + 0x2, 206 - jumpifhalfword 1, gCurrentMove, 165, BattleScript_1D6F14 +BattleScript_EffectRecoil: @ 81D76A6 + setmoveeffect EFFECT_RECOIL_25 | AFFECTS_USER | CERTAIN + jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit incrementgamestat 27 - goto BattleScript_1D6F14 + goto BattleScript_EffectHit -MoveEffect_Confuse: @ 81D76BF +BattleScript_EffectConfuse: @ 81D76BF attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifstatus2 TARGET, S_CONFUSED, BattleScript_1D76FE - accuracycheck BattleScript_ButItFailed, 0 - jumpifsideaffecting TARGET, 32, BattleScript_1D9037 + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_AlreadyConfused + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 7 + setmoveeffect EFFECT_CONFUSION seteffectprimary resultmessage waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D76FE: @ 81D76FE +BattleScript_AlreadyConfused: @ 81D76FE pause 32 printstring BATTLE_TEXT_AlreadyConfused waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_AttackUp2: @ 81D770C - setbyte gSharedMem + 0x1601E, 33 - goto BattleScript_1D71B2 +BattleScript_EffectAttackUp2: @ 81D770C + setstatchanger ATTACK, 2, FALSE + goto BattleScript_EffectStatUp -MoveEffect_DefenseUp2: @ 81D7717 - setbyte gSharedMem + 0x1601E, 34 - goto BattleScript_1D71B2 +BattleScript_EffectDefenseUp2: @ 81D7717 + setstatchanger DEFENSE, 2, FALSE + goto BattleScript_EffectStatUp -MoveEffect_SpeedUp2: @ 81D7722 - setbyte gSharedMem + 0x1601E, 35 - goto BattleScript_1D71B2 +BattleScript_EffectSpeedUp2: @ 81D7722 + setstatchanger SPEED, 2, FALSE + goto BattleScript_EffectStatUp -MoveEffect_SpecialAttackUp2: @ 81D772D - setbyte gSharedMem + 0x1601E, 36 - goto BattleScript_1D71B2 +BattleScript_EffectSpecialAttackUp2: @ 81D772D + setstatchanger SP_ATTACK, 2, FALSE + goto BattleScript_EffectStatUp -MoveEffect_SpecialDefenseUp2: @ 81D7738 - setbyte gSharedMem + 0x1601E, 37 - goto BattleScript_1D71B2 +BattleScript_EffectSpecialDefenseUp2: @ 81D7738 + setstatchanger SP_DEFENSE, 2, FALSE + goto BattleScript_EffectStatUp -MoveEffect_Transform: @ 81D7743 +BattleScript_EffectTransform: @ 81D7743 attackcanceler attackstring ppreduce transformdataexecution attackanimation waitanimation - printfromtable BattleTextList_4015A8 + printfromtable gTransformUsedStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_AttackDown2: @ 81D7756 - setbyte gSharedMem + 0x1601E, 161 - goto BattleScript_1D7227 +BattleScript_EffectAttackDown2: @ 81D7756 + setstatchanger ATTACK, 2, TRUE + goto BattleScript_EffectStatDown -MoveEffect_DefenseDown2: @ 81D7761 - setbyte gSharedMem + 0x1601E, 162 - goto BattleScript_1D7227 +BattleScript_EffectDefenseDown2: @ 81D7761 + setstatchanger DEFENSE, 2, TRUE + goto BattleScript_EffectStatDown -MoveEffect_SpeedDown2: @ 81D776C - setbyte gSharedMem + 0x1601E, 163 - goto BattleScript_1D7227 +BattleScript_EffectSpeedDown2: @ 81D776C + setstatchanger SPEED, 2, TRUE + goto BattleScript_EffectStatDown -MoveEffect_SpecialDefenseDown2: @ 81D7777 - setbyte gSharedMem + 0x1601E, 165 - goto BattleScript_1D7227 +BattleScript_EffectSpecialDefenseDown2: @ 81D7777 + setstatchanger SP_DEFENSE, 2, TRUE + goto BattleScript_EffectStatDown -MoveEffect_Reflect: @ 81D7782 +BattleScript_EffectReflect: @ 81D7782 attackcanceler attackstring ppreduce setreflect -BattleScript_1D7786: @ 81D7786 +BattleScript_PrintReflectLightScreenSafeguardString: @ 81D7786 attackanimation waitanimation - printfromtable BattleTextList_401540 + printfromtable gReflectLightScreenSafeguardStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Poison: @ 81D7795 +BattleScript_EffectPoison: @ 81D7795 attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_1D7463 - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifstatus TARGET, PSN, BattleScript_1D7455 - jumpifstatus TARGET, TOX, BattleScript_1D7455 - jumpiftype TARGET, TYPE_POISON, BattleScript_1D83E8 - jumpiftype TARGET, TYPE_STEEL, BattleScript_1D83E8 + jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_ImmunityProtected + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus TARGET, PSN, BattleScript_AlreadyPoisoned + jumpifstatus TARGET, TOX, BattleScript_AlreadyPoisoned + jumpiftype TARGET, TYPE_POISON, BattleScript_NotAffected + jumpiftype TARGET, TYPE_STEEL, BattleScript_NotAffected jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 - jumpifsideaffecting TARGET, 32, BattleScript_1D9037 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 2 + setmoveeffect EFFECT_POISON seteffectprimary resultmessage waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Paralyze: @ 81D77F6 +BattleScript_EffectParalyze: @ 81D77F6 attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_LIMBER, BattleScript_1D7859 - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifability TARGET, ABILITY_LIMBER, BattleScript_LimberProtected + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed typecalc - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_ButItFailed - jumpifstatus TARGET, PAR, BattleScript_1D784B + jumpifmovehadnoeffect BattleScript_ButItFailed + jumpifstatus TARGET, PAR, BattleScript_AlreadyParalyzed jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 - jumpifsideaffecting TARGET, 32, BattleScript_1D9037 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 5 + setmoveeffect EFFECT_PARALYSIS seteffectprimary resultmessage waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D784B: @ 81D784B +BattleScript_AlreadyParalyzed: @ 81D784B pause 32 printstring BATTLE_TEXT_AlreadyParalyzed waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D7859: @ 81D7859 - copyarray gEffectBank, gBankTarget, 1 - setbyte gUnknown_02024D1F + 0x4, 0 +BattleScript_LimberProtected: @ 81D7859 + copybyte gEffectBank, gBankTarget + setbyte cMULTISTRING_CHOOSER, 0 call BattleScript_PRLZPrevention - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_AttackDownHit: @ 81D7873 - setbyte gUnknown_02024D1F + 0x2, 22 - goto BattleScript_1D6F14 +BattleScript_EffectAttackDownHit: @ 81D7873 + setmoveeffect EFFECT_ATK_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_DefenseDownHit: @ 81D787E - setbyte gUnknown_02024D1F + 0x2, 23 - goto BattleScript_1D6F14 +BattleScript_EffectDefenseDownHit: @ 81D787E + setmoveeffect EFFECT_DEF_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_SpeedDownHit: @ 81D7889 - setbyte gUnknown_02024D1F + 0x2, 24 - goto BattleScript_1D6F14 +BattleScript_EffectSpeedDownHit: @ 81D7889 + setmoveeffect EFFECT_SPD_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_SpecialAttackDownHit: @ 81D7894 - setbyte gUnknown_02024D1F + 0x2, 25 - goto BattleScript_1D6F14 +BattleScript_EffectSpecialAttackDownHit: @ 81D7894 + setmoveeffect EFFECT_SP_ATK_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_SpecialDefenseDownHit: @ 81D789F - setbyte gUnknown_02024D1F + 0x2, 26 - goto BattleScript_1D6F14 +BattleScript_EffectSpecialDefenseDownHit: @ 81D789F + setmoveeffect EFFECT_SP_DEF_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_AccuracyDownHit: @ 81D78AA - setbyte gUnknown_02024D1F + 0x2, 27 - goto BattleScript_1D6F14 +BattleScript_EffectAccuracyDownHit: @ 81D78AA + setmoveeffect EFFECT_ACC_MINUS_1 + goto BattleScript_EffectHit -MoveEffect_SkyAttack: @ 81D78B5 - jumpifstatus2 USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D - setbyte gSharedMem + 0x16055, 3 - call BattleScript_1D756C - goto BattleScript_EndTurn +BattleScript_EffectSkyAttack: @ 81D78B5 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn + jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn + setbyte sTWOTURN_STRINGID, 3 + call BattleScriptFirstChargingTurn + goto BattleScript_MoveEnd -MoveEffect_ConfuseHit: @ 81D78DD - setbyte gUnknown_02024D1F + 0x2, 7 - goto BattleScript_1D6F14 +BattleScript_EffectConfuseHit: @ 81D78DD + setmoveeffect EFFECT_CONFUSION + goto BattleScript_EffectHit -MoveEffect_Twineedle: @ 81D78E8 +BattleScript_EffectTwineedle: @ 81D78E8 attackcanceler - accuracycheck BattleScript_1D6F72, 0 - setbyte gSharedMem + 0x16112, 2 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE + setbyte sMULTIHIT_EFFECT, 2 attackstring ppreduce setmultihitcounter 2 initmultihitstring - goto BattleScript_1D7300 + goto BattleScript_MultiHitLoop -MoveEffect_Substitute: @ 81D7900 +BattleScript_EffectSubstitute: @ 81D7900 attackcanceler ppreduce attackstring waitstate - jumpifstatus2 USER, S_SUBSTITUTE, BattleScript_1D7935 + jumpifstatus2 USER, STATUS2_SUBSTITUTE, BattleScript_AlreadyHasSubstitute setsubstitute - jumpifbyte 1, gUnknown_02024D1F + 0x4, 1, BattleScript_1D7922 + jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 1, BattleScript_SubstituteAnim pause 32 - goto BattleScript_1D7928 + goto BattleScript_SubstituteString -BattleScript_1D7922: @ 81D7922 +BattleScript_SubstituteAnim: @ 81D7922 attackanimation waitanimation healthbarupdate USER datahpupdate USER -BattleScript_1D7928: @ 81D7928 - printfromtable BattleTextList_4015AC +BattleScript_SubstituteString: @ 81D7928 + printfromtable gSubsituteUsedStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D7935: @ 81D7935 +BattleScript_AlreadyHasSubstitute: @ 81D7935 pause 32 printstring BATTLE_TEXT_SubAlready waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Recharge: @ 81D7943 +BattleScript_EffectRecharge: @ 81D7943 attackcanceler - accuracycheck BattleScript_1D6F72, 0 - setbyte gUnknown_02024D1F + 0x2, 221 - goto BattleScript_1D6F42 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE + setmoveeffect EFFECT_RECHARGE | AFFECTS_USER | CERTAIN + goto BattleScript_HitFromAtkString BattleScript_MoveUsedMustRecharge:: @ 81D7956 printstring BATTLE_TEXT_MustRecharge waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Rage: @ 81D7961 +BattleScript_EffectRage: @ 81D7961 attackcanceler - accuracycheck BattleScript_1D797B, 0 - setbyte gUnknown_02024D1F + 0x2, 30 + accuracycheck BattleScript_RageMiss, ACC_CURR_MOVE + setmoveeffect EFFECT_RAGE seteffectprimary - setbyte gUnknown_02024D1F + 0x2, 0 - goto BattleScript_1D6F42 + setmoveeffect 0 + goto BattleScript_HitFromAtkString -BattleScript_1D797B: @ 81D797B - setbyte gUnknown_02024D1F + 0x2, 30 +BattleScript_RageMiss: @ 81D797B + setmoveeffect EFFECT_RAGE clearstatusfromeffect USER - goto BattleScript_1D6F72 + goto BattleScript_PrintMoveMissed -MoveEffect_Mimic: @ 81D7988 +BattleScript_EffectMimic: @ 81D7988 attackcanceler attackstring ppreduce - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 65535 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON mimicattackcopy BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_LearnedMove2 waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Metronome: @ 81D79AE +BattleScript_EffectMetronome: @ 81D79AE attackcanceler attackstring pause 32 attackanimation waitanimation - setbyte gSharedMem + 0x16002, 0 - setbyte gSharedMem + 0x160A1, 0 + setbyte sANIM_TURN, 0 + setbyte sANIM_TARGETS_HIT, 0 metronome -MoveEffect_LeechSeed: @ 81D79C2 +BattleScript_EffectLeechSeed: @ 81D79C2 attackcanceler attackstring pause 32 ppreduce - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - accuracycheck BattleScript_1D79D9, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + accuracycheck BattleScript_DoLeechSeed, ACC_CURR_MOVE -BattleScript_1D79D9: @ 81D79D9 +BattleScript_DoLeechSeed: @ 81D79D9 setseeded attackanimation waitanimation - printfromtable BattleTextList_40154C + printfromtable gLeechSeedStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Splash: @ 81D79E9 +BattleScript_EffectSplash: @ 81D79E9 attackcanceler attackstring ppreduce @@ -1236,55 +1236,55 @@ MoveEffect_Splash: @ 81D79E9 incrementgamestat 26 printstring BATTLE_TEXT_Nothing waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Disable: @ 81D79FB +BattleScript_EffectDisable: @ 81D79FB attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 0 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE disablelastusedattack BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_MoveWasDisabled waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_LevelDamage: @ 81D7A17 +BattleScript_EffectLevelDamage: @ 81D7A17 attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce typecalc - bicbyte gBattleMoveFlags, 6 + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE dmgtolevel adjustsetdamage - goto BattleScript_1D6F48 + goto BattleScript_HitFromAtkAnimation -MoveEffect_Psywave: @ 81D7A2F +BattleScript_EffectPsywave: @ 81D7A2F attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce typecalc - bicbyte gBattleMoveFlags, 6 + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE psywavedamageeffect adjustsetdamage - goto BattleScript_1D6F48 + goto BattleScript_HitFromAtkAnimation -MoveEffect_Counter: @ 81D7A47 +BattleScript_EffectCounter: @ 81D7A47 attackcanceler - counterdamagecalculator BattleScript_1D83D4 - accuracycheck BattleScript_1D6F72, 0 + counterdamagecalculator BattleScript_ButItFailedAtkStringPpReduce + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce typecalc2 adjustsetdamage - goto BattleScript_1D6F48 + goto BattleScript_HitFromAtkAnimation -MoveEffect_Encore: @ 81D7A5D +BattleScript_EffectEncore: @ 81D7A5D attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce trysetencore BattleScript_ButItFailed @@ -1292,47 +1292,47 @@ MoveEffect_Encore: @ 81D7A5D waitanimation printstring BATTLE_TEXT_EncoreGot waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PainSplit: @ 81D7A79 +BattleScript_EffectPainSplit: @ 81D7A79 attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 65535 + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON painsplitdmgcalc BattleScript_ButItFailed attackanimation waitanimation - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER - copyarray gBattleMoveDamage, gSharedMem + 0x16014, 4 + copyword gBattleMoveDamage, sPAINSPLIT_HP healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_PainSplit waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Snore: @ 81D7AB0 +BattleScript_EffectSnore: @ 81D7AB0 attackcanceler - jumpifstatus USER, SLP, BattleScript_1D7AC2 + jumpifstatus USER, SLP, BattleScript_SnoreIsAsleep attackstring ppreduce goto BattleScript_ButItFailed -BattleScript_1D7AC2: @ 81D7AC2 - jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7AD6 +BattleScript_SnoreIsAsleep: @ 81D7AC2 + jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoSnore printstring BATTLE_TEXT_FastAsleep waitmessage 64 statusanimation USER -BattleScript_1D7AD6: @ 81D7AD6 +BattleScript_DoSnore: @ 81D7AD6 attackstring ppreduce - accuracycheck BattleScript_1D6F77, 0 - setbyte gUnknown_02024D1F + 0x2, 8 - goto BattleScript_1D6F44 + accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE + setmoveeffect EFFECT_FLINCH + goto BattleScript_HitFromCritCalc -MoveEffect_Conversion2: @ 81D7AEA +BattleScript_EffectConversion2: @ 81D7AEA attackcanceler attackstring ppreduce @@ -1341,34 +1341,34 @@ MoveEffect_Conversion2: @ 81D7AEA waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_LockOn: @ 81D7AFF +BattleScript_EffectLockOn: @ 81D7AFF attackcanceler attackstring ppreduce - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE setalwayshitflag attackanimation waitanimation printstring BATTLE_TEXT_TookAim waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Sketch: @ 81D7B21 +BattleScript_EffectSketch: @ 81D7B21 attackcanceler attackstring ppreduce - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed copymovepermanently BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_SketchedMove waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_SleepTalk: @ 81D7B40 +BattleScript_EffectSleepTalk: @ 81D7B40 attackcanceler jumpifstatus USER, SLP, BattleScript_1D7B52 attackstring @@ -1381,19 +1381,19 @@ BattleScript_1D7B52: @ 81D7B52 statusanimation USER attackstring ppreduce - orword gHitMarker, 0x800 - trychoosesleeptalkmove BattleScript_1D7B72 + orword gHitMarker, HITMARKER_NO_PPDEDUCT + trychoosesleeptalkmove BattleScript_SleepTalkIsAsleep pause 64 goto BattleScript_ButItFailed -BattleScript_1D7B72: @ 81D7B72 +BattleScript_SleepTalkIsAsleep: @ 81D7B72 attackanimation waitanimation - setbyte gSharedMem + 0x16002, 0 - setbyte gSharedMem + 0x160A1, 0 + setbyte sANIM_TURN, 0 + setbyte sANIM_TARGETS_HIT, 0 jumptorandomattack USER -MoveEffect_DestinyBond: @ 81D7B82 +BattleScript_EffectDestinyBond: @ 81D7B82 attackcanceler attackstring ppreduce @@ -1402,25 +1402,25 @@ MoveEffect_DestinyBond: @ 81D7B82 waitanimation printstring BATTLE_TEXT_DestinyBondTake waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Flail: @ 81D7B93 +BattleScript_EffectFlail: @ 81D7B93 remaininghptopower - goto BattleScript_1D6F14 + goto BattleScript_EffectHit -MoveEffect_Spite: @ 81D7B99 +BattleScript_EffectSpite: @ 81D7B99 attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 0 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE tryspiteppreduce BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_ReducedBy waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_HealBell: @ 81D7BB5 +BattleScript_EffectHealBell: @ 81D7BB5 attackcanceler attackstring ppreduce @@ -1428,49 +1428,48 @@ MoveEffect_HealBell: @ 81D7BB5 waitstate attackanimation waitanimation - printfromtable BattleTextList_4015D8 + printfromtable gPartyStatusHealStringIds waitmessage 64 - jumpifhalfword 1, gCurrentMove, 215, BattleScript_1D7BF2 - jumpifbyte 5, gUnknown_02024D1F + 0x4, 1, BattleScript_1D7BE1 + jumpifnotmove MOVE_HEAL_BELL, BattleScript_PartyHealEnd + jumpifbyte NO_COMMON_BITS, cMULTISTRING_CHOOSER, 1, BattleScript_CheckHealBellMon2Unaffected printstring BATTLE_TEXT_BlocksOther waitmessage 64 -BattleScript_1D7BE1: @ 81D7BE1 - jumpifbyte 5, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7BF2 +BattleScript_CheckHealBellMon2Unaffected: @ 81D7BE1 + jumpifbyte NO_COMMON_BITS, cMULTISTRING_CHOOSER, 2, BattleScript_PartyHealEnd printstring BATTLE_TEXT_BlocksOther2 waitmessage 64 -BattleScript_1D7BF2: @ 81D7BF2 - updatestatusicon 4 +BattleScript_PartyHealEnd: @ 81D7BF2 + updatestatusicon ATTACKER_WITH_PARTNER waitstate - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_TripleKick: @ 81D7BFA +BattleScript_EffectTripleKick: @ 81D7BFA attackcanceler attackstring ppreduce - setbyte gSharedMem + 0x160DE, 0 - setbyte gSharedMem + 0x160DF, 0 + sethword sTRIPLE_KICK_POWER, 0 initmultihitstring setmultihit 3 -BattleScript_1D7C0C: @ 81D7C0C - jumpifhasnohp USER, BattleScript_1D7CAF - jumpifhasnohp TARGET, BattleScript_1D7C8D - jumpifhalfword 0, gUnknown_02024BE8, 214, BattleScript_1D7C2E - jumpifstatus USER, SLP, BattleScript_1D7C8D +BattleScript_TripleKickLoop: @ 81D7C0C + jumpifhasnohp USER, BattleScript_TripleKickEnd + jumpifhasnohp TARGET, BattleScript_TripleKickNoMoreHits + jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoTripleKickAttack + jumpifstatus USER, SLP, BattleScript_TripleKickNoMoreHits -BattleScript_1D7C2E: @ 81D7C2E +BattleScript_DoTripleKickAttack: @ 81D7C2E movevaluescleanup - accuracycheck BattleScript_1D7C8D, 0 - addbyte gSharedMem + 0x160DE, 10 - addbyte gSharedMem + 0x160E4, 1 - copyarray gDynamicBasePower, gSharedMem + 0x160DE, 2 + accuracycheck BattleScript_TripleKickNoMoreHits, ACC_CURR_MOVE + addbyte sTRIPLE_KICK_POWER, 10 + addbyte sMULTIHIT_STRING + 4, 1 + copyhword gDynamicBasePower, sTRIPLE_KICK_POWER critcalc damagecalc typecalc adjustnormaldamage - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7C8D + jumpifmovehadnoeffect BattleScript_TripleKickNoMoreHits attackanimation waitanimation effectivenesssound @@ -1482,153 +1481,153 @@ BattleScript_1D7C2E: @ 81D7C2E waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - setbyte gSharedMem + 0x1600C, 0 + setbyte sMOVEEND_STATE, 0 moveend 2, 16 - jumpifbyte 4, gBattleMoveFlags, 64, BattleScript_1D7C90 - decrementmultihit BattleScript_1D7C0C - goto BattleScript_1D7C90 + jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_TripleKickPrintStrings + decrementmultihit BattleScript_TripleKickLoop + goto BattleScript_TripleKickPrintStrings -BattleScript_1D7C8D: @ 81D7C8D +BattleScript_TripleKickNoMoreHits: @ 81D7C8D pause 32 -BattleScript_1D7C90: @ 81D7C90 +BattleScript_TripleKickPrintStrings: @ 81D7C90 resultmessage waitmessage 64 - jumpifbyte 0, gSharedMem + 0x160E4, 0, BattleScript_1D7CAF - copyarray gBattleTextBuff1, gSharedMem + 0x160E0, 6 + jumpifbyte EQUAL, sMULTIHIT_STRING + 4, 0, BattleScript_TripleKickEnd + copyarray gBattleTextBuff1,sMULTIHIT_STRING, 6 printstring BATTLE_TEXT_HitMulti waitmessage 64 -BattleScript_1D7CAF: @ 81D7CAF +BattleScript_TripleKickEnd: @ 81D7CAF seteffectwithchance - tryfaintmon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 14 + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 14 moveend 0, 0 end -MoveEffect_Thief: @ 81D7CC1 - setbyte gUnknown_02024D1F + 0x2, 31 - goto BattleScript_1D6F14 +BattleScript_EffectThief: @ 81D7CC1 + setmoveeffect EFFECT_STEAL_ITEM + goto BattleScript_EffectHit -MoveEffect_MeanLook: @ 81D7CCC +BattleScript_EffectMeanLook: @ 81D7CCC attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 65534 - jumpifstatus2 TARGET, S_MEAN_LOOK, BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC + jumpifstatus2 TARGET, STATUS2_ESCAPE_PREVENTION, BattleScript_ButItFailed attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 32 + setmoveeffect EFFECT_PREVENT_ESCAPE seteffectprimary printstring BATTLE_TEXT_CantEscapeNow waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Nightmare: @ 81D7CF4 +BattleScript_EffectNightmare: @ 81D7CF4 attackcanceler attackstring ppreduce - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifstatus2 TARGET, S_NIGHTMARE, BattleScript_ButItFailed - jumpifstatus TARGET, SLP, BattleScript_1D7D1A + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_NIGHTMARE, BattleScript_ButItFailed + jumpifstatus TARGET, SLP, BattleScript_NightmareWorked goto BattleScript_ButItFailed -BattleScript_1D7D1A: @ 81D7D1A +BattleScript_NightmareWorked: @ 81D7D1A attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 33 + setmoveeffect EFFECT_NIGHTMARE seteffectprimary printstring BATTLE_TEXT_NightmareStart waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Minimize: @ 81D7D2E +BattleScript_EffectMinimize: @ 81D7D2E attackcanceler setminimize - setbyte gSharedMem + 0x1601E, 23 - goto BattleScript_1D71B3 + setstatchanger EVASION, 1, FALSE + goto BattleScript_EffectStatUpAfterAtkCanceler -MoveEffect_Curse: @ 81D7D3B - jumpiftype2 USER, TYPE_GHOST, BattleScript_1D7DB3 +BattleScript_EffectCurse: @ 81D7D3B + jumpiftype2 USER, TYPE_GHOST, BattleScript_GhostCurse attackcanceler attackstring ppreduce - jumpifstat USER, 2, 3, 0, BattleScript_1D7D60 - jumpifstat USER, 1, 1, 12, BattleScript_1D7D60 - jumpifstat USER, 0, 2, 12, BattleScript_ButItFailed + jumpifstat USER, GREATER_THAN, SPEED, 0, BattleScript_CurseTrySpeed + jumpifstat USER, NOT_EQUAL, ATTACK, 12, BattleScript_CurseTrySpeed + jumpifstat USER, EQUAL, DEFENSE, 12, BattleScript_ButItFailed -BattleScript_1D7D60: @ 81D7D60 - copyarray gBankTarget, gBankAttacker, 1 - setbyte gSharedMem + 0x16002, 1 +BattleScript_CurseTrySpeed: @ 81D7D60 + copybyte gBankTarget, gBankAttacker + setbyte sANIM_TURN, 1 attackanimation waitanimation - setbyte gSharedMem + 0x1601E, 147 - statbuffchange 65, BattleScript_1D7D86 - printfromtable BattleTextList_40157C + setstatchanger SPEED, 1, TRUE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseTryAttack + printfromtable gStatDownStringIds waitmessage 64 -BattleScript_1D7D86: @ 81D7D86 - setbyte gSharedMem + 0x1601E, 17 - statbuffchange 65, BattleScript_1D7D9A - printfromtable BattleTextList_401570 +BattleScript_CurseTryAttack: @ 81D7D86 + setstatchanger ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseTryDefence + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D7D9A: @ 81D7D9A - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D7DAE - printfromtable BattleTextList_401570 +BattleScript_CurseTryDefence: @ 81D7D9A + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CurseEnd + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D7DAE: @ 81D7DAE - goto BattleScript_EndTurn +BattleScript_CurseEnd: @ 81D7DAE + goto BattleScript_MoveEnd -BattleScript_1D7DB3: @ 81D7DB3 - jumpifarraynotequal gBankAttacker, gBankTarget, 1, BattleScript_1D7DC4 +BattleScript_GhostCurse: @ 81D7DB3 + jumpifbytenotequal gBankAttacker, gBankTarget, BattleScript_DoGhostCurse getmovetarget USER -BattleScript_1D7DC4: @ 81D7DC4 +BattleScript_DoGhostCurse: @ 81D7DC4 attackcanceler attackstring ppreduce - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed cursetarget BattleScript_ButItFailed - orword gHitMarker, 0x100 - setbyte gSharedMem + 0x16002, 0 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE + setbyte sANIM_TURN, 0 attackanimation waitanimation healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_CurseLay waitmessage 64 - tryfaintmon USER, 0, 0x0 - goto BattleScript_EndTurn + tryfaintmon USER, FALSE, NULL + goto BattleScript_MoveEnd -MoveEffect_Endure: @ 81D7DFD -MoveEffect_Protect: @ 81D7DFD +BattleScript_EffectEndure: @ 81D7DFD +BattleScript_EffectProtect: @ 81D7DFD attackcanceler attackstring ppreduce setprotectlike attackanimation waitanimation - printfromtable BattleTextList_40153A + printfromtable gProtectLikeUsedStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Spikes: @ 81D7E10 +BattleScript_EffectSpikes: @ 81D7E10 attackcanceler - trysetspikes BattleScript_1D83D4 + trysetspikes BattleScript_ButItFailedAtkStringPpReduce attackstring ppreduce attackanimation waitanimation printstring BATTLE_TEXT_SpikesScattered waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Foresight: @ 81D7E25 +BattleScript_EffectForesight: @ 81D7E25 attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce setforesight @@ -1636,9 +1635,9 @@ MoveEffect_Foresight: @ 81D7E25 waitanimation printstring BATTLE_TEXT_IdentifiedPoke waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PerishSong: @ 81D7E3D +BattleScript_EffectPerishSong: @ 81D7E3D attackcanceler attackstring ppreduce @@ -1647,120 +1646,120 @@ MoveEffect_PerishSong: @ 81D7E3D waitanimation printstring BATTLE_TEXT_PerishSong waitmessage 64 - setbyte gSharedMem + 0x16003, 0 + setbyte sBANK, 0 -BattleScript_1D7E53: @ 81D7E53 - jumpifability 10, ABILITY_SOUNDPROOF, BattleScript_1D7E73 +BattleScript_PerishSongLoop: @ 81D7E53 + jumpifability SCRIPTING_BANK, ABILITY_SOUNDPROOF, BattleScript_1D7E73 -BattleScript_1D7E5A: @ 81D7E5A - addbyte gSharedMem + 0x16003, 1 - jumpifarraynotequal gSharedMem + 0x16003, gNoOfAllBanks, 1, BattleScript_1D7E53 - goto BattleScript_EndTurn +BattleScript_PerishSongLoopIncrement: @ 81D7E5A + addbyte sBANK, 1 + jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_PerishSongLoop + goto BattleScript_MoveEnd BattleScript_1D7E73: @ 81D7E73 printstring BATTLE_TEXT_BlocksOther2 waitmessage 64 - goto BattleScript_1D7E5A + goto BattleScript_PerishSongLoopIncrement -MoveEffect_Sandstorm: @ 81D7E7E +BattleScript_EffectSandstorm: @ 81D7E7E attackcanceler attackstring ppreduce setsandstorm - goto BattleScript_1D7FFA + goto BattleScript_MoveWeatherChange -MoveEffect_Rollout: @ 81D7E87 +BattleScript_EffectRollout: @ 81D7E87 attackcanceler attackstring - jumpifstatus2 USER, S_CONTINUE, BattleScript_1D7E94 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_RolloutCheckAccuracy ppreduce -BattleScript_1D7E94: @ 81D7E94 - accuracycheck BattleScript_1D7E9B, 0 +BattleScript_RolloutCheckAccuracy: @ 81D7E94 + accuracycheck BattleScript_RolloutHit, ACC_CURR_MOVE -BattleScript_1D7E9B: @ 81D7E9B +BattleScript_RolloutHit: @ 81D7E9B typecalc2 rolloutdamagecalculation - goto BattleScript_1D6F44 + goto BattleScript_HitFromCritCalc -MoveEffect_Swagger: @ 81D7EA2 +BattleScript_EffectSwagger: @ 81D7EA2 attackcanceler - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D6F6C - accuracycheck BattleScript_1D6F72, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_MakeMoveMissed + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce jumpifconfusedandstatmaxed 1, BattleScript_ButItFailed attackanimation waitanimation - setbyte gSharedMem + 0x1601E, 33 - statbuffchange 1, BattleScript_1D7EE5 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7EE5 + setstatchanger ATTACK, 2, FALSE + statbuffchange 1, BattleScript_SwaggerTryConfuse + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_SwaggerTryConfuse setgraphicalstatchangevalues - playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 - printfromtable BattleTextList_401570 + playanimation TARGET, B_ANIM_STATS_CHANGE, sANIM_ARG1 + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D7EE5: @ 81D7EE5 - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 - jumpifsideaffecting TARGET, 32, BattleScript_1D9037 - setbyte gUnknown_02024D1F + 0x2, 7 +BattleScript_SwaggerTryConfuse: @ 81D7EE5 + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected + setmoveeffect EFFECT_CONFUSION seteffectprimary - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_FuryCutter: @ 81D7F00 +BattleScript_EffectFuryCutter: @ 81D7F00 attackcanceler attackstring ppreduce - accuracycheck BattleScript_1D7F0A, 0 + accuracycheck BattleScript_FuryCutterHit, ACC_CURR_MOVE -BattleScript_1D7F0A: @ 81D7F0A +BattleScript_FuryCutterHit: @ 81D7F0A furycuttercalc critcalc damagecalc typecalc - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D7F0A + jumpifmovehadnoeffect BattleScript_FuryCutterHit adjustnormaldamage - goto BattleScript_1D6F48 + goto BattleScript_HitFromAtkAnimation -MoveEffect_Attract: @ 81D7F1F +BattleScript_EffectAttract: @ 81D7F1F attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 0 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE tryinfatuating BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_FellLove waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Frustration: @ 81D7F3B -MoveEffect_Return: @ 81D7F3B +BattleScript_EffectFrustration: @ 81D7F3B +BattleScript_EffectReturn: @ 81D7F3B attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE happinesstodamagecalculation - goto BattleScript_1D6F42 + goto BattleScript_HitFromAtkString -MoveEffect_Present: @ 81D7F49 +BattleScript_EffectPresent: @ 81D7F49 attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce typecalc presentdamagecalculation -MoveEffect_Safeguard: @ 81D7F55 +BattleScript_EffectSafeguard: @ 81D7F55 attackcanceler attackstring ppreduce setsafeguard - goto BattleScript_1D7786 + goto BattleScript_PrintReflectLightScreenSafeguardString -MoveEffect_ThawHit: @ 81D7F5E - setbyte gUnknown_02024D1F + 0x2, 3 - goto BattleScript_1D6F14 +BattleScript_EffectThawHit: @ 81D7F5E + setmoveeffect EFFECT_BURN + goto BattleScript_EffectHit -MoveEffect_Magnitude: @ 81D7F69 +BattleScript_EffectMagnitude: @ 81D7F69 attackcanceler attackstring ppreduce @@ -1769,13 +1768,13 @@ MoveEffect_Magnitude: @ 81D7F69 pause 32 printstring BATTLE_TEXT_MagnitudeCount waitmessage 64 - goto BattleScript_1D80FD + goto BattleScript_HitsAllWithUndergroundBonusLoop -MoveEffect_BatonPass: @ 81D7F7C +BattleScript_EffectBatonPass: @ 81D7F7C attackcanceler attackstring ppreduce - jumpifcantswitch 129, BattleScript_ButItFailed + jumpifcantswitch ATK4F_DONT_CHECK_STATUSES | USER, BattleScript_ButItFailed attackanimation waitanimation openpartyscreen USER, BattleScript_ButItFailed @@ -1790,87 +1789,84 @@ MoveEffect_BatonPass: @ 81D7F7C switchinanim USER, 1 waitstate switchineffects USER - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_RapidSpin: @ 81D7FA9 - setbyte gUnknown_02024D1F + 0x2, 163 - goto BattleScript_1D6F14 +BattleScript_EffectRapidSpin: @ 81D7FA9 + setmoveeffect EFFECT_RAPIDSPIN | CERTAIN + goto BattleScript_EffectHit -MoveEffect_Sonicboom: @ 81D7FB4 +BattleScript_EffectSonicboom: @ 81D7FB4 attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce typecalc - bicbyte gBattleMoveFlags, 6 - setbyte gBattleMoveDamage, 20 - setbyte gBattleMoveDamage + 0x1, 0 - setbyte gBattleMoveDamage + 0x2, 0 - setbyte gBattleMoveDamage + 0x3, 0 + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE + setword gBattleMoveDamage, 20 adjustsetdamage - goto BattleScript_1D6F48 + goto BattleScript_HitFromAtkAnimation -MoveEffect_Moonlight: @ 81D7FE3 -MoveEffect_MorningSun: @ 81D7FE3 -MoveEffect_Synthesis: @ 81D7FE3 +BattleScript_EffectMoonlight: @ 81D7FE3 +BattleScript_EffectMorningSun: @ 81D7FE3 +BattleScript_EffectSynthesis: @ 81D7FE3 attackcanceler attackstring ppreduce - recoverbasedonsunlight BattleScript_1D83B5 - goto BattleScript_1D839B + recoverbasedonsunlight BattleScript_AlreadyAtFullHp + goto BattleScript_PresentHealTarget -MoveEffect_HiddenPower: @ 81D7FF0 +BattleScript_EffectHiddenPower: @ 81D7FF0 hiddenpowercalc - goto BattleScript_1D6F14 + goto BattleScript_EffectHit -MoveEffect_RainDance: @ 81D7FF6 +BattleScript_EffectRainDance: @ 81D7FF6 attackcanceler attackstring ppreduce setrain -BattleScript_1D7FFA: @ 81D7FFA +BattleScript_MoveWeatherChange: @ 81D7FFA attackanimation waitanimation - printfromtable BattleTextList_40151C + printfromtable gMoveWeatherChangeStringIds waitmessage 64 - call BattleScript_1D9761 - goto BattleScript_EndTurn + call BattleScript_WeatherFormChanges + goto BattleScript_MoveEnd -MoveEffect_SunnyDay: @ 81D800E +BattleScript_EffectSunnyDay: @ 81D800E attackcanceler attackstring ppreduce setsunny - goto BattleScript_1D7FFA + goto BattleScript_MoveWeatherChange -MoveEffect_DefenseUpHit: @ 81D8017 - setbyte gUnknown_02024D1F + 0x2, 80 - goto BattleScript_1D6F14 +BattleScript_EffectDefenseUpHit: @ 81D8017 + setbyte cEFFECT_CHOOSER, 80 + goto BattleScript_EffectHit -MoveEffect_AttackUpHit: @ 81D8022 - setbyte gUnknown_02024D1F + 0x2, 79 - goto BattleScript_1D6F14 +BattleScript_EffectAttackUpHit: @ 81D8022 + setbyte cEFFECT_CHOOSER, 79 + goto BattleScript_EffectHit -MoveEffect_AllStatsUpHit: @ 81D802D - setbyte gUnknown_02024D1F + 0x2, 98 - goto BattleScript_1D6F14 +BattleScript_EffectAllStatsUpHit: @ 81D802D + setbyte cEFFECT_CHOOSER, 98 + goto BattleScript_EffectHit -MoveEffect_BellyDrum: @ 81D8038 +BattleScript_EffectBellyDrum: @ 81D8038 attackcanceler attackstring ppreduce maxattackhalvehp BattleScript_ButItFailed - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE attackanimation waitanimation healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_CutHPMaxATK waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PsychUp: @ 81D805A +BattleScript_EffectPsychUp: @ 81D805A attackcanceler attackstring ppreduce @@ -1879,62 +1875,62 @@ MoveEffect_PsychUp: @ 81D805A waitanimation printstring BATTLE_TEXT_CopyStatChanges waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_MirrorCoat: @ 81D806F +BattleScript_EffectMirrorCoat: @ 81D806F attackcanceler - mirrorcoatdamagecalculator BattleScript_1D83D4 - accuracycheck BattleScript_1D6F72, 0 + mirrorcoatdamagecalculator BattleScript_ButItFailedAtkStringPpReduce + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce typecalc2 adjustsetdamage - goto BattleScript_1D6F48 - -MoveEffect_SkullBash: @ 81D8085 - jumpifstatus2 USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D - setbyte gSharedMem + 0x16055, 2 - call BattleScript_1D756C - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D80CF - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D80CF + goto BattleScript_HitFromAtkAnimation + +BattleScript_EffectSkullBash: @ 81D8085 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn + jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn + setbyte sTWOTURN_STRINGID, 2 + call BattleScriptFirstChargingTurn + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_SkullBashEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_SkullBashEnd setgraphicalstatchangevalues - playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 - printfromtable BattleTextList_401570 + playanimation USER, B_ANIM_STATS_CHANGE, sANIM_ARG1 + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D80CF: @ 81D80CF - goto BattleScript_EndTurn +BattleScript_SkullBashEnd: @ 81D80CF + goto BattleScript_MoveEnd -MoveEffect_Twister: @ 81D80D4 - jumpifstatus3condition TARGET, 0x40, 1, BattleScript_1D80EE - orword gHitMarker, 0x10000 - setbyte gSharedMem + 0x1601F, 2 +BattleScript_EffectTwister: @ 81D80D4 + jumpifnostatus3 TARGET, STATUS3_ON_AIR, BattleScript_FlinchEffect + orword gHitMarker, HITMARKER_IGNORE_ON_AIR + setbyte sDMG_MULTIPLIER, 2 -BattleScript_1D80EE: @ 81D80EE - setbyte gUnknown_02024D1F + 0x2, 8 - goto BattleScript_1D6F14 +BattleScript_FlinchEffect: @ 81D80EE + setmoveeffect EFFECT_FLINCH + goto BattleScript_EffectHit -MoveEffect_Earthquake: @ 81D80F9 +BattleScript_EffectEarthquake: @ 81D80F9 attackcanceler attackstring ppreduce selectfirstvalidtarget -BattleScript_1D80FD: @ 81D80FD +BattleScript_HitsAllWithUndergroundBonusLoop: @ 81D80FD movevaluescleanup - jumpifstatus3condition TARGET, 0x80, 1, BattleScript_1D811D - orword gHitMarker, 0x20000 - setbyte gSharedMem + 0x1601F, 2 - goto BattleScript_1D812C + jumpifnostatus3 TARGET, STATUS3_UNDERGROUND, BattleScript_HitsAllNoUndergroundBonus + orword gHitMarker, HITMARKER_IGNORE_UNDERGROUND + setbyte sDMG_MULTIPLIER, 2 + goto BattleScript_DoHitAllWithUndergroundBonus -BattleScript_1D811D: @ 81D811D - bicword gHitMarker, 0x20000 - setbyte gSharedMem + 0x1601F, 1 +BattleScript_HitsAllNoUndergroundBonus: @ 81D811D + bicword gHitMarker, HITMARKER_IGNORE_UNDERGROUND + setbyte sDMG_MULTIPLIER, 1 -BattleScript_1D812C: @ 81D812C - accuracycheck BattleScript_1D8165, 0 +BattleScript_DoHitAllWithUndergroundBonus: @ 81D812C + accuracycheck BattleScript_HitAllWithUndergroundBonusMissed, ACC_CURR_MOVE critcalc damagecalc typecalc @@ -1952,101 +1948,101 @@ BattleScript_1D812C: @ 81D812C waitmessage 64 printstring BATTLE_TEXT_Terminator2 waitmessage 1 - tryfaintmon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 0 + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 0 moveend 2, 16 - jumpifnexttargetvalid BattleScript_1D80FD + jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop end -BattleScript_1D8165: @ 81D8165 +BattleScript_HitAllWithUndergroundBonusMissed: @ 81D8165 pause 32 typecalc effectivenesssound resultmessage waitmessage 64 - setbyte gSharedMem + 0x1600C, 0 + setbyte sMOVEEND_STATE, 0 moveend 2, 16 - jumpifnexttargetvalid BattleScript_1D80FD + jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop end -MoveEffect_FutureSight: @ 81D817D +BattleScript_EffectFutureSight: @ 81D817D attackcanceler attackstring ppreduce trysetfutureattack BattleScript_ButItFailed attackanimation waitanimation - printfromtable BattleTextList_4015E2 - waitmessage 64 - goto BattleScript_EndTurn - -MoveEffect_Gust: @ 81D8194 - jumpifstatus3condition TARGET, 0x40, 1, BattleScript_1D6F14 - orword gHitMarker, 0x10000 - setbyte gSharedMem + 0x1601F, 2 - goto BattleScript_1D6F14 - -MoveEffect_FlinchHit2: @ 81D81B3 - jumpifstatus3condition TARGET, 0x100, 1, BattleScript_1D80EE - setbyte gSharedMem + 0x1601F, 2 - goto BattleScript_1D80EE - -MoveEffect_Solarbeam: @ 81D81C9 - jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_1D81E1 - jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_1D81E1 - jumpifhalfword 4, gBattleWeather, 96, BattleScript_1D8209 - -BattleScript_1D81E1: @ 81D81E1 - jumpifstatus2 USER, S_CONTINUE, BattleScript_1D753D - jumpifword 4, gHitMarker, 0x200, BattleScript_1D753D - setbyte gSharedMem + 0x16055, 1 - call BattleScript_1D756C - goto BattleScript_EndTurn - -BattleScript_1D8209: @ 81D8209 - orword gHitMarker, 0x8000000 - setbyte gUnknown_02024D1F + 0x2, 76 + printfromtable gFutureMoveUsedStringIds + waitmessage 64 + goto BattleScript_MoveEnd + +BattleScript_EffectGust: @ 81D8194 + jumpifnostatus3 TARGET, STATUS3_ON_AIR, BattleScript_EffectHit + orword gHitMarker, HITMARKER_IGNORE_ON_AIR + setbyte sDMG_MULTIPLIER, 2 + goto BattleScript_EffectHit + +BattleScript_EffectStomp: @ 81D81B3 + jumpifnostatus3 TARGET, STATUS3_MINIMIZED, BattleScript_FlinchEffect + setbyte sDMG_MULTIPLIER, 2 + goto BattleScript_FlinchEffect + +BattleScript_EffectSolarbeam: @ 81D81C9 + jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarbeamDecideTurn + jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarbeamDecideTurn + jumpifhalfword COMMON_BITS, gBattleWeather, 96, BattleScript_SolarbeamOnFirstTurn + +BattleScript_SolarbeamDecideTurn: @ 81D81E1 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn + jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn + setbyte sTWOTURN_STRINGID, 1 + call BattleScriptFirstChargingTurn + goto BattleScript_MoveEnd + +BattleScript_SolarbeamOnFirstTurn: @ 81D8209 + orword gHitMarker, HITMARKER_x8000000 + setbyte cEFFECT_CHOOSER, 76 seteffectprimary ppreduce - goto BattleScript_1D753D + goto BattleScript_TwoTurnMovesSecondTurn -MoveEffect_Thunder: @ 81D821F - setbyte gUnknown_02024D1F + 0x2, 5 - orword gHitMarker, 0x10000 - goto BattleScript_1D6F14 +BattleScript_EffectThunder: @ 81D821F + setmoveeffect EFFECT_PARALYSIS + orword gHitMarker, HITMARKER_IGNORE_ON_AIR + goto BattleScript_EffectHit -MoveEffect_Teleport: @ 81D8233 +BattleScript_EffectTeleport: @ 81D8233 attackcanceler attackstring ppreduce - jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_ButItFailed + jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed getifcantrunfrombattle USER - jumpifbyte 0, gBattleCommunication, 1, BattleScript_ButItFailed - jumpifbyte 0, gBattleCommunication, 2, BattleScript_1D8839 + jumpifbyte EQUAL, gBattleCommunication, 1, BattleScript_ButItFailed + jumpifbyte EQUAL, gBattleCommunication, 2, BattleScript_PrintAbilityMadeIneffective attackanimation waitanimation printstring BATTLE_TEXT_FledBattle waitmessage 64 setbyte gBattleOutcome, 5 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_BeatUp: @ 81D826E +BattleScript_EffectBeatUp: @ 81D826E attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring pause 32 ppreduce setbyte gBattleCommunication, 0 -BattleScript_1D8281: @ 81D8281 +BattleScript_BeatUpLoop: @ 81D8281 movevaluescleanup - trydobeatup BattleScript_1D82C4, BattleScript_ButItFailed + trydobeatup BattleScript_BeatUpEnd, BattleScript_ButItFailed printstring BATTLE_TEXT_PokeAttack critcalc - jumpifbyte 1, gCritMultiplier, 2, BattleScript_1D829C + jumpifbyte NOT_EQUAL, gCritMultiplier, 2, BattleScript_BeatUpAttack manipulatedamage 2 -BattleScript_1D829C: @ 81D829C +BattleScript_BeatUpAttack: @ 81D829C adjustnormaldamage attackanimation waitanimation @@ -2059,283 +2055,283 @@ BattleScript_1D829C: @ 81D829C waitmessage 64 resultmessage waitmessage 64 - tryfaintmon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 0 + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 0 moveend 2, 16 - goto BattleScript_1D8281 + goto BattleScript_BeatUpLoop -BattleScript_1D82C4: @ 81D82C4 +BattleScript_BeatUpEnd: @ 81D82C4 end -MoveEffect_Fly: @ 81D82C5 - jumpifstatus2 USER, S_CONTINUE, BattleScript_1D8333 - jumpifword 4, gHitMarker, 0x200, BattleScript_1D8333 - jumpifhalfword 0, gCurrentMove, 19, BattleScript_1D8322 - jumpifhalfword 0, gCurrentMove, 291, BattleScript_1D8317 - jumpifhalfword 0, gCurrentMove, 340, BattleScript_1D830C - setbyte gSharedMem + 0x16055, 5 - goto BattleScript_1D8328 +BattleScript_EffectSemiInvulnerable: @ 81D82C5 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_SecondTurnSemiInvulnerable + jumpifword COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_SecondTurnSemiInvulnerable + jumpifmove MOVE_FLY, BattleScript_FirstTurnFly + jumpifmove MOVE_DIVE, BattleScript_FirstTurnDive + jumpifmove MOVE_BOUNCE, BattleScript_FirstTurnBounce + setbyte sTWOTURN_STRINGID, 5 + goto BattleScript_FirstTurnSemiInvulnerable -BattleScript_1D830C: @ 81D830C - setbyte gSharedMem + 0x16055, 7 - goto BattleScript_1D8328 +BattleScript_FirstTurnBounce: @ 81D830C + setbyte sTWOTURN_STRINGID, 7 + goto BattleScript_FirstTurnSemiInvulnerable -BattleScript_1D8317: @ 81D8317 - setbyte gSharedMem + 0x16055, 6 - goto BattleScript_1D8328 +BattleScript_FirstTurnDive: @ 81D8317 + setbyte sTWOTURN_STRINGID, 6 + goto BattleScript_FirstTurnSemiInvulnerable -BattleScript_1D8322: @ 81D8322 - setbyte gSharedMem + 0x16055, 4 +BattleScript_FirstTurnFly: @ 81D8322 + setbyte sTWOTURN_STRINGID, 4 -BattleScript_1D8328: @ 81D8328 - call BattleScript_1D756C +BattleScript_FirstTurnSemiInvulnerable: @ 81D8328 + call BattleScriptFirstChargingTurn setsemiinvulnerablebit - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D8333: @ 81D8333 +BattleScript_SecondTurnSemiInvulnerable: @ 81D8333 attackcanceler - setbyte gUnknown_02024D1F + 0x2, 12 - setbyte gSharedMem + 0x16002, 1 + setmoveeffect EFFECT_CHARGING + setbyte sANIM_TURN, 1 clearstatusfromeffect USER - orword gHitMarker, 0x800 - jumpifhalfword 1, gCurrentMove, 340, BattleScript_1D835D - setbyte gUnknown_02024D1F + 0x2, 5 + orword gHitMarker, HITMARKER_NO_PPDEDUCT + jumpifnotmove MOVE_BOUNCE, BattleScript_SemiInvulnerableTryHit + setmoveeffect EFFECT_PARALYSIS -BattleScript_1D835D: @ 81D835D - accuracycheck BattleScript_1D836A, 0 +BattleScript_SemiInvulnerableTryHit: @ 81D835D + accuracycheck BattleScript_SemiInvulnerableMiss, ACC_CURR_MOVE clearsemiinvulnerablebit - goto BattleScript_1D6F42 + goto BattleScript_HitFromAtkString -BattleScript_1D836A: @ 81D836A +BattleScript_SemiInvulnerableMiss: @ 81D836A clearsemiinvulnerablebit - goto BattleScript_1D6F72 + goto BattleScript_PrintMoveMissed -MoveEffect_DefenseCurl: @ 81D8370 +BattleScript_EffectDefenseCurl: @ 81D8370 attackcanceler attackstring ppreduce setdefensecurlbit - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D838D - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D71D8 + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_DefenseCurlDoStatUpAnim + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_StatUpPrintString attackanimation waitanimation -BattleScript_1D838D: @ 81D838D - goto BattleScript_1D71D0 +BattleScript_DefenseCurlDoStatUpAnim: @ 81D838D + goto BattleScript_StatUpDoAnim -MoveEffect_Softboiled: @ 81D8392 +BattleScript_EffectSoftboiled: @ 81D8392 attackcanceler attackstring ppreduce - tryhealhalfhealth BattleScript_1D83B5, 0 + tryhealhalfhealth BattleScript_AlreadyAtFullHp, 0 -BattleScript_1D839B:: @ 81D839B +BattleScript_PresentHealTarget:: @ 81D839B attackanimation waitanimation - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D83B5:: @ 81D83B5 +BattleScript_AlreadyAtFullHp:: @ 81D83B5 pause 32 printstring BATTLE_TEXT_HPFull waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_FakeOut: @ 81D83C3 +BattleScript_EffectFakeOut: @ 81D83C3 attackcanceler - jumpifnotfirstturn BattleScript_1D83D4 - setbyte gUnknown_02024D1F + 0x2, 136 - goto BattleScript_1D6F14 + jumpifnotfirstturn BattleScript_ButItFailedAtkStringPpReduce + setbyte cEFFECT_CHOOSER, 136 + goto BattleScript_EffectHit -BattleScript_1D83D4: @ 81D83D4 +BattleScript_ButItFailedAtkStringPpReduce: @ 81D83D4 attackstring -BattleScript_1D83D5: @ 81D83D5 +BattleScript_ButItFailedPpReduce: @ 81D83D5 ppreduce BattleScript_ButItFailed:: @ 81D83D6 pause 32 - orbyte gBattleMoveFlags, 32 + orbyte gBattleMoveFlags, MOVESTATUS_FAILED resultmessage waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D83E8: @ 81D83E8 +BattleScript_NotAffected: @ 81D83E8 pause 32 - orbyte gBattleMoveFlags, 8 + orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED resultmessage waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Uproar: @ 81D83FA +BattleScript_EffectUproar: @ 81D83FA attackcanceler - accuracycheck BattleScript_1D6F72, 0 - setbyte gUnknown_02024D1F + 0x2, 74 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE + setbyte cEFFECT_CHOOSER, 74 attackstring - jumpifstatus2 USER, S_CONTINUE, BattleScript_1D8414 + jumpifstatus2 USER, STATUS2_MULTIPLETURNS, BattleScript_UproarHit ppreduce -BattleScript_1D8414: @ 81D8414 +BattleScript_UproarHit: @ 81D8414 nop - goto BattleScript_1D6F44 + goto BattleScript_HitFromCritCalc -MoveEffect_Stockpile: @ 81D841A +BattleScript_EffectStockpile: @ 81D841A attackcanceler attackstring ppreduce stockpile attackanimation waitanimation - printfromtable BattleTextList_40155E + printfromtable gStockpileUsedStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_SpitUp: @ 81D842D +BattleScript_EffectSpitUp: @ 81D842D attackcanceler - jumpifbyte 0, gUnknown_02024D1F + 0x5, 1, BattleScript_1D845C + jumpifbyte EQUAL, gUnknown_02024D1F + 0x5, 1, BattleScript_SpitUpFail attackstring ppreduce - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE stockpiletobasedamage BattleScript_1D844E typecalc adjustsetdamage - goto BattleScript_1D6F48 + goto BattleScript_HitFromAtkAnimation BattleScript_1D844E: @ 81D844E pause 32 printstring BATTLE_TEXT_SpitUpFail waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D845C: @ 81D845C +BattleScript_SpitUpFail: @ 81D845C attackstring ppreduce pause 64 stockpiletobasedamage BattleScript_1D844E resultmessage waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Swallow: @ 81D846F +BattleScript_EffectSwallow: @ 81D846F attackcanceler attackstring ppreduce - stockpiletohpheal BattleScript_1D847C - goto BattleScript_1D839B + stockpiletohpheal BattleScript_SwallowFail + goto BattleScript_PresentHealTarget -BattleScript_1D847C: @ 81D847C +BattleScript_SwallowFail: @ 81D847C pause 32 - printfromtable BattleTextList_401566 + printfromtable gSwallowFailStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Hail: @ 81D848C +BattleScript_EffectHail: @ 81D848C attackcanceler attackstring ppreduce sethail - goto BattleScript_1D7FFA + goto BattleScript_MoveWeatherChange -MoveEffect_Torment: @ 81D8495 +BattleScript_EffectTorment: @ 81D8495 attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 0 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE settorment BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_TormentSubject waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Flatter: @ 81D84B1 +BattleScript_EffectFlatter: @ 81D84B1 attackcanceler - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D6F6C - accuracycheck BattleScript_1D6F72, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_MakeMoveMissed + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce jumpifconfusedandstatmaxed 4, BattleScript_ButItFailed attackanimation waitanimation - setbyte gSharedMem + 0x1601E, 20 - statbuffchange 1, BattleScript_1D84F4 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D84F4 + setstatchanger SP_ATTACK, 1, FALSE + statbuffchange 1, BattleScript_FlatterTryConfuse + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_FlatterTryConfuse setgraphicalstatchangevalues - playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 - printfromtable BattleTextList_401570 + playanimation TARGET, B_ANIM_STATS_CHANGE, sANIM_ARG1 + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D84F4: @ 81D84F4 - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5 - jumpifsideaffecting TARGET, 32, BattleScript_1D9037 - setbyte gUnknown_02024D1F + 0x2, 7 +BattleScript_FlatterTryConfuse: @ 81D84F4 + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected + setmoveeffect EFFECT_CONFUSION seteffectprimary - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_WillOWisp: @ 81D850F +BattleScript_EffectWillOWisp: @ 81D850F attackcanceler attackstring ppreduce - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifstatus TARGET, BRN, BattleScript_1D8575 - jumpiftype TARGET, TYPE_FIRE, BattleScript_1D83E8 - jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_1D855B + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifstatus TARGET, BRN, BattleScript_AlreadyBurned + jumpiftype TARGET, TYPE_FIRE, BattleScript_NotAffected + jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_WaterVeilPrevents jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 - jumpifsideaffecting TARGET, 32, BattleScript_1D9037 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected attackanimation waitanimation - setbyte gUnknown_02024D1F + 0x2, 3 + setmoveeffect EFFECT_BURN seteffectprimary - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D855B: @ 81D855B - copyarray gEffectBank, gBankTarget, 1 - setbyte gUnknown_02024D1F + 0x4, 0 +BattleScript_WaterVeilPrevents: @ 81D855B + copybyte gEffectBank, gBankTarget + setbyte cMULTISTRING_CHOOSER, 0 call BattleScript_BRNPrevention - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D8575: @ 81D8575 +BattleScript_AlreadyBurned: @ 81D8575 pause 32 printstring BATTLE_TEXT_AlreadyBurned waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Memento: @ 81D8583 +BattleScript_EffectMemento: @ 81D8583 attackcanceler - jumpifbyte 0, gUnknown_02024D1F + 0x5, 1, BattleScript_1D860A + jumpifbyte EQUAL, gUnknown_02024D1F + 0x5, 1, BattleScript_1D860A attackstring ppreduce jumpifattackandspecialattackcannotfall BattleScript_ButItFailed setatkhptozero attackanimation waitanimation - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D85FF - setbyte gSharedMem + 0x160DC, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_1D85FF + setbyte sFIELD_1B, 0 playstatchangeanimation TARGET, 18, 7 playstatchangeanimation TARGET, 2, 3 - setbyte gSharedMem + 0x1601E, 161 + setstatchanger ATTACK, 2, TRUE statbuffchange 1, BattleScript_1D85D0 - jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D85D0 - printfromtable BattleTextList_40157C + jumpifbyte GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_1D85D0 + printfromtable gStatDownStringIds waitmessage 64 BattleScript_1D85D0: @ 81D85D0 playstatchangeanimation TARGET, 16, 3 - setbyte gSharedMem + 0x1601E, 164 + setstatchanger SP_ATTACK, 2, TRUE statbuffchange 1, BattleScript_1D85F3 - jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D85F3 - printfromtable BattleTextList_40157C + jumpifbyte GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_1D85F3 + printfromtable gStatDownStringIds waitmessage 64 BattleScript_1D85F3: @ 81D85F3 - tryfaintmon USER, 0, 0x0 - goto BattleScript_EndTurn + tryfaintmon USER, FALSE, NULL + goto BattleScript_MoveEnd BattleScript_1D85FF: @ 81D85FF printstring BATTLE_TEXT_NoEffect @@ -2353,36 +2349,36 @@ BattleScript_1D8611: @ 81D8611 effectivenesssound resultmessage waitmessage 64 - tryfaintmon USER, 0, 0x0 - goto BattleScript_EndTurn + tryfaintmon USER, FALSE, NULL + goto BattleScript_MoveEnd -MoveEffect_Facade: @ 81D8626 - jumpifstatus USER, PSN | BRN | PAR | TOX, BattleScript_1D8635 - goto BattleScript_1D6F14 +BattleScript_EffectFacade: @ 81D8626 + jumpifstatus USER, PSN | BRN | PAR | TOX, BattleScript_FacadeDoubleDmg + goto BattleScript_EffectHit -BattleScript_1D8635: @ 81D8635 - setbyte gSharedMem + 0x1601F, 2 - goto BattleScript_1D6F14 +BattleScript_FacadeDoubleDmg: @ 81D8635 + setbyte sDMG_MULTIPLIER, 2 + goto BattleScript_EffectHit -MoveEffect_FocusPunch: @ 81D8640 +BattleScript_EffectFocusPunch: @ 81D8640 attackcanceler - jumpifnodamage BattleScript_1D6F3B + jumpifnodamage BattleScript_HitFromAccCheck ppreduce printstring BATTLE_TEXT_LostFocus waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Smellingsalt: @ 81D8652 - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D6F14 - setbyte gUnknown_02024D1F + 0x2, 164 - jumpifstatus TARGET, PAR, BattleScript_1D8671 - goto BattleScript_1D6F14 +BattleScript_EffectSmellingsalt: @ 81D8652 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectHit + setmoveeffect EFFECT_REMOVE_PARALYSIS | CERTAIN + jumpifstatus TARGET, PAR, BattleScript_SmellingsaltDoubleDmg + goto BattleScript_EffectHit -BattleScript_1D8671: @ 81D8671 - setbyte gSharedMem + 0x1601F, 2 - goto BattleScript_1D6F14 +BattleScript_SmellingsaltDoubleDmg: @ 81D8671 + setbyte sDMG_MULTIPLIER, 2 + goto BattleScript_EffectHit -MoveEffect_FollowMe: @ 81D867C +BattleScript_EffectFollowMe: @ 81D867C attackcanceler attackstring ppreduce @@ -2391,9 +2387,9 @@ MoveEffect_FollowMe: @ 81D867C waitanimation printstring BATTLE_TEXT_CenterAttention waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_NaturePower: @ 81D868D +BattleScript_EffectNaturePower: @ 81D868D attackcanceler attackstring pause 32 @@ -2402,7 +2398,7 @@ MoveEffect_NaturePower: @ 81D868D waitmessage 64 return -MoveEffect_Charge: @ 81D869A +BattleScript_EffectCharge: @ 81D869A attackcanceler attackstring ppreduce @@ -2411,21 +2407,21 @@ MoveEffect_Charge: @ 81D869A waitanimation printstring BATTLE_TEXT_ChargingPower waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Taunt: @ 81D86AB +BattleScript_EffectTaunt: @ 81D86AB attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 0 + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE settaunt BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_TauntFell waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_HelpingHand: @ 81D86C7 +BattleScript_EffectHelpingHand: @ 81D86C7 attackcanceler attackstring ppreduce @@ -2434,55 +2430,55 @@ MoveEffect_HelpingHand: @ 81D86C7 waitanimation printstring BATTLE_TEXT_ReadyToHelp waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Trick: @ 81D86DC +BattleScript_EffectTrick: @ 81D86DC attackcanceler attackstring ppreduce - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - accuracycheck BattleScript_ButItFailed, 0 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE tryswapitems BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_SwitchedItems waitmessage 64 - printfromtable BattleTextList_401642 + printfromtable gItemSwapStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_RolePlay: @ 81D870A +BattleScript_EffectRolePlay: @ 81D870A attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 65535 + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON trycopyability BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_CopiedObject waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Wish: @ 81D8726 +BattleScript_EffectWish: @ 81D8726 attackcanceler attackstring ppreduce trywish 0, BattleScript_ButItFailed attackanimation waitanimation - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Assist: @ 81D8736 +BattleScript_EffectAssist: @ 81D8736 attackcanceler attackstring - assistattackselect BattleScript_1D83D5 + assistattackselect BattleScript_ButItFailedPpReduce attackanimation waitanimation - setbyte gSharedMem + 0x16002, 0 - setbyte gSharedMem + 0x160A1, 0 + setbyte sANIM_TURN, 0 + setbyte sANIM_TARGETS_HIT, 0 jumptorandomattack USER -MoveEffect_Ingrain: @ 81D874D +BattleScript_EffectIngrain: @ 81D874D attackcanceler attackstring ppreduce @@ -2491,24 +2487,24 @@ MoveEffect_Ingrain: @ 81D874D waitanimation printstring BATTLE_TEXT_PlantedRoots waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Superpower: @ 81D8762 - setbyte gUnknown_02024D1F + 0x2, 229 - goto BattleScript_1D6F14 +BattleScript_EffectSuperpower: @ 81D8762 + setmoveeffect EFFECT_ATK_DEF_DOWN | AFFECTS_USER | CERTAIN + goto BattleScript_EffectHit -MoveEffect_MagicCoat: @ 81D876D +BattleScript_EffectMagicCoat: @ 81D876D attackcanceler - trysetmagiccoat BattleScript_1D83D4 + trysetmagiccoat BattleScript_ButItFailedAtkStringPpReduce attackstring ppreduce attackanimation waitanimation printstring BATTLE_TEXT_ShroudedItself waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Recycle: @ 81D8782 +BattleScript_EffectRecycle: @ 81D8782 attackcanceler attackstring ppreduce @@ -2517,15 +2513,15 @@ MoveEffect_Recycle: @ 81D8782 waitanimation printstring BATTLE_TEXT_FoundOne waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Revenge: @ 81D8797 +BattleScript_EffectRevenge: @ 81D8797 doubledamagedealtifdamaged - goto BattleScript_1D6F14 + goto BattleScript_EffectHit -MoveEffect_BrickBreak: @ 81D879D +BattleScript_EffectBrickBreak: @ 81D879D attackcanceler - accuracycheck BattleScript_1D6F72, 0 + accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce removelightscreenreflect @@ -2533,17 +2529,17 @@ MoveEffect_BrickBreak: @ 81D879D damagecalc typecalc adjustnormaldamage - jumpifbyte 0, gSharedMem + 0x16002, 0, BattleScript_1D87BD + jumpifbyte EQUAL, sANIM_TURN, 0, BattleScript_BrickBreakAnim bicbyte gBattleMoveFlags, 9 -BattleScript_1D87BD: @ 81D87BD +BattleScript_BrickBreakAnim: @ 81D87BD attackanimation waitanimation - jumpifbyte 3, gSharedMem + 0x16002, 2, BattleScript_1D87D0 + jumpifbyte LESS_THAN, sANIM_TURN, 2, BattleScript_BrickBreakDoHit printstring BATTLE_TEXT_BrokeWall waitmessage 64 -BattleScript_1D87D0: @ 81D87D0 +BattleScript_BrickBreakDoHit: @ 81D87D0 typecalc2 effectivenesssound hitanimation TARGET @@ -2555,70 +2551,70 @@ BattleScript_1D87D0: @ 81D87D0 resultmessage waitmessage 64 seteffectwithchance - tryfaintmon TARGET, 0, 0x0 - goto BattleScript_EndTurn + tryfaintmon TARGET, FALSE, NULL + goto BattleScript_MoveEnd -MoveEffect_Yawn: @ 81D87EE +BattleScript_EffectYawn: @ 81D87EE attackcanceler attackstring ppreduce - jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_1D882F - jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_1D882F - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_ButItFailed - jumpifsideaffecting TARGET, 32, BattleScript_1D9037 - accuracycheck BattleScript_ButItFailed, 65535 + jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBankAbilityMadeIneffective + jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_PrintBankAbilityMadeIneffective + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON jumpifcantmakeasleep BattleScript_ButItFailed setyawn BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_DrowsyMade waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D882F: @ 81D882F - copyarray gSharedMem + 0x16003, gSharedMem + 0x160F8, 1 +BattleScript_PrintBankAbilityMadeIneffective: @ 81D882F + copybyte sBANK, sBANK_WITH_ABILITY -BattleScript_1D8839: @ 81D8839 +BattleScript_PrintAbilityMadeIneffective: @ 81D8839 pause 32 printstring BATTLE_TEXT_MadeIneffective2 waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_KnockOff: @ 81D8847 - setbyte gUnknown_02024D1F + 0x2, 54 - goto BattleScript_1D6F14 +BattleScript_EffectKnockOff: @ 81D8847 + setmoveeffect EFFECT_KNOCK_OFF + goto BattleScript_EffectHit -MoveEffect_Endeavor: @ 81D8852 +BattleScript_EffectEndeavor: @ 81D8852 attackcanceler attackstring ppreduce setdamagetohealthdifference BattleScript_ButItFailed - copyarray gHP_dealt, gBattleMoveDamage, 4 - accuracycheck BattleScript_1D6F77, 0 + copyword gHP_dealt, gBattleMoveDamage + accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE typecalc - jumpifbyte 4, gBattleMoveFlags, 41, BattleScript_1D6F48 - bicbyte gBattleMoveFlags, 6 - copyarray gBattleMoveDamage, gHP_dealt, 4 + jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE + copyword gBattleMoveDamage, gHP_dealt adjustsetdamage - goto BattleScript_1D6F48 + goto BattleScript_HitFromAtkAnimation -MoveEffect_Eruption: @ 81D888D +BattleScript_EffectEruption: @ 81D888D scaledamagebyhealthratio - goto BattleScript_1D6F14 + goto BattleScript_EffectHit -MoveEffect_SkillSwap: @ 81D8893 +BattleScript_EffectSkillSwap: @ 81D8893 attackcanceler attackstring ppreduce - accuracycheck BattleScript_ButItFailed, 65535 + accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON tryswapabilities BattleScript_ButItFailed attackanimation waitanimation printstring BATTLE_TEXT_AbilitySwap waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Imprison: @ 81D88AF +BattleScript_EffectImprison: @ 81D88AF attackcanceler attackstring ppreduce @@ -2627,9 +2623,9 @@ MoveEffect_Imprison: @ 81D88AF waitanimation printstring BATTLE_TEXT_SealedMove waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Refresh: @ 81D88C4 +BattleScript_EffectRefresh: @ 81D88C4 attackcanceler attackstring ppreduce @@ -2638,10 +2634,10 @@ MoveEffect_Refresh: @ 81D88C4 waitanimation printstring BATTLE_TEXT_StatusNormal waitmessage 64 - updatestatusicon 1 - goto BattleScript_EndTurn + updatestatusicon USER + goto BattleScript_MoveEnd -MoveEffect_Grudge: @ 81D88DB +BattleScript_EffectGrudge: @ 81D88DB attackcanceler attackstring ppreduce @@ -2650,11 +2646,11 @@ MoveEffect_Grudge: @ 81D88DB waitanimation printstring BATTLE_TEXT_GrudgeBear waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_Snatch: @ 81D88F0 +BattleScript_EffectSnatch: @ 81D88F0 attackcanceler - trysetsnatch BattleScript_1D83D4 + trysetsnatch BattleScript_ButItFailedAtkStringPpReduce attackstring ppreduce attackanimation @@ -2662,267 +2658,267 @@ MoveEffect_Snatch: @ 81D88F0 pause 32 printstring BATTLE_TEXT_AwaitMove waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_LowKick: @ 81D8908 +BattleScript_EffectLowKick: @ 81D8908 attackcanceler attackstring ppreduce weightdamagecalculation - accuracycheck BattleScript_1D6F77, 0 - goto BattleScript_1D6F44 + accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE + goto BattleScript_HitFromCritCalc -MoveEffect_SecretPower: @ 81D8918 +BattleScript_EffectSecretPower: @ 81D8918 getsecretpowereffect - goto BattleScript_1D6F14 + goto BattleScript_EffectHit -MoveEffect_DoubleEdge: @ 81D891E - setbyte gUnknown_02024D1F + 0x2, 230 - goto BattleScript_1D6F14 +BattleScript_EffectDoubleEdge: @ 81D891E + setmoveeffect EFFECT_RECOIL_33_PARALYSIS | AFFECTS_USER | CERTAIN + goto BattleScript_EffectHit -MoveEffect_TeeterDance: @ 81D8929 +BattleScript_EffectTeeterDance: @ 81D8929 attackcanceler attackstring ppreduce setbyte gBankTarget, 0 -BattleScript_1D8932: @ 81D8932 +BattleScript_TeeterDanceLoop: @ 81D8932 movevaluescleanup - setbyte gUnknown_02024D1F + 0x2, 7 - jumpifarrayequal gBankAttacker, gBankTarget, 1, BattleScript_1D8978 - jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D8996 - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D89B2 - jumpifstatus2 TARGET, S_CONFUSED, BattleScript_1D89C0 - accuracycheck BattleScript_1D89CE, 0 - jumpifsideaffecting TARGET, 32, BattleScript_1D89A4 + setmoveeffect EFFECT_CONFUSION + jumpifbyteequal gBankAttacker, gBankTarget, BattleScript_TeeterDanceDoMoveEndIncrement + jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_TeeterDanceLoopIncrement + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_TeeterDanceSubstitutePrevents + jumpifstatus2 TARGET, STATUS2_CONFUSION, BattleScript_TeeterDanceAlreadyConfused + accuracycheck BattleScript_TeeterDanceMissed, ACC_CURR_MOVE + jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_TeeterDanceSafeguardProtected attackanimation waitanimation seteffectprimary resultmessage waitmessage 64 -BattleScript_1D8978: @ 81D8978 - setbyte gSharedMem + 0x1600C, 0 +BattleScript_TeeterDanceDoMoveEndIncrement: @ 81D8978 + setbyte sMOVEEND_STATE, 0 moveend 2, 16 addbyte gBankTarget, 1 - jumpifarraynotequal gBankTarget, gNoOfAllBanks, 1, BattleScript_1D8932 + jumpifbytenotequal gBankTarget, gNoOfAllBanks, BattleScript_TeeterDanceLoop end -BattleScript_1D8996: @ 81D8996 +BattleScript_TeeterDanceLoopIncrement: @ 81D8996 pause 32 printstring BATTLE_TEXT_PreventedConfusion waitmessage 64 - goto BattleScript_1D8978 + goto BattleScript_TeeterDanceDoMoveEndIncrement -BattleScript_1D89A4: @ 81D89A4 +BattleScript_TeeterDanceSafeguardProtected: @ 81D89A4 pause 32 printstring BATTLE_TEXT_SafeguardActive waitmessage 64 - goto BattleScript_1D8978 + goto BattleScript_TeeterDanceDoMoveEndIncrement -BattleScript_1D89B2: @ 81D89B2 +BattleScript_TeeterDanceSubstitutePrevents: @ 81D89B2 pause 32 printstring BATTLE_TEXT_Failed waitmessage 64 - goto BattleScript_1D8978 + goto BattleScript_TeeterDanceDoMoveEndIncrement -BattleScript_1D89C0: @ 81D89C0 +BattleScript_TeeterDanceAlreadyConfused: @ 81D89C0 pause 32 printstring BATTLE_TEXT_AlreadyConfused waitmessage 64 - goto BattleScript_1D8978 + goto BattleScript_TeeterDanceDoMoveEndIncrement -BattleScript_1D89CE: @ 81D89CE +BattleScript_TeeterDanceMissed: @ 81D89CE resultmessage waitmessage 64 - goto BattleScript_1D8978 + goto BattleScript_TeeterDanceDoMoveEndIncrement -MoveEffect_MudSport: @ 81D89D7 -MoveEffect_WaterSport: @ 81D89D7 +BattleScript_EffectMudSport: @ 81D89D7 +BattleScript_EffectWaterSport: @ 81D89D7 attackcanceler attackstring ppreduce settypebasedhalvers BattleScript_ButItFailed attackanimation waitanimation - printfromtable BattleTextList_4015D4 + printfromtable gSportsUsedStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_PoisonFang: @ 81D89EE - setbyte gUnknown_02024D1F + 0x2, 6 - goto BattleScript_1D6F14 +BattleScript_EffectPoisonFang: @ 81D89EE + setmoveeffect EFFECT_TOXIC + goto BattleScript_EffectHit -MoveEffect_WeatherBall: @ 81D89F9 +BattleScript_EffectWeatherBall: @ 81D89F9 setweatherballtype - goto BattleScript_1D6F14 + goto BattleScript_EffectHit -MoveEffect_Overheat: @ 81D89FF - setbyte gUnknown_02024D1F + 0x2, 251 - goto BattleScript_1D6F14 +BattleScript_EffectOverheat: @ 81D89FF + setmoveeffect EFFECT_SP_ATK_TWO_DOWN | AFFECTS_USER | CERTAIN + goto BattleScript_EffectHit -MoveEffect_Tickle: @ 81D8A0A +BattleScript_EffectTickle: @ 81D8A0A attackcanceler attackstring ppreduce - jumpifstat TARGET, 2, 1, 0, BattleScript_1D8A1F - jumpifstat TARGET, 0, 2, 0, BattleScript_1D8A7D + jumpifstat TARGET, GREATER_THAN, ATTACK, 0, BattleScript_TickleDoMoveAnim + jumpifstat TARGET, EQUAL, DEFENSE, 0, BattleScript_CantLowerMultipleStats -BattleScript_1D8A1F: @ 81D8A1F - accuracycheck BattleScript_ButItFailed, 0 +BattleScript_TickleDoMoveAnim: @ 81D8A1F + accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE attackanimation waitanimation - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation TARGET, 6, 5 playstatchangeanimation TARGET, 2, 1 - setbyte gSharedMem + 0x1601E, 145 - statbuffchange 1, BattleScript_1D8A55 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8A55 - printfromtable BattleTextList_40157C + setstatchanger ATTACK, 1, TRUE + statbuffchange 1, BattleScript_TickleTryLowerDef + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_TickleTryLowerDef + printfromtable gStatDownStringIds waitmessage 64 -BattleScript_1D8A55: @ 81D8A55 +BattleScript_TickleTryLowerDef: @ 81D8A55 playstatchangeanimation TARGET, 4, 1 - setbyte gSharedMem + 0x1601E, 146 - statbuffchange 1, BattleScript_1D8A78 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8A78 - printfromtable BattleTextList_40157C + setstatchanger DEFENSE, 1, TRUE + statbuffchange 1, BattleScript_TickleEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_TickleEnd + printfromtable gStatDownStringIds waitmessage 64 -BattleScript_1D8A78: @ 81D8A78 - goto BattleScript_EndTurn +BattleScript_TickleEnd: @ 81D8A78 + goto BattleScript_MoveEnd -BattleScript_1D8A7D: @ 81D8A7D +BattleScript_CantLowerMultipleStats: @ 81D8A7D pause 32 - orbyte gBattleMoveFlags, 32 + orbyte gBattleMoveFlags, MOVESTATUS_FAILED printstring BATTLE_TEXT_StatNoLower waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_CosmicPower: @ 81D8A91 +BattleScript_EffectCosmicPower: @ 81D8A91 attackcanceler attackstring ppreduce - jumpifstat USER, 3, 2, 12, BattleScript_1D8AA6 - jumpifstat USER, 0, 5, 12, BattleScript_1D8BCB + jumpifstat USER, LESS_THAN, DEFENSE, 12, BattleScript_CosmicPowerDoMoveAnim + jumpifstat USER, EQUAL, SP_DEFENSE, 12, BattleScript_CantRaiseMultipleStats -BattleScript_1D8AA6: @ 81D8AA6 +BattleScript_CosmicPowerDoMoveAnim: @ 81D8AA6 attackanimation waitanimation - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 36, 0 - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D8AD1 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8AD1 - printfromtable BattleTextList_401570 + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CosmicPowerTrySpDef + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CosmicPowerTrySpDef + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8AD1: @ 81D8AD1 - setbyte gSharedMem + 0x1601E, 21 - statbuffchange 65, BattleScript_1D8AF0 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8AF0 - printfromtable BattleTextList_401570 +BattleScript_CosmicPowerTrySpDef: @ 81D8AD1 + setstatchanger SP_DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CosmicPowerEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CosmicPowerEnd + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8AF0: @ 81D8AF0 - goto BattleScript_EndTurn +BattleScript_CosmicPowerEnd: @ 81D8AF0 + goto BattleScript_MoveEnd -MoveEffect_SkyUppercut: @ 81D8AF5 - orword gHitMarker, 0x10000 - goto BattleScript_1D6F14 +BattleScript_EffectSkyUppercut: @ 81D8AF5 + orword gHitMarker, HITMARKER_IGNORE_ON_AIR + goto BattleScript_EffectHit -MoveEffect_BulkUp: @ 81D8B03 +BattleScript_EffectBulkUp: @ 81D8B03 attackcanceler attackstring ppreduce - jumpifstat USER, 3, 1, 12, BattleScript_1D8B18 - jumpifstat USER, 0, 2, 12, BattleScript_1D8BCB + jumpifstat USER, LESS_THAN, ATTACK, 12, BattleScript_BulkUpDoMoveAnim + jumpifstat USER, EQUAL, DEFENSE, 12, BattleScript_CantRaiseMultipleStats -BattleScript_1D8B18: @ 81D8B18 +BattleScript_BulkUpDoMoveAnim: @ 81D8B18 attackanimation waitanimation - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 6, 0 - setbyte gSharedMem + 0x1601E, 17 - statbuffchange 65, BattleScript_1D8B43 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8B43 - printfromtable BattleTextList_401570 + setstatchanger ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_BulkUpTryDef + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_BulkUpTryDef + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8B43: @ 81D8B43 - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D8B62 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8B62 - printfromtable BattleTextList_401570 +BattleScript_BulkUpTryDef: @ 81D8B43 + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_BulkUpEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_BulkUpEnd + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8B62: @ 81D8B62 - goto BattleScript_EndTurn +BattleScript_BulkUpEnd: @ 81D8B62 + goto BattleScript_MoveEnd -MoveEffect_CalmMind: @ 81D8B67 +BattleScript_EffectCalmMind: @ 81D8B67 attackcanceler attackstring ppreduce - jumpifstat USER, 3, 4, 12, BattleScript_1D8B7C - jumpifstat USER, 0, 5, 12, BattleScript_1D8BCB + jumpifstat USER, LESS_THAN, SP_ATTACK, 12, BattleScript_CalmMindDoMoveAnim + jumpifstat USER, EQUAL, SP_DEFENSE, 12, BattleScript_CantRaiseMultipleStats -BattleScript_1D8B7C: @ 81D8B7C +BattleScript_CalmMindDoMoveAnim: @ 81D8B7C attackanimation waitanimation - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 48, 0 - setbyte gSharedMem + 0x1601E, 20 - statbuffchange 65, BattleScript_1D8BA7 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8BA7 - printfromtable BattleTextList_401570 + setstatchanger SP_ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CalmMindTrySpDef + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CalmMindTrySpDef + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8BA7: @ 81D8BA7 - setbyte gSharedMem + 0x1601E, 21 - statbuffchange 65, BattleScript_1D8BC6 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8BC6 - printfromtable BattleTextList_401570 +BattleScript_CalmMindTrySpDef: @ 81D8BA7 + setstatchanger SP_DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_CalmMindEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CalmMindEnd + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8BC6: @ 81D8BC6 - goto BattleScript_EndTurn +BattleScript_CalmMindEnd: @ 81D8BC6 + goto BattleScript_MoveEnd -BattleScript_1D8BCB: @ 81D8BCB +BattleScript_CantRaiseMultipleStats: @ 81D8BCB pause 32 - orbyte gBattleMoveFlags, 32 + orbyte gBattleMoveFlags, MOVESTATUS_FAILED printstring BATTLE_TEXT_StatNoHigher waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -MoveEffect_DragonDance: @ 81D8BDF +BattleScript_EffectDragonDance: @ 81D8BDF attackcanceler attackstring ppreduce - jumpifstat USER, 3, 1, 12, BattleScript_1D8BF4 - jumpifstat USER, 0, 3, 12, BattleScript_1D8BCB + jumpifstat USER, LESS_THAN, ATTACK, 12, BattleScript_DragonDanceDoMoveAnim + jumpifstat USER, EQUAL, SPEED, 12, BattleScript_CantRaiseMultipleStats -BattleScript_1D8BF4: @ 81D8BF4 +BattleScript_DragonDanceDoMoveAnim: @ 81D8BF4 attackanimation waitanimation - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 10, 0 - setbyte gSharedMem + 0x1601E, 17 - statbuffchange 65, BattleScript_1D8C1F - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8C1F - printfromtable BattleTextList_401570 + setstatchanger ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_DragonDanceTrySpeed + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_DragonDanceTrySpeed + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8C1F: @ 81D8C1F - setbyte gSharedMem + 0x1601E, 19 - statbuffchange 65, BattleScript_1D8C3E - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8C3E - printfromtable BattleTextList_401570 +BattleScript_DragonDanceTrySpeed: @ 81D8C1F + setstatchanger SPEED, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_DragonDanceEnd + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_DragonDanceEnd + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D8C3E: @ 81D8C3E - goto BattleScript_EndTurn +BattleScript_DragonDanceEnd: @ 81D8C3E + goto BattleScript_MoveEnd -MoveEffect_Camouflage: @ 81D8C43 +BattleScript_EffectCamouflage: @ 81D8C43 attackcanceler attackstring ppreduce @@ -2931,62 +2927,62 @@ MoveEffect_Camouflage: @ 81D8C43 waitanimation printstring BATTLE_TEXT_TypeTransform waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -gUnknown_081D8C58:: @ 81D8C58 - playfaintcry 1 +BattleScript_FaintAttacker:: @ 81D8C58 + playfaintcry USER pause 64 - dofaintanimation 1 - cleareffectsonfaint 1 + dofaintanimation USER + cleareffectsonfaint USER printstring BATTLE_TEXT_AttackingFainted return -gUnknown_081D8C65:: @ 81D8C65 - playfaintcry 0 +BattleScript_FaintTarget:: @ 81D8C65 + playfaintcry TARGET pause 64 - dofaintanimation 0 - cleareffectsonfaint 0 + dofaintanimation TARGET + cleareffectsonfaint TARGET printstring BATTLE_TEXT_DefendingFainted return -gUnknown_081D8C72:: @ 81D8C72 - setbyte gSharedMem + 0x1600F, 0 - getexp 0 +BattleScript_GiveExp:: @ 81D8C72 + setbyte sGIVEEXP_STATE, 0 + getexp TARGET end2 -gUnknown_081D8C7B:: @ 81D8C7B +BattleScript_HandleFaintedMon:: @ 81D8C7B atk24 BattleScript_1D8D87 - jumpifbyte 1, gBattleOutcome, 0, BattleScript_1D8D86 - jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_1D8CC2 - jumpifword 5, gHitMarker, 0x400000, BattleScript_1D8CC2 + jumpifbyte NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd + jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonTryChooseAnother + jumpifword NO_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonTryChooseAnother printstring BATTLE_TEXT_UseNext setbyte gBattleCommunication, 0 yesnobox - jumpifbyte 0, gUnknown_02024D1F, 0, BattleScript_1D8CC2 - jumpifplayerran BattleScript_1D8D86 + jumpifbyte EQUAL, gUnknown_02024D1F, 0, BattleScript_FaintedMonTryChooseAnother + jumpifplayerran BattleScript_FaintedMonEnd printstring BATTLE_TEXT_CantEscape -BattleScript_1D8CC2: @ 81D8CC2 - openpartyscreen 3, BattleScript_1D8D86 +BattleScript_FaintedMonTryChooseAnother: @ 81D8CC2 + openpartyscreen 3, BattleScript_FaintedMonEnd switchhandleorder 3, 2 - jumpifhalfword 5, gBattleTypeFlags, 8, BattleScript_1D8D66 - jumpifhalfword 4, gBattleTypeFlags, 2, BattleScript_1D8D66 - jumpifhalfword 4, gBattleTypeFlags, 256, BattleScript_1D8D66 - jumpifhalfword 4, gBattleTypeFlags, 1, BattleScript_1D8D66 - jumpifword 4, gHitMarker, 0x400000, BattleScript_1D8D66 - jumpifbyte 0, gSharedMem + 0x16084, 1, BattleScript_1D8D66 - jumpifcantswitch USER, BattleScript_1D8D66 + jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother + jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother + jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_FaintedMonChooseAnother + jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother + jumpifword COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother + jumpifbyte EQUAL, sBATTLE_STYLE, 1, BattleScript_FaintedMonChooseAnother + jumpifcantswitch USER, BattleScript_FaintedMonChooseAnother printstring BATTLE_TEXT_WillSwitch setbyte gBattleCommunication, 0 yesnobox - jumpifbyte 0, gUnknown_02024D1F, 1, BattleScript_1D8D66 + jumpifbyte EQUAL, gUnknown_02024D1F, 1, BattleScript_FaintedMonChooseAnother setatktoplayer0 - openpartyscreen 129, BattleScript_1D8D66 + openpartyscreen 129, BattleScript_FaintedMonChooseAnother switchhandleorder USER, 2 - jumpifbyte 0, gBattleCommunication, 6, BattleScript_1D8D66 + jumpifbyte EQUAL, gBattleCommunication, 6, BattleScript_FaintedMonChooseAnother atknameinbuff1 resetintrimidatetracebits USER - hpthresholds2 1 + hpthresholds2 USER printstring 2 switchoutabilities USER waitstate @@ -3003,7 +2999,7 @@ BattleScript_1D8CC2: @ 81D8CC2 switchineffects USER resetsentmonsvalue -BattleScript_1D8D66: @ 81D8D66 +BattleScript_FaintedMonChooseAnother: @ 81D8D66 drawpartystatussummary 3 getswitchedmondata 3 switchindataupdate 3 @@ -3013,10 +3009,10 @@ BattleScript_1D8D66: @ 81D8D66 switchinanim 3, 0 waitstate switchineffects 3 - jumpifhalfword 4, gBattleTypeFlags, 1, BattleScript_1D8D86 + jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonEnd cancelallactions -BattleScript_1D8D86: @ 81D8D86 +BattleScript_FaintedMonEnd: @ 81D8D86 end2 BattleScript_1D8D87: @ 81D8D87 @@ -3038,12 +3034,12 @@ BattleScript_1D8D99: @ 81D8D99 switchinanim 3, 0 waitstate switchineffects 5 - jumpifarraynotequal gBank1, gNoOfAllBanks, 1, BattleScript_1D8D99 + jumpifbytenotequal gBank1, gNoOfAllBanks, BattleScript_1D8D99 BattleScript_1D8DBD: @ 81D8DBD end2 -gUnknown_081D8DBE:: @ 81D8DBE +BattleScript_LocalTrainerBattleWon:: @ 81D8DBE printstring BATTLE_TEXT_PlayerDefeatedTrainer2 trainerslidein 1 waitstate @@ -3052,21 +3048,21 @@ gUnknown_081D8DBE:: @ 81D8DBE printstring BATTLE_TEXT_WinningPrize waitmessage 64 -gUnknown_081D8DCE:: @ 81D8DCE +BattleScript_PayDayMoneyAndPickUpItems:: @ 81D8DCE givepaydaymoney pickup end2 -gUnknown_081D8DD1:: @ 81D8DD1 - jumpifhalfword 4, gBattleTypeFlags, 256, BattleScript_1D8E01 - jumpifhalfword 4, gBattleTypeFlags, 2048, BattleScript_1D8E01 - jumpifhalfword 0, gTrainerBattleOpponent, 1024, BattleScript_1D8E01 +BattleScript_LocalBattleLost:: @ 81D8DD1 + jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_LocalBattleLostEnd + jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd + jumpifhalfword EQUAL, gTrainerBattleOpponent, 1024, BattleScript_LocalBattleLostEnd printstring BATTLE_TEXT_OutOfUsablePoke waitmessage 64 printstring BATTLE_TEXT_WhitedOut waitmessage 64 -BattleScript_1D8E01: @ 81D8E01 +BattleScript_LocalBattleLostEnd: @ 81D8E01 end2 gUnknown_081D8E02:: @ 81D8E02 @@ -3082,64 +3078,64 @@ gUnknown_081D8E0D:: @ 81D8E0D waitstate end2 -gUnknown_081D8E14:: @ 81D8E14 - playanimation USER, B_ANIM_SMOKEBALL_ESCAPE, 0x0 +BattleScript_SmokeBallEscape:: @ 81D8E14 + playanimation USER, B_ANIM_SMOKEBALL_ESCAPE, NULL printstring BATTLE_TEXT_FledUsingItem waitmessage 64 end2 -gUnknown_081D8E22:: @ 81D8E22 +BattleScript_RanAwayUsingMonAbility:: @ 81D8E22 printstring BATTLE_TEXT_FledUsingOther waitmessage 64 end2 -gUnknown_081D8E29:: @ 81D8E29 +BattleScript_GotAwaySafely:: @ 81D8E29 printstring BATTLE_TEXT_GotAwaySafely waitmessage 64 end2 -gUnknown_081D8E30:: @ 81D8E30 +BattleScript_WildMonFled:: @ 81D8E30 printstring BATTLE_TEXT_FledWild waitmessage 64 end2 -gUnknown_081D8E37:: @ 81D8E37 +BattleScript_PrintCantRunFromTrainer:: @ 81D8E37 printstring BATTLE_TEXT_NoRunning end2 -gUnknown_081D8E3B:: @ 81D8E3B - printfromtable BattleTextList_401512 +BattleScript_PrintFailedToRunString:: @ 81D8E3B + printfromtable gNoEscapeStringIds waitmessage 64 end2 -gUnknown_081D8E44:: @ 81D8E44 - printselectionstringfromtable BattleTextList_401512 +BattleScript_PrintCantEscapeFromBattle:: @ 81D8E44 + printselectionstringfromtable gNoEscapeStringIds endselectionscript -gUnknown_081D8E4A:: @ 81D8E4A +BattleScript_PrintFullBox:: @ 81D8E4A printselectionstring BATTLE_TEXT_BoxFull endselectionscript -gUnknown_081D8E4E:: @ 81D8E4E - hpthresholds2 1 +BattleScript_ActionSwitch:: @ 81D8E4E + hpthresholds2 USER printstring 2 - setbyte gSharedMem + 0x1601F, 2 - jumpifbyte 4, gBattleTypeFlags, 1, BattleScript_1D8E6B + setbyte sDMG_MULTIPLIER, 2 + jumpifbyte COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_DOUBLE, BattleScript_PursuitSwitchDmgSetMultihit setmultihit 1 - goto BattleScript_1D8E6D + goto BattleScript_PursuitSwitchDmgLoop -BattleScript_1D8E6B: @ 81D8E6B +BattleScript_PursuitSwitchDmgSetMultihit: @ 81D8E6B setmultihit 2 -BattleScript_1D8E6D: @ 81D8E6D - jumpifnopursuitswitchdmg BattleScript_1D8E7A +BattleScript_PursuitSwitchDmgLoop: @ 81D8E6D + jumpifnopursuitswitchdmg BattleScript_DoSwitchOut atk5f trysetdestinybondtohappen - call BattleScript_1D8EAD + call BattleScript_PursuitDmgOnSwitchOut atk5f -BattleScript_1D8E7A: @ 81D8E7A - decrementmultihit BattleScript_1D8E6D +BattleScript_DoSwitchOut: @ 81D8E7A + decrementmultihit BattleScript_PursuitSwitchDmgLoop switchoutabilities USER waitstate returnatktoball @@ -3154,13 +3150,13 @@ BattleScript_1D8E7A: @ 81D8E7A switchinanim USER, 0 waitstate switchineffects USER - setbyte gSharedMem + 0x1600C, 4 + setbyte sMOVEEND_STATE, 4 moveend 1, 0 - setbyte gSharedMem + 0x1600C, 15 + setbyte sMOVEEND_STATE, 15 moveend 1, 0 end2 -BattleScript_1D8EAD: @ 81D8EAD +BattleScript_PursuitDmgOnSwitchOut: @ 81D8EAD pause 32 attackstring ppreduce @@ -3179,15 +3175,15 @@ BattleScript_1D8EAD: @ 81D8EAD waitmessage 64 resultmessage waitmessage 64 - tryfaintmon TARGET, 0, 0x0 - setbyte gSharedMem + 0x1600C, 3 + tryfaintmon TARGET, FALSE, NULL + setbyte sMOVEEND_STATE, 3 moveend 2, 6 various TARGET, 4 - jumpifbyte 0, gBattleCommunication, 0, BattleScript_1D8EEE - setbyte gSharedMem + 0x1600F, 0 - getexp 0 + jumpifbyte EQUAL, gBattleCommunication, 0, BattleScript_PursuitDmgOnSwitchOutRet + setbyte sGIVEEXP_STATE, 0 + getexp TARGET -BattleScript_1D8EEE: @ 81D8EEE +BattleScript_PursuitDmgOnSwitchOutRet: @ 81D8EEE return BattleScript_Pausex20:: @ 81D8EEF @@ -3195,162 +3191,162 @@ BattleScript_Pausex20:: @ 81D8EEF return BattleScript_LevelUp:: @ 81D8EF3 - fanfare 0xe10016f - attackcanceler - setbyte gSharedMem + 0x1609C, 0 + fanfare BGM_FANFA1 + printstring BATTLE_TEXT_GrewLevel + setbyte sLVLBOX_STATE, 0 drawlvlupbox - handlelearnnewmove BattleScript_1D8F4F, BattleScript_1D8F61, 1 - goto BattleScript_1D8F19 + handlelearnnewmove BattleScript_LearnedNewMove, BattleScript_LearnMoveReturn, 1 + goto BattleScript_AskToLearnMove -BattleScript_1D8F0F: @ 81D8F0F - handlelearnnewmove BattleScript_1D8F4F, BattleScript_1D8F61, 0 +BattleScript_TryLearnMoveLoop: @ 81D8F0F + handlelearnnewmove BattleScript_LearnedNewMove, BattleScript_LearnMoveReturn, 0 -BattleScript_1D8F19: @ 81D8F19 +BattleScript_AskToLearnMove: @ 81D8F19 buffermovetolearn printstring BATTLE_TEXT_TryingToLearnMove printstring BATTLE_TEXT_CantLearnMore printstring BATTLE_TEXT_DeleteMove waitstate - setbyte gSharedMem + 0x1601A, 0 - yesnoboxlearnmove BattleScript_1D8F46 + setbyte sLEARNMOVE_STATE, 0 + yesnoboxlearnmove BattleScript_ForgotAndLearnedNewMove printstring BATTLE_TEXT_StopLearning waitstate - setbyte gSharedMem + 0x1601A, 0 - yesnoboxstoplearningmove BattleScript_1D8F19 + setbyte sLEARNMOVE_STATE, 0 + yesnoboxstoplearningmove BattleScript_AskToLearnMove printstring BATTLE_TEXT_DidNotLearn - goto BattleScript_1D8F0F + goto BattleScript_TryLearnMoveLoop -BattleScript_1D8F46: @ 81D8F46 +BattleScript_ForgotAndLearnedNewMove: @ 81D8F46 printstring BATTLE_TEXT_MoveForget123 printstring BATTLE_TEXT_DeletedMove printstring BATTLE_TEXT_MoveForgetAnd -BattleScript_1D8F4F: @ 81D8F4F +BattleScript_LearnedNewMove: @ 81D8F4F buffermovetolearn - fanfare 0xf10016f - attackcanceler + fanfare BGM_FANFA1 + printstring BATTLE_TEXT_LearnedMove waitmessage 64 updatechoicemoveonlvlup USER - goto BattleScript_1D8F0F + goto BattleScript_TryLearnMoveLoop -BattleScript_1D8F61: @ 81D8F61 +BattleScript_LearnMoveReturn: @ 81D8F61 return -gUnknown_081D8F62:: @ 81D8F62 - printfromtable BattleTextList_401534 +BattleScript_RainContinuesOrEnds:: @ 81D8F62 + printfromtable gRainContinuesStringIds waitmessage 64 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8F7C - playanimation USER, B_ANIM_RAIN_CONTINUES, 0x0 + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_RainContinuesOrEndsEnd + playanimation USER, B_ANIM_RAIN_CONTINUES, NULL -BattleScript_1D8F7C: @ 81D8F7C +BattleScript_RainContinuesOrEndsEnd: @ 81D8F7C end2 -gUnknown_081D8F7D:: @ 81D8F7D - printfromtable BattleTextList_401528 +BattleScript_DamagingWeatherContinues:: @ 81D8F7D + printfromtable gSandStormHailContinuesStringIds waitmessage 64 - playanimation2 1, gSharedMem + 0x160A4, 0x0 + playanimation2 USER, sANIM_ARG1, NULL setbyte gBattleCommunication, 0 -BattleScript_1D8F95: @ 81D8F95 +BattleScript_DamagingWeatherLoop: @ 81D8F95 copyarraywithindex gBankAttacker, gTurnOrder, gBattleCommunication, 1 weatherdamage - jumpifword 0, gBattleMoveDamage, 0x0, BattleScript_1D8FD6 - printfromtable BattleTextList_40152C + jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement + printfromtable gSandStormHailDmgStringIds waitmessage 64 - orword gHitMarker, 0x1100120 + orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE effectivenesssound hitanimation USER healthbarupdate USER datahpupdate USER - tryfaintmon USER, 0, 0x0 - atk24 BattleScript_1D8FD6 + tryfaintmon USER, FALSE, NULL + atk24 BattleScript_DamagingWeatherLoopIncrement -BattleScript_1D8FD6: @ 81D8FD6 - jumpifbyte 1, gBattleOutcome, 0, BattleScript_1D8FF5 +BattleScript_DamagingWeatherLoopIncrement: @ 81D8FD6 + jumpifbyte NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamagingWeatherContinuesEnd addbyte gBattleCommunication, 1 - jumpifarraynotequal gBattleCommunication, gNoOfAllBanks, 1, BattleScript_1D8F95 + jumpifbytenotequal gBattleCommunication, gNoOfAllBanks, BattleScript_DamagingWeatherLoop -BattleScript_1D8FF5: @ 81D8FF5 - bicword gHitMarker, 0x1100120 +BattleScript_DamagingWeatherContinuesEnd: @ 81D8FF5 + bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE end2 -gUnknown_081D8FFF:: @ 81D8FFF - printfromtable BattleTextList_401530 +BattleScript_SandStormHailEnds:: @ 81D8FFF + printfromtable gSandStormHailEndStringIds waitmessage 64 end2 -gUnknown_081D9008:: @ 81D9008 +BattleScript_SunlightContinues:: @ 81D9008 printstring BATTLE_TEXT_SunStrong waitmessage 64 - playanimation USER, B_ANIM_SUN_CONTINUES, 0x0 + playanimation USER, B_ANIM_SUN_CONTINUES, NULL end2 -gUnknown_081D9016:: @ 81D9016 +BattleScript_SunlightFaded:: @ 81D9016 printstring BATTLE_TEXT_SunFaded waitmessage 64 end2 -gUnknown_081D901D:: @ 81D901D - printfromtable BattleTextList_4015EE +BattleScript_OverworldWeatherStarts:: @ 81D901D + printfromtable gWeatherContinuesStringIds waitmessage 64 - playanimation2 1, gSharedMem + 0x160A4, 0x0 + playanimation2 USER, sANIM_ARG1, NULL end3 -gUnknown_081D9030:: @ 81D9030 +BattleScript_SideStatusWoreOff:: @ 81D9030 printstring BATTLE_TEXT_WoreOff waitmessage 64 end2 -BattleScript_1D9037: @ 81D9037 +BattleScript_SafeguardProtected: @ 81D9037 pause 32 printstring BATTLE_TEXT_SafeguardActive waitmessage 64 end2 -gUnknown_081D9041:: @ 81D9041 +BattleScript_SafeguardEnds:: @ 81D9041 pause 32 printstring BATTLE_TEXT_SafeguardFaded waitmessage 64 end2 BattleScript_LeechSeedTurnDrain:: @ 81D904B - playanimation USER, B_ANIM_LEECH_SEED_DRAIN, gSharedMem + 0x160A4 - orword gHitMarker, 0x100100 + playanimation USER, B_ANIM_LEECH_SEED_DRAIN, sANIM_ARG1 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate USER datahpupdate USER - copyarray gBattleMoveDamage, gHP_dealt, 4 - jumpifability USER, ABILITY_LIQUID_OOZE, BattleScript_1D907D + copyword gBattleMoveDamage, gHP_dealt + jumpifability USER, ABILITY_LIQUID_OOZE, BattleScript_LeechSeedTurnPrintLiquidOoze manipulatedamage 0 - setbyte gUnknown_02024D1F + 0x4, 3 - goto BattleScript_1D9083 + setbyte cMULTISTRING_CHOOSER, 3 + goto BattleScript_LeechSeedTurnPrintAndUpdateHp -BattleScript_1D907D: @ 81D907D - setbyte gUnknown_02024D1F + 0x4, 4 +BattleScript_LeechSeedTurnPrintLiquidOoze: @ 81D907D + setbyte cMULTISTRING_CHOOSER, 4 -BattleScript_1D9083: @ 81D9083 - orword gHitMarker, 0x100100 +BattleScript_LeechSeedTurnPrintAndUpdateHp: @ 81D9083 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate TARGET datahpupdate TARGET - printfromtable BattleTextList_40154C + printfromtable gLeechSeedStringIds waitmessage 64 - tryfaintmon USER, 0, 0x0 - tryfaintmon TARGET, 0, 0x0 + tryfaintmon USER, FALSE, NULL + tryfaintmon TARGET, FALSE, NULL end2 BattleScript_BideStoringEnergy:: @ 81D90A7 printstring BATTLE_TEXT_StoringEnergy waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_BideAttack:: @ 81D90B2 printstring BATTLE_TEXT_UnleashedEnergy waitmessage 64 - accuracycheck BattleScript_1D6F77, 0 + accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE typecalc - bicbyte gBattleMoveFlags, 6 - copyarray gBattleMoveDamage, gSharedMem + 0x16090, 4 + bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE + copyword gBattleMoveDamage, sBIDE_DMG adjustsetdamage - setbyte gSharedMem + 0x16002, 1 + setbyte sANIM_TURN, 1 attackanimation waitanimation effectivenesssound @@ -3360,32 +3356,32 @@ BattleScript_BideAttack:: @ 81D90B2 datahpupdate TARGET resultmessage waitmessage 64 - tryfaintmon TARGET, 0, 0x0 - goto BattleScript_EndTurn + tryfaintmon TARGET, FALSE, NULL + goto BattleScript_MoveEnd BattleScript_BideNoEnergyToAttack:: @ 81D90F1 printstring BATTLE_TEXT_UnleashedEnergy waitmessage 64 goto BattleScript_ButItFailed -gUnknown_081D90FC:: @ 81D90FC +BattleScript_SuccessForceOut:: @ 81D90FC attackanimation waitanimation switchoutabilities TARGET returntoball TARGET waitstate - jumpifhalfword 4, gBattleTypeFlags, 8, BattleScript_1D9116 + jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_TrainerBattleForceOut setbyte gBattleOutcome, 5 finishaction -BattleScript_1D9116: @ 81D9116 +BattleScript_TrainerBattleForceOut: @ 81D9116 getswitchedmondata TARGET switchindataupdate TARGET switchinanim TARGET, 0 waitstate printstring BATTLE_TEXT_DraggedOut switchineffects TARGET - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MistProtected:: @ 81D9128 pause 32 @@ -3393,7 +3389,7 @@ BattleScript_MistProtected:: @ 81D9128 waitmessage 64 return -gUnknown_081D9132:: @ 81D9132 +BattleScript_RageIsBuilding:: @ 81D9132 printstring BATTLE_TEXT_RageBuilding waitmessage 64 return @@ -3401,7 +3397,7 @@ gUnknown_081D9132:: @ 81D9132 BattleScript_MoveUsedIsDisabled:: @ 81D9139 printstring BATTLE_TEXT_MoveIsDisabled waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveSelectionDisabledMove:: @ 81D9144 printselectionstring BATTLE_TEXT_MoveIsDisabled @@ -3417,58 +3413,58 @@ BattleScript_EncoredNoMore:: @ 81D914F waitmessage 64 end2 -gUnknown_081D9156:: @ 81D9156 +BattleScript_DestinyBondTakesLife:: @ 81D9156 printstring BATTLE_TEXT_DestinyBondTaken waitmessage 64 - orword gHitMarker, 0x100100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate USER datahpupdate USER - tryfaintmon USER, 0, 0x0 + tryfaintmon USER, FALSE, NULL return -gUnknown_081D9171:: @ 81D9171 - orword gHitMarker, 0x100100 +BattleScript_SpikesOnAttacker:: @ 81D9171 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate USER datahpupdate USER - call BattleScript_1D91FB - tryfaintmon USER, 0, 0x0 - tryfaintmon USER, 1, BattleScript_1D9192 + call BattleScript_PrintHurtBySpikes + tryfaintmon USER, FALSE, NULL + tryfaintmon USER, TRUE, BattleScript_SpikesOnAttackerFainted return -BattleScript_1D9192: @ 81D9192 - setbyte gSharedMem + 0x1600F, 0 - getexp 1 - goto gUnknown_081D8C7B +BattleScript_SpikesOnAttackerFainted: @ 81D9192 + setbyte sGIVEEXP_STATE, 0 + getexp USER + goto BattleScript_HandleFaintedMon -gUnknown_081D919F:: @ 81D919F - orword gHitMarker, 0x100100 +BattleScript_SpikesOnTarget:: @ 81D919F + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate TARGET datahpupdate TARGET - call BattleScript_1D91FB - tryfaintmon TARGET, 0, 0x0 - tryfaintmon TARGET, 1, BattleScript_1D91C0 + call BattleScript_PrintHurtBySpikes + tryfaintmon TARGET, FALSE, NULL + tryfaintmon TARGET, TRUE, BattleScript_SpikesOnTargetFainted return -BattleScript_1D91C0: @ 81D91C0 - setbyte gSharedMem + 0x1600F, 0 - getexp 0 - goto gUnknown_081D8C7B +BattleScript_SpikesOnTargetFainted: @ 81D91C0 + setbyte sGIVEEXP_STATE, 0 + getexp TARGET + goto BattleScript_HandleFaintedMon -gUnknown_081D91CD:: @ 81D91CD - orword gHitMarker, 0x100100 +BattleScript_SpikesOngBank1:: @ 81D91CD + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate 3 datahpupdate 3 - call BattleScript_1D91FB - tryfaintmon 3, 0, 0x0 - tryfaintmon 3, 1, BattleScript_1D91EE + call BattleScript_PrintHurtBySpikes + tryfaintmon GBANK_1, FALSE, NULL + tryfaintmon GBANK_1, TRUE, BattleScript_SpikesOngBank1Fainted return -BattleScript_1D91EE: @ 81D91EE - setbyte gSharedMem + 0x1600F, 0 +BattleScript_SpikesOngBank1Fainted: @ 81D91EE + setbyte sGIVEEXP_STATE, 0 getexp 3 - goto gUnknown_081D8C7B + goto BattleScript_HandleFaintedMon -BattleScript_1D91FB: @ 81D91FB +BattleScript_PrintHurtBySpikes: @ 81D91FB printstring BATTLE_TEXT_SpikesHurt waitmessage 64 return @@ -3476,10 +3472,10 @@ BattleScript_1D91FB: @ 81D91FB BattleScript_PerishSongHits:: @ 81D9202 printstring BATTLE_TEXT_PerishSongFell waitmessage 64 - orword gHitMarker, 0x100100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate USER datahpupdate USER - tryfaintmon USER, 0, 0x0 + tryfaintmon USER, FALSE, NULL end2 BattleScript_PerishSongTimerGoesDown:: @ 81D921D @@ -3488,45 +3484,45 @@ BattleScript_PerishSongTimerGoesDown:: @ 81D921D end2 BattleScript_AllStatsUp:: @ 81D9224 - jumpifstat USER, 3, 1, 12, BattleScript_1D9251 - jumpifstat USER, 3, 2, 12, BattleScript_1D9251 - jumpifstat USER, 3, 3, 12, BattleScript_1D9251 - jumpifstat USER, 3, 4, 12, BattleScript_1D9251 - jumpifstat USER, 0, 5, 12, BattleScript_1D92BF - -BattleScript_1D9251: @ 81D9251 - setbyte gSharedMem + 0x160DC, 0 + jumpifstat USER, LESS_THAN, ATTACK, 12, BattleScript_AllStatsUpAtk + jumpifstat USER, LESS_THAN, DEFENSE, 12, BattleScript_AllStatsUpAtk + jumpifstat USER, LESS_THAN, SPEED, 12, BattleScript_AllStatsUpAtk + jumpifstat USER, LESS_THAN, SP_ATTACK, 12, BattleScript_AllStatsUpAtk + jumpifstat USER, EQUAL, SP_DEFENSE, 12, BattleScript_AllStatsUpRet + +BattleScript_AllStatsUpAtk: @ 81D9251 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 62, 0 - setbyte gSharedMem + 0x1601E, 17 - statbuffchange 65, BattleScript_1D926F - printfromtable BattleTextList_401570 + setstatchanger ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpDef + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D926F: @ 81D926F - setbyte gSharedMem + 0x1601E, 18 - statbuffchange 65, BattleScript_1D9283 - printfromtable BattleTextList_401570 +BattleScript_AllStatsUpDef: @ 81D926F + setstatchanger DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpeed + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D9283: @ 81D9283 - setbyte gSharedMem + 0x1601E, 19 - statbuffchange 65, BattleScript_1D9297 - printfromtable BattleTextList_401570 +BattleScript_AllStatsUpSpeed: @ 81D9283 + setstatchanger SPEED, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpAtk + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D9297: @ 81D9297 - setbyte gSharedMem + 0x1601E, 20 - statbuffchange 65, BattleScript_1D92AB - printfromtable BattleTextList_401570 +BattleScript_AllStatsUpSpAtk: @ 81D9297 + setstatchanger SP_ATTACK, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpSpDef + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D92AB: @ 81D92AB - setbyte gSharedMem + 0x1601E, 21 - statbuffchange 65, BattleScript_1D92BF - printfromtable BattleTextList_401570 +BattleScript_AllStatsUpSpDef: @ 81D92AB + setstatchanger SP_DEFENSE, 1, FALSE + statbuffchange AFFECTS_USER | 0x1, BattleScript_AllStatsUpRet + printfromtable gStatUpStringIds waitmessage 64 -BattleScript_1D92BF: @ 81D92BF +BattleScript_AllStatsUpRet: @ 81D92BF return BattleScript_RapidSpinAway:: @ 81D92C0 @@ -3548,26 +3544,26 @@ BattleScript_SpikesFree:: @ 81D92D0 waitmessage 64 return -BattleScript_FutureSightHits:: @ 81D92D7 +BattleScript_MonTookFutureAttack:: @ 81D92D7 printstring BATTLE_TEXT_TookAttack waitmessage 64 - jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D92F4 - accuracycheck BattleScript_1D934B, 248 - goto BattleScript_1D92FB + jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_CheckDoomDesireMiss + accuracycheck BattleScript_FutureAttackMiss, 248 + goto BattleScript_FutureAttackAnimate -BattleScript_1D92F4: @ 81D92F4 - accuracycheck BattleScript_1D934B, 353 +BattleScript_CheckDoomDesireMiss: @ 81D92F4 + accuracycheck BattleScript_FutureAttackMiss, 353 -BattleScript_1D92FB: @ 81D92FB +BattleScript_FutureAttackAnimate: @ 81D92FB adjustnormaldamage2 - jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D9313 - playanimation USER, B_ANIM_FUTURE_SIGHT_HIT, 0x0 - goto BattleScript_1D931A + jumpifbyte NOT_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_FutureHitAnimDoomDesire + playanimation USER, B_ANIM_FUTURE_SIGHT_HIT, NULL + goto BattleScript_DoFutureAttackHit -BattleScript_1D9313: @ 81D9313 - playanimation USER, B_ANIM_DOOM_DESIRE_HIT, 0x0 +BattleScript_FutureHitAnimDoomDesire: @ 81D9313 + playanimation USER, B_ANIM_DOOM_DESIRE_HIT, NULL -BattleScript_1D931A: @ 81D931A +BattleScript_DoFutureAttackHit: @ 81D931A effectivenesssound hitanimation TARGET waitstate @@ -3575,21 +3571,21 @@ BattleScript_1D931A: @ 81D931A datahpupdate TARGET resultmessage waitmessage 64 - tryfaintmon TARGET, 0, 0x0 - atk24 BattleScript_1D9332 + tryfaintmon TARGET, FALSE, NULL + atk24 BattleScript_FutureAttackEnd -BattleScript_1D9332: @ 81D9332 - setbyte gSharedMem + 0x1600C, 0 +BattleScript_FutureAttackEnd: @ 81D9332 + setbyte sMOVEEND_STATE, 0 moveend 1, 0 - setbyte gSharedMem + 0x1600C, 8 + setbyte sMOVEEND_STATE, 8 moveend 2, 14 setbyte gBattleMoveFlags, 0 end2 -BattleScript_1D934B: @ 81D934B +BattleScript_FutureAttackMiss: @ 81D934B pause 32 setbyte gBattleMoveFlags, 0 - orbyte gBattleMoveFlags, 32 + orbyte gBattleMoveFlags, MOVESTATUS_FAILED resultmessage waitmessage 64 setbyte gBattleMoveFlags, 0 @@ -3608,14 +3604,14 @@ BattleScript_NoPPForMove:: @ 81D936D pause 32 printstring BATTLE_TEXT_NoPP2 waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveSelectionTormented:: @ 81D937C printselectionstring BATTLE_TEXT_TormentNoUse endselectionscript printstring BATTLE_TEXT_TormentNoUse waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveSelectionTaunted:: @ 81D938B printselectionstring BATTLE_TEXT_TauntNoUse @@ -3624,21 +3620,21 @@ BattleScript_MoveSelectionTaunted:: @ 81D938B BattleScript_MoveUsedIsTaunted:: @ 81D938F printstring BATTLE_TEXT_TauntNoUse waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_WishComesTrue:: @ 81D939A - trywish 1, BattleScript_1D93C1 - playanimation TARGET, B_ANIM_WISH_HEAL, 0x0 + trywish 1, BattleScript_WishButFullHp + playanimation TARGET, B_ANIM_WISH_HEAL, NULL printstring BATTLE_TEXT_WishTrue waitmessage 64 - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_RegainedHealth waitmessage 64 end2 -BattleScript_1D93C1: @ 81D93C1 +BattleScript_WishButFullHp: @ 81D93C1 printstring BATTLE_TEXT_WishTrue waitmessage 64 pause 32 @@ -3647,43 +3643,43 @@ BattleScript_1D93C1: @ 81D93C1 end2 BattleScript_IngrainTurnHeal:: @ 81D93D1 - playanimation USER, B_ANIM_INGRAIN_HEAL, 0x0 + playanimation USER, B_ANIM_INGRAIN_HEAL, NULL printstring BATTLE_TEXT_AbsorbNutrients waitmessage 64 - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER end2 -BattleScript_1D93EC: @ 81D93EC +BattleScript_PrintMonIsRooted: @ 81D93EC pause 32 printstring BATTLE_TEXT_AnchoredItself waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_AtkDefDown:: @ 81D93FA - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 6, 13 playstatchangeanimation USER, 2, 9 - setbyte gSharedMem + 0x1601E, 145 - statbuffchange 193, BattleScript_1D9427 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D9427 - printfromtable BattleTextList_40157C + setstatchanger ATTACK, 1, TRUE + statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_1D9427 + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_1D9427 + printfromtable gStatDownStringIds waitmessage 64 BattleScript_1D9427: @ 81D9427 playstatchangeanimation USER, 4, 9 - setbyte gSharedMem + 0x1601E, 146 - statbuffchange 193, BattleScript_1D944A - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D944A - printfromtable BattleTextList_40157C + setstatchanger DEFENSE, 1, TRUE + statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_1D944A + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_1D944A + printfromtable gStatDownStringIds waitmessage 64 BattleScript_1D944A: @ 81D944A return BattleScript_KnockedOff:: @ 81D944B - playanimation TARGET, B_ANIM_ITEM_KNOCKOFF, 0x0 + playanimation TARGET, B_ANIM_ITEM_KNOCKOFF, NULL printstring BATTLE_TEXT_KnockedOffItem waitmessage 64 return @@ -3691,13 +3687,13 @@ BattleScript_KnockedOff:: @ 81D944B BattleScript_MoveUsedIsImprisoned:: @ 81D9459 printstring BATTLE_TEXT_SealedNoUse waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveSelectionImprisoned:: @ 81D9464 printselectionstring BATTLE_TEXT_SealedNoUse endselectionscript -gUnknown_081D9468:: @ 81D9468 +BattleScript_SelectingImprisionedMoveInPalace:: @ 81D9468 printstring BATTLE_TEXT_GrudgeLosePP waitmessage 64 return @@ -3708,7 +3704,7 @@ BattleScript_MagicCoatBounce:: @ 81D946F pause 32 printstring BATTLE_TEXT_MagicCoatBounce waitmessage 64 - orword gHitMarker, 0x800c00 + orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000 setmagiccoattarget USER return @@ -3716,10 +3712,10 @@ BattleScript_SnatchedMove:: @ 81D9487 attackstring ppreduce snatchsetbanks - playanimation TARGET, B_ANIM_SNATCH_MOVE, 0x0 + playanimation TARGET, B_ANIM_SNATCH_MOVE, NULL printstring BATTLE_TEXT_SnatchedMove waitmessage 64 - orword gHitMarker, 0x800c00 + orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000 atk5f return @@ -3734,12 +3730,12 @@ BattleScript_OneHitKOMsg:: @ 81D94A9 return BattleScript_SAtkDown2:: @ 81D94B0 - setbyte gSharedMem + 0x160DC, 0 + setbyte sFIELD_1B, 0 playstatchangeanimation USER, 16, 11 - setbyte gSharedMem + 0x1601E, 164 - statbuffchange 193, BattleScript_1D94D9 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D94D9 - printfromtable BattleTextList_40157C + setstatchanger SP_ATTACK, 2, TRUE + statbuffchange AFFECTS_USER | CERTAIN | 0x1, BattleScript_1D94D9 + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_1D94D9 + printfromtable gStatDownStringIds waitmessage 64 BattleScript_1D94D9: @ 81D94D9 @@ -3748,7 +3744,7 @@ BattleScript_1D94D9: @ 81D94D9 BattleScript_FocusPunchSetUp:: @ 81D94DA printstring BATTLE_TEXT_Terminator2 waitmessage 1 - playanimation USER, B_ANIM_FOCUS_PUNCH_SET_UP, 0x0 + playanimation USER, B_ANIM_FOCUS_PUNCH_SET_UP, NULL printstring BATTLE_TEXT_TightenFocus waitmessage 64 end2 @@ -3757,79 +3753,79 @@ BattleScript_MoveUsedIsAsleep:: @ 81D94EE printstring BATTLE_TEXT_FastAsleep waitmessage 64 statusanimation USER - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveUsedWokeUp:: @ 81D94FB - bicword gHitMarker, 0x10 - printfromtable BattleTextList_401562 + bicword gHitMarker, HITMARKER_x10 + printfromtable gWokeUpStringIds waitmessage 64 - updatestatusicon 1 + updatestatusicon USER return -gUnknown_081D950F:: @ 81D950F +BattleScript_MonWokeUpInUproar:: @ 81D950F printstring BATTLE_TEXT_UproarWoke waitmessage 64 - updatestatusicon 1 + updatestatusicon USER end2 BattleScript_PoisonTurnDmg:: @ 81D9518 printstring BATTLE_TEXT_PoisonHurt waitmessage 64 -BattleScript_1D951E: @ 81D951E +BattleScript_DoStatusTurnDmg: @ 81D951E statusanimation USER -BattleScript_1D9520: @ 81D9520 - orword gHitMarker, 0x100100 +BattleScript_DoTurnDmg: @ 81D9520 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate USER datahpupdate USER - tryfaintmon USER, 0, 0x0 - atk24 BattleScript_1D9539 + tryfaintmon USER, FALSE, NULL + atk24 BattleScript_DoTurnDmgEnd -BattleScript_1D9539: @ 81D9539 +BattleScript_DoTurnDmgEnd: @ 81D9539 end2 BattleScript_BurnTurnDmg:: @ 81D953A printstring BATTLE_TEXT_BurnHurt waitmessage 64 - goto BattleScript_1D951E + goto BattleScript_DoStatusTurnDmg BattleScript_MoveUsedIsFrozen:: @ 81D9545 printstring BATTLE_TEXT_FrozenSolid waitmessage 64 statusanimation USER - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveUsedUnfroze:: @ 81D9552 - printfromtable BattleTextList_4015C4 + printfromtable gGotDefrostedStringIds waitmessage 64 - updatestatusicon 1 + updatestatusicon USER return -gUnknown_081D955D:: @ 81D955D +BattleScript_DefrostedViaFireMove:: @ 81D955D printstring BATTLE_TEXT_DefendingDefrosted waitmessage 64 - updatestatusicon 0 + updatestatusicon TARGET return BattleScript_MoveUsedIsParalyzed:: @ 81D9566 printstring BATTLE_TEXT_Paralyzed3 waitmessage 64 statusanimation USER - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveUsedFlinched:: @ 81D9573 printstring BATTLE_TEXT_Flinched waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -gUnknown_081D957E:: @ 81D957E - printfromtable BattleTextList_40155A +BattleScript_PrintUproarOverTurns:: @ 81D957E + printfromtable gUproarOverTurnStringIds waitmessage 64 end2 BattleScript_ThrashConfuses:: @ 81D9587 - chosenstatusanimation 1, 1, S_CONFUSED + chosenstatus2animation USER, STATUS2_CONFUSION printstring BATTLE_TEXT_FatigueConfuse waitmessage 64 end2 @@ -3837,10 +3833,10 @@ BattleScript_ThrashConfuses:: @ 81D9587 BattleScript_MoveUsedIsConfused:: @ 81D9595 printstring BATTLE_TEXT_Confused waitmessage 64 - status2animation 1, 0x7 - jumpifbyte 0, gUnknown_02024D1F + 0x4, 0, BattleScript_1D95D3 + status2animation USER, STATUS2_CONFUSION + jumpifbyte EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_MoveUsedIsConfusedRet -BattleScript_1D95AC: @ 81D95AC +BattleScript_DoSelfConfusionDmg: @ 81D95AC cancelmultiturnmoves USER adjustnormaldamage2 printstring BATTLE_TEXT_HurtItself @@ -3848,13 +3844,13 @@ BattleScript_1D95AC: @ 81D95AC effectivenesssound hitanimation USER waitstate - orword gHitMarker, 0x100100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate USER datahpupdate USER - tryfaintmon USER, 0, 0x0 - goto BattleScript_EndTurn + tryfaintmon USER, FALSE, NULL + goto BattleScript_MoveEnd -BattleScript_1D95D3: @ 81D95D3 +BattleScript_MoveUsedIsConfusedRet: @ 81D95D3 return BattleScript_MoveUsedIsConfusedNoMore:: @ 81D95D4 @@ -3862,16 +3858,16 @@ BattleScript_MoveUsedIsConfusedNoMore:: @ 81D95D4 waitmessage 64 return -gUnknown_081D95DB:: @ 81D95DB +BattleScript_PrintPayDayMoneyString:: @ 81D95DB printstring BATTLE_TEXT_PickedUpYen waitmessage 64 return BattleScript_WrapTurnDmg:: @ 81D95E2 - playanimation USER, B_ANIM_TURN_TRAP, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_TURN_TRAP, sANIM_ARG1 printstring BATTLE_TEXT_HurtBy waitmessage 64 - goto BattleScript_1D9520 + goto BattleScript_DoTurnDmg BattleScript_WrapEnds:: @ 81D95F4 printstring BATTLE_TEXT_FreedFrom @@ -3881,119 +3877,119 @@ BattleScript_WrapEnds:: @ 81D95F4 BattleScript_MoveUsedIsInLove:: @ 81D95FB printstring BATTLE_TEXT_InLoveWith waitmessage 64 - status2animation 1, 0xf0000 + status2animation USER, STATUS2_INFATUATION return BattleScript_MoveUsedIsParalyzedCantAttack:: @ 81D9608 printstring BATTLE_TEXT_ImmobilizedBy waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_NightmareTurnDmg:: @ 81D9613 printstring BATTLE_TEXT_NightmareLock waitmessage 64 - status2animation 1, Start - goto BattleScript_1D9520 + status2animation USER, STATUS2_NIGHTMARE + goto BattleScript_DoTurnDmg BattleScript_CurseTurnDmg:: @ 81D9624 printstring BATTLE_TEXT_CurseAfflict waitmessage 64 - status2animation 1, 0x10000000 - goto BattleScript_1D9520 + status2animation USER, STATUS2_CURSED + goto BattleScript_DoTurnDmg BattleScript_TargetPRLZHeal:: @ 81D9635 printstring BATTLE_TEXT_ParalysisHealed waitmessage 64 - updatestatusicon 0 + updatestatusicon TARGET return -BattleScript_1D963E:: @ 81D963E - statusanimation 2 - printfromtable BattleTextList_4015B8 +BattleScript_MoveEffectSleep:: @ 81D963E + statusanimation EFFECT_BANK + printfromtable gFellAsleepStringIds waitmessage 64 -BattleScript_1D9648: @ 81D9648 - updatestatusicon 2 +BattleScript_UpdateEffectStatusIconRet: @ 81D9648 + updatestatusicon EFFECT_BANK waitstate return BattleScript_YawnMakesAsleep:: @ 81D964C - statusanimation 2 + statusanimation EFFECT_BANK printstring BATTLE_TEXT_FellAsleep waitmessage 64 - updatestatusicon 2 + updatestatusicon EFFECT_BANK waitstate makevisible 2 end2 -BattleScript_1D965A:: @ 81D965A - statusanimation 2 - printfromtable BattleTextList_4015B0 +BattleScript_MoveEffectPoison:: @ 81D965A + statusanimation EFFECT_BANK + printfromtable gGotPoisonedStringIds waitmessage 64 - goto BattleScript_1D9648 + goto BattleScript_UpdateEffectStatusIconRet -BattleScript_1D9669:: @ 81D9669 - statusanimation 2 - printfromtable BattleTextList_4015BC +BattleScript_MoveEffectBurn:: @ 81D9669 + statusanimation EFFECT_BANK + printfromtable gGotBurnedStringIds waitmessage 64 - goto BattleScript_1D9648 + goto BattleScript_UpdateEffectStatusIconRet -BattleScript_1D9678:: @ 81D9678 - statusanimation 2 - printfromtable BattleTextList_4015C0 +BattleScript_MoveEffectFreeze:: @ 81D9678 + statusanimation EFFECT_BANK + printfromtable gGotFrozenStringIds waitmessage 64 - goto BattleScript_1D9648 + goto BattleScript_UpdateEffectStatusIconRet -BattleScript_1D9687:: @ 81D9687 - statusanimation 2 - printfromtable BattleTextList_4015B4 +BattleScript_MoveEffectParalysis:: @ 81D9687 + statusanimation EFFECT_BANK + printfromtable gGotParalyzedStringIds waitmessage 64 - goto BattleScript_1D9648 + goto BattleScript_UpdateEffectStatusIconRet -BattleScript_1D9696:: @ 81D9696 +BattleScript_MoveEffectUproar:: @ 81D9696 printstring BATTLE_TEXT_UproarCaused waitmessage 64 return -BattleScript_1D969D:: @ 81D969D - statusanimation 2 +BattleScript_MoveEffectToxic:: @ 81D969D + statusanimation EFFECT_BANK printstring BATTLE_TEXT_BadlyPoisoned waitmessage 64 - goto BattleScript_1D9648 + goto BattleScript_UpdateEffectStatusIconRet -BattleScript_1D96AA:: @ 81D96AA +BattleScript_MoveEffectPayDay:: @ 81D96AA printstring BATTLE_TEXT_CoinScatter waitmessage 64 return -BattleScript_1D96B1:: @ 81D96B1 - printfromtable BattleTextList_401594 +BattleScript_MoveEffectWrap:: @ 81D96B1 + printfromtable gWrappedStringIds waitmessage 64 return -BattleScript_1D96BA:: @ 81D96BA - chosenstatusanimation 2, 1, S_CONFUSED +BattleScript_MoveEffectConfusion:: @ 81D96BA + chosenstatus2animation EFFECT_BANK, STATUS2_CONFUSION printstring BATTLE_TEXT_BecameConfused waitmessage 64 return -BattleScript_1D96C8:: @ 81D96C8 - jumpifhalfword 0, gCurrentMove, 165, BattleScript_1D96DB - jumpifability USER, ABILITY_ROCK_HEAD, BattleScript_1D96F5 +BattleScript_MoveEffectRecoil33:: @ 81D96C8 + jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil33 + jumpifability USER, ABILITY_ROCK_HEAD, BattleScript_Recoil33End -BattleScript_1D96DB: @ 81D96DB - orword gHitMarker, 0x100100 +BattleScript_DoRecoil33: @ 81D96DB + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_HitRecoil waitmessage 64 - tryfaintmon USER, 0, 0x0 + tryfaintmon USER, FALSE, NULL -BattleScript_1D96F5: @ 81D96F5 +BattleScript_Recoil33End: @ 81D96F5 return BattleScript_ItemSteal:: @ 81D96F6 - playanimation TARGET, B_ANIM_ITEM_STEAL, 0x0 + playanimation TARGET, B_ANIM_ITEM_STEAL, NULL printstring BATTLE_TEXT_StoleSomething waitmessage 64 return @@ -4002,12 +3998,12 @@ BattleScript_DrizzleActivates:: @ 81D9704 pause 32 printstring BATTLE_TEXT_RainMade waitstate - playanimation 7, B_ANIM_RAIN_CONTINUES, 0x0 - call BattleScript_1D9761 + playanimation 7, B_ANIM_RAIN_CONTINUES, NULL + call BattleScript_WeatherFormChanges end3 BattleScript_SpeedBoostActivates:: @ 81D9718 - playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_STATS_CHANGE, sANIM_ARG1 printstring BATTLE_TEXT_SpeedRisen waitmessage 64 end3 @@ -4021,7 +4017,7 @@ BattleScript_TraceActivates:: @ 81D9726 BattleScript_RainDishActivates:: @ 81D9730 printstring BATTLE_TEXT_RestoredHPByItem waitmessage 64 - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER end3 @@ -4030,23 +4026,23 @@ BattleScript_SandstreamActivates:: @ 81D9744 pause 32 printstring BATTLE_TEXT_WhipSandstorm waitstate - playanimation 7, B_ANIM_SANDSTORM_CONTINUES, 0x0 - call BattleScript_1D9761 + playanimation 7, B_ANIM_SANDSTORM_CONTINUES, NULL + call BattleScript_WeatherFormChanges end3 BattleScript_ShedSkinActivates:: @ 81D9758 printstring BATTLE_TEXT_CuredProblem waitmessage 64 - updatestatusicon 1 + updatestatusicon USER end3 -BattleScript_1D9761: @ 81D9761 - setbyte gSharedMem + 0x16003, 0 +BattleScript_WeatherFormChanges: @ 81D9761 + setbyte sBANK, 0 -BattleScript_1D9767: @ 81D9767 +BattleScript_WeatherFormChangesLoop: @ 81D9767 trycastformdatachange - addbyte gSharedMem + 0x16003, 1 - jumpifarraynotequal gSharedMem + 0x16003, gNoOfAllBanks, 1, BattleScript_1D9767 + addbyte sBANK, 1 + jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_WeatherFormChangesLoop return BattleScript_CastformChange:: @ 81D977D @@ -4069,18 +4065,18 @@ BattleScript_1D9792: @ 81D9792 gUnknown_081D9795:: @ 81D9795 setbyte gBankTarget, 0 - setbyte gSharedMem + 0x1601E, 145 + setstatchanger ATTACK, 1, TRUE BattleScript_1D97A1: @ 81D97A1 trygetintimidatetarget BattleScript_1D97EF - jumpifstatus2 TARGET, S_SUBSTITUTE, BattleScript_1D97E4 + jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_1D97E4 jumpifability TARGET, ABILITY_CLEAR_BODY, BattleScript_1D97F0 jumpifability TARGET, ABILITY_HYPER_CUTTER, BattleScript_1D97F0 jumpifability TARGET, ABILITY_WHITE_SMOKE, BattleScript_1D97F0 statbuffchange 33, BattleScript_1D97E4 - jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D97E4 + jumpifbyte GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_1D97E4 setgraphicalstatchangevalues - playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 + playanimation TARGET, B_ANIM_STATS_CHANGE, sANIM_ARG1 printstring BATTLE_TEXT_CutsAttack waitmessage 64 @@ -4101,8 +4097,8 @@ BattleScript_DroughtActivates:: @ 81D97FE pause 32 printstring BATTLE_TEXT_SunIntensified waitstate - playanimation 7, B_ANIM_SUN_CONTINUES, 0x0 - call BattleScript_1D9761 + playanimation 7, B_ANIM_SUN_CONTINUES, NULL + call BattleScript_WeatherFormChanges end3 BattleScript_TookAttack:: @ 81D9812 @@ -4110,20 +4106,20 @@ BattleScript_TookAttack:: @ 81D9812 pause 32 printstring BATTLE_TEXT_TookAttack2 waitmessage 64 - orword gHitMarker, 0x400 + orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED return -gUnknown_081D9826:: @ 81D9826 +BattleScript_SturdyPreventsOHKO:: @ 81D9826 pause 32 printstring BATTLE_TEXT_ProtectedBy pause 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -gUnknown_081D9834:: @ 81D9834 +BattleScript_DampStopsExplosion:: @ 81D9834 pause 32 printstring BATTLE_TEXT_PreventedBy pause 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_MoveHPDrain_PPLoss:: @ 81D9842 ppreduce @@ -4131,13 +4127,13 @@ BattleScript_MoveHPDrain_PPLoss:: @ 81D9842 BattleScript_MoveHPDrain:: @ 81D9843 attackstring pause 32 - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate TARGET datahpupdate TARGET printstring BATTLE_TEXT_HPRestoredUsing waitmessage 64 - orbyte gBattleMoveFlags, 8 - goto BattleScript_EndTurn + orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED + goto BattleScript_MoveEnd BattleScript_MoveHPDrain_FullHP_PPLoss:: @ 81D9865 ppreduce @@ -4147,8 +4143,8 @@ BattleScript_MoveHPDrain_FullHP:: @ 81D9866 pause 32 printstring BATTLE_TEXT_MadeUseless waitmessage 64 - orbyte gBattleMoveFlags, 8 - goto BattleScript_EndTurn + orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED + goto BattleScript_MoveEnd BattleScript_FlashFireBoost_PPLoss:: @ 81D987B ppreduce @@ -4156,15 +4152,15 @@ BattleScript_FlashFireBoost_PPLoss:: @ 81D987B BattleScript_FlashFireBoost:: @ 81D987C attackstring pause 32 - printfromtable BattleTextList_401648 + printfromtable gFlashFireStringIds waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D988D: @ 81D988D +BattleScript_AbilityPreventsPhasingOut: @ 81D988D pause 32 printstring BATTLE_TEXT_AnchorsItself waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_AbilityNoStatLoss:: @ 81D989B pause 32 @@ -4174,19 +4170,19 @@ BattleScript_AbilityNoStatLoss:: @ 81D989B BattleScript_BRNPrevention:: @ 81D98A5 pause 32 - printfromtable BattleTextList_401630 + printfromtable gBRNPreventionStringIds waitmessage 64 return BattleScript_PRLZPrevention:: @ 81D98B1 pause 32 - printfromtable BattleTextList_401636 + printfromtable gPRLZPreventionStringIds waitmessage 64 return BattleScript_PSNPrevention:: @ 81D98BD pause 32 - printfromtable BattleTextList_40163C + printfromtable gPSNPreventionStringIds waitmessage 64 return @@ -4194,19 +4190,19 @@ BattleScript_ObliviousPreventsAttraction:: @ 81D98C9 pause 32 printstring BATTLE_TEXT_PreventedRomance waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_FlinchPrevention:: @ 81D98D7 pause 32 printstring BATTLE_TEXT_PreventedFlinching waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd -BattleScript_1D98E5: @ 81D98E5 +BattleScript_OwnTempoPrevents: @ 81D98E5 pause 32 printstring BATTLE_TEXT_PreventedConfusion waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_SoundproofProtected:: @ 81D98F3 attackstring @@ -4214,20 +4210,20 @@ BattleScript_SoundproofProtected:: @ 81D98F3 pause 32 printstring BATTLE_TEXT_BlocksOther waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_AbilityNoSpecificStatLoss:: @ 81D9903 pause 32 printstring BATTLE_TEXT_PreventedLoss waitmessage 64 - setbyte gUnknown_02024D1F + 0x4, 3 + setbyte cMULTISTRING_CHOOSER, 3 return BattleScript_NoItemSteal:: @ 81D9913 pause 32 printstring BATTLE_TEXT_MadeIneffective waitmessage 64 - goto BattleScript_EndTurn + goto BattleScript_MoveEnd BattleScript_ColorChangeActivates:: @ 81D9921 printstring BATTLE_TEXT_MadeType @@ -4235,16 +4231,16 @@ BattleScript_ColorChangeActivates:: @ 81D9921 return BattleScript_RoughSkinActivates:: @ 81D9928 - orword gHitMarker, 0x100100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_HurtOther waitmessage 64 - tryfaintmon USER, 0, 0x0 + tryfaintmon USER, FALSE, NULL return BattleScript_CuteCharmActivates:: @ 81D9943 - status2animation 1, 0xf0000 + status2animation USER, STATUS2_INFATUATION printstring BATTLE_TEXT_InfatuatedPoke waitmessage 64 return @@ -4259,47 +4255,47 @@ BattleScript_SynchronizeActivates:: @ 81D9953 seteffectprimary return -gUnknown_081D9956:: @ 81D9956 +BattleScript_AbilityCuredStatus:: @ 81D9956 printstring BATTLE_TEXT_CuredOfProblem waitmessage 64 - updatestatusicon 10 + updatestatusicon SCRIPTING_BANK return gUnknown_081D995F:: @ 81D995F printstring BATTLE_TEXT_IgnoredOrdersSLP waitmessage 64 - setbyte gSharedMem + 0x1600C, 0 + setbyte sMOVEEND_STATE, 0 moveend 2, 16 end -gUnknown_081D996F:: @ 81D996F +BattleScript_IgnoresAndUsesRandomMove:: @ 81D996F printstring BATTLE_TEXT_IgnoredOrders waitmessage 64 jumptorandomattack TARGET BattleScript_MoveUsedLoafingAround:: @ 81D9977 - printfromtable BattleTextList_40160E + printfromtable gInobedientStringIds waitmessage 64 - setbyte gSharedMem + 0x1600C, 0 + setbyte sMOVEEND_STATE, 0 moveend 2, 16 end -gUnknown_081D9989:: @ 81D9989 +BattleScript_IgnoresAndFallsAsleep:: @ 81D9989 printstring BATTLE_TEXT_BeganNap waitmessage 64 - setbyte gUnknown_02024D1F + 0x2, 65 + setmoveeffect EFFECT_SLEEP | AFFECTS_USER seteffectprimary - setbyte gSharedMem + 0x1600C, 0 + setbyte sMOVEEND_STATE, 0 moveend 2, 16 end gUnknown_081D99A0:: @ 81D99A0 printstring BATTLE_TEXT_WontObey waitmessage 64 - goto BattleScript_1D95AC + goto BattleScript_DoSelfConfusionDmg BattleScript_SubstituteFade:: @ 81D99AB - playanimation TARGET, B_ANIM_SUBSTITUTE_FADE, 0x0 + playanimation TARGET, B_ANIM_SUBSTITUTE_FADE, NULL printstring BATTLE_TEXT_SubFaded return @@ -4308,11 +4304,11 @@ BattleScript_BerryCurePrlzEnd2:: @ 81D99B6 end2 BattleScript_BerryCureParRet:: @ 81D99BC - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredParalysis waitmessage 64 - updatestatusicon 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_BerryCurePsnEnd2:: @ 81D99CE @@ -4320,11 +4316,11 @@ BattleScript_BerryCurePsnEnd2:: @ 81D99CE end2 BattleScript_BerryCurePsnRet:: @ 81D99D4 - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredPoison waitmessage 64 - updatestatusicon 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_BerryCureBrnEnd2:: @ 81D99E6 @@ -4332,11 +4328,11 @@ BattleScript_BerryCureBrnEnd2:: @ 81D99E6 end2 BattleScript_BerryCureBrnRet:: @ 81D99EC - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredBurn waitmessage 64 - updatestatusicon 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_BerryCureFrzEnd2:: @ 81D99FE @@ -4344,11 +4340,11 @@ BattleScript_BerryCureFrzEnd2:: @ 81D99FE end2 BattleScript_BerryCureFrzRet:: @ 81D9A04 - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredFreeze waitmessage 64 - updatestatusicon 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_BerryCureSlpEnd2:: @ 81D9A16 @@ -4356,11 +4352,11 @@ BattleScript_BerryCureSlpEnd2:: @ 81D9A16 end2 BattleScript_BerryCureSlpRet:: @ 81D9A1C - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredSleep waitmessage 64 - updatestatusicon 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_BerryCureConfusionEnd2:: @ 81D9A2E @@ -4368,22 +4364,22 @@ BattleScript_BerryCureConfusionEnd2:: @ 81D9A2E end2 BattleScript_BerryCureConfusionRet:: @ 81D9A34 - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_CuredConfusion waitmessage 64 - removeitem 10 + removeitem SCRIPTING_BANK return -gUnknown_081D9A44:: @ 81D9A44 - call gUnknown_081D9A4A +BattleScript_BerryCureChosenStatusEnd2:: @ 81D9A44 + call BattleScript_BerryCureChosenStatusRet end2 -gUnknown_081D9A4A:: @ 81D9A4A - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 - printfromtable BattleTextList_40162C +BattleScript_BerryCureChosenStatusRet:: @ 81D9A4A + playanimation 10, B_ANIM_ITEM_EFFECT, NULL + printfromtable gBerryEffectStringIds waitmessage 64 - updatestatusicon 10 - removeitem 10 + updatestatusicon SCRIPTING_BANK + removeitem SCRIPTING_BANK return BattleScript_WhiteHerbEnd2:: @ 81D9A5E @@ -4391,24 +4387,24 @@ BattleScript_WhiteHerbEnd2:: @ 81D9A5E end2 BattleScript_WhiteHerbRet:: @ 81D9A64 - playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_RestoredStatus waitmessage 64 - removeitem 10 + removeitem SCRIPTING_BANK return BattleScript_ItemHealHP_RemoveItem:: @ 81D9A74 - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER removeitem USER end2 BattleScript_BerryPPHealEnd2:: @ 81D9A91 - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_RestoredPP waitmessage 64 removeitem USER @@ -4419,10 +4415,10 @@ BattleScript_ItemHealHP_End2:: @ 81D9AA1 end2 BattleScript_ItemHealHP_Ret:: @ 81D9AA7 - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_RestoredHPLittle waitmessage 64 - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER return @@ -4432,43 +4428,43 @@ BattleScript_MoveSelectionChoiceBanded:: @ 81D9AC2 endselectionscript BattleScript_HangedOnMsg:: @ 81D9AC6 - playanimation TARGET, B_ANIM_HANGED_ON, 0x0 + playanimation TARGET, B_ANIM_HANGED_ON, NULL printstring BATTLE_TEXT_FocusSash waitmessage 64 return BattleScript_BerryConfuseHealEnd2:: @ 81D9AD4 - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_UnknownString2 waitmessage 64 - setbyte gUnknown_02024D1F + 0x2, 71 + setmoveeffect EFFECT_CONFUSION | AFFECTS_USER seteffectprimary removeitem USER end2 BattleScript_BerryStatRaiseEnd2:: @ 81D9AFE - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 - statbuffchange 65, BattleScript_1D9B0B + playanimation USER, B_ANIM_ITEM_EFFECT, NULL + statbuffchange AFFECTS_USER | 0x1, BattleScript_1D9B0B BattleScript_1D9B0B: @ 81D9B0B - setbyte gUnknown_02024D1F + 0x4, 4 + setbyte cMULTISTRING_CHOOSER, 0x4 call BattleScript_StatUp removeitem USER end2 BattleScript_BerryFocusEnergyEnd2:: @ 81D9B19 - playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, NULL printstring BATTLE_TEXT_HustleUse waitmessage 64 removeitem USER end2 -gUnknown_081D9B29:: @ 81D9B29 +BattleScript_ActionSelectionItemsCantBeUsed:: @ 81D9B29 printselectionstring BATTLE_TEXT_CantUseItems endselectionscript diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index c6112fdd3..26f28726d 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,3 +1,6 @@ +#include "constants/battle_constants.h" +#include "constants/items.h" +#include "constants/songs.h" .include "asm/macros.inc" .include "asm/macros/battle_script.inc" .include "constants/constants.inc" @@ -7,91 +10,91 @@ .align 2 gBattlescriptsForBallThrow:: @ 81D9E48 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EBC - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - -gUnknown_081D9E7C:: @ 81D9E7C - .4byte BattleScript_1D9F45 - .4byte BattleScript_1D9F4F - .4byte BattleScript_1D9F4F - .4byte BattleScript_1D9F7B - .4byte BattleScript_1D9F9C - .4byte BattleScript_1D9FBB + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_SafariBallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + +gBattlescriptsForUsingItem:: @ 81D9E7C + .4byte BattleScript_PlayerUsesItem + .4byte BattleScript_OpponentUsesHealItem + .4byte BattleScript_OpponentUsesHealItem + .4byte BattleScript_OpponentUsesStatusCureItem + .4byte BattleScript_OpponentUsesXItem + .4byte BattleScript_OpponentUsesGuardSpecs gBattlescriptsForRunningByItem:: @ 81D9E94 - .4byte BattleScript_1D9FDA + .4byte BattleScript_RunByUsingItem gBattlescriptsForSafariActions:: @ 81D9E98 - .4byte BattleScript_1D9FE4 - .4byte BattleScript_1D9FEB - .4byte BattleScript_1D9FF4 + .4byte BattleScript_ActionWatchesCarefully + .4byte BattleScript_ActionGetNear + .4byte BattleScript_ActionThrowPokeblock .4byte BattleScript_1DA00A -BattleScript_1D9EA8: @ 81D9EA8 - jumpifhalfword 4, gBattleTypeFlags, 512, BattleScript_1D9EB8 +BattleScript_BallThrow: @ 81D9EA8 + jumpifhalfword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally printstring BATTLE_TEXT_Used1 handleballthrow -BattleScript_1D9EB8: @ 81D9EB8 +BattleScript_BallThrowByWally: @ 81D9EB8 printstring BATTLE_TEXT_TutorialUsed handleballthrow -BattleScript_1D9EBC: @ 81D9EBC +BattleScript_SafariBallThrow: @ 81D9EBC printstring BATTLE_TEXT_Used1 - updatestatusicon 1 + updatestatusicon USER handleballthrow BattleScript_SuccessBallThrow:: @ 81D9EC2 - jumpifhalfword 0, gLastUsedItem, 5, BattleScript_1D9ED0 + jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo incrementgamestat 11 -BattleScript_1D9ED0: @ 81D9ED0 +BattleScript_PrintCaughtMonInfo: @ 81D9ED0 printstring BATTLE_TEXT_BallCaught1 - trysetcaughtmondexflags BattleScript_1D9EE3 + trysetcaughtmondexflags BattleScript_TryNicknameCaughtMon printstring BATTLE_TEXT_AddedToDex waitstate setbyte gBattleCommunication, 0 displaydexinfo -BattleScript_1D9EE3: @ 81D9EE3 +BattleScript_TryNicknameCaughtMon: @ 81D9EE3 printstring BATTLE_TEXT_GiveNickname waitstate setbyte gBattleCommunication, 0 - trygivecaughtmonnick BattleScript_1D9EF8 + trygivecaughtmonnick BattleScript_GiveCaughtMonEnd printstring BATTLE_TEXT_SentToPC waitmessage 64 -BattleScript_1D9EF8: @ 81D9EF8 +BattleScript_GiveCaughtMonEnd: @ 81D9EF8 givecaughtmon - setbyte gBattleOutcome, 7 + setbyte gBattleOutcome, BATTLE_CAUGHT finishturn BattleScript_WallyBallThrow:: @ 81D9F00 printstring BATTLE_TEXT_BallCaught2 - setbyte gBattleOutcome, 7 + setbyte gBattleOutcome, BATTLE_CAUGHT finishturn BattleScript_ShakeBallThrow:: @ 81D9F0A - printfromtable BattleTextList_4015E6 + printfromtable gBallEscapeStringIds waitmessage 64 - jumpifbyte 5, gBattleTypeFlags, 128, BattleScript_1D9F34 - jumpifbyte 1, gNumSafariBalls, 0, BattleScript_1D9F34 + jumpifbyte NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd + jumpifbyte NOT_EQUAL, gNumSafariBalls, 0, BattleScript_ShakeBallThrowEnd printstring BATTLE_TEXT_SafariOver waitmessage 64 - setbyte gBattleOutcome, 8 + setbyte gBattleOutcome, BATTLE_OUT_OF_BALLS -BattleScript_1D9F34: @ 81D9F34 +BattleScript_ShakeBallThrowEnd: @ 81D9F34 finishaction BattleScript_TrainerBallBlock:: @ 81D9F35 @@ -102,84 +105,84 @@ BattleScript_TrainerBallBlock:: @ 81D9F35 waitmessage 64 finishaction -BattleScript_1D9F45: @ 81D9F45 - setbyte gSharedMem + 0x1600C, 15 +BattleScript_PlayerUsesItem: @ 81D9F45 + setbyte sMOVEEND_STATE, 15 moveend 1, 0 end -BattleScript_1D9F4F: @ 81D9F4F +BattleScript_OpponentUsesHealItem: @ 81D9F4F pause 48 - playse 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - updatestatusicon 1 - setbyte gSharedMem + 0x1600C, 15 + updatestatusicon USER + setbyte sMOVEEND_STATE, 15 moveend 1, 0 finishaction -BattleScript_1D9F7B: @ 81D9F7B +BattleScript_OpponentUsesStatusCureItem: @ 81D9F7B pause 48 - playse 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent - printfromtable BattleTextList_401620 + printfromtable gTrainerItemCuredStatusStringIds waitmessage 64 - updatestatusicon 1 - setbyte gSharedMem + 0x1600C, 15 + updatestatusicon USER + setbyte sMOVEEND_STATE, 15 moveend 1, 0 finishaction -BattleScript_1D9F9C: @ 81D9F9C +BattleScript_OpponentUsesXItem: @ 81D9F9C pause 48 - playse 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent - printfromtable BattleTextList_401570 + printfromtable gStatUpStringIds waitmessage 64 - setbyte gSharedMem + 0x1600C, 15 + setbyte sMOVEEND_STATE, 15 moveend 1, 0 finishaction -BattleScript_1D9FBB: @ 81D9FBB +BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB pause 48 - playse 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent - printfromtable BattleTextList_4015A0 + printfromtable gMistUsedStringIds waitmessage 64 - setbyte gSharedMem + 0x1600C, 15 + setbyte sMOVEEND_STATE, 15 moveend 1, 0 finishaction -BattleScript_1D9FDA: @ 81D9FDA +BattleScript_RunByUsingItem: @ 81D9FDA playse 17 - setbyte gBattleOutcome, 4 + setbyte gBattleOutcome, BATTLE_RAN finishturn -BattleScript_1D9FE4: @ 81D9FE4 +BattleScript_ActionWatchesCarefully: @ 81D9FE4 printstring BATTLE_TEXT_WatchingCarefully waitmessage 64 end2 -BattleScript_1D9FEB: @ 81D9FEB - printfromtable BattleTextList_401616 +BattleScript_ActionGetNear: @ 81D9FEB + printfromtable gSafariGetNearStringIds waitmessage 64 end2 -BattleScript_1D9FF4: @ 81D9FF4 +BattleScript_ActionThrowPokeblock: @ 81D9FF4 printstring BATTLE_TEXT_ThrewBlock waitmessage 64 playanimation USER, B_ANIM_POKEBLOCK_THROW, 0x0 - printfromtable BattleTextList_40161A + printfromtable gSafariPokeblockResultStringIds waitmessage 64 end2 @@ -188,7 +191,7 @@ BattleScript_1DA00A: @ 81DA00A waitmessage 64 returnatktoball waitstate - trainerslidein 0 + trainerslidein TARGET waitstate printstring BATTLE_TEXT_WallyBall waitmessage 64 -- cgit v1.2.3 From 13b2657c49b60dcf5d851a63346801232f9ee832 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 13:31:22 -0500 Subject: through sub_8104498; decompile some data --- data/slot_machine.s | 114 ---------------------------------------------------- 1 file changed, 114 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 3d7c6253c..91b3b0ebf 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,120 +3,6 @@ .section .rodata - .align 2 -gUnknown_083ECB20:: @ 83ECB20 - .4byte sub_8102A9C - .4byte sub_8102AD0 - .4byte sub_8102B80 - - .align 2 -gUnknown_083ECB2C:: @ 83ECB2C - .4byte sub_8102EA0 - .4byte sub_8102EA4 - .4byte sub_8102EC0 - .4byte sub_8102F4C - .4byte sub_8103008 - - .align 2 -gUnknown_083ECB40:: @ 83ECB40 - .4byte sub_810305C - .4byte sub_81032C0 - .4byte sub_81033DC - - .align 2 -gUnknown_083ECB4C:: @ 83ECB4C - .4byte sub_81034F4 - .4byte sub_8103540 - .4byte sub_810380C - - .align 1 -gUnknown_083ECB58:: @ 83ECB58 (sub_8102F4C) - .2byte 2, 4, 4, 4, 8 - - .align 2 -gUnknown_083ECB64:: @ 83ECB64 - .4byte sub_8103154 - .4byte sub_81031B4 - .4byte sub_81031B4 - - .align 2 -gUnknown_083ECB70:: @ 83ECB70 - .4byte sub_81032E8 - .4byte sub_81032E8 - .4byte sub_810333C - - .align 2 -gUnknown_083ECB7C:: @ 83ECB7C - .4byte sub_810341C - .4byte sub_810341C - .4byte sub_810347C - - .align 2 -gUnknown_083ECB88:: @ 83ECB88 - .4byte sub_8103564 - .4byte j5_08111E84 - .4byte sub_8103668 - - .align 2 -gUnknown_083ECB94:: @ 83ECB94 - .4byte sub_8103830 - .4byte sub_8103910 - .4byte sub_8103A78 - - .align 2 -gUnknown_083ECBA0:: @ 83ECBA0 - .4byte sub_8103C78 - .4byte sub_8103CAC - .4byte sub_8103CC8 - - .align 1 -gUnknown_083ECBAC:: @ 83ECBAC - .2byte 5, 10, 15 - - .align 2 -gUnknown_083ECBB4:: @ 83ECBB4 - .4byte nullsub_68 - .4byte sub_810411C - .4byte sub_8104144 - .4byte sub_81041AC - - .align 1 -gUnknown_083ECBC4:: @ 83ECBC4 - .2byte 0x9E, 0x6E, 0x9F, 0x6F, 0xAF, 0x7F - - .align 2 -gUnknown_083ECBD0:: @ 83ECBD0 - .4byte sub_810437C - .4byte sub_81043EC - .4byte sub_8104468 - .4byte sub_8104498 - .4byte sub_8104548 - .4byte sub_8104598 - .4byte sub_81045CC - .4byte sub_810463C - .4byte sub_81046C0 - .4byte sub_8104764 - .4byte sub_8104794 - .4byte sub_81047EC - .4byte sub_8104860 - .4byte sub_81048A8 - .4byte sub_81048CC - .4byte sub_8104940 - .4byte sub_81049C8 - .4byte sub_8104794 - .4byte sub_81049F8 - -gUnknown_083ECC1C:: @ 83ECC1C - .byte 1, 1, 2, 2 - - .align 1 -gUnknown_083ECC20:: @ 83ECC20 - .2byte 0x40, 0x30, 0x18, 0x8 - - .align 1 -gUnknown_083ECC28:: @ 83ECC28 - .2byte 10, 8, 6, 4 - .align 2 gUnknown_083ECC30:: @ 83ECC30 .4byte sub_8104B3C -- cgit v1.2.3 From 1989ffb9a856ebebde994b5af53860436c6606a0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 17:11:00 -0500 Subject: through sub_8104C5C --- data/slot_machine.s | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 91b3b0ebf..9b9ba021e 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,18 +3,6 @@ .section .rodata - .align 2 -gUnknown_083ECC30:: @ 83ECC30 - .4byte sub_8104B3C - .4byte sub_8104B60 - .4byte sub_8104B80 - .4byte sub_8104B60 - .4byte sub_8104BC8 - .4byte sub_8104B60 - .4byte sub_8104BFC - .4byte sub_8104B60 - .4byte sub_8104C44 - gUnknown_083ECC54:: @ 83ECC54 .4byte nullsub_69 -- cgit v1.2.3 From 7f6d7c107b2986a4631218b482db216cfca91733 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 30 Dec 2017 20:18:52 -0500 Subject: through sub_8104F8C --- data/slot_machine.s | 3 --- 1 file changed, 3 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 9b9ba021e..d3af411ec 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,9 +3,6 @@ .section .rodata -gUnknown_083ECC54:: @ 83ECC54 - .4byte nullsub_69 - gUnknown_083ECC58:: @ 83ECC58 .byte 16, 0 -- cgit v1.2.3 From c21bde059812ed521952512e4d800038e0e1deb7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 30 Dec 2017 22:29:07 -0600 Subject: Remove redundant battle constants --- data/battle_moves.s | 217 ++++++++++++++++++++++++++-------------------------- 1 file changed, 109 insertions(+), 108 deletions(-) (limited to 'data') diff --git a/data/battle_moves.s b/data/battle_moves.s index 9a7398999..2c65bd3a5 100644 --- a/data/battle_moves.s +++ b/data/battle_moves.s @@ -1,3 +1,4 @@ +#include "constants/battle_constants.h" #include "constants/battle_move_effects.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -156,7 +157,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -167,7 +168,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -420,7 +421,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM + .byte TARGET_RANDOM .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags @@ -442,7 +443,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags @@ -486,7 +487,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags @@ -508,7 +509,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags @@ -574,7 +575,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -607,7 +608,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -640,7 +641,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -662,7 +663,7 @@ gBattleMoves:: @ 81FB12C .byte 70 @ accuracy .byte 5 @ PP .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -761,7 +762,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte -5 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_MAKES_CONTACT @ misc. flags @@ -827,7 +828,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -838,7 +839,7 @@ gBattleMoves:: @ 81FB12C .byte 95 @ accuracy .byte 25 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -893,7 +894,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM + .byte TARGET_RANDOM .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags @@ -904,7 +905,7 @@ gBattleMoves:: @ 81FB12C .byte 95 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags @@ -992,7 +993,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER + .byte TARGET_ALL_EXCEPT_USER .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1069,7 +1070,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1080,7 +1081,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1113,7 +1114,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -1157,7 +1158,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1168,7 +1169,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1179,7 +1180,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1190,7 +1191,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1223,7 +1224,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1234,7 +1235,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1245,7 +1246,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1256,7 +1257,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1267,7 +1268,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_PROTECT @ misc. flags @@ -1278,7 +1279,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1289,7 +1290,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1300,7 +1301,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags @@ -1311,7 +1312,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 0 @ priority .4byte 0 @ misc. flags @@ -1322,7 +1323,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 0 @ priority .4byte 0 @ misc. flags @@ -1333,7 +1334,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER + .byte TARGET_ALL_EXCEPT_USER .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1432,7 +1433,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1476,7 +1477,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1498,7 +1499,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_SNATCH @ misc. flags @@ -1608,7 +1609,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1663,7 +1664,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -1674,7 +1675,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1696,7 +1697,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER + .byte TARGET_ALL_EXCEPT_USER .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1729,7 +1730,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1740,7 +1741,7 @@ gBattleMoves:: @ 81FB12C .byte 90 @ accuracy .byte 10 @ PP .byte 30 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -1762,7 +1763,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1773,7 +1774,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -1817,7 +1818,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -1949,7 +1950,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2004,7 +2005,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 25 @ PP .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2015,7 +2016,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 3 @ priority .4byte 0 @ misc. flags @@ -2070,7 +2071,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2114,7 +2115,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ENEMY_SIDE + .byte TARGET_ENEMY_SIDE .byte 0 @ priority .4byte 0 @ misc. flags @@ -2147,7 +2148,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2158,7 +2159,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2169,7 +2170,7 @@ gBattleMoves:: @ 81FB12C .byte 95 @ accuracy .byte 15 @ PP .byte 100 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2180,7 +2181,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 3 @ priority .4byte 0 @ misc. flags @@ -2213,7 +2214,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 15 @ PP .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM + .byte TARGET_RANDOM .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags @@ -2224,7 +2225,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2246,7 +2247,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 3 @ priority .4byte 0 @ misc. flags @@ -2301,7 +2302,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2367,7 +2368,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 0 @ priority .4byte 0 @ misc. flags @@ -2378,7 +2379,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2422,7 +2423,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 25 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2455,7 +2456,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 30 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER + .byte TARGET_ALL_EXCEPT_USER .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2499,7 +2500,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2543,7 +2544,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2587,7 +2588,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2598,7 +2599,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2609,7 +2610,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2642,7 +2643,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 20 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2653,7 +2654,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2664,7 +2665,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -2686,7 +2687,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte -5 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags @@ -2796,7 +2797,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM + .byte TARGET_RANDOM .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2807,7 +2808,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2829,7 +2830,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2840,7 +2841,7 @@ gBattleMoves:: @ 81FB12C .byte 90 @ accuracy .byte 10 @ PP .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -2851,7 +2852,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_PROTECT @ misc. flags @@ -2939,7 +2940,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 3 @ priority .4byte 0 @ misc. flags @@ -2950,7 +2951,7 @@ gBattleMoves:: @ 81FB12C .byte 95 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 0 @ priority .4byte 0 @ misc. flags @@ -2961,7 +2962,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -2983,7 +2984,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 5 @ priority .4byte 0 @ misc. flags @@ -3016,7 +3017,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_PROTECT @ misc. flags @@ -3027,7 +3028,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 0 @ priority .4byte 0 @ misc. flags @@ -3038,7 +3039,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3060,7 +3061,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 4 @ priority .4byte 0 @ misc. flags @@ -3071,7 +3072,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -3137,7 +3138,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3159,7 +3160,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_PROTECT @ misc. flags @@ -3170,7 +3171,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3181,7 +3182,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3192,7 +3193,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL + .byte TARGET_SPECIAL .byte 4 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags @@ -3236,7 +3237,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3247,7 +3248,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3291,7 +3292,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER + .byte TARGET_ALL_EXCEPT_USER .byte 0 @ priority .4byte F_AFFECTED_BY_PROTECT @ misc. flags @@ -3313,7 +3314,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -3346,7 +3347,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3357,7 +3358,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 10 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3445,7 +3446,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3467,7 +3468,7 @@ gBattleMoves:: @ 81FB12C .byte 95 @ accuracy .byte 25 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3555,7 +3556,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3566,7 +3567,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 5 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3643,7 +3644,7 @@ gBattleMoves:: @ 81FB12C .byte 85 @ accuracy .byte 10 @ PP .byte 30 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES + .byte TARGET_BOTH_ENEMIES .byte 0 @ priority .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags @@ -3687,7 +3688,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3709,7 +3710,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 40 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3742,7 +3743,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3819,7 +3820,7 @@ gBattleMoves:: @ 81FB12C .byte 100 @ accuracy .byte 15 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte 0 @ misc. flags @@ -3830,7 +3831,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags @@ -3852,7 +3853,7 @@ gBattleMoves:: @ 81FB12C .byte 0 @ accuracy .byte 20 @ PP .byte 0 @ secondary effect chance - .byte F_TARGET_USER + .byte TARGET_USER .byte 0 @ priority .4byte F_AFFECTED_BY_SNATCH @ misc. flags -- cgit v1.2.3 From 7f0ba304065a80d68b8610c4c8801839221677f6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 31 Dec 2017 16:59:55 -0600 Subject: Port battle_setup names from pokeemerald --- data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 4 ++-- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/JaggedPass.inc | 4 ++-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- data/scripts/maps/MeteorFalls_1F_2R.inc | 6 +++--- data/scripts/maps/MtChimney.inc | 2 +- data/scripts/maps/MtPyre_6F.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 2 +- data/scripts/maps/Route102.inc | 2 +- data/scripts/maps/Route103.inc | 6 +++--- data/scripts/maps/Route104.inc | 6 +++--- data/scripts/maps/Route106.inc | 2 +- data/scripts/maps/Route107.inc | 2 +- data/scripts/maps/Route109.inc | 4 ++-- data/scripts/maps/Route110.inc | 8 ++++---- data/scripts/maps/Route111.inc | 6 +++--- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route113.inc | 4 ++-- data/scripts/maps/Route114.inc | 4 ++-- data/scripts/maps/Route115.inc | 6 +++--- data/scripts/maps/Route116.inc | 4 ++-- data/scripts/maps/Route117.inc | 12 ++++++------ data/scripts/maps/Route118.inc | 4 ++-- data/scripts/maps/Route119.inc | 4 ++-- data/scripts/maps/Route120.inc | 4 ++-- data/scripts/maps/Route121.inc | 4 ++-- data/scripts/maps/Route123.inc | 4 ++-- data/scripts/maps/Route124.inc | 6 +++--- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route128.inc | 4 ++-- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- data/specials.inc | 4 ++-- 34 files changed, 67 insertions(+), 67 deletions(-) (limited to 'data') diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 5e8ab1062..e1e903cc0 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index a0fd0ac3d..270575bcb 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 sub_80C4BF0 + special SetContestTrainerGfxIds call FallarborTown_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 2 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 1a4fd9bdc..bf1f0233d 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7a13b1c48..377c2908d 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -575,7 +575,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 - special sub_80C4BF0 + special SetContestTrainerGfxIds call LilycoveCity_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 4 call LilycoveCity_ContestLobby_EventScript_158F08 diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index b3a0c51fe..49d629294 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a831f0dcc..d93ec772a 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 433b533b3..ae09300a3 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 83bfe7da4..73eb4f661 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 95a0a4a1f..ad1571caa 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 35994cd45..bfcbeb87a 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b97d92c7d..c90a97531 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 2ec903363..ae65c7013 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index b6973407b..ad2d293fc 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index f56081097..28bf046a4 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -396,7 +396,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 2b4293ed4..586031a1a 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -177,7 +177,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index aa136559b..5336bd510 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -392,7 +392,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index f38a296e7..83d93f222 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 82f7855e1..1b589fcde 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 302c162b0..f6bb6d8ba 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 8e0eb7855..f16c2088a 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 5fab808bc..4e08705cf 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -240,7 +240,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 44c4c156c..fa648f79e 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index b34c22a50..63decb5d6 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 95edf346c..e82d7b313 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -296,7 +296,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 9e5ff95be..d2866cceb 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -292,7 +292,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index d1f153117..6108b129d 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index adfebfe08..a25c306cc 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -62,7 +62,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 3e062bfdc..289ea2d29 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index ea24434e2..58bf75c51 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 7a08d0acb..a97a1e93f 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -182,7 +182,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 72528a929..2fd62e9af 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 sub_80C4BF0 + special SetContestTrainerGfxIds call SlateportCity_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 3 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 568d9b207..016b2e7ba 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 sub_80C4BF0 + special SetContestTrainerGfxIds call VerdanturfTown_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 1 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index a206d5531..ed0440343 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 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 diff --git a/data/specials.inc b/data/specials.inc index f39af822b..42a0bcf1c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -64,7 +64,7 @@ gSpecials:: def_special ScrSpecial_HasTrainerBeenFought def_special ScrSpecial_EndTrainerApproach def_special PlayTrainerEncounterMusic - def_special sub_8082C68 + def_special ShouldTryRematchBattle def_special ScrSpecial_GetTrainerEyeRematchFlag def_special ScrSpecial_StartTrainerEyeRematch def_special ShowPokemonStorageSystem @@ -90,7 +90,7 @@ gSpecials:: def_special sub_80C4858 def_special sub_80C4C64 def_special sub_80C4758 - def_special sub_80C4BF0 + def_special SetContestTrainerGfxIds def_special sub_80C43F4 def_special sub_80C4D80 def_special sub_80C4F70 -- cgit v1.2.3 From c8d963b26afbe410bc1946bad911a11a7197c45e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 1 Jan 2018 08:44:43 -0600 Subject: Label DoPokeNews and PokeNews struct --- data/scripts/tv.inc | 2 +- data/specials.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 4b55e505f..d893a729f 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -77,7 +77,7 @@ EventScript_1A6F3F: end EventScript_1A6F50: - special sub_80BECE8 + special DoPokeNews compare RESULT, 0 goto_if_eq EventScript_1A6EBB waitmessage diff --git a/data/specials.inc b/data/specials.inc index 42a0bcf1c..f8f6f1c52 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -71,7 +71,7 @@ gSpecials:: def_special CheckForAlivePartyMons def_special TurnOffTVScreen def_special DoTVShow - def_special sub_80BECE8 + def_special DoPokeNews def_special special_0x44 def_special sub_80BDA0C def_special sub_80BF2C4 -- cgit v1.2.3 From 2da819cabb04e623dfb3830ad57ac6eed91efc65 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 1 Jan 2018 09:34:13 -0600 Subject: Label TV specials, and port over some TV changes from pokeemerald --- data/event_scripts.s | 18 +++++++++--------- data/scripts/maps/SlateportCity_House1.inc | 10 +++++----- data/scripts/tv.inc | 6 +++--- data/specials.inc | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 7b69ac338..5ff370f99 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4383,14 +4383,14 @@ BattleTower_Lobby_EventScript_1ADE46:: @ 81ADE46 FallarborTown_ContestLobby_EventScript_1ADE46:: @ 81ADE46 SlateportCity_OceanicMuseum_1F_EventScript_1ADE46:: @ 81ADE46 SlateportCity_PokemonFanClub_EventScript_1ADE46:: @ 81ADE46 - special sub_80BDE48 + special InterviewAfter incrementgamestat GAME_STAT_GOT_INTERVIEWED release end SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D setvar VAR_SPECIAL_5, 1 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4435,7 +4435,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 lock faceplayer setvar VAR_SPECIAL_5, 2 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4490,11 +4490,11 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96 SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 lock faceplayer - specialvar RESULT, sub_80BF544 + specialvar RESULT, LeadMonNicknamed compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE4D setvar VAR_SPECIAL_5, 3 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4571,7 +4571,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 checkflag FLAG_TEMP_2 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E setvar VAR_SPECIAL_5, 6 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4631,7 +4631,7 @@ VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE setvar VAR_SPECIAL_5, 6 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE1FE switch VAR_CONTEST_LOCATION @@ -4668,7 +4668,7 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF checkflag FLAG_TEMP_2 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 setvar VAR_SPECIAL_5, 7 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 @@ -4737,7 +4737,7 @@ BattleTower_Lobby_EventScript_1AE2ED:: @ 81AE2ED compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 goto_if_eq BattleTower_Lobby_EventScript_1AE30F setvar VAR_SPECIAL_5, 7 - special sub_80BF2C4 + special InterviewBefore compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE30F clearflag FLAG_HIDE_REPORTER_BATTLE_TOWER diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index e760beab5..2a25ded19 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -30,12 +30,12 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialvar RESULT, ScriptGetPartyMonSpecies compare RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C - special sub_80BFAE0 - special sub_80BFB10 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + special TV_CheckMonOTIDEqualsPlayerID compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 specialvar RESULT, sub_810F96C - special sub_80BFAE0 + special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq 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 - specialvar RESULT, sub_80BF9B4 - special sub_80BFAE0 + specialvar RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged + special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index d893a729f..cf82cf943 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -1,7 +1,7 @@ Event_TV:: @ 81A6E72 lockall incrementgamestat GAME_STAT_WATCHED_TV - special sub_80C2014 + special ResetTVShowState specialvar RESULT, CheckForBigMovieOrEmergencyNewsOnTV compare RESULT, 2 goto_if_eq EventScript_1A6F01 @@ -21,11 +21,11 @@ EventScript_1A6EBB: specialvar VAR_SPECIAL_4, special_0x44 compare VAR_SPECIAL_4, 255 goto_if_eq EventScript_1A6F3F - specialvar RESULT, special_0x4a + specialvar RESULT, GetNonMassOutbreakActiveTVShow compare RESULT, 255 goto_if_eq EventScript_1A6F3F copyvar VAR_SPECIAL_4, RESULT - specialvar RESULT, sub_80BDA0C + specialvar RESULT, GetTVShowType compare RESULT, 0 goto_if 5, EventScript_1A6F21 end diff --git a/data/specials.inc b/data/specials.inc index f8f6f1c52..71e08d91e 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -73,16 +73,16 @@ gSpecials:: def_special DoTVShow def_special DoPokeNews def_special special_0x44 - def_special sub_80BDA0C - def_special sub_80BF2C4 - def_special sub_80BDE48 - def_special sub_80BF544 + def_special GetTVShowType + def_special InterviewBefore + def_special InterviewAfter + def_special LeadMonNicknamed def_special SetContestCategoryStringVarForInterview - def_special special_0x4a - def_special sub_80BF974 + def_special GetNonMassOutbreakActiveTVShow + def_special TV_IsScriptShowKindAlreadyInQueue def_special CheckForBigMovieOrEmergencyNewsOnTV def_special GetMomOrDadStringForTVMessage - def_special sub_80C2014 + def_special ResetTVShowState def_special sub_80C47C0 def_special sub_80C496C def_special sub_80C4C28 @@ -130,9 +130,9 @@ gSpecials:: def_special CompareShroomishSize def_special GetBarboachSizeRecordInfo def_special CompareBarboachSize - def_special sub_80BF9B4 - def_special sub_80BFAE0 - def_special sub_80BFB10 + def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged + def_special TV_CopyNicknameToStringVar1AndEnsureTerminated + def_special TV_CheckMonOTIDEqualsPlayerID def_special sub_80FA5BC def_special sub_80FA5E4 def_special sub_80EB83C -- cgit v1.2.3 From 56e2fe07d4e46ab73320d33a457802da48f9729a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 1 Jan 2018 10:00:10 -0600 Subject: Label trendy phrase specials --- data/event_scripts.s | 2 +- data/scripts/maps/DewfordTown_Hall.inc | 8 ++++---- data/specials.inc | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 5ff370f99..898df7f3d 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1809,7 +1809,7 @@ DewfordTown_EventScript_1A0102:: @ 81A0102 DewfordTown_Hall_EventScript_1A0102:: @ 81A0102 dodailyevents setvar VAR_SPECIAL_4, 0 - special sub_80FA5BC + special BufferTrendyPhraseString return DewfordTown_EventScript_1A010C:: @ 81A010C diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index e54ef8e50..530a4e04d 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 sub_80FA5E4 + special TrendyPhraseIsOld compare RESULT, 1 goto_if_eq 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 sub_80EB83C + special BufferRandomHobbyOrLifestyleString msgbox DewfordTown_Hall_Text_1755F9, 5 compare RESULT, 1 goto_if_eq 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 sub_80FA648 + special GetDewfordHallPaintingNameIndex 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 sub_80FA648 + special GetDewfordHallPaintingNameIndex switch RESULT case 0, DewfordTown_Hall_EventScript_153470 case 1, DewfordTown_Hall_EventScript_153470 diff --git a/data/specials.inc b/data/specials.inc index 71e08d91e..5c732309e 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -133,10 +133,10 @@ gSpecials:: def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged def_special TV_CopyNicknameToStringVar1AndEnsureTerminated def_special TV_CheckMonOTIDEqualsPlayerID - def_special sub_80FA5BC - def_special sub_80FA5E4 - def_special sub_80EB83C - def_special sub_80FA648 + def_special BufferTrendyPhraseString + def_special TrendyPhraseIsOld + def_special BufferRandomHobbyOrLifestyleString + def_special GetDewfordHallPaintingNameIndex def_special SwapRegisteredBike def_special CalculatePlayerPartyCount def_special sub_8095B6C -- cgit v1.2.3 From 7158286302493c6fe34068926b351292af2cb6a9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 1 Jan 2018 13:59:39 -0600 Subject: Label a bunch more specials --- data/event_scripts.s | 8 +- data/field_move_scripts.inc | 2 +- data/scripts/day_care.inc | 8 +- data/scripts/gabby_and_ty.inc | 4 +- .../maps/AbandonedShip_HiddenFloorRooms.inc | 8 +- data/scripts/maps/BattleTower_BattleRoom.inc | 20 ++--- data/scripts/maps/BattleTower_Elevator.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 50 +++++------ data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/FallarborTown_House2.inc | 6 +- data/scripts/maps/FortreeCity_House1.inc | 10 +-- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 8 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 82 +++++++++--------- data/scripts/maps/MauvilleCity_GameCorner.inc | 24 +++--- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 2 +- data/scripts/maps/PacifidlogTown_House2.inc | 8 +- data/scripts/maps/PacifidlogTown_House3.inc | 10 +-- data/scripts/maps/RustboroCity_House1.inc | 10 +-- data/scripts/maps/SlateportCity_House1.inc | 4 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SootopolisCity_House8.inc | 4 +- data/scripts/pokeblocks.inc | 8 +- data/scripts/safari_zone.inc | 2 +- data/specials.inc | 98 +++++++++++----------- 28 files changed, 196 insertions(+), 196 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 898df7f3d..7d59b5234 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -490,7 +490,7 @@ EventScript_15F4A1: goto_if_eq EventScript_15F4E0 compare RESULT, 2 goto_if_eq EventScript_15F503 - special sub_80BC224 + special BufferSecretBaseOwnerName msgbox UnknownString_81A3958, 5 compare RESULT, 0 goto_if_eq EventScript_15F452 @@ -2538,7 +2538,7 @@ MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678 SlateportCity_House1_EventScript_1A0678:: @ 81A0678 fadescreen 1 - special sub_80BF9F8 + special ChangePokemonNickname waitstate return @@ -3792,7 +3792,7 @@ EventScript_1A2E45: compare RESULT, 0 goto_if_eq EventScript_1A2F3A fadescreen 1 - special sub_80BC50C + special MoveSecretBase closemessage fadescreen 0 msgbox UnknownString_81A3CC9, 5 @@ -4296,7 +4296,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A special sub_80BCE1C setvar VAR_SPECIAL_4, 1 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate special ScrSpecial_HealPlayerParty release diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 0a0eeaa73..0a7112125 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -87,7 +87,7 @@ DoRockSmashMovement: @ 81B0F0C applymovement LAST_TALKED, RockSmashMovement waitmovement 0 removeobject LAST_TALKED - specialvar RESULT, sub_810F5BC + specialvar RESULT, TryUpdateRusturfTunnelState compare RESULT, 1 goto_if_eq DoRockSmashMovement_Done special ScrSpecial_RockSmashWildEncounter diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 7664a14ca..8c2325e04 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -96,7 +96,7 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 end Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C - specialvar RESULT, sub_8095B6C + specialvar RESULT, GetNumValidDaycarePartyMons compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3 msgbox Route117_PokemonDayCare_Text_1B2947, 4 @@ -105,7 +105,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C waitstate compare VAR_SPECIAL_4, 255 goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0 - specialvar RESULT, sub_8095C10 + specialvar RESULT, CountAlivePartyMonsExceptSelectedOne compare RESULT, 0 goto_if_eq Route117_PokemonDayCare_EventScript_1B23FD specialvar VAR_SPECIAL_5, GetSelectedDaycareMonNickname @@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 end Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4 - specialvar RESULT, sub_80B7CE8 + specialvar RESULT, HasEnoughMoneyFor compare RESULT, 1 goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE msgbox Route117_PokemonDayCare_Text_1B2A30, 4 @@ -207,7 +207,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE applymovement 1, Route117_PokemonDayCare_Movement_1B2543 waitmovement 0 specialvar RESULT, TakePokemonFromDaycare - special sub_80B7D0C + special PayMoneyFor playse 95 msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index ff45d2cff..e2f43b77e 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -248,7 +248,7 @@ Route120_EventScript_1AE60F:: @ 81AE60F compare RESULT, 0 goto_if_eq Route111_EventScript_1AE69F msgbox Route111_Text_1AC10A, 4 - specialvar RESULT, sub_80BDD18 + specialvar RESULT, GabbyAndTyGetLastBattleTrivia switch RESULT case 0, Route111_EventScript_1AE6AD case 1, Route111_EventScript_1AE6BB @@ -310,7 +310,7 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3 compare RESULT, 0 goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC487, 4 - special sub_80BDC14 + special GabbyAndTyAfterInterview setflag FLAG_TEMP_1 release end diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 343ef4233..9ad419da1 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setfieldeffectargument 1, 10 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4D4 + specialvar RESULT, FoundAbandonedShipRoom4Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B waitfieldeffect 54 @@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 - specialvar RESULT, sub_810F488 + specialvar RESULT, FoundAbandonedShipRoom1Key compare RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 @@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setfieldeffectargument 1, 3 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4FC + specialvar RESULT, FoundAbandonedShipRoom6Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B waitfieldeffect 54 @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setfieldeffectargument 1, 6 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4B0 + specialvar RESULT, FoundAbandonedShipRoom2Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B waitfieldeffect 54 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 87ba8c01a..7853b3598 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -23,16 +23,16 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special ScrSpecial_HealPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 5 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 14 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 @@ -40,7 +40,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA BattleTower_BattleRoom_EventScript_160961:: @ 8160961 setvar VAR_SPECIAL_4, 6 - special sub_8135668 + special SetBattleTowerProperty switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 applymovement 1, BattleTower_BattleRoom_Movement_160AC6 @@ -53,7 +53,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 msgbox BattleTower_BattleRoom_Text_19ACDC, 4 special LoadPlayerParty special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty playfanfare 368 waitfanfare special ScrSpecial_HealPlayerParty @@ -91,14 +91,14 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 4 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 2 setvar VAR_SPECIAL_5, 1 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 7 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 14 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 @@ -106,7 +106,7 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 setvar VAR_SPECIAL_4, 2 - special sub_8135BA0 + special SaveBattleTowerProgress message BattleTower_BattleRoom_Text_1C6CE1 delay 60 waitmessage diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index fccfcdb2c..6749c5623 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -12,7 +12,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 1, BattleTower_Elevator_Movement_160835 applymovement 255, BattleTower_Elevator_Movement_160839 waitmovement 0 - special sub_810EBEC + special ShakeScreenInElevator waitstate delay 64 applymovement 1, BattleTower_Elevator_Movement_16083D diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 527bae389..4058d5aae 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -6,18 +6,18 @@ BattleTower_Lobby_MapScripts:: @ 816027E .byte 0 BattleTower_Lobby_MapScript1_160293:: @ 8160293 - special sub_813610C + special TryEnableBravoTrainerBattleTower call BattleTower_Lobby_EventScript_16029C end BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar VAR_SPECIAL_4, 10 - special sub_8135668 + special SetBattleTowerProperty checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialvar VAR_SPECIAL_7, sub_810F404 + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER @@ -25,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialvar VAR_SPECIAL_7, sub_810F404 + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER @@ -76,7 +76,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 message BattleTower_Lobby_Text_19A487 waitmessage setvar VAR_SPECIAL_4, 0 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special AwardBattleTowerRibbons @@ -90,23 +90,23 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar VAR_SPECIAL_4, 8 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage setvar VAR_SPECIAL_4, 13 - special sub_8135668 + special SetBattleTowerProperty special DetermineBattleTowerPrize setvar VAR_SPECIAL_4, 3 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 3 - special sub_8135668 + special SetBattleTowerProperty message BattleTower_Lobby_Text_19A4BB waitmessage special GiveBattleTowerPrize @@ -117,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD playfanfare 370 waitfanfare setvar VAR_SPECIAL_4, 9 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 49 goto_if 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 waitmessage setvar VAR_SPECIAL_4, 13 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse msgbox BattleTower_Lobby_Text_199FA9, 4 @@ -165,15 +165,15 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B message BattleTower_Lobby_Text_19A5CE waitmessage setvar VAR_SPECIAL_4, 1 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_TEMP_0, 5 special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 @@ -185,7 +185,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer setvar VAR_SPECIAL_4, 0 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty @@ -214,7 +214,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA setvar VAR_SPECIAL_4, 1 copyvar VAR_SPECIAL_5, RESULT copyvar VAR_SPECIAL_6, RESULT - special sub_8135668 + special SetBattleTowerProperty msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 special ChooseBattleTowerPlayerParty @@ -229,16 +229,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar VAR_SPECIAL_4, 5 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_TEMP_0, 0 setvar VAR_SPECIAL_4, 11 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 1 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 - special sub_8135668 + special SetBattleTowerProperty special LoadPlayerParty closemessage delay 2 @@ -249,7 +249,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 goto_if_eq BattleTower_Lobby_EventScript_160642 incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage @@ -277,7 +277,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 BattleTower_Lobby_EventScript_160642:: @ 8160642 setvar VAR_SPECIAL_4, 12 - special sub_8135668 + special SetBattleTowerProperty goto BattleTower_Lobby_EventScript_160652 BattleTower_Lobby_EventScript_16064F:: @ 816064F @@ -286,7 +286,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 setvar VAR_SPECIAL_4, 11 - special sub_8135668 + special SetBattleTowerProperty BattleTower_Lobby_EventScript_160662:: @ 8160662 release @@ -402,7 +402,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 end BattleTower_Lobby_EventScript_160773:: @ 8160773 - specialvar RESULT, sub_810F404 + specialvar RESULT, GetBestBattleTowerStreak compare RESULT, 100 goto_if 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 ee702c102..669b0a5fe 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -65,7 +65,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar RESULT, sub_810E300 + specialvar RESULT, GetBattleOutcome compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag FLAG_HIDE_WALLACE_SOOTOPOLIS diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 081850326..0546ef5be 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 sub_80F9A4C + special SelectMoveTutorMon waitstate compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 - special sub_80FA148 + special IsSelectedMonEgg compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 compare VAR_SPECIAL_5, 0 @@ -38,7 +38,7 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 - special sub_8132670 + special TeachMoveTutorMove waitstate compare VAR_SPECIAL_4, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index aee4141a8..f6f8aafa6 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -8,25 +8,25 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 goto_if_eq FortreeCity_House1_EventScript_157EAD setvar VAR_SPECIAL_8, 1 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_SPECIAL_9 msgbox FortreeCity_House1_Text_1856F7, 4 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 00a10b655..7e221122b 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 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 checkflag FLAG_TEMP_2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD - specialvar RESULT, sub_8090FC0 + specialvar RESULT, CompletedHoennPokedex compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 8233504dd..1198054f0 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 FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR - special sub_810E944 + special DisplayCurrentElevatorFloor message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage multichoice 0, 0, 57, 0 @@ -74,7 +74,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 erasebox 0, 0, 29, 19 applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 waitmovement 0 - special sub_810EBEC + special ShakeScreenInElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index a9680e3a5..d4dedb0c2 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E waitmessage special RetrieveLotteryNumber copyvar VAR_SPECIAL_8, RESULT - special sub_810F9AC + special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 1024d30e9..a3c8d23af 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -14,11 +14,11 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B - special sub_80FA148 + special IsSelectedMonEgg compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves @@ -26,7 +26,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 - special sub_80F9EEC + special SelectMove fadescreen 0 compare VAR_SPECIAL_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE @@ -39,7 +39,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE end LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 - special sub_80FA0DC + special DeleteMonMove playfanfare 378 waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 2db702ffc..4656f0182 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 sub_810FCE8 + special UpdateMovedLilycoveFanClubMembers setvar VAR_SPECIAL_4, 8 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar VAR_SPECIAL_4, 9 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar VAR_SPECIAL_4, 10 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar VAR_SPECIAL_4, 11 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar VAR_SPECIAL_4, 12 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar VAR_SPECIAL_4, 13 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar VAR_SPECIAL_4, 14 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar VAR_SPECIAL_4, 15 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -147,13 +147,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer setvar VAR_SPECIAL_4, 13 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq 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 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 @@ -187,13 +187,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer setvar VAR_SPECIAL_4, 8 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq 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 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 @@ -227,13 +227,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer setvar VAR_SPECIAL_4, 9 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq 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 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 @@ -267,13 +267,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer setvar VAR_SPECIAL_4, 10 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq 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 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 @@ -307,11 +307,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer setvar VAR_SPECIAL_4, 11 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq 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 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 @@ -340,11 +340,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer setvar VAR_SPECIAL_4, 12 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq 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 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 @@ -373,11 +373,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer setvar VAR_SPECIAL_4, 14 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq 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 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 @@ -406,11 +406,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer setvar VAR_SPECIAL_4, 15 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq 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 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 6befb5fb9..c2b785254 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 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 0 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -536,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 1 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -547,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 2 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -558,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 3 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -569,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 4 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -580,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 5 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -591,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 6 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -602,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 7 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -613,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 8 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -624,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 9 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -635,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 10 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -646,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 11 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 1e7c26511..ad3b366a8 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -92,7 +92,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty - special sub_810F414 + special BufferEReaderTrainerName msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 9395633e7..9f20b6310 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -20,7 +20,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E closemessage setvar VAR_SPECIAL_4, 2 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate compare RESULT, 3 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index f073201ca..df7f42a8b 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if 0, PacifidlogTown_House2_EventScript_1A14DC - specialvar RESULT, sub_810F908 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable compare RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - special sub_810F950 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, 4 release end @@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - special sub_810F950 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, 4 release end PacifidlogTown_House2_EventScript_154254:: @ 8154254 - specialvar RESULT, sub_810F908 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 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 b65c2e67d..f5f93f05a 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -8,25 +8,25 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar VAR_SPECIAL_8, 2 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_SPECIAL_9 msgbox PacifidlogTown_House3_Text_1794C4, 4 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index cf91c31bd..2e0d106bb 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -8,25 +8,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D goto_if_eq RustboroCity_House1_EventScript_157D13 setvar VAR_SPECIAL_8, 0 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate msgbox RustboroCity_House1_Text_184F6B, 4 setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 2a25ded19..aa1157d7e 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 sub_80F9A0C + special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 @@ -34,7 +34,7 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 special TV_CheckMonOTIDEqualsPlayerID compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - specialvar RESULT, sub_810F96C + specialvar RESULT, MonOTNameMatchesPlayer special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 9f2d6c35b..38514b03b 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 sub_8069D78 + special SetSootopolisGymCrackedIceMetatiles end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index 6a72ec1da..91dd3490b 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -6,7 +6,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 lock faceplayer msgbox SootopolisCity_House8_Text_1900F7, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 @@ -55,7 +55,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 lock faceplayer msgbox SootopolisCity_House8_Text_190431, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 4a659f469..eb12ab148 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -53,7 +53,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 - specialvar RESULT, sub_810CA00 + specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, 65535 @@ -94,7 +94,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 fadescreen 1 - special sub_804E538 + special DoBerryBlending waitstate releaseall end @@ -214,7 +214,7 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 - specialvar RESULT, sub_810CA00 + specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, 65535 @@ -276,7 +276,7 @@ FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D removeobject 239 removeobject 238 removeobject 237 - special sub_804E538 + special DoBerryBlending waitstate releaseall end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index ca48bb41f..5dba65b8a 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -53,7 +53,7 @@ gUnknown_081C346A:: @ 81C346A EventScript_1C348E: fadescreen 1 - special sub_810BAF4 + special OpenPokeblockCaseOnFeeder waitstate compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A0 diff --git a/data/specials.inc b/data/specials.inc index 5c732309e..032a3884c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -139,8 +139,8 @@ gSpecials:: def_special GetDewfordHallPaintingNameIndex def_special SwapRegisteredBike def_special CalculatePlayerPartyCount - def_special sub_8095B6C - def_special sub_8095C10 + def_special GetNumValidDaycarePartyMons + def_special CountAlivePartyMonsExceptSelectedOne def_special sub_80C4CF8 def_special sub_80C4CEC def_special sub_80C4C78 @@ -165,29 +165,29 @@ gSpecials:: def_special ScrSpecial_ViewWallClock def_special ScrSpecial_ChooseStarter def_special ScrSpecial_StartWallyTutorialBattle - def_special sub_80BF9F8 - def_special sub_80F9A0C - def_special sub_810CA00 - def_special sub_804E538 + def_special ChangePokemonNickname + def_special SelectMonForNPCTrade + def_special GetFirstFreePokeblockSlot + def_special DoBerryBlending def_special PlayRoulette - def_special sub_810FD60 - def_special sub_810FCB0 - def_special sub_810FDAC + def_special ShouldMoveLilycoveFanClubMember + def_special GetNumMovedLilycoveFanClubMembers + def_special BufferStreakTrainerText def_special sub_810FA74 - def_special sub_810FCE8 + def_special UpdateMovedLilycoveFanClubMembers def_special sub_810FF48 def_special sub_810FAA0 def_special sub_810FF60 def_special ScrSpecial_RockSmashWildEncounter def_special GabbyAndTyGetBattleNum - def_special sub_80BDC14 + def_special GabbyAndTyAfterInterview def_special GabbyAndTyBeforeInterview def_special DoTVShowInSearchOfTrainers def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote - def_special sub_80BDD18 + def_special GabbyAndTyGetLastBattleTrivia def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds - def_special sub_810E300 + def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState def_special RejectEggFromDayCare @@ -204,8 +204,8 @@ gSpecials:: def_special EggHatch def_special sub_8042B4C def_special ShowLinkBattleRecords - def_special sub_80B7CE8 - def_special sub_80B7D0C + def_special HasEnoughMoneyFor + def_special PayMoneyFor def_special ExecuteWhiteOut def_special sp0C8_whiteout_maybe def_special RotatingGate_InitPuzzle @@ -215,7 +215,7 @@ gSpecials:: def_special EnterSafariMode def_special ExitSafariMode def_special SafariZoneGetPokeblockNameInFeeder - def_special sub_810BAF4 + def_special OpenPokeblockCaseOnFeeder def_special IsMirageIslandPresent def_special UpdateShoalTideFlag def_special InitBirchState @@ -226,12 +226,12 @@ gSpecials:: def_special SetDepartmentStoreFloorVar def_special DoLotteryCornerComputerEffect def_special EndLotteryCornerComputerEffect - def_special sub_80F9A4C - def_special sub_80F9EEC - def_special sub_80FA0DC + def_special SelectMoveTutorMon + def_special SelectMove + def_special DeleteMonMove def_special ScrSpecial_GetPokemonNicknameAndMoveName def_special ScrSpecial_CountPokemonMoves - def_special sub_8132670 + def_special TeachMoveTutorMove def_special GetRecordedCyclingRoadResults def_special ScrSpecial_BeginCyclingRoadChallenge def_special GetPlayerAvatarBike @@ -243,26 +243,26 @@ gSpecials:: def_special CheckPartyBattleTowerBanlist def_special PrintBattleTowerTrainerGreeting def_special PrintEReaderTrainerGreeting - def_special sub_813556C - def_special sub_8135668 - def_special sub_81358A4 - def_special sub_8135A14 - def_special sub_8135BA0 + def_special StartSpecialBattle + def_special SetBattleTowerProperty + def_special BattleTowerUtil + def_special SetBattleTowerParty + def_special SaveBattleTowerProgress def_special BattleTower_SoftReset def_special DetermineBattleTowerPrize def_special GiveBattleTowerPrize def_special AwardBattleTowerRibbons def_special ChooseBattleTowerPlayerParty def_special ValidateEReaderTrainer - def_special sub_810F404 + def_special GetBestBattleTowerStreak 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 GetInGameTradeSpeciesInfo + def_special CreateInGameTradePokemon + def_special DoInGameTradeScene + def_special GetTradeSpecies def_special GetWeekCount def_special RetrieveLotteryNumber def_special PickLotteryCornerTicket @@ -280,7 +280,7 @@ gSpecials:: def_special sub_80C7958 def_special DoSoftReset def_special GameClear - def_special sub_810EBEC + def_special ShakeScreenInElevator def_special ShowGlassWorkshopMenu def_special SpawnCameraDummy def_special RemoveCameraDummy @@ -292,31 +292,31 @@ gSpecials:: def_special sub_80818FC def_special ShowBattleTowerRecords def_special WaitWeather - def_special sub_810F414 - def_special sub_810F424 + def_special BufferEReaderTrainerName + def_special GetSlotMachineId 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 FoundAbandonedShipRoom1Key + def_special FoundAbandonedShipRoom2Key + def_special FoundAbandonedShipRoom4Key + def_special FoundAbandonedShipRoom6Key def_special LeadMonHasEffortRibbon def_special GivLeadMonEffortRibbon def_special ScrSpecial_AreLeadMonEVsMaxedOut def_special sub_8064EAC def_special sub_8064ED4 def_special InitRoamer - def_special sub_810F5BC + def_special TryUpdateRusturfTunnelState def_special IsGrassTypeInParty def_special sub_8081334 def_special PutZigzagoonInPlayerParty def_special IsStarterInParty - def_special sub_80BC224 + def_special BufferSecretBaseOwnerName def_special CheckFreePokemonStorageSpace def_special DoSealedChamberShakingEffect1 - def_special sub_810E944 + def_special DisplayCurrentElevatorFloor def_special GetShieldToyTVDecorationInfo def_special IsPokerusInParty - def_special sub_8069D78 + def_special SetSootopolisGymCrackedIceMetatiles def_special sub_810F758 def_special ScrSpecial_StartGroudonKyogreBattle def_special ScrSpecial_StartRayquazaBattle @@ -335,17 +335,17 @@ gSpecials:: def_special SetRoute123Weather def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies - def_special sub_80FA148 + def_special IsSelectedMonEgg def_special sub_810F8FC - def_special sub_80BC50C + def_special MoveSecretBase 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 SetPacifidlogTMReceivedDay + def_special GetDaysUntilPacifidlogTMAvailable + def_special CompletedHoennPokedex + def_special MonOTNameMatchesPlayer + def_special BufferLottoTicketNumber + def_special TryEnableBravoTrainerBattleTower def_special GetNameOfEnigmaBerryInPlayerParty def_special ScriptRandom def_special sub_80835D8 -- cgit v1.2.3 From d84dfb66de48aca1146f86b2b790a2c73f964b51 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 1 Jan 2018 21:11:54 -0500 Subject: Decompile enough data to nuke the explicit calls to memcpy --- data/slot_machine.s | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index d3af411ec..2811e5b5f 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,45 +3,6 @@ .section .rodata -gUnknown_083ECC58:: @ 83ECC58 - .byte 16, 0 - - .align 1 -gUnknown_083ECC5A:: @ 83ECC5A - .2byte 0x0, 0x40, 0x80, 0xC0 - - .align 1 -gUnknown_083ECC62:: @ 83ECC62 - .2byte 4, -4, 4, -4 - - .align 1 -gUnknown_083ECC6A:: @ 83ECC6A - .2byte 4, 4, -4, -4 - - .align 1 -gUnknown_083ECC72:: @ 83ECC72 - .2byte 0, -40, 0, 0, 48, 0, 24, 0 - - .align 1 -gUnknown_083ECC82:: @ 83ECC82 - .2byte -32, 0, -32, -48, 0, -48, 0, -48 - - .align 1 -gUnknown_083ECC92:: @ 83ECC92 - .2byte 16, 12, 16, 0, 0, 4, 8, 8 - - .align 1 -gUnknown_083ECCA2:: @ 83ECCA2 - .2byte 160, 192, 224, 104, 80, 64, 48, 24 - -gUnknown_083ECCB2:: @ 83ECCB2 - .byte 0, 4, 2, 6, 5, 3, 1, 3, 4, 5, 6, 2, 0, 5, 3, 6, 2, 1, 5, 3, 6 - .byte 0, 4, 6, 3, 2, 4, 6, 5, 5, 3, 1, 3, 6, 4, 2, 3, 6, 4, 3, 6, 4 - .byte 0, 5, 1, 6, 3, 2, 6, 3, 5, 2, 6, 3, 2, 5, 6, 3, 2, 5, 6, 3, 4 - -gUnknown_083ECCF1:: @ 83ECCF1 - .byte 1, 0, 5, 4, 3, 2, 0 - .align 1 gUnknown_083ECCF8:: @ 83ECCF8 .2byte 0, 6, 0, 10, 0, 2 -- cgit v1.2.3 From 28e98d9df7db41f9dcc813ad4e0b37c568833aee Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 1 Jan 2018 23:09:51 -0600 Subject: decompile sub_80E60D8 - sub_80E6AC4 --- data/easy_chat.s | 149 ------------------------------------------------------- 1 file changed, 149 deletions(-) (limited to 'data') diff --git a/data/easy_chat.s b/data/easy_chat.s index 99a03f8f5..98f88b1fc 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,155 +8,6 @@ .section .rodata - .align 1 -gMysteryEventPhrase:: @ 83DB678 - .2byte EC_WORD_MYSTERY - .2byte EC_WORD_EVENT - .2byte EC_WORD_IS - .2byte EC_WORD_EXCITING - - .align 1 -gBerryMasterWifePhrases:: @ 83DB680 -.ifdef ENGLISH - .2byte EC_WORD_GREAT - .2byte EC_WORD_BATTLE - - .2byte EC_WORD_CHALLENGE - .2byte EC_WORD_CONTEST - - .2byte EC_WORD_OVERWHELMING - .2byte EC_POKEMON(LATIAS) - - .2byte EC_WORD_COOL - .2byte EC_POKEMON(LATIOS) - - .2byte EC_WORD_SUPER - .2byte EC_WORD_HUSTLE -.else - .2byte EC_WORD_GREAT - .2byte EC_WORD_FIGHT - - .2byte EC_WORD_CONTEST - .2byte EC_WORD_CHALLENGE - - .2byte EC_POKEMON(LATIAS) - .2byte EC_WORD_OVERWHELMING - - .2byte EC_POKEMON(LATIOS) - .2byte EC_WORD_COOL - - .2byte EC_WORD_SUPER - .2byte 0xFFFF -.endif - -gUnknown_083DB694:: @ 83DB694 - .4byte gSharedMem + 0x1000 - - .align 2 -gUnknown_083DB698:: @ 83DB698 - .4byte REG_BG3VOFS - .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 - .4byte 1 - -gUnknown_083DB6A4:: @ 83DB6A4 - .byte 4 - .byte 0 - .byte 0 - .byte 0 - .byte 1 - .byte 5 - .byte 0 - .byte 2 - .byte 2 - .byte 3 - .byte 2 - .byte 2 - .byte 2 - .byte 3 - -gUnknown_083DB6B2:: @ 83DB6B2 - .string "ABCDEF $ " - .string "GHIJKL$ " - .string "MNOPQRS$ " - .string "TUVWXYZ$ " - - .align 2 -gUnknown_083DB6F4:: @ 83DB6F4 - .4byte OtherText_MakeProfilePage1, OtherText_MakeProfilePage2, 0x1 - .4byte OtherText_MakeMessagePage1, OtherText_MakeMessagePage2, 0x1 - .4byte OtherText_CombineNinePhrasesPage1, OtherText_CombineNinePhrasesPage2, 0x1 - .4byte OtherText_DescribeFeelingsPage1, OtherText_DescribeFeelingsPage2, 0x1 - .4byte OtherText_ImproveBardSongPage1, OtherText_ImproveBardSongPage2, 0x1 - .4byte OtherText_CombineTwoPhrasesPage1, OtherText_CombineTwoPhrasesPage2, 0x1 - .4byte OtherText_YourProfile, OtherText_ConfirmTrendyPage2, 0x0 - .4byte OtherText_YourFeelingBattle, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_SetWinMessage, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_SetLossMessage, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_MailMessage, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_MailSalutation, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_NewSong, OtherText_ConfirmTrendyPage2, 0x0 - .4byte OtherText_TheAnswer, OtherText_ConfirmTrendyPage2, 0x0 - .4byte OtherText_ConfirmTrendyPage1, OtherText_ConfirmTrendyPage2, 0x1 - .4byte OtherText_HipsterPage1, OtherText_HipsterPage2, 0x1 - .4byte OtherText_WithFourPhrases, OtherText_CombineNinePhrasesPage2, 0x1 - -gUnknown_083DB7C0:: @ 83DB7C0 - .byte 0, 6 - .byte 1, 7 - .byte 1, 8 - .byte 1, 9 - .byte 2, 10 - .byte 16, 13 - .byte 4, 12 - .byte 3, 13 - .byte 3, 13 - .byte 5, 14 - .byte 3, 13 - .byte 3, 13 - .byte 3, 13 - .byte 15, 13 - - .align 2 -gUnknown_083DB7DC:: @ 83DB7DC -.ifdef ENGLISH - .4byte gSharedMem + 0xAC80 - .4byte gSharedMem + 0xACC9 - .4byte gSharedMem + 0xAD12 - .4byte gSharedMem + 0xAD5B -.else - .4byte gSharedMem + 0xAFAC - .4byte gSharedMem + 0xAFF5 - .4byte gSharedMem + 0xB03E - .4byte gSharedMem + 0xB087 -.endif - - .align 1 -gUnknown_083DB7EC:: @ 83DB7EC -.ifdef ENGLISH - .2byte EC_WORD_I_AM - .2byte EC_WORD_A - .2byte EC_WORD_POKEMON - .2byte EC_WORD_GREAT -.else - .2byte EC_WORD_I_AM - .2byte EC_WORD_BIG - .2byte EC_WORD_IN - .2byte EC_WORD_POKEMON -.endif - - .align 1 -gUnknown_083DB7F4:: @ 83DB7F4 - .2byte EC_WORD_ARE - .2byte EC_WORD_YOU - .2byte EC_WORD_READY - .2byte EC_WORD_QUES - .2byte EC_WORD_HERE_I_COME - .2byte EC_WORD_EXCL - - .align 2 -InterviewPalette_0:: @ 83DB800 - .incbin "graphics/misc/interview_pal0.gbapal" - .align 2 InterviewPalette_1:: @ 83DB820 .incbin "graphics/misc/interview_pal1.gbapal" -- cgit v1.2.3 From 865dcd79aab063eb90aef470e6ed54ba40a8c812 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 10:54:50 -0500 Subject: data through gUnknown_083ECE12 --- data/slot_machine.s | 44 -------------------------------------------- 1 file changed, 44 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 2811e5b5f..6caf29e42 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,50 +3,6 @@ .section .rodata - .align 1 -gUnknown_083ECCF8:: @ 83ECCF8 - .2byte 0, 6, 0, 10, 0, 2 - -gUnknown_083ECD04:: @ 83ECD04 - .byte 1, 1, 12 - .byte 1, 1, 14 - .byte 2, 2, 14 - .byte 2, 2, 14 - .byte 2, 3, 16 - .byte 3, 3, 16 - -gUnknown_083ECD16:: @ 83ECD16 - .byte 25, 25, 30, 40, 40, 50 - .byte 25, 25, 30, 30, 35, 35 - .byte 25, 25, 30, 25, 25, 30 - -gUnknown_083ECD28:: @ 83ECD28 - .byte 20, 25, 25, 20, 25, 25 - .byte 12, 15, 15, 18, 19, 22 - .byte 25, 25, 25, 30, 30, 40 - .byte 25, 25, 20, 20, 15, 15 - .byte 40, 40, 35, 35, 40, 40 - -gUnknown_083ECD46:: @ 83ECD46 - .byte -13, -13, -13, 80, 80, 80, 80, 40, 40, 40, 40, 40, 40, 5, 5, 5, 5 - .byte 5, 5, 5,-106,-106,-106,-106,-126,-126,-126,-126,-126,-126, 100, 100, 100, 5 - .byte 4, 4, 4, 20, 20, 20, 20, 80, 80, 80, 80, 80, 80, 100, 100, 100, 40 - .byte 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 45, 45, 45, 100 - .byte 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 5, 5, 100 - .byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 6 - -gUnknown_083ECDAC:: @ 83ECDAC - .byte -13, -13, -13, -56, -56, -56, -56, -96, -96, -96, -96, -96, -96, 70, 70, 70, 5 - .byte 5, 5, 5, 25, 25, 25, 25, 5, 5, 5, 5, 5, 5, 2, 2, 2, 6 - .byte 4, 4, 4, 25, 25, 25, 25, 30, 30, 30, 30, 30, 30, 40, 40, 40, 35 - .byte 2, 2, 2, 3, 3, 3, 3, 30, 30, 30, 30, 30, 30, 100, 100, 100, 50 - .byte 1, 1, 1, 2, 2, 2, 2, 30, 30, 30, 30, 30, 30, 40, 40, 40, 100 - .byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 60 - - .align 1 -gUnknown_083ECE12:: @ 83ECE12 - .2byte 128, 175, 200, 225, 256 - gUnknown_083ECE1C:: @ 83ECE1C .byte 10, 0, 5, 0, 10, 0, 10, 0, 10, 0, 15, 0, 10, 0, 25, 0, 10, 0, 35, 0 -- cgit v1.2.3 From 8f0ea5f965251a6fc8097302b2dae3c8635ae569 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 11:52:15 -0500 Subject: data through gOamData_83ED0B8 --- data/slot_machine.s | 285 ---------------------------------------------------- 1 file changed, 285 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 6caf29e42..4f9629c49 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,291 +3,6 @@ .section .rodata -gUnknown_083ECE1C:: @ 83ECE1C - .byte 10, 0, 5, 0, 10, 0, 10, 0, 10, 0, 15, 0, 10, 0, 25, 0, 10, 0, 35, 0 - -gUnknown_083ECE30:: @ 83ECE30 - .byte 0, 0, 5, 0, 10, 0, 15, 0, 20, 0 - -gUnknown_083ECE3A:: @ 83ECE3A - .byte 6, 4, 3, 2, 5, 0, 0, 0 - -gUnknown_083ECE42:: @ 83ECE42 - .byte 0x80, 0 - .byte 0x20, 0 - .byte 0x40, 0 - -gUnknown_083ECE48:: @ 83ECE48 - .byte 0x10, 0 - .byte 0x08, 0 - .byte 0x04, 0 - .byte 0x02, 0 - .byte 0x01, 0 - -gUnknown_083ECE52:: @ 83ECE52 - .byte 7, 8, 4, 3, 0, 5, 2, 0 - - .align 1 -gUnknown_083ECE5A:: @ 83ECE5A - .2byte 1, 2, 4, 8, 16, 32, 64, 128, 256 - - .align 1 -gUnknown_083ECE6C:: @ 83ECE6C - .2byte 2, 4, 0, 6, 12, 3, 90, 300, 300 - - .align 1 -gUnknown_083ECE7E:: @ 83ECE7E - .2byte 208, 56 - .2byte 184, 0 - .2byte 200, 8 - .2byte 216, 16 - .2byte 232, 24 - .2byte 208, 72 - .2byte 208, 8 - .2byte 208, 64 - .2byte 208, 56 - .2byte 192, 88 - .2byte 224, 88 - .2byte 192, 120 - .2byte 224, 120 - .2byte 144, 56 - .2byte 272, 88 - .2byte 168, 112 - .2byte 208, 84 - .2byte 208, 112 - .2byte 188, 52 - .2byte 208, 52 - .2byte 228, 52 - .2byte 184, 72 - .2byte 196, 72 - .2byte 208, 72 - .2byte 220, 72 - .2byte 232, 72 - .2byte 188, 52 - .2byte 208, 52 - .2byte 228, 52 - .2byte 184, 72 - .2byte 196, 72 - .2byte 208, 72 - .2byte 220, 72 - .2byte 232, 72 - .2byte 0, 0 - - .align 2 -gUnknown_083ECF0C:: @ 83ECF0C - .4byte sub_8105C64 - .4byte sub_8105F54 - .4byte sub_8105F54 - .4byte sub_8105F54 - .4byte sub_8105F54 - .4byte sub_8105F9C - .4byte sub_8105EB4 - .4byte sub_8105C64 - .4byte sub_8105C64 - .4byte sub_8105C6C - .4byte sub_8105CF0 - .4byte sub_8105D08 - .4byte sub_8105D20 - .4byte sub_8105D3C - .4byte sub_8105DA4 - .4byte sub_8105E08 - .4byte sub_8105C64 - .4byte sub_8106058 - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81060FC - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_81061C8 - .4byte sub_8106230 - - .align 2 -Unknown_83ECF98: - .byte 25, 34 - .2byte 0 - .byte 2, 0 - .2byte 0 - .byte 9, 16 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ECFA8: - .byte 10, 1 - .2byte 0 - .byte 11, 2 - .2byte 0 - .byte 12, 3 - .2byte 0 - .byte 13, 4 - .2byte 0 - .byte 5, 5 - .2byte 0 - .byte 8, 6 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ECFC4: - .byte 3, 7 - .2byte 0 - .byte 8, 17 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ECFD0: - .byte 4, 8 - .2byte 0 - .byte 6, 9 - .2byte 0 - .byte 6, 10 - .2byte 1 - .byte 6, 11 - .2byte 2 - .byte 6, 12 - .2byte 3 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ECFE8: - .byte 0, 13 - .2byte 0 - .byte 1, 14 - .2byte 0 - .byte 7, 15 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ECFF8: - .byte 19, 26 - .2byte 0 - .byte 20, 27 - .2byte 1 - .byte 21, 28 - .2byte 2 - .byte 14, 29 - .2byte 3 - .byte 15, 30 - .2byte 4 - .byte 16, 31 - .2byte 5 - .byte 17, 32 - .2byte 6 - .byte 18, 33 - .2byte 7 - .byte 8, 17 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -Unknown_83ED020: - .byte 22, 18 - .2byte 0 - .byte 23, 19 - .2byte 1 - .byte 24, 20 - .2byte 2 - .byte 14, 21 - .2byte 3 - .byte 15, 22 - .2byte 4 - .byte 16, 23 - .2byte 5 - .byte 17, 24 - .2byte 6 - .byte 18, 25 - .2byte 7 - .byte 8, 17 - .2byte 0 - .byte 255, 0 - .2byte 0 - - .align 2 -gUnknown_083ED048:: @ 83ED048 - .4byte Unknown_83ECF98 - .4byte Unknown_83ECFA8 - .4byte Unknown_83ECFC4 - .4byte Unknown_83ECFD0 - .4byte Unknown_83ECFE8 - .4byte Unknown_83ED020 - .4byte Unknown_83ECFF8 - - .align 2 -gUnknown_083ED064:: @ 83ED064 - .4byte sub_810639C - .4byte sub_8106364 - .4byte sub_8106370 - .4byte nullsub_70 - .4byte nullsub_70 - .4byte sub_8106370 - .4byte sub_8106370 - - .align 2 -gOamData_83ED080:: @ 83ED080 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gOamData_83ED088:: @ 83ED088 - .2byte 0x8000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gOamData_83ED090:: @ 83ED090 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0000 - - .align 2 -gOamData_83ED098:: @ 83ED098 - .2byte 0x8000 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 -gOamData_83ED0A0:: @ 83ED0A0 - .2byte 0x0000 - .2byte 0x8000 - .2byte 0x0000 - - .align 2 -gOamData_83ED0A8:: @ 83ED0A8 - .2byte 0x8000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gOamData_83ED0B0:: @ 83ED0B0 - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gOamData_83ED0B8:: @ 83ED0B8 - .2byte 0x0000 - .2byte 0xC000 - .2byte 0x0000 - .align 2 gSpriteImageTable_83ED0C0:: @ 83ED0C0 obj_frame_tiles gSharedMem + 0x13200, 0x800 -- cgit v1.2.3 From fb99fe5aa6d8f7a257ba5613b32f285bba7afabd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 12:05:43 -0500 Subject: data through gSpriteImageTable_83ED228 --- data/slot_machine.s | 127 ---------------------------------------------------- 1 file changed, 127 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 4f9629c49..ffc54f75e 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,133 +3,6 @@ .section .rodata - .align 2 -gSpriteImageTable_83ED0C0:: @ 83ED0C0 - obj_frame_tiles gSharedMem + 0x13200, 0x800 - obj_frame_tiles gSharedMem + 0x13A00, 0x800 - obj_frame_tiles gSharedMem + 0x14200, 0x800 - obj_frame_tiles gSharedMem + 0x14A00, 0x800 - obj_frame_tiles gSharedMem + 0x15200, 0x800 - - .align 2 -gSpriteImageTable_83ED0E8:: @ 83ED0E8 - obj_frame_tiles gSharedMem + 0x15A00, 0x300 - - .align 2 -gSpriteImageTable_83ED0F0:: @ 83ED0F0 - obj_frame_tiles gSharedMem + 0x15D00, 0x500 - - .align 2 -gSpriteImageTable_83ED0F8:: @ 83ED0F8 - obj_frame_tiles gSharedMem + 0x16200, 0x600 - - .align 2 -gSpriteImageTable_83ED100:: @ 83ED100 - obj_frame_tiles gSpriteImage_8E988E8, 0x80 - obj_frame_tiles gSpriteImage_8E98968, 0x80 - obj_frame_tiles gSpriteImage_8E989E8, 0x80 - obj_frame_tiles gSpriteImage_8E98A68, 0x80 - obj_frame_tiles gSpriteImage_8E98AE8, 0x80 - obj_frame_tiles gSpriteImage_8E98B68, 0x80 - - .align 2 -gSpriteImageTable_83ED130:: @ 83ED130 - obj_frame_tiles gSpriteImage_8E991E8, 0x200 - - .align 2 -gSpriteImageTable_83ED138:: @ 83ED138 - obj_frame_tiles gSpriteImage_8E99808, 0x40 - - .align 2 -gSpriteImageTable_83ED140:: @ 83ED140 - obj_frame_tiles gSpriteImage_8E98BE8, 0x100 - obj_frame_tiles gSpriteImage_8E98CE8, 0x100 - - .align 2 -gSpriteImageTable_83ED150:: @ 83ED150 - obj_frame_tiles gSpriteImage_8E993E8, 0x400 - - .align 2 -gSpriteImageTable_83ED158:: @ 83ED158 - obj_frame_tiles gSpriteImage_8E98DE8, 0x200 - obj_frame_tiles gSpriteImage_8E98FE8, 0x200 - - .align 2 -gSpriteImageTable_83ED168:: @ 83ED168 - obj_frame_tiles gSpriteImage_8E98848, 0x20 - - .align 2 -gSpriteImageTable_83ED170:: @ 83ED170 - obj_frame_tiles gSpriteImage_8E98868, 0x80 - - .align 2 -gSpriteImageTable_83ED178:: @ 83ED178 - obj_frame_tiles gSharedMem + 0x10000, 0x600 - - .align 2 -gSpriteImageTable_83ED180:: @ 83ED180 - obj_frame_tiles gSharedMem + 0x10600, 0x200 - - .align 2 -gSpriteImageTable_83ED188:: @ 83ED188 - obj_frame_tiles gSharedMem + 0x10800, 0x200 - - .align 2 -gSpriteImageTable_83ED190:: @ 83ED190 - obj_frame_tiles gSharedMem + 0x10A00, 0x200 - - .align 2 -gSpriteImageTable_83ED198:: @ 83ED198 - obj_frame_tiles gSharedMem + 0x10C00, 0x300 - - .align 2 -gSpriteImageTable_83ED1A0:: @ 83ED1A0 - obj_frame_tiles gSharedMem + 0x11000, 0x400 - - .align 2 -gSpriteImageTable_83ED1A8:: @ 83ED1A8 - obj_frame_tiles gSharedMem + 0x11400, 0x200 - - .align 2 -gSpriteImageTable_83ED1B0:: @ 83ED1B0 - obj_frame_tiles gSharedMem + 0x11600, 0x300 - - .align 2 -gSpriteImageTable_83ED1B8:: @ 83ED1B8 - obj_frame_tiles gSharedMem + 0x11900, 0x300 - - .align 2 -gSpriteImageTable_83ED1C0:: @ 83ED1C0 - obj_frame_tiles gSharedMem + 0x11C00, 0x200 - obj_frame_tiles gSharedMem + 0x11E00, 0x200 - obj_frame_tiles gSharedMem + 0x11E00, 0x200 @ is this a typo? - - .align 2 -gSpriteImageTable_83ED1D8:: @ 83ED1D8 - obj_frame_tiles gSharedMem + 0x12000, 0x280 - - .align 2 -gSpriteImageTable_83ED1E0:: @ 83ED1E0 - obj_frame_tiles gSharedMem + 0x12280, 0x80 - obj_frame_tiles gSharedMem + 0x12300, 0x80 - obj_frame_tiles gSharedMem + 0x12380, 0x80 - obj_frame_tiles gSharedMem + 0x12400, 0x80 - obj_frame_tiles gSharedMem + 0x12480, 0x80 - - .align 2 -gSpriteImageTable_83ED208:: @ 83ED208 - obj_frame_tiles gSharedMem + 0x12600, 0x480 - obj_frame_tiles gSharedMem + 0x12A80, 0x480 - - .align 2 -gSpriteImageTable_83ED218:: @ 83ED218 - obj_frame_tiles gSharedMem + 0x12F00, 0x180 - obj_frame_tiles gSharedMem + 0x13080, 0x180 - - .align 2 -gSpriteImageTable_83ED228:: @ 83ED228 - obj_frame_tiles gSpriteImage_8E98828, 0x20 - .align 2 gSpriteAnim_83ED230:: @ 83ED230 obj_image_anim_frame 0, 1 -- cgit v1.2.3 From e6f56f2936bfe98da65514291bf9ee6412190b31 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 12:17:54 -0500 Subject: data through gSpriteTemplate_83ED6CC --- data/slot_machine.s | 346 ---------------------------------------------------- 1 file changed, 346 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index ffc54f75e..ef1459851 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,352 +3,6 @@ .section .rodata - .align 2 -gSpriteAnim_83ED230:: @ 83ED230 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED238:: @ 83ED238 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED240:: @ 83ED240 - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED248:: @ 83ED248 - obj_image_anim_frame 1, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED254:: @ 83ED254 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED260:: @ 83ED260 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED26C:: @ 83ED26C - obj_image_anim_frame 2, 32 - obj_image_anim_frame 3, 32 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED278:: @ 83ED278 - obj_image_anim_frame 4, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED280:: @ 83ED280 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED288:: @ 83ED288 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED290:: @ 83ED290 - obj_image_anim_frame 2, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED298:: @ 83ED298 - obj_image_anim_frame 3, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED2A0:: @ 83ED2A0 - obj_image_anim_frame 4, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED2A8:: @ 83ED2A8 - obj_image_anim_frame 5, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED2B0:: @ 83ED2B0 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED2BC:: @ 83ED2BC - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED2C8:: @ 83ED2C8 - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED2D4:: @ 83ED2D4 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED2DC:: @ 83ED2DC - obj_image_anim_frame 0, 30 - obj_image_anim_frame 1, 30 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED2E8:: @ 83ED2E8 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16 - obj_image_anim_frame 0, 16 - obj_image_anim_frame 1, 16, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_83ED2FC:: @ 83ED2FC - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED304:: @ 83ED304 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED30C:: @ 83ED30C - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED314:: @ 83ED314 - obj_image_anim_frame 2, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED31C:: @ 83ED31C - obj_image_anim_frame 3, 1 - obj_image_anim_end - - .align 2 -gSpriteAnim_83ED324:: @ 83ED324 - obj_image_anim_frame 4, 1 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83ED32C:: @ 83ED32C - .4byte gSpriteAnim_83ED230 - - .align 2 -gSpriteAnimTable_83ED330:: @ 83ED330 - .4byte gSpriteAnim_83ED238 - - .align 2 -gSpriteAnimTable_83ED334:: @ 83ED334 - .4byte gSpriteAnim_83ED240 - .4byte gSpriteAnim_83ED248 - .4byte gSpriteAnim_83ED254 - .4byte gSpriteAnim_83ED260 - .4byte gSpriteAnim_83ED26C - .4byte gSpriteAnim_83ED278 - - .align 2 -gSpriteAnimTable_83ED34C:: @ 83ED34C - .4byte gSpriteAnim_83ED280 - .4byte gSpriteAnim_83ED288 - .4byte gSpriteAnim_83ED290 - .4byte gSpriteAnim_83ED298 - .4byte gSpriteAnim_83ED2A0 - .4byte gSpriteAnim_83ED2A8 - - .align 2 -gSpriteAnimTable_83ED364:: @ 83ED364 - .4byte gSpriteAnim_83ED2B0 - - .align 2 -gSpriteAnimTable_83ED368:: @ 83ED368 - .4byte gSpriteAnim_83ED2BC - - .align 2 -gSpriteAnimTable_83ED36C:: @ 83ED36C - .4byte gSpriteAnim_83ED2C8 - .4byte gSpriteAnim_83ED2D4 - - .align 2 -gSpriteAnimTable_83ED374:: @ 83ED374 - .4byte gSpriteAnim_83ED2DC - - .align 2 -gSpriteAnimTable_83ED378:: @ 83ED378 - .4byte gSpriteAnim_83ED2E8 - .4byte gSpriteAnim_83ED2FC - - .align 2 -gSpriteAnimTable_83ED380:: @ 83ED380 - .4byte gSpriteAnim_83ED304 - .4byte gSpriteAnim_83ED30C - .4byte gSpriteAnim_83ED314 - .4byte gSpriteAnim_83ED31C - .4byte gSpriteAnim_83ED324 - - .align 2 -gSpriteAffineAnim_83ED394:: @ 83ED394 - obj_rot_scal_anim_frame 0x10, 0x10, 0, 0 - obj_rot_scal_anim_loop 0 - obj_rot_scal_anim_frame 0x1, 0x1, 0, 1 - obj_rot_scal_anim_loop 255 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83ED3BC:: @ 83ED3BC - .4byte gSpriteAffineAnim_83ED394 - - .align 2 -gSpriteAffineAnim_83ED3C0:: @ 83ED3C0 - obj_rot_scal_anim_frame 0x0, 0x0, 8, 32 - obj_rot_scal_anim_frame 0x0, 0x0, 6, 32 - obj_rot_scal_anim_frame 0x0, 0x0, 4, 16 - obj_rot_scal_anim_frame 0x0, 0x0, 12, 2 - obj_rot_scal_anim_frame 0x0, 0x0, -12, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 12, 2 - obj_rot_scal_anim_frame 0x0, 0x0, 12, 2 - obj_rot_scal_anim_frame 0x0, 0x0, -12, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 12, 2 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_83ED410:: @ 83ED410 - .4byte gSpriteAffineAnim_83ED3C0 - - .align 2 -gSpriteTemplate_83ED414:: @ 83ED414 - spr_template 0, 0, gOamData_83ED0A0, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, sub_8104F18 - - .align 2 -gSpriteTemplate_83ED42C:: @ 83ED42C - spr_template 7, 4, gOamData_83ED088, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, sub_810506C - - .align 2 -gSpriteTemplate_83ED444:: @ 83ED444 - spr_template 17, 0, gOamData_83ED0B8, gSpriteAnimTable_83ED32C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED45C:: @ 83ED45C - spr_template 0xFFFF, 1, gOamData_83ED0B8, gSpriteAnimTable_83ED334, gSpriteImageTable_83ED0C0, gDummySpriteAffineAnimTable, sub_8105170 - - .align 2 -gSpriteTemplate_83ED474:: @ 83ED474 - spr_template 0xFFFF, 2, gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0E8, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED48C:: @ 83ED48C - spr_template 0xFFFF, 3, gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0F0, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED4A4:: @ 83ED4A4 - spr_template 0xFFFF, 3, gOamData_83ED088, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED0F8, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED4BC:: @ 83ED4BC - spr_template 0xFFFF, 4, gOamData_83ED090, gSpriteAnimTable_83ED34C, gSpriteImageTable_83ED100, gDummySpriteAffineAnimTable, sub_810535C - - .align 2 -gSpriteTemplate_83ED4D4:: @ 83ED4D4 - spr_template 0xFFFF, 4, gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED130, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED4EC:: @ 83ED4EC - spr_template 0xFFFF, 4, gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED138, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED504:: @ 83ED504 - spr_template 0xFFFF, 4, gOamData_83ED098, gSpriteAnimTable_83ED364, gSpriteImageTable_83ED140, gDummySpriteAffineAnimTable, sub_810562C - - .align 2 -gSpriteTemplate_83ED51C:: @ 83ED51C - spr_template 0xFFFF, 7, gOamData_83ED0A8, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED150, gDummySpriteAffineAnimTable, sub_8105784 - - .align 2 -gSpriteTemplate_83ED534:: @ 83ED534 - spr_template 0xFFFF, 5, gOamData_83ED0A0, gSpriteAnimTable_83ED368, gSpriteImageTable_83ED158, gDummySpriteAffineAnimTable, sub_8105894 - - .align 2 -gSpriteTemplate_83ED54C:: @ 83ED54C - spr_template 0xFFFF, 4, gOamData_83ED080, gSpriteAnimTable_83ED330, gSpriteImageTable_83ED168, gDummySpriteAffineAnimTable, sub_810594C - - .align 2 -gSpriteTemplate_83ED564:: @ 83ED564 - spr_template 0xFFFF, 4, gOamData_83ED090, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED170, gSpriteAffineAnimTable_83ED3BC, sub_8105A38 - - .align 2 -gSpriteTemplate_83ED57C:: @ 83ED57C - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED178, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED594:: @ 83ED594 - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED180, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED5AC:: @ 83ED5AC - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED188, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED5C4:: @ 83ED5C4 - spr_template 18, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED190, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED5DC:: @ 83ED5DC - spr_template 0xFFFF, 6, gOamData_83ED0B0, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED198, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED5F4:: @ 83ED5F4 - spr_template 0xFFFF, 6, gOamData_83ED0B0, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1A0, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED60C:: @ 83ED60C - spr_template 19, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1A8, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED624:: @ 83ED624 - spr_template 20, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1B0, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED63C:: @ 83ED63C - spr_template 21, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1B8, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED654:: @ 83ED654 - spr_template 0xFFFF, 6, gOamData_83ED0A0, gSpriteAnimTable_83ED36C, gSpriteImageTable_83ED1C0, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED66C:: @ 83ED66C - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED1D8, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED684:: @ 83ED684 - spr_template 0xFFFF, 6, gOamData_83ED090, gSpriteAnimTable_83ED380, gSpriteImageTable_83ED1E0, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED69C:: @ 83ED69C - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED378, gSpriteImageTable_83ED208, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED6B4:: @ 83ED6B4 - spr_template 0xFFFF, 6, gOamData_83ED080, gSpriteAnimTable_83ED374, gSpriteImageTable_83ED218, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_83ED6CC:: @ 83ED6CC - spr_template 0xFFFF, 4, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED228, gSpriteAffineAnimTable_83ED410, sub_8105B70 - .align 2 gSubspriteTable_83ED6E4:: @ 83ED6E4 subsprite -64, -64, 3, 0, 64x64 -- cgit v1.2.3 From d1b6882fb2ddad468a1dfd19493b0bada58d6103 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 12:36:14 -0500 Subject: data through gSubspriteTables_83EDB54 --- data/slot_machine.s | 320 ---------------------------------------------------- 1 file changed, 320 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index ef1459851..391bdf05d 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,326 +3,6 @@ .section .rodata - .align 2 -gSubspriteTable_83ED6E4:: @ 83ED6E4 - subsprite -64, -64, 3, 0, 64x64 - subsprite 0, -64, 3, 0, 64x64 - subsprite -64, 0, 3, 0, 64x64 - subsprite 0, 0, 3, 0, 64x64 - - .align 2 -gSubspriteTables_83ED704:: @ 83ED704 - .4byte 4, gSubspriteTable_83ED6E4 - - .align 2 -gSubspriteTable_83ED70C:: @ 83ED70C - subsprite -32, -12, 1, 0, 32x8 - subsprite 0, -12, 1, 4, 32x8 - subsprite -32, -4, 1, 8, 32x8 - subsprite 0, -4, 1, 12, 32x8 - subsprite -32, 4, 1, 16, 32x8 - subsprite 0, 4, 1, 20, 32x8 - - .align 2 -gSubspriteTables_83ED73C:: @ 83ED73C - .4byte 6, gSubspriteTable_83ED70C - - .align 2 -gSubspriteTable_83ED744:: @ 83ED744 - subsprite -32, -20, 1, 0, 64x32 - subsprite -32, 12, 1, 32, 32x8 - subsprite 0, 12, 1, 36, 32x8 - - .align 2 -gSubspriteTables_83ED75C:: @ 83ED75C - .4byte 3, gSubspriteTable_83ED744 - - .align 2 -gSubspriteTable_83ED764:: @ 83ED764 - subsprite -32, -24, 1, 0, 64x32 - subsprite -32, 8, 1, 32, 32x8 - subsprite 0, 8, 1, 36, 32x8 - subsprite -32, 16, 1, 40, 32x8 - subsprite 0, 16, 1, 44, 32x8 - - .align 2 -gSubspriteTables_83ED78C:: @ 83ED78C - .4byte 5, gSubspriteTable_83ED764 - - .align 2 -gSubspriteTable_83ED794:: @ 83ED794 - subsprite -32, -8, 1, 0, 32x8 - subsprite 0, -8, 1, 4, 32x8 - subsprite -32, 0, 1, 8, 32x8 - subsprite 0, 0, 1, 12, 32x8 - - .align 2 -gSubspriteTables_83ED7B4:: @ 83ED7B4 - .4byte 4, gSubspriteTable_83ED794 - - .align 2 -gSubspriteTable_83ED7BC:: @ 83ED7BC - subsprite -8, -12, 1, 0, 16x8 - subsprite -8, -4, 1, 0, 16x8 - subsprite -8, 4, 1, 0, 16x8 - - .align 2 -gSubspriteTables_83ED7D4:: @ 83ED7D4 - .4byte 3, gSubspriteTable_83ED7BC - - .align 2 -gSubspriteTable_83ED7DC:: @ 83ED7DC - subsprite -32, -24, 3, 0, 64x32 - subsprite -32, 8, 3, 32, 32x8 - subsprite 0, 8, 3, 36, 32x8 - subsprite -32, 16, 3, 40, 32x8 - subsprite 0, 16, 3, 44, 32x8 - - .align 2 -gSubspriteTables_83ED804:: @ 83ED804 - .4byte 5, gSubspriteTable_83ED7DC - - .align 2 -gSubspriteTable_83ED80C:: @ 83ED80C - subsprite -32, -8, 3, 0, 32x8 - subsprite 0, -8, 3, 4, 32x8 - subsprite -32, 0, 3, 8, 32x8 - subsprite 0, 0, 3, 12, 32x8 - - .align 2 -gSubspriteTables_83ED82C:: @ 83ED82C - .4byte 4, gSubspriteTable_83ED80C - - .align 2 -gSubspriteTable_83ED834:: @ 83ED834 - subsprite -32, -8, 3, 0, 32x8 - subsprite 0, -8, 3, 4, 32x8 - subsprite -32, 0, 3, 8, 32x8 - subsprite 0, 0, 3, 12, 32x8 - - .align 2 -gSubspriteTables_83ED854:: @ 83ED854 - .4byte 4, gSubspriteTable_83ED834 - - .align 2 -gSubspriteTable_83ED85C:: @ 83ED85C - subsprite -32, -8, 3, 0, 32x8 - subsprite 0, -8, 3, 4, 32x8 - subsprite -32, 0, 3, 8, 32x8 - subsprite 0, 0, 3, 12, 32x8 - - .align 2 -gSubspriteTables_83ED87C:: @ 83ED87C - .4byte 4, gSubspriteTable_83ED85C - - .align 2 -gSubspriteTable_83ED884:: @ 83ED884 - subsprite -32, -12, 3, 0, 32x8 - subsprite 0, -12, 3, 4, 32x8 - subsprite -32, -4, 3, 8, 32x8 - subsprite 0, -4, 3, 12, 32x8 - subsprite -32, 4, 3, 16, 32x8 - subsprite 0, 4, 3, 20, 32x8 - - .align 2 -gSubspriteTables_83ED8B4:: @ 83ED8B4 - .4byte 6, gSubspriteTable_83ED884 - - .align 2 -gSubspriteTable_83ED8BC:: @ 83ED8BC - subsprite -16, -16, 3, 0, 32x32 - - .align 2 -gSubspriteTable_83ED8C4:: @ 83ED8C4 - subsprite -8, -8, 3, 16, 16x16 - - .align 2 -gSubspriteTables_83ED8CC:: @ 83ED8CC - .4byte 1, gSubspriteTable_83ED8BC - .4byte 1, gSubspriteTable_83ED8C4 - - .align 2 -gSubspriteTable_83ED8DC:: @ 83ED8DC - subsprite -24, -24, 3, 0, 32x8 - subsprite 8, -24, 3, 4, 16x8 - subsprite -24, -16, 3, 6, 32x8 - subsprite 8, -16, 3, 10, 16x8 - subsprite -24, -8, 3, 12, 32x8 - subsprite 8, -8, 3, 16, 16x8 - subsprite -24, 0, 3, 18, 32x8 - subsprite 8, 0, 3, 22, 16x8 - subsprite -24, 8, 3, 24, 32x8 - subsprite 8, 8, 3, 28, 16x8 - subsprite -24, 16, 3, 30, 32x8 - subsprite 8, 16, 3, 34, 16x8 - - .align 2 -gSubspriteTables_83ED93C:: @ 83ED93C - .4byte 12, gSubspriteTable_83ED8DC - - .align 2 -gSubspriteTable_83ED944:: @ 83ED944 - subsprite -16, -12, 3, 0, 32x16 - subsprite -16, 4, 3, 8, 16x8 - subsprite 0, 4, 3, 10, 16x8 - - .align 2 -gSubspriteTables_83ED95C:: @ 83ED95C - .4byte 3, gSubspriteTable_83ED944 - - .align 2 -gSubspriteTable_83ED964:: @ 83ED964 - subsprite -8, -8, 3, 0, 16x8 - subsprite -8, 0, 3, 8, 16x8 - - .align 2 -gSubspriteTables_83ED974:: @ 83ED974 - .4byte 2, gSubspriteTable_83ED964 - - .align 2 -gSubspriteTable_83ED97C:: @ 83ED97C - subsprite -8, -8, 3, 2, 16x8 - subsprite -8, 0, 3, 10, 16x8 - - .align 2 -gSubspriteTables_83ED98C:: @ 83ED98C - .4byte 2, gSubspriteTable_83ED97C - - .align 2 -gSubspriteTable_83ED994:: @ 83ED994 - subsprite -8, -8, 3, 4, 16x8 - subsprite -8, 0, 3, 12, 16x8 - - .align 2 -gSubspriteTables_83ED9A4:: @ 83ED9A4 - .4byte 2, gSubspriteTable_83ED994 - - .align 2 -gSubspriteTable_83ED9AC:: @ 83ED9AC - subsprite -8, -8, 3, 6, 16x8 - subsprite -8, 0, 3, 14, 16x8 - - .align 2 -gSubspriteTables_83ED9BC:: @ 83ED9BC - .4byte 2, gSubspriteTable_83ED9AC - - .align 2 -gSubspriteTable_83ED9C4:: @ 83ED9C4 - subsprite -8, -8, 3, 0, 16x8 - subsprite -8, 0, 3, 8, 16x8 - - .align 2 -gSubspriteTables_83ED9D4:: @ 83ED9D4 - .4byte 2, gSubspriteTable_83ED9C4 - - .align 2 -gSubspriteTable_83ED9DC:: @ 83ED9DC - subsprite -4, -8, 3, 2, 8x8 - subsprite -4, 0, 3, 10, 8x8 - - .align 2 -gSubspriteTables_83ED9EC:: @ 83ED9EC - .4byte 2, gSubspriteTable_83ED9DC - - .align 2 -gSubspriteTable_83ED9F4:: @ 83ED9F4 - subsprite -8, -8, 3, 3, 16x8 - subsprite -8, 0, 3, 11, 16x8 - - .align 2 -gSubspriteTables_83EDA04:: @ 83EDA04 - .4byte 2, gSubspriteTable_83ED9F4 - - .align 2 -gSubspriteTable_83EDA0C:: @ 83EDA0C - subsprite -4, -8, 3, 5, 8x8 - subsprite -4, 0, 3, 13, 8x8 - - .align 2 -gSubspriteTables_83EDA1C:: @ 83EDA1C - .4byte 2, gSubspriteTable_83EDA0C - - .align 2 -gSubspriteTable_83EDA24:: @ 83EDA24 - subsprite -8, -8, 3, 6, 16x8 - subsprite -8, 0, 3, 14, 16x8 - - .align 2 -gSubspriteTables_83EDA34:: @ 83EDA34 - .4byte 2, gSubspriteTable_83EDA24 - - .align 2 -gSubspriteTable_83EDA3C:: @ 83EDA3C - subsprite -12, -12, 3, 0, 16x8 - subsprite 4, -12, 3, 2, 8x8 - subsprite -12, -4, 3, 8, 16x8 - subsprite 4, -4, 3, 10, 8x8 - subsprite -12, 4, 3, 16, 16x8 - subsprite 4, 4, 3, 18, 8x8 - - .align 2 -gSubspriteTables_83EDA6C:: @ 83EDA6C - .4byte 6, gSubspriteTable_83EDA3C - - .align 2 -gSubspriteTable_83EDA74:: @ 83EDA74 - subsprite -8, -12, 3, 3, 16x8 - subsprite -8, -4, 3, 11, 16x8 - subsprite -8, 4, 3, 19, 16x8 - - .align 2 -gSubspriteTables_83EDA8C:: @ 83EDA8C - .4byte 3, gSubspriteTable_83EDA74 - - .align 2 -gSubspriteTable_83EDA94:: @ 83EDA94 - subsprite -12, -12, 3, 5, 16x8 - subsprite 4, -12, 3, 7, 8x8 - subsprite -12, -4, 3, 13, 16x8 - subsprite 4, -4, 3, 15, 8x8 - subsprite -12, 4, 3, 21, 16x8 - subsprite 4, 4, 3, 23, 8x8 - - .align 2 -gSubspriteTables_83EDAC4:: @ 83EDAC4 - .4byte 6, gSubspriteTable_83EDA94 - - .align 2 -gSubspriteTable_83EDACC:: @ 83EDACC - subsprite -12, -12, 3, 0, 16x8 - subsprite 4, -12, 3, 2, 8x8 - subsprite -12, -4, 3, 8, 16x8 - subsprite 4, -4, 3, 10, 8x8 - subsprite -12, 4, 3, 16, 16x8 - subsprite 4, 4, 3, 18, 8x8 - - .align 2 -gSubspriteTables_83EDAFC:: @ 83EDAFC - .4byte 6, gSubspriteTable_83EDACC - - .align 2 -gSubspriteTable_83EDB04:: @ 83EDB04 - subsprite -8, -12, 3, 3, 16x8 - subsprite -8, -4, 3, 11, 16x8 - subsprite -8, 4, 3, 19, 16x8 - - .align 2 -gSubspriteTables_83EDB1C:: @ 83EDB1C - .4byte 3, gSubspriteTable_83EDB04 - - .align 2 -gSubspriteTable_83EDB24:: @ 83EDB24 - subsprite -12, -12, 3, 5, 16x8 - subsprite 4, -12, 3, 7, 8x8 - subsprite -12, -4, 3, 13, 16x8 - subsprite 4, -4, 3, 15, 8x8 - subsprite -12, 4, 3, 21, 16x8 - subsprite 4, 4, 3, 23, 8x8 - - .align 2 -gSubspriteTables_83EDB54:: @ 83EDB54 - .4byte 6, gSubspriteTable_83EDB24 - .align 2 gUnknown_083EDB5C:: @ 83EDB5C .4byte gSpriteTemplate_83ED57C -- cgit v1.2.3 From aee62a5b2487845921a1e6c3c3f08475cc7ae2ea Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 15:08:57 -0500 Subject: data through gUnknown_083EDD08 --- data/slot_machine.s | 106 ---------------------------------------------------- 1 file changed, 106 deletions(-) (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s index 391bdf05d..23d2b8a74 100644 --- a/data/slot_machine.s +++ b/data/slot_machine.s @@ -3,112 +3,6 @@ .section .rodata - .align 2 -gUnknown_083EDB5C:: @ 83EDB5C - .4byte gSpriteTemplate_83ED57C - .4byte gSpriteTemplate_83ED594 - .4byte gSpriteTemplate_83ED5AC - .4byte gSpriteTemplate_83ED5DC - .4byte gSpriteTemplate_83ED5F4 - .4byte gSpriteTemplate_83ED654 - .4byte gSpriteTemplate_83ED66C - .4byte gSpriteTemplate_83ED684 - .4byte gSpriteTemplate_83ED69C - .4byte gSpriteTemplate_83ED6B4 - .4byte gSpriteTemplate_83ED5C4 - .4byte gSpriteTemplate_83ED5C4 - .4byte gSpriteTemplate_83ED5C4 - .4byte gSpriteTemplate_83ED5C4 - .4byte gSpriteTemplate_83ED60C - .4byte gSpriteTemplate_83ED60C - .4byte gSpriteTemplate_83ED60C - .4byte gSpriteTemplate_83ED60C - .4byte gSpriteTemplate_83ED60C - .4byte gSpriteTemplate_83ED624 - .4byte gSpriteTemplate_83ED624 - .4byte gSpriteTemplate_83ED624 - .4byte gSpriteTemplate_83ED63C - .4byte gSpriteTemplate_83ED63C - .4byte gSpriteTemplate_83ED63C - .4byte gDummySpriteTemplate - - .align 2 -gUnknown_083EDBC4:: @ 83EDBC4 - .4byte gSubspriteTables_83ED804 - .4byte gSubspriteTables_83ED82C - .4byte gSubspriteTables_83ED854 - .4byte gSubspriteTables_83ED8B4 - .4byte NULL - .4byte NULL - .4byte gSubspriteTables_83ED8CC - .4byte NULL - .4byte gSubspriteTables_83ED93C - .4byte gSubspriteTables_83ED95C - .4byte gSubspriteTables_83ED974 - .4byte gSubspriteTables_83ED98C - .4byte gSubspriteTables_83ED9A4 - .4byte gSubspriteTables_83ED9BC - .4byte gSubspriteTables_83ED9D4 - .4byte gSubspriteTables_83ED9EC - .4byte gSubspriteTables_83EDA04 - .4byte gSubspriteTables_83EDA1C - .4byte gSubspriteTables_83EDA34 - .4byte gSubspriteTables_83EDA6C - .4byte gSubspriteTables_83EDA8C - .4byte gSubspriteTables_83EDAC4 - .4byte gSubspriteTables_83EDAFC - .4byte gSubspriteTables_83EDB1C - .4byte gSubspriteTables_83EDB54 - .4byte NULL - - .align 2 -gUnknown_083EDC2C:: @ 83EDC2C - obj_tiles gSlotMachineReelSymbol1Tiles, 0x200, 0 - obj_tiles gSlotMachineReelSymbol2Tiles, 0x200, 1 - obj_tiles gSlotMachineReelSymbol3Tiles, 0x200, 2 - obj_tiles gSlotMachineReelSymbol4Tiles, 0x200, 3 - obj_tiles gSlotMachineReelSymbol5Tiles, 0x200, 4 - obj_tiles gSlotMachineReelSymbol6Tiles, 0x200, 5 - obj_tiles gSlotMachineReelSymbol7Tiles, 0x200, 6 - obj_tiles gSlotMachineNumber0Tiles, 0x40, 7 - obj_tiles gSlotMachineNumber1Tiles, 0x40, 8 - obj_tiles gSlotMachineNumber2Tiles, 0x40, 9 - obj_tiles gSlotMachineNumber3Tiles, 0x40, 10 - obj_tiles gSlotMachineNumber4Tiles, 0x40, 11 - obj_tiles gSlotMachineNumber5Tiles, 0x40, 12 - obj_tiles gSlotMachineNumber6Tiles, 0x40, 13 - obj_tiles gSlotMachineNumber7Tiles, 0x40, 14 - obj_tiles gSlotMachineNumber8Tiles, 0x40, 15 - obj_tiles gSlotMachineNumber9Tiles, 0x40, 16 - obj_tiles gSharedMem + 0x10A00, 0x200, 18 - obj_tiles gSharedMem + 0x11400, 0x200, 19 - obj_tiles gSharedMem + 0x11600, 0x300, 20 - obj_tiles gSharedMem + 0x11900, 0x300, 21 - null_obj_tiles - - .align 2 -gUnknown_083EDCDC:: @ 83EDCDC - obj_tiles gSharedMem + 0x10000, 2048, 0x0011 - - .align 2 -gUnknown_083EDCE4:: @ 83EDCE4 - .4byte gUnknownPalette_08E997E8 - -UnknownPalette_83EDCE8: - .ifdef SAPPHIRE - .incbin "graphics/unknown/sapphire_83EDD40.gbapal" - .else - .incbin "graphics/unknown/ruby_83EDCE8.gbapal" - .endif - - .align 2 -gUnknown_083EDD08:: @ 83EDD08 - .4byte UnknownPalette_83EDCE8 + 10 * 2 - .4byte UnknownPalette_83EDCE8 + 11 * 2 - .4byte UnknownPalette_83EDCE8 + 12 * 2 - .4byte UnknownPalette_83EDCE8 + 13 * 2 - .4byte UnknownPalette_83EDCE8 + 14 * 2 - .align 2 gUnknown_083EDD1C:: @ 83EDD1C .4byte gUnknown_08E95A18 + 148 -- cgit v1.2.3 From 9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 2 Jan 2018 21:35:41 -0500 Subject: Remaining slot machine data --- data/slot_machine.s | 102 ---------------------------------------------------- 1 file changed, 102 deletions(-) delete mode 100644 data/slot_machine.s (limited to 'data') diff --git a/data/slot_machine.s b/data/slot_machine.s deleted file mode 100644 index 23d2b8a74..000000000 --- a/data/slot_machine.s +++ /dev/null @@ -1,102 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083EDD1C:: @ 83EDD1C - .4byte gUnknown_08E95A18 + 148 - .4byte gUnknown_08E95A18 + 150 - .4byte gUnknown_08E95A18 + 152 - .4byte gUnknown_08E95A18 + 154 - .4byte gUnknown_08E95A18 + 156 - -gUnknown_083EDD30:: @ 83EDD30 - .byte 0x4A, 0x4B, 0x4C, 0x4E, 0x4D - -gUnknown_083EDD35:: @ 83EDD35 - .byte 0, 0, 1, 2, 3, 4 - -gUnknown_083EDD3B:: @ 83EDD3B - .byte 1, 2, 2 - - .align 1 -Unknown_83EDD3E: - .ifdef SAPPHIRE - .incbin "graphics/unknown/sapphire_83EDD96.gbapal" - .else - .incbin "graphics/unknown/ruby_83EDD3E.gbapal" - .endif - - .align 1 -Unknown_83EDD5E: - .ifdef SAPPHIRE - .incbin "graphics/unknown/sapphire_83EDDB6.gbapal" - .else - .incbin "graphics/unknown/ruby_83EDD5E.gbapal" - .endif - - .align 1 -Unknown_83EDD7E: - .ifdef SAPPHIRE - .incbin "graphics/unknown/sapphire_83EDDD6.gbapal" - .else - .incbin "graphics/unknown/ruby_83EDD7E.gbapal" - .endif - - .align 2 -gUnknown_083EDDA0:: @ 83EDDA0 - .4byte Unknown_83EDD3E - .4byte Unknown_83EDD5E - .4byte Unknown_83EDD7E - - .align 2 -gUnknown_083EDDAC:: @ 83EDDAC - .4byte gUnknown_08E95A18 + 32 - - .align 1 -Palette_83EDDB0: - .incbin "graphics/slot_machine/83EDDB0.gbapal" - - .align 1 -Palette_83EDDD0: - .incbin "graphics/slot_machine/83EDDD0.gbapal" - - .align 1 -Palette_83EDDF0: - .incbin "graphics/slot_machine/83EDDF0.gbapal" - - .align 2 -gUnknown_083EDE10:: @ 83EDE10 - .4byte Palette_83EDDB0 - .4byte Palette_83EDDD0 - .4byte Palette_83EDDF0 - .4byte gSlotMachineSpritePalette6 - - .align 2 -gUnknown_083EDE20:: @ 83EDE20 - .4byte gSlotMachineSpritePalette6 - - .align 1 -gPalette_83EDE24:: @ 83EDE24 - .incbin "graphics/slot_machine/83EDE24_pal.bin" - - .align 2 -gSlotMachineSpritePalettes:: @ 83EDE44 - obj_pal gSlotMachineSpritePalette0, 0 - obj_pal gSlotMachineSpritePalette1, 1 - obj_pal gSlotMachineSpritePalette2, 2 - obj_pal gSlotMachineSpritePalette3, 3 - obj_pal gSlotMachineSpritePalette4, 4 - obj_pal gSlotMachineSpritePalette5, 5 - obj_pal gSlotMachineSpritePalette6, 6 - obj_pal gSlotMachineSpritePalette4, 7 - null_obj_pal - - .align 2 -gUnknown_083EDE8C:: @ 83EDE8C - .incbin "graphics/slot_machine/reel_time.4bpp.lz" - - .align 2 -gReelTimeWindowTilemap:: @ 83EEFE0 - .incbin "graphics/slot_machine/reel_time_window_map.bin" -- cgit v1.2.3 From b5ecdfa404a34c66fdf9f96342a2de0f173e6e73 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Wed, 3 Jan 2018 16:22:06 +0100 Subject: Decompiled fire_2.s --- data/battle_anim_80CA710.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index ba5d9f533..bd50379b0 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -2505,7 +2505,7 @@ gSpriteTemplate_83D96C4:: @ 83D96C4 spr_template 10201, 10201, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58FC .align 1 -gUnknown_083D96DC:: @ 83D96DC +gUnknown_083D96DC:: @ 83D96DC @ holds coords for heated rocks of Move_ERUPTION .2byte -2, -5 .2byte -1, -1 .2byte 3, -6 -- cgit v1.2.3 From 6649ab0876f608eedbdc5bff55d4c55593b12122 Mon Sep 17 00:00:00 2001 From: "Marco Willems (M17.1)" Date: Wed, 3 Jan 2018 20:55:10 +0100 Subject: Updated with pull request remarks --- data/battle_anim_80CA710.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index bd50379b0..4430cd372 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -2505,7 +2505,7 @@ gSpriteTemplate_83D96C4:: @ 83D96C4 spr_template 10201, 10201, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58FC .align 1 -gUnknown_083D96DC:: @ 83D96DC @ holds coords for heated rocks of Move_ERUPTION +gHeatedRockCoords:: @ 83D96DC .2byte -2, -5 .2byte -1, -1 .2byte 3, -6 -- cgit v1.2.3 From cf37681831a9a8289d5941e66ce673b896abf71f Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 3 Jan 2018 14:30:23 -0600 Subject: decompile sub_80E810C - sub_80E872C --- data/easy_chat.s | 147 ------------------------------------------------------- 1 file changed, 147 deletions(-) (limited to 'data') diff --git a/data/easy_chat.s b/data/easy_chat.s index 98f88b1fc..6630e19d2 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,153 +8,6 @@ .section .rodata - .align 2 -InterviewPalette_1:: @ 83DB820 - .incbin "graphics/misc/interview_pal1.gbapal" - - .align 2 -InterviewArrowTiles: @ 83DB840 - .incbin "graphics/misc/interview_arrow.4bpp" - - .align 2 -InterviewButtonTiles: @ 83DB940 - .incbin "graphics/misc/interview_buttons.4bpp" - - .align 2 -gMenuInterviewFrame_Pal:: - .incbin "graphics/misc/interview_frame.gbapal" - - .align 2 -gMenuInterviewFrame_Gfx:: - .incbin "graphics/misc/interview_frame.4bpp.lz" - - .align 2 -InterviewTriangleCursorTiles: @ 83DBB94 - .incbin "graphics/misc/interview_triangle_cursor.4bpp" - - .align 2 -gSpriteSheets_Interview:: @ 83DBBB4 - obj_tiles InterviewTriangleCursorTiles, 0x20, 0 - obj_tiles gInterviewOutlineCursorTiles, 0x700, 1 - obj_tiles InterviewArrowTiles, 0x100, 2 - obj_tiles InterviewButtonTiles, 0x100, 3 - null_obj_tiles - - .align 2 -gSpritePalettes_Interview:: @ 83DBBDC - obj_pal InterviewPalette_0, 0 - obj_pal InterviewPalette_1, 1 - null_obj_pal - - .align 2 -gOamData_83DBBF4:: @ 83DBBF4 - .2byte 0x0000 - .2byte 0x0000 - .2byte 0x0000 - - .align 2 -gSpriteTemplate_83DBBFC:: @ 83DBBFC - spr_template 0, 0, gOamData_83DBBF4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E82BC - - .align 2 -gOamData_83DBC14:: @ 83DBC14 - .2byte 0x4400 - .2byte 0x8000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83DBC1C:: @ 83DBC1C - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC24:: @ 83DBC24 -.ifdef ENGLISH - obj_image_anim_frame 8, 5 -.else - obj_image_anim_frame 0, 5 -.endif - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC2C:: @ 83DBC2C - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC34:: @ 83DBC34 - obj_image_anim_frame 24, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC3C:: @ 83DBC3C - obj_image_anim_frame 32, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC44:: @ 83DBC44 - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC4C:: @ 83DBC4C - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC54:: @ 83DBC54 - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC5C:: @ 83DBC5C - obj_image_anim_frame 48, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC64:: @ 83DBC64 -.ifdef ENGLISH - obj_image_anim_frame 40, 5 -.else - obj_image_anim_frame 16, 5 -.endif - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC6C:: @ 83DBC6C - obj_image_anim_frame 48, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBC74:: @ 83DBC74 - obj_image_anim_frame 40, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83DBC7C:: @ 83DBC7C - .4byte gSpriteAnim_83DBC1C - .4byte gSpriteAnim_83DBC24 - .4byte gSpriteAnim_83DBC2C - .4byte gSpriteAnim_83DBC34 - - .align 2 -gSpriteAnimTable_83DBC8C:: @ 83DBC8C - .4byte gSpriteAnim_83DBC3C - .4byte gSpriteAnim_83DBC44 - .4byte gSpriteAnim_83DBC4C - .4byte gSpriteAnim_83DBC54 - - .align 2 -gSpriteAnimTable_83DBC9C:: @ 83DBC9C - .4byte gSpriteAnim_83DBC5C - .4byte gSpriteAnim_83DBC64 - .4byte gSpriteAnim_83DBC6C - .4byte gSpriteAnim_83DBC74 - - .align 2 -gSpriteTemplate_83DBCAC:: @ 83DBCAC - spr_template 1, 1, gOamData_83DBC14, gSpriteAnimTable_83DBC7C, NULL, gDummySpriteAffineAnimTable, sub_80E85F8 - .align 2 gUnknown_083DBCC4:: @ 83DBCC4 .byte 1, 3, 5, 8, 10, 12, 15 -- cgit v1.2.3 From 324705201c8648830a9b5ed7926891bf38bfcabe Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 3 Jan 2018 20:24:50 -0600 Subject: decompile sub_80E8760 - sub_80E8B78 --- data/easy_chat.s | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) (limited to 'data') diff --git a/data/easy_chat.s b/data/easy_chat.s index 6630e19d2..9181ea296 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,53 +8,6 @@ .section .rodata - .align 2 -gUnknown_083DBCC4:: @ 83DBCC4 - .byte 1, 3, 5, 8, 10, 12, 15 - .byte 1, 3, 5, 8, 10, 12, 0 - .byte 1, 3, 5, 8, 10, 12, 14 - .byte 1, 3, 5, 8, 10, 12, 14 - - .align 2 -gOamData_83DBCE0:: @ 83DBCE0 - .2byte 0x0000 - .2byte 0x4000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_83DBCE8:: @ 83DBCE8 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBCF0:: @ 83DBCF0 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83DBCF8:: @ 83DBCF8 - .4byte gSpriteAnim_83DBCE8 - .4byte gSpriteAnim_83DBCF0 - - .align 2 -gSpriteAnim_83DBD00:: @ 83DBD00 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBD08:: @ 83DBD08 - obj_image_anim_frame 4, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83DBD10:: @ 83DBD10 - .4byte gSpriteAnim_83DBD00 - .4byte gSpriteAnim_83DBD08 - - .align 2 -gSpriteTemplate_83DBD18:: @ 83DBD18 - spr_template 2, 0, gOamData_83DBCE0, gSpriteAnimTable_83DBCF8, NULL, gDummySpriteAffineAnimTable, sub_80E8B78 - .align 2 gUnknown_083DBD30:: @ 83DBD30 obj_tiles gMenuInterviewFrame_Gfx, 2048, 0x0006 -- cgit v1.2.3 From 5c427e8afed44ed3720cf97d6748fa9e806c9b83 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 14:37:52 -0800 Subject: Use song constants in scripts --- data/battle_scripts_2.s | 2 +- data/event_scripts.s | 46 +++++++++++----------- data/scripts/berry_tree.inc | 2 +- data/scripts/cable_club.inc | 2 +- data/scripts/contest_hall.inc | 32 +++++++-------- data/scripts/day_care.inc | 4 +- data/scripts/magma_chimney.inc | 2 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 8 ++-- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 10 ++--- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 +- data/scripts/maps/DewfordTown_Gym.inc | 8 ++-- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 14 +++---- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 4 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 6 +-- data/scripts/maps/LilycoveCity.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 16 ++++---- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 2 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 6 +-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 4 +- .../maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 6 +-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/scripts/maps/MauvilleCity.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 22 +++++------ data/scripts/maps/MauvilleCity_Gym.inc | 4 +- data/scripts/maps/MauvilleCity_House2.inc | 2 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 4 +- data/scripts/maps/NewMauville_Entrance.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 4 +- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 6 +-- data/scripts/maps/PetalburgCity_Gym.inc | 6 +-- data/scripts/maps/PetalburgWoods.inc | 4 +- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route103.inc | 8 ++-- data/scripts/maps/Route110.inc | 6 +-- data/scripts/maps/Route110_TrickHouseEnd.inc | 6 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 10 ++--- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 8 ++-- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 14 +++---- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 10 ++--- data/scripts/maps/Route111.inc | 4 +- data/scripts/maps/Route113_GlassWorkshop.inc | 2 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 2 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/RustboroCity.inc | 18 ++++----- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 8 ++-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 +- data/scripts/maps/RusturfTunnel.inc | 4 +- data/scripts/maps/SSTidalCorridor.inc | 14 +++---- data/scripts/maps/SeafloorCavern_Room9.inc | 12 +++--- data/scripts/maps/SealedChamber_InnerRoom.inc | 8 ++-- data/scripts/maps/SlateportCity.inc | 6 +-- data/scripts/maps/SlateportCity_ContestLobby.inc | 4 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 6 +-- .../maps/SlateportCity_OceanicMuseum_2F.inc | 4 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 2 +- data/scripts/maps/SootopolisCity.inc | 4 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 ++-- data/scripts/maps/UnknownMap_25_34.inc | 10 ++--- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 4 +- data/scripts/players_house.inc | 12 +++--- data/scripts/safari_zone.inc | 4 +- 82 files changed, 248 insertions(+), 248 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 26f28726d..e113513d6 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -164,7 +164,7 @@ BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB finishaction BattleScript_RunByUsingItem: @ 81D9FDA - playse 17 + playse SE_NIGERU setbyte gBattleOutcome, BATTLE_RAN finishturn diff --git a/data/event_scripts.s b/data/event_scripts.s index 7d59b5234..b751a2e63 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -396,13 +396,13 @@ gStdScripts_End:: gUnknown_0815F36C:: @ 815F36C lockall - playse 2 + playse SE_PC_LOGON message UnknownString_81A3A72 dofieldeffect 61 waitstate waitmessage waitbuttonpress - playse 5 + playse SE_SELECT goto EventScript_15F384 end @@ -458,12 +458,12 @@ EventScript_15F436: gUnknown_0815F43A:: @ 815F43A lockall message UnknownString_81A3A72 - playse 2 + playse SE_PC_LOGON dofieldeffect 61 waitstate waitmessage waitbuttonpress - playse 5 + playse SE_SELECT goto EventScript_15F452 end @@ -1566,11 +1566,11 @@ Std_ObtainItem_Fail: @ 819FECC return PlayGetItemFanfare: - playfanfare 0x172 + playfanfare BGM_FANFA4 return PlayGetTMHMFanfare: - playfanfare 0x174 + playfanfare BGM_ME_WAZA return Std_ObtainDecoration: @ 819FEDA @@ -1588,7 +1588,7 @@ Std_ObtainDecoration_: @ 819FEE8 return Std_ObtainDecoration_Success: @ 819FF03 - playfanfare 0x172 + playfanfare BGM_FANFA4 message Message_ObtainedDecoration waitfanfare waitmessage @@ -1685,7 +1685,7 @@ gUnknown_081A0009:: @ 81A0009 lockall setvar VAR_SPECIAL_4, 0 special DoPCTurnOnEffect - playse 4 + playse SE_PC_ON msgbox UnknownString_81A09EC, 4 goto EventScript_1A0023 end @@ -1708,7 +1708,7 @@ EventScript_1A0033: end EventScript_1A0070: - playse 2 + playse SE_PC_LOGON msgbox UnknownString_81A0A54, 4 special PlayerPC waitstate @@ -1716,7 +1716,7 @@ EventScript_1A0070: end EventScript_1A0085: - playse 2 + playse SE_PC_LOGON checkflag FLAG_SYS_PC_LANETTE call_if 0, EventScript_1A00AC checkflag FLAG_SYS_PC_LANETTE @@ -1737,7 +1737,7 @@ EventScript_1A00B5: EventScript_1A00BE: setvar VAR_SPECIAL_4, 0 - playse 3 + playse SE_PC_OFF special DoPCTurnOffEffect releaseall end @@ -1745,7 +1745,7 @@ EventScript_1A00BE: EventScript_1A00CB: checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_1A00BE - playse 2 + playse SE_PC_LOGON special AccessHallOfFamePC waitstate goto EventScript_1A0033 @@ -2105,7 +2105,7 @@ MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5 PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5 RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5 SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5 - playfanfare 369 + playfanfare BGM_ME_BACHI waitfanfare return @@ -2114,7 +2114,7 @@ Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA SSTidalRooms_EventScript_1A02CA:: @ 81A02CA fadescreen 1 - playfanfare 368 + playfanfare BGM_ME_ASA waitfanfare special ScrSpecial_HealPlayerParty fadescreen 0 @@ -2133,7 +2133,7 @@ DewfordTown_EventScript_1A02E7:: @ 81A02E7 Route104_EventScript_1A02E7:: @ 81A02E7 Route109_EventScript_1A02E7:: @ 81A02E7 setflag FLAG_SPECIAL_FLAG_1 - playbgm 431, 0 + playbgm BGM_M_BOAT, FALSE return DewfordTown_EventScript_1A02EF:: @ 81A02EF @@ -2547,7 +2547,7 @@ GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F MtPyre_Summit_EventScript_1A067F:: @ 81A067F SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F bufferitemname 0, VAR_SPECIAL_4 - playfanfare 372 + playfanfare BGM_ME_WAZA message FallarborTown_House1_Text_1A1498 waitmessage waitfanfare @@ -2560,7 +2560,7 @@ EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693 EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853 waitmovement 0 - playse 8 + playse SE_DOOR setmetatile 6, 1, 836, 0 setmetatile 6, 2, 837, 0 setmetatile 0, 2, 734, 1 @@ -2582,7 +2582,7 @@ EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710 EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710 applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847 waitmovement 0 - playse 52 + playse SE_TRACK_DOOR setmetatile 5, 12, 518, 1 setmetatile 6, 12, 518, 1 setmetatile 7, 12, 518, 1 @@ -3721,7 +3721,7 @@ EventScript_1A2DAA: EventScript_1A2DB8: closemessage - playse 9 + playse SE_KAIDAN setvar VAR_0x4097, 0 setflag FLAG_DECORATION_1 special sub_80BB8CC @@ -3741,7 +3741,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closemessage - playse 9 + playse SE_KAIDAN special sub_80BC440 end @@ -3760,7 +3760,7 @@ SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 gUnknown_081A2E14:: @ 81A2E14 lockall setvar VAR_0x4097, 1 - playse 9 + playse SE_KAIDAN special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 @@ -4883,7 +4883,7 @@ S_FallDownHole:: @ 81C6BC5 delay 20 applymovement 255, GraniteCave_B1F_Movement_1C6BF7 waitmovement 0 - playse 43 + playse SE_RU_HYUU delay 60 warphole MAP_UNDEFINED waitstate @@ -4894,7 +4894,7 @@ gUnknown_081C6BDE:: @ 81C6BDE delay 20 applymovement 255, GraniteCave_B1F_Movement_1C6BF7 waitmovement 0 - playse 43 + playse SE_RU_HYUU delay 60 special sp13F_fall_to_last_warp waitstate diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 55b8e2439..817e2b1e4 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -113,7 +113,7 @@ Route102_EventScript_1A161D:: @ 81A161D goto_if_eq Route102_EventScript_1A1642 special FieldObjectInteractionRemoveBerryTree message Route102_Text_1A17FD - playfanfare 387 + playfanfare BGM_ME_KINOMI waitmessage waitfanfare waitbuttonpress diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index b3926af65..397538eaf 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -136,7 +136,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30 waitmovement 0 message OldaleTown_PokemonCenter_2F_Text_1A4E50 waitmessage - playse 21 + playse SE_PIN message OldaleTown_PokemonCenter_2F_Text_1A4E79 waitmessage applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 9c5c246e2..4a7712f58 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -345,13 +345,13 @@ LinkContestRoom1_EventScript_1A5323:: @ 81A5323 waitmovement 0 releaseall addobject 13 - playse 10 + playse SE_DANSA lockall applymovement VAR_SPECIAL_B, LinkContestRoom1_Movement_1A5D9C waitmovement 0 releaseall addvar VAR_SPECIAL_6, -1 - playse 15 + playse SE_BOWA2 special ShowContestEntryMonPic call LinkContestRoom1_EventScript_1A535E return @@ -371,7 +371,7 @@ LinkContestRoom1_EventScript_1A5370:: @ 81A5370 LinkContestRoom1_EventScript_1A5377:: @ 81A5377 call LinkContestRoom1_EventScript_1A53B3 call LinkContestRoom1_EventScript_1A53CE - playse 223 + playse SE_W227B waitmessage call LinkContestRoom1_EventScript_1A5A90 applymovement 1, LinkContestRoom1_Movement_1A5D9F @@ -408,7 +408,7 @@ LinkContestRoom1_EventScript_1A53DF:: @ 81A53DF LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 applymovement 1, LinkContestRoom1_Movement_1A5DAF waitmovement 0 - playse 223 + playse SE_W227B call LinkContestRoom1_EventScript_1A5AE4 applymovement 9, LinkContestRoom1_Movement_1A5DB7 applymovement 12, LinkContestRoom1_Movement_1A5DBB @@ -621,7 +621,7 @@ LinkContestRoom1_EventScript_1A5760:: @ 81A5760 compare VAR_TEMP_1, 1 goto_if_eq LinkContestRoom1_EventScript_1A5783 applymovement 6, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_1, 1 addvar VAR_TEMP_0, -1 @@ -634,7 +634,7 @@ LinkContestRoom1_EventScript_1A5784:: @ 81A5784 compare VAR_TEMP_2, 1 goto_if_eq LinkContestRoom1_EventScript_1A57A7 applymovement 12, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_2, 1 addvar VAR_TEMP_0, -1 @@ -647,7 +647,7 @@ LinkContestRoom1_EventScript_1A57A8:: @ 81A57A8 compare VAR_TEMP_3, 1 goto_if_eq LinkContestRoom1_EventScript_1A57CB applymovement 7, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_3, 1 addvar VAR_TEMP_0, -1 @@ -660,7 +660,7 @@ LinkContestRoom1_EventScript_1A57CC:: @ 81A57CC compare VAR_TEMP_4, 1 goto_if_eq LinkContestRoom1_EventScript_1A57EF applymovement 8, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_4, 1 addvar VAR_TEMP_0, -1 @@ -673,7 +673,7 @@ LinkContestRoom1_EventScript_1A57F0:: @ 81A57F0 compare VAR_TEMP_5, 1 goto_if_eq LinkContestRoom1_EventScript_1A5813 applymovement 9, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_5, 1 addvar VAR_TEMP_0, -1 @@ -686,7 +686,7 @@ LinkContestRoom1_EventScript_1A5814:: @ 81A5814 compare VAR_TEMP_6, 1 goto_if_eq LinkContestRoom1_EventScript_1A5837 applymovement 10, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_6, 1 addvar VAR_TEMP_0, -1 @@ -699,7 +699,7 @@ LinkContestRoom1_EventScript_1A5838:: @ 81A5838 compare VAR_TEMP_7, 1 goto_if_eq LinkContestRoom1_EventScript_1A585B applymovement 11, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_7, 1 addvar VAR_TEMP_0, -1 @@ -712,7 +712,7 @@ LinkContestRoom1_EventScript_1A585C:: @ 81A585C compare VAR_TEMP_8, 1 goto_if_eq LinkContestRoom1_EventScript_1A587F applymovement 15, LinkContestRoom1_Movement_1A5D8D - playse 21 + playse SE_PIN delay 14 setvar VAR_TEMP_8, 1 addvar VAR_TEMP_0, -1 @@ -805,7 +805,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A setvar VAR_TEMP_9, 1 showcontestresults setvar VAR_TEMP_9, 0 - playbgm 439, 0 + playbgm BGM_CON_FAN, FALSE return LinkContestRoom1_EventScript_1A5984:: @ 81A5984 @@ -890,7 +890,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49 call LinkContestRoom1_EventScript_1A5A75 applymovement VAR_TEMP_3, LinkContestRoom1_Movement_1A5D99 waitmovement 0 - playse 223 + playse SE_W227B setvar VAR_TEMP_1, 0 return @@ -1002,7 +1002,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB waitmessage call LinkContestRoom1_EventScript_1A5C7F call LinkContestRoom1_EventScript_1A5CE5 - playse 223 + playse SE_W227B setvar VAR_TEMP_1, 0 call LinkContestRoom1_EventScript_1A5A90 delay 30 @@ -1146,7 +1146,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_1A6D6A, 4 - playfanfare 370 + playfanfare BGM_FANFA4 msgbox LinkContestRoom1_Text_1A6D96, 4 waitfanfare special sub_80C4858 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 8c2325e04..ab91466d8 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -36,7 +36,7 @@ Route117_EventScript_1B2298:: @ 81B2298 Route117_EventScript_1B22B2:: @ 81B22B2 message Route117_Text_1B27A2 - playfanfare 367 + playfanfare BGM_FANFA1 waitfanfare waitmessage waitbuttonpress @@ -208,7 +208,7 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE waitmovement 0 specialvar RESULT, TakePokemonFromDaycare special PayMoneyFor - playse 95 + playse SE_REGI msgbox Route117_PokemonDayCare_Text_1B2B75, 4 waitse playmoncry RESULT, 0 diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index d104b52d4..11f42daf0 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -37,7 +37,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .endif applymovement 2, MtChimney_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement 2, MtChimney_Movement_1A0833 waitmovement 0 applymovement 2, MtChimney_Movement_1A0835 diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index c27951abb..b4d29632e 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -34,7 +34,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 compare RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 - playse 21 + playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_15E9C0 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 35e86543b..7b61190e5 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -66,7 +66,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 @@ -82,7 +82,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 @@ -114,7 +114,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 5ec8197f9..d7b47cdfd 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -10,7 +10,7 @@ AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall setvar VAR_SPECIAL_8, 1 - playse 21 + playse SE_PIN applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 7853b3598..1ee0d35d2 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -54,7 +54,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special LoadPlayerParty special SavePlayerParty special SetBattleTowerParty - playfanfare 368 + playfanfare BGM_ME_ASA waitfanfare special ScrSpecial_HealPlayerParty @@ -110,7 +110,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 message BattleTower_BattleRoom_Text_1C6CE1 delay 60 waitmessage - playse 55 + playse SE_SAVE waitse msgbox BattleTower_BattleRoom_Text_1C6D05, 4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 4058d5aae..5700480e2 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -84,7 +84,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waitmessage - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare msgbox BattleTower_Lobby_Text_19A719, 4 @@ -100,7 +100,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D special DetermineBattleTowerPrize setvar VAR_SPECIAL_4, 3 special SaveBattleTowerProgress - playse 55 + playse SE_SAVE waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD @@ -114,7 +114,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 waitmessage - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare setvar VAR_SPECIAL_4, 9 special BattleTowerUtil @@ -148,7 +148,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 special SaveBattleTowerProgress - playse 55 + playse SE_SAVE waitse msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage @@ -166,7 +166,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waitmessage setvar VAR_SPECIAL_4, 1 special SaveBattleTowerProgress - playse 55 + playse SE_SAVE waitse setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 669b0a5fe..904759cf1 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -37,7 +37,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 doweather special WaitWeather waitstate - playse 209 + playse SE_W197 setfieldeffectargument 0, 9 setfieldeffectargument 1, 13 setfieldeffectargument 2, 0 @@ -48,7 +48,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 .else setvar RESULT, 2 .endif - playse 107 + playse SE_TAMA special sub_80818A4 waitstate special sub_80818FC diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index ee7d77d6b..ba933dbe9 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -56,25 +56,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 return DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 - playse 35 + playse SE_MU_PACHI animateflash 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 - playse 35 + playse SE_MU_PACHI animateflash 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C - playse 35 + playse SE_MU_PACHI animateflash 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 - playse 35 + playse SE_MU_PACHI animateflash 0 call DewfordTown_Gym_EventScript_153071 return diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 1ca62b61c..29c29c80b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -38,20 +38,20 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 step_end EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 - playbgm 454, 0 + playbgm BGM_DAIGO, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 - playse 8 + playse SE_DOOR setmetatile 6, 1, 838, 0 setmetatile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closemessage - playse 8 + playse SE_DOOR checkplayergender compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C @@ -67,17 +67,17 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C - playbgm 415, 0 + playbgm BGM_GIRL_SUP, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 - playbgm 421, 0 + playbgm BGM_BOY_SUP, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4 delay 40 - playse 21 + playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 waitmovement 0 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 @@ -90,7 +90,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4 delay 40 - playse 21 + playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 waitmovement 0 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index d83745593..a738264fe 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 faceplayer checkflag FLAG_DEFEATED_ELITE_4_DRAKE goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 0e5b493e2..e3a4145d6 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA faceplayer checkflag FLAG_DEFEATED_ELITE_4_GLACIA goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 19219a626..d23f234db 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 faceplayer checkflag FLAG_DEFEATED_ELITE_4_PHOEBE goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 5957508ae..a787b0f90 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -64,7 +64,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmovement 0 delay 10 - playfanfare 369 + playfanfare BGM_ME_BACHI message EverGrandeCity_PokemonLeague_Text_191804 waitmessage waitfanfare @@ -86,7 +86,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F return EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A - playse 32 + playse SE_HAZURE msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4 releaseall end diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index f3df03b7d..4531845ab 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -44,7 +44,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 faceplayer checkflag FLAG_DEFEATED_ELITE_4_SYDNEY goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 270575bcb..641a201e3 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -22,13 +22,13 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 0c9880137..93a5115af 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 - playse 18 + playse SE_JIDO_DOA removeobject 4 clearflag FLAG_HIDE_LANETTE release diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 3d4a57c13..c9616266e 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -22,7 +22,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - playse 9 + playse SE_KAIDAN removeobject 1 release end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 43a8ed7cd..e81c3b69f 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -58,11 +58,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED end LavaridgeTown_EventScript_14E56B:: @ 814E56B - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE return LavaridgeTown_EventScript_14E570:: @ 814E570 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE return LavaridgeTown_EventScript_14E575:: @ 814E575 @@ -282,7 +282,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag FLAG_RECEIVED_LAVARIDGE_EGG - playfanfare 370 + playfanfare BGM_FANFA4 message LavaridgeTown_Text_16C2EA waitfanfare waitmessage diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 5c05639fd..0d714003e 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -255,7 +255,7 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 end LilycoveCity_EventScript_14CD60:: @ 814CD60 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CDB0 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE @@ -286,7 +286,7 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 end LilycoveCity_EventScript_14CDD3:: @ 814CDD3 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CE23 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 377c2908d..591587be8 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -72,13 +72,13 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 special sub_80C4858 applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E waitmovement 0 - playse 21 + playse SE_PIN applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833 waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - playfanfare 370 + playfanfare BGM_FANFA4 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -245,13 +245,13 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 special sub_80C4858 applymovement 11, LilycoveCity_ContestLobby_Movement_158B78 waitmovement 0 - playse 21 + playse SE_PIN applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833 waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - playfanfare 370 + playfanfare BGM_FANFA4 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -496,13 +496,13 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 9, 2, 545, 1 setmetatile 9, 3, 609, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 9, 2, 721, 1 setmetatile 9, 3, 729, 1 special DrawWholeMapView @@ -635,13 +635,13 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 lockall applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 3e4caf100..c8a3dcab9 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -41,7 +41,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D lockall - playse 21 + playse SE_PIN applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 waitmovement 0 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 7e221122b..4878cc6bc 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -20,7 +20,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag FLAG_TEMP_2 - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index ff7722f13..da4009759 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 - playse 106 + playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 @@ -159,7 +159,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse 106 + playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 @@ -171,7 +171,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse 106 + playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index d4dedb0c2..12d8bfb4e 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -25,7 +25,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmovement 0 - playse 4 + playse SE_PC_ON special DoLotteryCornerComputerEffect special PickLotteryCornerTicket delay 220 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index a3c8d23af..0c9a9054b 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 special DeleteMonMove - playfanfare 378 + playfanfare BGM_ME_WASURE waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 releaseall diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index c11546bb5..ef2145bbb 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -99,7 +99,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D LittlerootTown_EventScript_14D62B:: @ 814D62B delay 15 - playse 10 + playse SE_DANSA applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 @@ -868,7 +868,7 @@ LittlerootTown_EventScript_14DD2B:: @ 814DD2B LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16A8FD, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message LittlerootTown_Text_16AA32 waitfanfare waitmessage diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 4ce1e277a..8a86cd946 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -90,7 +90,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 lockall - playse 21 + playse SE_PIN applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index af7a2976b..45e9e0783 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -90,7 +90,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 lockall - playse 21 + playse SE_PIN applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 waitmovement 0 applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 8bd9a01d2..34300b13e 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -37,7 +37,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A - playse 9 + playse SE_KAIDAN removeobject LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_STATE, 1 @@ -48,7 +48,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 44adab6f1..e1cb348fd 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -27,7 +27,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 compare RESULT, 1 @@ -155,7 +155,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 return LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D - playfanfare 370 + playfanfare BGM_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 6861e46c8..d7f0611e1 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -95,7 +95,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 msgbox MauvilleCity_Text_165D01, 4 applymovement 6, MauvilleCity_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement 6, MauvilleCity_Movement_1A0833 waitmovement 0 applymovement 6, MauvilleCity_Movement_1A0835 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index c2b785254..c40c05d37 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -62,7 +62,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -163,7 +163,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 takecoins 1000 givedecoration 88 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -179,7 +179,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 takecoins 1000 givedecoration 89 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -195,7 +195,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA takecoins 1000 givedecoration 90 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -297,7 +297,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C takecoins 1500 giveitem ITEM_TM32, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 takecoins 3500 giveitem ITEM_TM29, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 takecoins 4000 giveitem ITEM_TM35, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA takecoins 4000 giveitem ITEM_TM24, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 takecoins 4000 giveitem ITEM_TM13, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -468,7 +468,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C setflag FLAG_RECEIVED_20_COINS givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 - playse 95 + playse SE_REGI goto MauvilleCity_GameCorner_EventScript_1570CA end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 05287c7de..fd9c673dc 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -91,7 +91,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView - playse 44 + playse SE_KI_GASYAN goto MauvilleCity_Gym_EventScript_15661D end @@ -146,7 +146,7 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial2 special MauvilleGymSpecial1 special DrawWholeMapView - playse 44 + playse SE_KI_GASYAN checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if_eq MauvilleCity_Gym_EventScript_1566E1 checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index a058003bc..32269ab89 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -14,7 +14,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 end MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 - playse 21 + playse SE_PIN applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0833 waitmovement 0 applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index a3e396ab0..bf51408b8 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -18,7 +18,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_1A0841 applymovement 6, MeteorFalls_1F_1R_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 5, MeteorFalls_1F_1R_Movement_1A0833 waitmovement 0 applymovement 5, MeteorFalls_1F_1R_Movement_1A0835 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 54a9546c4..bc22ce3fe 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -94,7 +94,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA MossdeepCity_Gym_EventScript_15A619:: @ 815A619 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA releaseall end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index eababfa6c..9aa9d8ef3 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -31,7 +31,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B lockall applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833 waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835 @@ -79,7 +79,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar VAR_SPECIAL_4, RESULT removeobject 2 - playfanfare 370 + playfanfare BGM_FANFA4 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 1e4cdf256..b7d68b257 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmetatile 4, 1, 716, 0 setmetatile 5, 1, 717, 1 special DrawWholeMapView - playse 20 + playse SE_BAN setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 283b6bfed..ae33d7978 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -31,7 +31,7 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA lockall setvar VAR_TEMP_1, 1 setvar VAR_TEMP_2, 0 - playse 21 + playse SE_PIN call NewMauville_Inside_EventScript_15E5DA special DrawWholeMapView releaseall @@ -41,7 +41,7 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 lockall setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 1 - playse 21 + playse SE_PIN call NewMauville_Inside_EventScript_15E728 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 329313e74..a2d2616d3 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -43,7 +43,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC checkflag FLAG_TEMP_1 goto_if_eq OldaleTown_EventScript_14DE79 setflag FLAG_TEMP_1 - playbgm 420, 0 + playbgm BGM_TSURETEK, FALSE msgbox OldaleTown_Text_16AEF2, 4 closemessage switch FACING diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 2ac3f35f9..ea58f50c6 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_14B731:: @ 814B731 return PetalburgCity_EventScript_14B739:: @ 814B739 - savebgm 420 + savebgm BGM_TSURETEK return PetalburgCity_MapScript2_14B73D:: @ 814B73D @@ -181,8 +181,8 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, PetalburgCity_Movement_1A0839 waitmovement 0 - playbgm 420, 0 - playse 21 + playbgm BGM_TSURETEK, FALSE + playse SE_PIN applymovement 9, PetalburgCity_Movement_1A0833 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 1bd1649cf..de141daf9 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -84,7 +84,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement 255, PetalburgCity_Gym_Movement_1A0845 applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 - playse 9 + playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_WALLY_PETALBURG delay 30 @@ -143,7 +143,7 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 - playse 8 + playse SE_DOOR compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE compare VAR_SPECIAL_8, 1 @@ -195,7 +195,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 - playbgm 420, 0 + playbgm BGM_TSURETEK, FALSE compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 compare VAR_SPECIAL_8, 1 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 73eb4f661..149fd4e46 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -13,7 +13,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closemessage - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 @@ -48,7 +48,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closemessage - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 6749f2136..6840c45f4 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playbgm 410, 1 + playbgm BGM_EVENT0, TRUE msgbox Route101_Text_16D10E, 4 closemessage setobjectxy 2, 0, 15 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index bfcbeb87a..22c3fa391 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -18,7 +18,7 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, 4 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE applymovement 2, Route103_Movement_1A0839 waitmovement 0 applymovement 2, Route103_Movement_1A0833 @@ -34,7 +34,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, 4 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE applymovement 2, Route103_Movement_1A0839 waitmovement 0 applymovement 2, Route103_Movement_1A0833 @@ -100,7 +100,7 @@ Route103_EventScript_14ECD9:: @ 814ECD9 Route103_EventScript_14ED0C:: @ 814ED0C applymovement 2, Route103_Movement_14ED67 waitmovement 0 - playse 10 + playse SE_DANSA applymovement 2, Route103_Movement_14ED6B waitmovement 0 goto Route103_EventScript_14ED46 @@ -109,7 +109,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C Route103_EventScript_14ED29:: @ 814ED29 applymovement 2, Route103_Movement_14ED71 waitmovement 0 - playse 10 + playse SE_DANSA applymovement 2, Route103_Movement_14ED74 waitmovement 0 goto Route103_EventScript_14ED46 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 586031a1a..d5219582c 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -17,7 +17,7 @@ Route110_MapScript1_14F914:: @ 814F914 end Route110_EventScript_14F92F:: @ 814F92F - savebgm 403 @ Bicycle music + savebgm BGM_CYCLING return Route110_MapScript2_14F933:: @ 814F933 @@ -352,11 +352,11 @@ Route110_EventScript_14FD34:: @ 814FD34 end Route110_EventScript_14FDA7:: @ 814FDA7 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE return Route110_EventScript_14FDAC:: @ 814FDAC - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE return Route110_EventScript_14FDB1:: @ 814FDB1 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index c825c1234..e7e19b4dd 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -182,7 +182,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E applymovement 1, Route110_TrickHouseEnd_Movement_161315 waitmovement 0 - playse 178 + playse SE_W153 applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 removeobject 1 @@ -224,13 +224,13 @@ Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall turnobject 1, 3 - playse 21 + playse SE_PIN applymovement 1, Route110_TrickHouseEnd_Movement_1A0833 waitmovement 0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_161CEA waitmovement 0 - playse 178 + playse SE_W153 applymovement 255, Route110_TrickHouseEnd_Movement_1A0845 waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, 4 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 8a8dd2763..e5a216db4 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -220,7 +220,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse 178 + playse SE_W153 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -243,7 +243,7 @@ Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A end Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D - playse 21 + playse SE_PIN applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833 waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 @@ -336,7 +336,7 @@ Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835 @@ -469,7 +469,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse 178 + playse SE_W153 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -714,7 +714,7 @@ Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C - playfanfare 370 + playfanfare BGM_FANFA4 message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare waitmessage diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 9ebde8451..b1cb0c9df 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -36,7 +36,7 @@ Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 lockall setvar VAR_TEMP_1, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E2C special DrawWholeMapView releaseall @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 lockall setvar VAR_TEMP_2, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E3F special DrawWholeMapView releaseall @@ -54,7 +54,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 lockall setvar VAR_TEMP_3, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E52 special DrawWholeMapView releaseall @@ -63,7 +63,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 lockall setvar VAR_TEMP_4, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E65 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index cb129b06d..8d5392ae8 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -289,7 +289,7 @@ Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF call Route110_TrickHousePuzzle3_EventScript_162612 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle3_EventScript_161F12 goto Route110_TrickHousePuzzle3_EventScript_1626AD end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 5fedee3a9..1bcdb8087 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -160,7 +160,7 @@ Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 - playse 21 + playse SE_PIN applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -182,7 +182,7 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 - playse 21 + playse SE_PIN applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -204,7 +204,7 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 - playse 21 + playse SE_PIN applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -226,7 +226,7 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 - playse 21 + playse SE_PIN applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -248,7 +248,7 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 - playse 21 + playse SE_PIN applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -389,7 +389,7 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 waitse - playse 32 + playse SE_HAZURE msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4 applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F @@ -408,7 +408,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF waitse - playse 31 + playse SE_SEIKAI goto Route110_TrickHousePuzzle5_EventScript_162DE9 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 66aa8b5e7..d1de7682f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -126,7 +126,7 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 @@ -141,7 +141,7 @@ Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 @@ -156,7 +156,7 @@ Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 @@ -171,7 +171,7 @@ Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 @@ -186,7 +186,7 @@ Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 5336bd510..d0f4e6394 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -222,14 +222,14 @@ Route111_Movement_1501BA:: @ 81501BA Route111_EventScript_1501BC:: @ 81501BC setweather 2 - fadenewbgm 360 + fadenewbgm BGM_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 setweather 8 - fadenewbgm 409 + fadenewbgm BGM_ASHROAD doweather end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index bc32449cd..6c1e8559f 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -197,7 +197,7 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 msgbox Route113_GlassWorkshop_Text_19E827, 4 closemessage fadescreen 1 - playse 5 + playse SE_SELECT delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 63decb5d6..0ed9e9b01 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -77,7 +77,7 @@ Route118_EventScript_150FE4:: @ 8150FE4 end Route118_EventScript_151004:: @ 8151004 - playse 10 + playse SE_DANSA applymovement 19, Route118_Movement_15106D waitmovement 0 delay 30 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index e82d7b313..8d9f88474 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -80,11 +80,11 @@ Route119_EventScript_1511DB:: @ 81511DB end Route119_EventScript_151254:: @ 8151254 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE return Route119_EventScript_151259:: @ 8151259 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE return Route119_EventScript_15125E:: @ 815125E diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 50f453465..b36500345 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -58,7 +58,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A getpartysize compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 - playfanfare 370 + playfanfare BGM_FANFA4 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 6235e3b1c..67fa830e9 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -71,7 +71,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare waitmessage diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 47d216d9f..c6bdbbdb7 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -381,7 +381,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 RustboroCity_EventScript_14C691:: @ 814C691 applymovement 9, RustboroCity_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -393,7 +393,7 @@ RustboroCity_EventScript_14C691:: @ 814C691 RustboroCity_EventScript_14C6BD:: @ 814C6BD applymovement 9, RustboroCity_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -405,7 +405,7 @@ RustboroCity_EventScript_14C6BD:: @ 814C6BD RustboroCity_EventScript_14C6E9:: @ 814C6E9 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -417,7 +417,7 @@ RustboroCity_EventScript_14C6E9:: @ 814C6E9 RustboroCity_EventScript_14C715:: @ 814C715 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -489,7 +489,7 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 RustboroCity_EventScript_14C7FE:: @ 814C7FE applymovement 9, RustboroCity_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -501,7 +501,7 @@ RustboroCity_EventScript_14C7FE:: @ 814C7FE RustboroCity_EventScript_14C82A:: @ 814C82A applymovement 9, RustboroCity_Movement_1A0843 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -513,7 +513,7 @@ RustboroCity_EventScript_14C82A:: @ 814C82A RustboroCity_EventScript_14C856:: @ 814C856 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -525,7 +525,7 @@ RustboroCity_EventScript_14C856:: @ 814C856 RustboroCity_EventScript_14C882:: @ 814C882 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -539,7 +539,7 @@ RustboroCity_EventScript_14C882:: @ 814C882 RustboroCity_EventScript_14C8B8:: @ 814C8B8 applymovement 9, RustboroCity_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index c997935cc..9bbbaacfa 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -80,7 +80,7 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 closemessage - playse 21 + playse SE_PIN applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 @@ -98,7 +98,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE closemessage - playse 21 + playse SE_PIN applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 @@ -140,7 +140,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare 370 + playfanfare BGM_FANFA4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage @@ -160,7 +160,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare 370 + playfanfare BGM_FANFA4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index af5d5d6ee..ff854d7ef 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -37,7 +37,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 closemessage - playbgm 420, 0 + playbgm BGM_TSURETEK, FALSE applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 @@ -50,7 +50,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 giveitem_std ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index d50e7cec0..050cf28c2 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -148,7 +148,7 @@ RusturfTunnel_EventScript_15C91B:: @ 815C91B return RusturfTunnel_EventScript_15C92D:: @ 815C92D - playse 21 + playse SE_PIN applymovement 1, RusturfTunnel_Movement_1A0833 waitmovement 0 applymovement 1, RusturfTunnel_Movement_1A0835 @@ -309,7 +309,7 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 RusturfTunnel_EventScript_15C9EA:: @ 815C9EA lock faceplayer - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE msgbox RusturfTunnel_Text_19419B, 4 trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index fc018a7b9..dd5aee95c 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -13,7 +13,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 2 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_199007, 4 releaseall end @@ -21,7 +21,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 setvar VAR_PORTHOLE_STATE, 6 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_199088, 4 releaseall end @@ -29,14 +29,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 7 - playse 73 + playse SE_PINPON msgbox SSTidalRooms_Text_199007, 4 return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 4 - playse 73 + playse SE_PINPON msgbox SSTidalRooms_Text_1990F8, 4 return @@ -51,7 +51,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 3 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_199088, 4 releaseall end @@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_1990B4, 4 releaseall end @@ -68,7 +68,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 - playse 73 + playse SE_PINPON msgbox SSTidalRooms_Text_1990B4, 4 return diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 574c7412e..54c99b371 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -78,7 +78,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 0 .endif - playse 209 + playse SE_W197 setfieldeffectargument 0, 16 setfieldeffectargument 1, 42 setfieldeffectargument 2, 0 @@ -89,8 +89,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 1 .endif - playfanfare 388 - playse 107 + playfanfare BGM_ME_TAMA + playse SE_TAMA special sub_80818A4 applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 @@ -126,7 +126,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4A89, 4 .endif - playse 2 + playse SE_PC_LOGON applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE @@ -143,7 +143,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4B11, 4 .endif closemessage - playse 3 + playse SE_PC_OFF delay 20 applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845 waitmovement 0 @@ -167,7 +167,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif - playse 21 + playse SE_PIN applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835 diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index cd778202c..d788be9b3 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -12,21 +12,21 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 compare RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeoutbgm 0 - playse 49 + playse SE_TRACK_MOVE special DoSealedChamberShakingEffect1 waitstate delay 40 special DoSealedChamberShakingEffect2 waitstate - playse 8 + playse SE_DOOR delay 40 special DoSealedChamberShakingEffect2 waitstate - playse 8 + playse SE_DOOR delay 40 special DoSealedChamberShakingEffect2 waitstate - playse 8 + playse SE_DOOR delay 40 msgbox SealedChamber_InnerRoom_Text_1A138B, 4 closemessage diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 4079763a3..d39f788d8 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -73,7 +73,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 compare RESULT, 0 call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message SlateportCity_Text_1646DD waitfanfare waitmessage @@ -508,7 +508,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_1A0841 waitmovement 0 msgbox SlateportCity_Text_1655E7, 4 - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE msgbox SlateportCity_Text_1656BC, 4 applymovement 6, SlateportCity_Movement_1A083F applymovement 1, SlateportCity_Movement_1A083F @@ -519,7 +519,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_1A0845 waitmovement 0 msgbox SlateportCity_Text_16578F, 4 - playse 21 + playse SE_PIN applymovement 11, SlateportCity_Movement_1A0833 waitmovement 0 applymovement 11, SlateportCity_Movement_1A0835 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 2fd62e9af..59c5b13fc 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -22,13 +22,13 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 lockall applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index abbe3f78f..ad349932a 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -158,7 +158,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A lock faceplayer delay 8 - playse 21 + playse SE_PIN applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 waitmovement 0 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 @@ -180,7 +180,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse 9 + playse SE_KAIDAN removeobject 13 release end @@ -189,7 +189,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse 9 + playse SE_KAIDAN removeobject 13 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 007e42f90..5dae0bc6b 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -11,7 +11,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 closemessage - playbgm BGM_EVIL_TEAM, 1 + playbgm BGM_EVIL_TEAM, TRUE addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 waitmovement 0 @@ -84,7 +84,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 closemessage applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 - playse 9 + playse SE_KAIDAN removeobject 1 setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 6e7d2614b..f7cc67236 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -206,7 +206,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 end SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A - playse 21 + playse SE_PIN applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 waitmovement 0 applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index e29700981..f2ccc9484 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -216,7 +216,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 applymovement 10, SootopolisCity_Movement_1A083F applymovement 255, SootopolisCity_Movement_1A0843 waitmovement 0 - playse 21 + playse SE_PIN applymovement 10, SootopolisCity_Movement_1A0833 waitmovement 0 applymovement 10, SootopolisCity_Movement_1A0835 @@ -237,7 +237,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169E82, 4 .endif - playse 21 + playse SE_PIN applymovement 5, SootopolisCity_Movement_1A0833 waitmovement 0 applymovement 5, SootopolisCity_Movement_1A0835 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 38514b03b..35fa306e6 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -49,7 +49,7 @@ SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse 40 + playse SE_RU_GASHIN call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -57,7 +57,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse 40 + playse SE_RU_GASHIN call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -65,7 +65,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse 40 + playse SE_RU_GASHIN call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -75,7 +75,7 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 delay 20 applymovement 255, SootopolisCity_Gym_1F_Movement_15AFFD waitmovement 0 - playse 43 + playse SE_RU_HYUU delay 60 warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index e2afd07dc..ffd184ddf 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -26,23 +26,23 @@ LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 - savebgm 393 + savebgm BGM_TEST1 return LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4 - savebgm 394 + savebgm BGM_TEST2 return LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8 - savebgm 395 + savebgm BGM_TEST3 return LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC - savebgm 396 + savebgm BGM_TEST4 return LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 - savebgm 440 + savebgm BGM_CONTEST0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 016b2e7ba..37811dbc1 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -22,13 +22,13 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 lockall applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index d93ff7660..b1ead4060 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -73,7 +73,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 - playse 9 + playse SE_KAIDAN removeobject VAR_SPECIAL_8 releaseall end @@ -160,7 +160,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC waitmovement 0 - playbgm 453, 0 + playbgm BGM_INTER_V, FALSE msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4 closemessage applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB @@ -185,7 +185,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4 waitmovement 0 - playbgm 453, 0 + playbgm BGM_INTER_V, FALSE msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4 closemessage applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE @@ -206,7 +206,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D - playse 21 + playse SE_PIN applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1A0835 @@ -372,7 +372,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0835 @@ -396,7 +396,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B - playse 8 + playse SE_DOOR removeobject VAR_SPECIAL_9 setflag FLAG_RECEIVED_SS_TICKET setvar VAR_LITTLEROOT_HOUSES_STATE, 4 diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 5dba65b8a..6b1e76a1b 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -24,7 +24,7 @@ EventScript_1C3443: gUnknown_081C3448:: @ 81C3448 lockall - playse 73 + playse SE_PINPON message UnknownString_81C34E4 waitmessage waitbuttonpress @@ -33,7 +33,7 @@ gUnknown_081C3448:: @ 81C3448 gUnknown_081C3459:: @ 81C3459 lockall - playse 73 + playse SE_PINPON message UnknownString_81C3514 waitmessage waitbuttonpress -- cgit v1.2.3 From 88c42ade4bfb4a285444c327663e72c7f438adea Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 14:52:51 -0800 Subject: Use weather constants in scripts (and giveegg) --- data/event_scripts.s | 5 +++-- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/JaggedPass.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/MtPyre_Exterior.inc | 6 +++--- data/scripts/maps/Route111.inc | 6 +++--- data/scripts/maps/Route113.inc | 2 +- data/scripts/maps/Route120.inc | 6 +++--- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index b751a2e63..8b0011893 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -8,6 +8,7 @@ #include "constants/opponents.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/weather.h" #include "constants/vars.h" .include "asm/macros.inc" .include "asm/macros/event.inc" @@ -2090,9 +2091,9 @@ Route127_EventScript_1A02C1:: @ 81A02C1 Route128_EventScript_1A02C1:: @ 81A02C1 SootopolisCity_EventScript_1A02C1:: @ 81A02C1 .ifdef SAPPHIRE - setweather 13 + setweather WEATHER_RAIN_HEAVY .else - setweather 12 + setweather WEATHER_DROUGHT .endif return diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 904759cf1..315dda886 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -33,7 +33,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4 .endif closemessage - setweather 0 + setweather WEATHER_NONE doweather special WaitWeather waitstate diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index bf1f0233d..efe5d6a6e 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -13,7 +13,7 @@ JaggedPass_MapScript1_15D274:: @ 815D274 end JaggedPass_EventScript_15D280:: @ 815D280 - setweather 7 + setweather WEATHER_ASH doweather return diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index e81c3b69f..f1a6deed0 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -286,7 +286,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A message LavaridgeTown_Text_16C2EA waitfanfare waitmessage - giveegg 360 + giveegg SPECIES_WYNAUT release end diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 76f1736c2..ec5864df5 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -13,15 +13,15 @@ MtPyre_Exterior_EventScript_15D492:: @ 815D492 return MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3 - setweather 6 + setweather WEATHER_FOG_1 return MtPyre_Exterior_EventScript_15D4A7:: @ 815D4A7 - setweather 6 + setweather WEATHER_FOG_1 doweather end MtPyre_Exterior_EventScript_15D4AC:: @ 815D4AC - setweather 2 + setweather WEATHER_SUNNY doweather end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index d0f4e6394..c3d807f66 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -34,7 +34,7 @@ Route111_EventScript_14FFCD:: @ 814FFCD goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 - setweather 8 + setweather WEATHER_SANDSTORM Route111_EventScript_15000C:: @ 815000C return @@ -221,14 +221,14 @@ Route111_Movement_1501BA:: @ 81501BA step_end Route111_EventScript_1501BC:: @ 81501BC - setweather 2 + setweather WEATHER_SUNNY fadenewbgm BGM_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 - setweather 8 + setweather WEATHER_SANDSTORM fadenewbgm BGM_ASHROAD doweather end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 1b589fcde..a1593ba1e 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -18,7 +18,7 @@ Route113_EventScript_1505E5:: @ 81505E5 goto_if 0, Route113_EventScript_150604 compare VAR_TEMP_0, 84 goto_if 2, Route113_EventScript_150604 - setweather 7 + setweather WEATHER_ASH return Route113_EventScript_150604:: @ 8150604 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index d2866cceb..3858c0e4f 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -90,11 +90,11 @@ Route120_EventScript_1516EA:: @ 81516EA return Route120_EventScript_151711:: @ 8151711 - setweather 1 + setweather WEATHER_CLOUDS return Route120_EventScript_151715:: @ 8151715 - setweather 2 + setweather WEATHER_SUNNY return Route120_EventScript_151719:: @ 8151719 @@ -106,7 +106,7 @@ Route120_EventScript_151719:: @ 8151719 end Route120_EventScript_151735:: @ 8151735 - setweather 3 + setweather WEATHER_RAIN_LIGHT return Route120_EventScript_151739:: @ 8151739 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 54c99b371..afc076a65 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -62,7 +62,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B49C1, 4 .endif - setweather 0 + setweather WEATHER_NONE doweather special sub_8081924 waitstate -- cgit v1.2.3 From c748287725a01561ba9f972b094d7b297cea2d8e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 15:24:19 -0800 Subject: Use -1 instead of 65535 for compare macro --- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- data/scripts/mauville_man.inc | 4 ++-- data/scripts/pokeblocks.inc | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 591587be8..bb13b95be 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -475,7 +475,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar VAR_SPECIAL_4, 65535 + addvar VAR_SPECIAL_4, -1 goto LilycoveCity_ContestLobby_EventScript_158DEE end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 58dacb2f3..0e1835ae4 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -141,7 +141,7 @@ do_trader_menu_get: waitstate compare VAR_SPECIAL_4, 0 goto_if_eq cancelled_get_menu - compare VAR_SPECIAL_4, 65535 + compare VAR_SPECIAL_4, -1 goto_if_eq rare_item_cant_trade_away msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO compare RESULT, NO @@ -178,7 +178,7 @@ do_trader_menu_give: waitstate compare VAR_SPECIAL_6, 0 goto_if_eq cancelled_give_menu - compare VAR_SPECIAL_6, 65535 + compare VAR_SPECIAL_6, -1 goto_if_eq decoration_is_in_use special ScrSpecial_IsDecorationFull compare RESULT, 1 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index eb12ab148..2f5dd6f47 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -54,9 +54,9 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialvar RESULT, GetFirstFreePokeblockSlot - compare RESULT, 65535 + compare RESULT, -1 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF - compare RESULT, 65535 + compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -215,9 +215,9 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialvar RESULT, GetFirstFreePokeblockSlot - compare RESULT, 65535 + compare RESULT, -1 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 - compare RESULT, 65535 + compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end -- cgit v1.2.3 From c6fd37b0dffe1975159699cee3ce57c9ea5716d4 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 4 Jan 2018 17:29:36 -0600 Subject: decompile sub_80E8BF4 - sub_80E95A4 --- data/easy_chat.s | 84 -------------------------------------------------------- 1 file changed, 84 deletions(-) (limited to 'data') diff --git a/data/easy_chat.s b/data/easy_chat.s index 9181ea296..44347345b 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,90 +8,6 @@ .section .rodata - .align 2 -gUnknown_083DBD30:: @ 83DBD30 - obj_tiles gMenuInterviewFrame_Gfx, 2048, 0x0006 - - .align 2 -gUnknown_083DBD38:: @ 83DBD38 - obj_pal gMenuInterviewFrame_Pal, 0x0004 - - .align 2 -gOamData_83DBD40:: @ 83DBD40 - .2byte 0x0000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gSpriteTemplate_83DBD48:: @ 83DBD48 - spr_template 6, 4, gOamData_83DBD40, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gUnknown_083DBD60:: @ 83DBD60 - obj_tiles gMenuWordGroupIndicator_Gfx, 4096, 0x0007 - - .align 2 -gUnknown_083DBD68:: @ 83DBD68 - obj_pal gMenuWordGroupIndicator_Pal, 0x0005 - - .align 2 -gOamData_83DBD70:: @ 83DBD70 - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gSpriteAnim_83DBD78:: @ 83DBD78 - obj_image_anim_frame 96, 3 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBD80:: @ 83DBD80 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 96, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBD94:: @ 83DBD94 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 96, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_frame 32, 4 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBDA8:: @ 83DBDA8 - obj_image_anim_frame 64, 2 - obj_image_anim_frame 32, 2 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBDB4:: @ 83DBDB4 - obj_image_anim_frame 64, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_end - - .align 2 -gSpriteAnim_83DBDC0:: @ 83DBDC0 - obj_image_anim_frame 64, 2 - obj_image_anim_frame 96, 2 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83DBDCC:: @ 83DBDCC - .4byte gSpriteAnim_83DBD78 - .4byte gSpriteAnim_83DBD80 - .4byte gSpriteAnim_83DBD94 - .4byte gSpriteAnim_83DBDA8 - .4byte gSpriteAnim_83DBDB4 - .4byte gSpriteAnim_83DBDC0 - - .align 2 -gSpriteTemplate_83DBDE4:: @ 83DBDE4 - spr_template 7, 5, gOamData_83DBD70, gSpriteAnimTable_83DBDCC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - gUnknown_083DBDFC:: @ 83DBDFC .incbin "graphics/unknown/unknown_3DBDFC.gbapal" -- cgit v1.2.3 From 27024647438c3cfeb6218965821ac2c07122e132 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 16:03:26 -0800 Subject: Use constants for some item names stored in script vars --- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 6 ++-- data/scripts/maps/MauvilleCity_GameCorner.inc | 18 ++++++------ data/scripts/maps/Route110_TrickHouseEnd.inc | 4 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 4 +-- data/scripts/maps/Route113_GlassWorkshop.inc | 32 +++++++++++----------- .../maps/Route124_DivingTreasureHuntersHouse.inc | 16 +++++------ 6 files changed, 40 insertions(+), 40 deletions(-) (limited to 'data') diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index da4009759..cd5e0d980 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -88,17 +88,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C - setvar VAR_TEMP_0, 26 + setvar VAR_TEMP_0, ITEM_FRESH_WATER goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 - setvar VAR_TEMP_0, 27 + setvar VAR_TEMP_0, ITEM_SODA_POP goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 - setvar VAR_TEMP_0, 28 + setvar VAR_TEMP_0, ITEM_LEMONADE goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index c40c05d37..d150e1508 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -156,12 +156,12 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecorationname 1, 88 - checkdecorspace 88 + bufferdecorationname 1, DECOR_TREECKO_DOLL + checkdecorspace DECOR_TREECKO_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - givedecoration 88 + givedecoration DECOR_TREECKO_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -172,12 +172,12 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecorationname 1, 89 - checkdecorspace 89 + bufferdecorationname 1, DECOR_TORCHIC_DOLL + checkdecorspace DECOR_TORCHIC_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - givedecoration 89 + givedecoration DECOR_TORCHIC_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -188,12 +188,12 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecorationname 1, 90 - checkdecorspace 90 + bufferdecorationname 1, DECOR_MUDKIP_DOLL + checkdecorspace DECOR_MUDKIP_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - givedecoration 90 + givedecoration DECOR_MUDKIP_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index e7e19b4dd..68ce0f5a7 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -167,9 +167,9 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 .ifdef SAPPHIRE - givedecoration_std 32 + givedecoration_std DECOR_BLUE_TENT .else - givedecoration_std 31 + givedecoration_std DECOR_RED_TENT .endc compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index e5a216db4..f34bba6e6 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -450,9 +450,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, 4 .ifdef SAPPHIRE - givedecoration_std 32 + givedecoration_std DECOR_BLUE_TENT .else - givedecoration_std 31 + givedecoration_std DECOR_RED_TENT .endif compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 6c1e8559f..e1bb038e3 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -67,7 +67,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar VAR_SPECIAL_8, 39 + setvar VAR_SPECIAL_8, ITEM_BLUE_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 @@ -81,7 +81,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C - setvar VAR_SPECIAL_8, 40 + setvar VAR_SPECIAL_8, ITEM_YELLOW_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 @@ -95,7 +95,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 - setvar VAR_SPECIAL_8, 41 + setvar VAR_SPECIAL_8, ITEM_RED_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 @@ -109,7 +109,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 - setvar VAR_SPECIAL_8, 43 + setvar VAR_SPECIAL_8, ITEM_WHITE_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 @@ -123,7 +123,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 - setvar VAR_SPECIAL_8, 42 + setvar VAR_SPECIAL_8, ITEM_BLACK_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 @@ -138,7 +138,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 13 + setvar VAR_SPECIAL_8, DECOR_PRETTY_CHAIR bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 @@ -153,7 +153,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 6 + setvar VAR_SPECIAL_8, DECOR_PRETTY_DESK bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 @@ -246,50 +246,50 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 39 + setvar VAR_SPECIAL_8, ITEM_BLUE_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 40 + setvar VAR_SPECIAL_8, ITEM_YELLOW_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 41 + setvar VAR_SPECIAL_8, ITEM_RED_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 43 + setvar VAR_SPECIAL_8, ITEM_WHITE_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 42 + setvar VAR_SPECIAL_8, ITEM_BLACK_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 13 - bufferdecorationname 0, 13 + setvar VAR_SPECIAL_8, DECOR_PRETTY_CHAIR + bufferdecorationname 0, DECOR_PRETTY_CHAIR goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 6 - bufferdecorationname 0, 6 + setvar VAR_SPECIAL_8, DECOR_PRETTY_DESK + bufferdecorationname 0, DECOR_PRETTY_DESK goto Route113_GlassWorkshop_EventScript_1639B1 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 4061dcd7e..bc71fac41 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -224,23 +224,23 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 - setvar VAR_SPECIAL_8, 48 - setvar VAR_SPECIAL_9, 95 + setvar VAR_SPECIAL_8, ITEM_RED_SHARD + setvar VAR_SPECIAL_9, ITEM_FIRE_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar VAR_SPECIAL_8, 50 - setvar VAR_SPECIAL_9, 96 + setvar VAR_SPECIAL_8, ITEM_YELLOW_SHARD + setvar VAR_SPECIAL_9, ITEM_THUNDER_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar VAR_SPECIAL_8, 49 - setvar VAR_SPECIAL_9, 97 + setvar VAR_SPECIAL_8, ITEM_BLUE_SHARD + setvar VAR_SPECIAL_9, ITEM_WATER_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar VAR_SPECIAL_8, 51 - setvar VAR_SPECIAL_9, 98 + setvar VAR_SPECIAL_8, ITEM_GREEN_SHARD + setvar VAR_SPECIAL_9, ITEM_LEAF_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 -- cgit v1.2.3 From f0097860b0098ae465204152fb3a38d69422b27e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 16:19:02 -0800 Subject: Use MSGBOX_YESNO and YES/NO constants for yes/no message boxes --- data/event_scripts.s | 138 ++++++++++----------- data/field_move_scripts.inc | 24 ++-- data/scripts/berry_tree.inc | 18 +-- data/scripts/cable_club.inc | 16 +-- data/scripts/contest_hall.inc | 16 +-- data/scripts/day_care.inc | 36 +++--- data/scripts/gabby_and_ty.inc | 16 +-- data/scripts/maps/BattleTower_BattleRoom.inc | 18 +-- data/scripts/maps/BattleTower_Lobby.inc | 12 +- data/scripts/maps/BattleTower_Outside.inc | 8 +- data/scripts/maps/DewfordTown.inc | 16 +-- data/scripts/maps/DewfordTown_Hall.inc | 6 +- data/scripts/maps/FallarborTown_House1.inc | 6 +- data/scripts/maps/FallarborTown_House2.inc | 4 +- data/scripts/maps/FortreeCity.inc | 4 +- data/scripts/maps/FortreeCity_House1.inc | 4 +- data/scripts/maps/LavaridgeTown.inc | 4 +- data/scripts/maps/LilycoveCity.inc | 12 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 24 ++-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 4 +- data/scripts/maps/LilycoveCity_Harbor.inc | 8 +- data/scripts/maps/LilycoveCity_House3.inc | 4 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 6 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 12 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 18 +-- data/scripts/maps/MauvilleCity.inc | 8 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 18 +-- data/scripts/maps/MauvilleCity_GameCorner.inc | 12 +- data/scripts/maps/MauvilleCity_House2.inc | 6 +- data/scripts/maps/MossdeepCity.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 8 +- data/scripts/maps/MossdeepCity_House3.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 8 +- data/scripts/maps/MtChimney.inc | 8 +- data/scripts/maps/MtChimney_CableCarStation.inc | 6 +- data/scripts/maps/MtPyre_Summit.inc | 24 ++-- data/scripts/maps/NewMauville_Entrance.inc | 4 +- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- data/scripts/maps/PacifidlogTown_House4.inc | 6 +- data/scripts/maps/PetalburgCity_Gym.inc | 72 +++++------ data/scripts/maps/Route104_MrBrineysHouse.inc | 12 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 12 +- data/scripts/maps/Route109.inc | 4 +- data/scripts/maps/Route109_SeashoreHouse.inc | 4 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 4 +- data/scripts/maps/Route111.inc | 12 +- data/scripts/maps/Route111_OldLadysRestStop.inc | 12 +- data/scripts/maps/Route112_CableCarStation.inc | 6 +- data/scripts/maps/Route113_GlassWorkshop.inc | 28 ++--- data/scripts/maps/Route114_LanettesHouse.inc | 8 +- data/scripts/maps/Route118.inc | 6 +- data/scripts/maps/Route120.inc | 14 +-- data/scripts/maps/Route121_SafariZoneEntrance.inc | 8 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 8 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 16 +-- data/scripts/maps/RustboroCity_House1.inc | 4 +- data/scripts/maps/SafariZone_Southeast.inc | 4 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 4 +- data/scripts/maps/SlateportCity.inc | 6 +- data/scripts/maps/SlateportCity_Harbor.inc | 16 +-- data/scripts/maps/SlateportCity_House1.inc | 12 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 4 +- data/scripts/maps/SootopolisCity.inc | 4 +- data/scripts/maps/SootopolisCity_House2.inc | 6 +- data/scripts/maps/SootopolisCity_House3.inc | 4 +- data/scripts/maps/SootopolisCity_House6.inc | 4 +- data/scripts/maps/SouthernIsland_Exterior.inc | 4 +- data/scripts/pokeblocks.inc | 18 +-- data/scripts/safari_zone.inc | 8 +- data/scripts/secret_power_tm.inc | 4 +- 70 files changed, 441 insertions(+), 441 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 8b0011893..1ed419b52 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -440,8 +440,8 @@ EventScript_15F3E2: end EventScript_15F419: - msgbox UnknownString_81A38FB, 5 - compare RESULT, 0 + msgbox UnknownString_81A38FB, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_15F384 closemessage special SecretBasePC_PackUp @@ -492,8 +492,8 @@ EventScript_15F4A1: compare RESULT, 2 goto_if_eq EventScript_15F503 special BufferSecretBaseOwnerName - msgbox UnknownString_81A3958, 5 - compare RESULT, 0 + msgbox UnknownString_81A3958, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A22, 3 special sub_80BC5BC @@ -502,8 +502,8 @@ EventScript_15F4A1: end EventScript_15F4E0: - msgbox UnknownString_81A3982, 5 - compare RESULT, 0 + msgbox UnknownString_81A3982, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_15F452 msgbox UnknownString_81A3A3A, 3 special sub_80BC5BC @@ -1444,9 +1444,9 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B lock faceplayer msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO - compare RESULT, 1 + compare RESULT, YES goto_if_eq do_heal_party - compare RESULT, 0 + compare RESULT, NO goto_if_eq dont_heal_party end @@ -1664,10 +1664,10 @@ HiddenItemScript_Fail: UnusedMixRecordsScript: @ 819FFD5 lock faceplayer - msgbox UnusedMixRecordsPromptText, 5 - compare RESULT, 1 + msgbox UnusedMixRecordsPromptText, MSGBOX_YESNO + compare RESULT, YES goto_if_eq UnusedMixRecordsScript_Yes - compare RESULT, 0 + compare RESULT, NO goto_if_eq UnusedMixRecordsScript_Done goto UnusedMixRecordsScript_Done UnusedMixRecordsScript_Yes: @ 819FFFA @@ -1827,8 +1827,8 @@ UseSurfScript:: @ 81A0117 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT lockall - msgbox UseSurfPromptText, 5 - compare RESULT, 0 + msgbox UseSurfPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq UseSurfScript_No msgbox UsedSurfText, 4 dofieldeffect 9 @@ -2193,8 +2193,8 @@ Route101_EventScript_1A037F:: @ 81A037F Route103_EventScript_1A037F:: @ 81A037F lock faceplayer - msgbox Route101_Text_1C4449, 5 - compare RESULT, 0 + msgbox Route101_Text_1C4449, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route101_EventScript_1A039B call Route101_EventScript_1A03B0 release @@ -2442,8 +2442,8 @@ Route120_EventScript_1A0594:: @ 81A0594 end Route119_EventScript_1A05AE:: @ 81A05AE - msgbox Route119_Text_171BB6, 5 - compare RESULT, 1 + msgbox Route119_Text_171BB6, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route119_EventScript_1A05C3 release end @@ -3632,8 +3632,8 @@ EventScript_1A2CB0: compare RESULT, 6 goto_if_eq EventScript_1A2CF1 bufferpartymonnick 0, RESULT - msgbox UnknownString_8198F34, 5 - compare RESULT, 0 + msgbox UnknownString_8198F34, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage @@ -3663,8 +3663,8 @@ EventScript_1A2D08: compare RESULT, 6 goto_if_eq EventScript_1A2D49 bufferpartymonnick 0, RESULT - msgbox UnknownString_81A197B, 5 - compare RESULT, 0 + msgbox UnknownString_81A197B, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage @@ -3694,8 +3694,8 @@ EventScript_1A2D60: compare RESULT, 6 goto_if_eq EventScript_1A2DA1 bufferpartymonnick 0, RESULT - msgbox UnknownString_81A1A4B, 5 - compare RESULT, 0 + msgbox UnknownString_81A1A4B, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A msgbox UsedCutRockSmashText, 4 closemessage @@ -3738,8 +3738,8 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE applymovement 255, SecretBase_RedCave1_Movement_1A2E11 waitmovement 0 setvar VAR_0x4097, 1 - msgbox SecretBase_RedCave1_Text_198F89, 5 - compare RESULT, 1 + msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SecretBase_RedCave1_EventScript_1A2E08 closemessage playse SE_KAIDAN @@ -3786,18 +3786,18 @@ EventScript_1A2E45: setorcopyvar VAR_SPECIAL_4, RESULT lockall special GetSecretBaseNearbyMapName - msgbox UnknownString_81A3C71, 5 - compare RESULT, 0 + msgbox UnknownString_81A3C71, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A - msgbox UnknownString_81A38FB, 5 - compare RESULT, 0 + msgbox UnknownString_81A38FB, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A fadescreen 1 special MoveSecretBase closemessage fadescreen 0 - msgbox UnknownString_81A3CC9, 5 - compare RESULT, 0 + msgbox UnknownString_81A3CC9, MSGBOX_YESNO + compare RESULT, NO goto_if_eq EventScript_1A2F3A bufferpartymonnick 0, VAR_SPECIAL_4 buffermovename 1, MOVE_SECRET_POWER @@ -3950,8 +3950,8 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A1AEA, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A1AEA, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 special sub_80BCE4C @@ -3985,8 +3985,8 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A1E67, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A1E67, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 special sub_80BCE4C @@ -4020,8 +4020,8 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock faceplayer - msgbox SecretBase_RedCave1_Text_1A218F, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A218F, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 special sub_80BCE4C @@ -4055,8 +4055,8 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A24E1, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A24E1, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 special sub_80BCE4C @@ -4090,8 +4090,8 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2830, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2830, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 special sub_80BCE4C @@ -4125,8 +4125,8 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A1CB2, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A1CB2, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 special sub_80BCE4C @@ -4160,8 +4160,8 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2026, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2026, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 special sub_80BCE4C @@ -4195,8 +4195,8 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A236A, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A236A, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 special sub_80BCE4C @@ -4230,8 +4230,8 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2663, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2663, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 special sub_80BCE4C @@ -4265,8 +4265,8 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock faceplayer - msgbox SecretBase_RedCave1_Text_1A2A13, 5 - compare RESULT, 0 + msgbox SecretBase_RedCave1_Text_1A2A13, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 special sub_80BCE4C @@ -4395,10 +4395,10 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADED6 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox SlateportCity_PokemonFanClub_Text_1A8704, 5 - compare RESULT, 1 + msgbox SlateportCity_PokemonFanClub_Text_1A8704, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADE84 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADEB9 end @@ -4443,18 +4443,18 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER - msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 - compare RESULT, 1 + msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25 - msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, 5 - compare RESULT, 1 + msgbox SlateportCity_OceanicMuseum_1F_Text_1A934C, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF79 end @@ -4499,10 +4499,10 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0 compare RESULT, 1 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0AC copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox SlateportCity_PokemonFanClub_Text_1A82F1, 5 - compare RESULT, 1 + msgbox SlateportCity_PokemonFanClub_Text_1A82F1, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_PokemonFanClub_EventScript_1ADFE9 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2 end @@ -4576,10 +4576,10 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox FallarborTown_ContestLobby_Text_1A6F7C, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1A6F7C, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1AE0F8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D end @@ -4673,10 +4673,10 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - msgbox BattleTower_Lobby_Text_1A776D, 5 - compare RESULT, 1 + msgbox BattleTower_Lobby_Text_1A776D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq BattleTower_Lobby_EventScript_1AE241 - compare RESULT, 0 + compare RESULT, NO goto_if_eq BattleTower_Lobby_EventScript_1AE297 end diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 0a7112125..a4a7513e5 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -8,8 +8,8 @@ S_CuttableTree:: @ 81B0DCC setfieldeffectargument 0, RESULT bufferpartymonnick 0, RESULT buffermovename 1, MOVE_CUT - msgbox UseCutPromptText, 5 - compare RESULT, 0 + msgbox UseCutPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Cut_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage @@ -66,8 +66,8 @@ S_BreakableRock:: @ 81B0EB7 setfieldeffectargument 0, RESULT bufferpartymonnick 0, RESULT buffermovename 1, MOVE_ROCK_SMASH - msgbox UseRockSmashPromptText, 5 - compare RESULT, 0 + msgbox UseRockSmashPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RockSmash_ChoseNo msgbox UsedCutRockSmashText, 4 closemessage @@ -133,8 +133,8 @@ S_PushableBoulder:: @ 81B0FCB compare RESULT, 6 goto_if_eq CannotUseStrength setfieldeffectargument 0, RESULT - msgbox UseStrengthPromptText, 5 - compare RESULT, 0 + msgbox UseStrengthPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Strength_ChoseNo closemessage dofieldeffect 40 @@ -195,8 +195,8 @@ S_UseWaterfall:: @ 81B115A goto_if_eq Waterfall_NoMonKnows bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT - msgbox UseWaterfallPromptText, 5 - compare RESULT, 0 + msgbox UseWaterfallPromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Waterfall_Done msgbox UsedWaterfallText, 4 dofieldeffect 43 @@ -229,8 +229,8 @@ UseDiveScript:: @ 81B1220 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT setfieldeffectargument 1, 1 - msgbox UseDivePromptText, 5 - compare RESULT, 0 + msgbox UseDivePromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Dive_Done msgbox UsedDiveText, 4 dofieldeffect 44 @@ -252,8 +252,8 @@ S_UseDiveUnderwater:: @ 81B1269 bufferpartymonnick 0, RESULT setfieldeffectargument 0, RESULT setfieldeffectargument 1, 1 - msgbox UnderwaterUseDivePromptText, 5 - compare RESULT, 0 + msgbox UnderwaterUseDivePromptText, MSGBOX_YESNO + compare RESULT, NO goto_if_eq UnderwaterDive_Done msgbox UsedDiveText, 4 dofieldeffect 44 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 817e2b1e4..9fb808074 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -31,10 +31,10 @@ Route102_EventScript_1A153D:: @ 81A153D end Route102_EventScript_1A1558:: @ 81A1558 - msgbox Route102_Text_1A16CD, 5 - compare RESULT, 1 + msgbox Route102_Text_1A16CD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route102_EventScript_1A1577 - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route102_EventScript_1A1593 end @@ -101,10 +101,10 @@ Route102_EventScript_1A15F9:: @ 81A15F9 buffernumberstring 1, VAR_SPECIAL_6 lock faceplayer - msgbox Route102_Text_1A17C0, 5 - compare RESULT, 1 + msgbox Route102_Text_1A17C0, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route102_EventScript_1A161D - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route102_EventScript_1A164B Route102_EventScript_1A161D:: @ 81A161D @@ -148,10 +148,10 @@ Route102_EventScript_1A165F:: @ 81A165F checkitem ITEM_WAILMER_PAIL, 1 compare RESULT, 0 goto_if_eq Route102_EventScript_1A168D - msgbox Route102_Text_1A18E6, 5 - compare RESULT, 1 + msgbox Route102_Text_1A18E6, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route102_EventScript_1A1693 - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route102_EventScript_1A168D Route102_EventScript_1A168D:: @ 81A168D diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 397538eaf..334a52382 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -351,10 +351,10 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer - msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, 5 - compare RESULT, 0 + msgbox OldaleTown_PokemonCenter_2F_Text_1A457E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 1 + compare RESULT, YES goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A40FA OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA @@ -448,10 +448,10 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer - msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, 5 - compare RESULT, 0 + msgbox OldaleTown_PokemonCenter_2F_Text_1A45FE, MSGBOX_YESNO + compare RESULT, NO goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - compare RESULT, 1 + compare RESULT, YES goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 @@ -790,8 +790,8 @@ RecordCorner_EventScript_1A44D6:: @ 81A44D6 end TradeRoom_PromptToCancelLink:: @ 81A44E5 - msgbox TradeRoom_WillLinkBeTerminated, 5 - compare RESULT, 1 + msgbox TradeRoom_WillLinkBeTerminated, MSGBOX_YESNO + compare RESULT, YES goto_if_eq TradeRoom_TerminateLink erasebox 0, 0, 29, 19 end diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 4a7712f58..af2c39979 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -32,8 +32,8 @@ FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1 end FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 - msgbox FallarborTown_ContestLobby_Text_1A64F4, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1A64F4, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F13 msgbox FallarborTown_ContestLobby_Text_1A65EA, 4 releaseall @@ -153,17 +153,17 @@ FallarborTown_ContestLobby_EventScript_1A50C8:: @ 81A50C8 end FallarborTown_ContestLobby_EventScript_1A50D7:: @ 81A50D7 - msgbox FallarborTown_ContestLobby_Text_1A67A3, 5 + msgbox FallarborTown_ContestLobby_Text_1A67A3, MSGBOX_YESNO switch RESULT - case 0, FallarborTown_ContestLobby_EventScript_1A5048 - case 1, FallarborTown_ContestLobby_EventScript_1A513D + case NO, FallarborTown_ContestLobby_EventScript_1A5048 + case YES, FallarborTown_ContestLobby_EventScript_1A513D end FallarborTown_ContestLobby_EventScript_1A50FB:: @ 81A50FB - msgbox FallarborTown_ContestLobby_Text_1A6724, 5 + msgbox FallarborTown_ContestLobby_Text_1A6724, MSGBOX_YESNO switch RESULT - case 0, FallarborTown_ContestLobby_EventScript_1A5048 - case 1, FallarborTown_ContestLobby_EventScript_1A513D + case NO, FallarborTown_ContestLobby_EventScript_1A5048 + case YES, FallarborTown_ContestLobby_EventScript_1A513D end FallarborTown_ContestLobby_EventScript_1A511F:: @ 81A511F diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index ab91466d8..0d0d83801 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -14,11 +14,11 @@ Route117_EventScript_1B222D:: @ 81B222D end Route117_EventScript_1B2262:: @ 81B2262 - msgbox Route117_Text_1B2659, 5 - compare RESULT, 1 + msgbox Route117_Text_1B2659, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_EventScript_1B2298 - msgbox Route117_Text_1B28C4, 5 - compare RESULT, 1 + msgbox Route117_Text_1B28C4, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 clearflag FLAG_PENDING_DAYCARE_EGG @@ -88,8 +88,8 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327 goto_if_eq Route117_PokemonDayCare_EventScript_1B242B compare RESULT, 3 goto_if_eq Route117_PokemonDayCare_EventScript_1B2558 - msgbox Route117_PokemonDayCare_Text_1B28F2, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B28F2, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B236C msgbox Route117_PokemonDayCare_Text_1B2A14, 4 release @@ -127,8 +127,8 @@ Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0 end Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA - msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B29AD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B236C goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -162,11 +162,11 @@ Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B msgbox Route117_PokemonDayCare_Text_1B2A88, 4 setvar VAR_SPECIAL_4, 0 call Route117_PokemonDayCare_EventScript_1B241A - msgbox Route117_PokemonDayCare_Text_1B29AD, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B29AD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B236C - msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B2BF6, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -189,8 +189,8 @@ Route117_PokemonDayCare_EventScript_1B2469:: @ 81B2469 Route117_PokemonDayCare_EventScript_1B24A8:: @ 81B24A8 special GetDaycareCost - msgbox Route117_PokemonDayCare_Text_1B2B49, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B2B49, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B24C4 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -221,8 +221,8 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE end Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520 - msgbox Route117_PokemonDayCare_Text_1B2A4F, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B2A4F, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 goto Route117_PokemonDayCare_EventScript_1B23D0 end @@ -263,8 +263,8 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 call Route117_PokemonDayCare_EventScript_1B241A setvar VAR_SPECIAL_4, 1 call Route117_PokemonDayCare_EventScript_1B241A - msgbox Route117_PokemonDayCare_Text_1B2BF6, 5 - compare RESULT, 1 + msgbox Route117_PokemonDayCare_Text_1B2BF6, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route117_PokemonDayCare_EventScript_1B2469 msgbox Route117_PokemonDayCare_Text_1B2A76, 4 release diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index e2f43b77e..ad7a3d3c5 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -210,7 +210,7 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 call_if 1, Route111_EventScript_1AE5FD checkflag FLAG_TEMP_1 goto_if_eq Route111_EventScript_1AE73A - msgbox Route111_Text_1AC015, 5 + msgbox Route111_Text_1AC015, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end @@ -270,37 +270,37 @@ Route111_Movement_1AE69D:: @ 81AE69D step_end Route111_EventScript_1AE69F:: @ 81AE69F - msgbox Route111_Text_1AC60B, 5 + msgbox Route111_Text_1AC60B, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6AD:: @ 81AE6AD - msgbox Route111_Text_1AC3CF, 5 + msgbox Route111_Text_1AC3CF, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6BB:: @ 81AE6BB - msgbox Route111_Text_1AC18D, 5 + msgbox Route111_Text_1AC18D, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6C9:: @ 81AE6C9 - msgbox Route111_Text_1AC219, 5 + msgbox Route111_Text_1AC219, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6D7:: @ 81AE6D7 - msgbox Route111_Text_1AC2D6, 5 + msgbox Route111_Text_1AC2D6, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6E5:: @ 81AE6E5 - msgbox Route111_Text_1AC355, 5 + msgbox Route111_Text_1AC355, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end Route111_EventScript_1AE6F3:: @ 81AE6F3 - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route111_EventScript_1AE72D msgbox Route111_Text_1AC40F, 4 setvar VAR_SPECIAL_4, 10 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 1ee0d35d2..ce7d7c0e9 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -59,24 +59,24 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special ScrSpecial_HealPlayerParty BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2 - msgbox BattleTower_BattleRoom_Text_19AD09, 5 + msgbox BattleTower_BattleRoom_Text_19AD09, MSGBOX_YESNO switch RESULT - case 0, BattleTower_BattleRoom_EventScript_1609E0 - case 1, BattleTower_BattleRoom_EventScript_160A3C + case NO, BattleTower_BattleRoom_EventScript_1609E0 + case YES, BattleTower_BattleRoom_EventScript_160A3C case 127, BattleTower_BattleRoom_EventScript_1609E0 BattleTower_BattleRoom_EventScript_1609E0:: @ 81609E0 - msgbox BattleTower_BattleRoom_Text_19AD3C, 5 + msgbox BattleTower_BattleRoom_Text_19AD3C, MSGBOX_YESNO switch RESULT - case 0, BattleTower_BattleRoom_EventScript_160A0E - case 1, BattleTower_BattleRoom_EventScript_160A94 + case NO, BattleTower_BattleRoom_EventScript_160A0E + case YES, BattleTower_BattleRoom_EventScript_160A94 case 127, BattleTower_BattleRoom_EventScript_160A0E BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E - msgbox BattleTower_BattleRoom_Text_19AD66, 5 + msgbox BattleTower_BattleRoom_Text_19AD66, MSGBOX_YESNO switch RESULT - case 0, BattleTower_BattleRoom_EventScript_1609B2 - case 1, BattleTower_BattleRoom_EventScript_160AB1 + case NO, BattleTower_BattleRoom_EventScript_1609B2 + case YES, BattleTower_BattleRoom_EventScript_160AB1 case 127, BattleTower_BattleRoom_EventScript_1609B2 BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 5700480e2..14b85c5b0 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -221,10 +221,10 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA waitstate compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16064F - msgbox BattleTower_Lobby_Text_199FDA, 5 + msgbox BattleTower_Lobby_Text_199FDA, MSGBOX_YESNO switch RESULT - case 0, BattleTower_Lobby_EventScript_16064F - case 1, BattleTower_Lobby_EventScript_160587 + case NO, BattleTower_Lobby_EventScript_16064F + case YES, BattleTower_Lobby_EventScript_160587 case 127, BattleTower_Lobby_EventScript_16064F BattleTower_Lobby_EventScript_160587:: @ 8160587 @@ -334,10 +334,10 @@ BattleTower_Lobby_Movement_16069A:: @ 816069A BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 lock faceplayer - msgbox BattleTower_Lobby_Text_19A747, 5 + msgbox BattleTower_Lobby_Text_19A747, MSGBOX_YESNO switch RESULT - case 1, BattleTower_Lobby_EventScript_1606CC - case 0, BattleTower_Lobby_EventScript_1606F7 + case YES, BattleTower_Lobby_EventScript_1606CC + case NO, BattleTower_Lobby_EventScript_1606F7 release end diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 3992ffd2c..8f6cb4305 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -35,8 +35,8 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 end BattleTower_Outside_EventScript_1601D0:: @ 81601D0 - msgbox BattleTower_Outside_Text_199DF2, 5 - compare RESULT, 0 + msgbox BattleTower_Outside_Text_199DF2, MSGBOX_YESNO + compare RESULT, NO goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 @@ -46,8 +46,8 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 end BattleTower_Outside_EventScript_1601FB:: @ 81601FB - msgbox BattleTower_Outside_Text_199E0E, 5 - compare RESULT, 0 + msgbox BattleTower_Outside_Text_199E0E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index dc733071f..50c9d8991 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -42,8 +42,8 @@ DewfordTown_EventScript_14E06B:: @ 814E06B end DewfordTown_EventScript_14E076:: @ 814E076 - msgbox DewfordTown_Text_16B3BC, 5 - compare RESULT, 1 + msgbox DewfordTown_Text_16B3BC, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release @@ -76,10 +76,10 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 faceplayer checkflag FLAG_RECEIVED_OLD_ROD goto_if_eq DewfordTown_EventScript_14E11B - msgbox DewfordTown_Text_16B665, 5 - compare RESULT, 1 + msgbox DewfordTown_Text_16B665, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E0F0 - compare RESULT, 0 + compare RESULT, NO goto_if_eq DewfordTown_EventScript_14E111 end @@ -598,10 +598,10 @@ DewfordTown_EventScript_14E413:: @ 814E413 lock faceplayer call DewfordTown_EventScript_1A0102 - msgbox DewfordTown_Text_16B9CE, 5 - compare RESULT, 1 + msgbox DewfordTown_Text_16B9CE, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E439 - compare RESULT, 0 + compare RESULT, NO goto_if_eq DewfordTown_EventScript_14E443 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 530a4e04d..c4ccc769c 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -30,10 +30,10 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD faceplayer call DewfordTown_Hall_EventScript_1A0102 special BufferRandomHobbyOrLifestyleString - msgbox DewfordTown_Hall_Text_1755F9, 5 - compare RESULT, 1 + msgbox DewfordTown_Hall_Text_1755F9, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_Hall_EventScript_1532F6 - compare RESULT, 0 + compare RESULT, NO goto_if_eq DewfordTown_Hall_EventScript_153300 end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 3c5345f8f..d2b27f478 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -22,7 +22,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA call_if 0, FallarborTown_House1_EventScript_153C2D checkflag FLAG_TEMP_2 call_if 1, FallarborTown_House1_EventScript_153C3E - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem_std ITEM_TM27 @@ -37,11 +37,11 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA FallarborTown_House1_EventScript_153C2D:: @ 8153C2D msgbox FallarborTown_House1_Text_177755, 4 - msgbox FallarborTown_House1_Text_17780E, 5 + msgbox FallarborTown_House1_Text_17780E, MSGBOX_YESNO return FallarborTown_House1_EventScript_153C3E:: @ 8153C3E - msgbox FallarborTown_House1_Text_1779B8, 5 + msgbox FallarborTown_House1_Text_1779B8, MSGBOX_YESNO return FallarborTown_House1_EventScript_153C47:: @ 8153C47 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 0546ef5be..7ceaabdef 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -16,9 +16,9 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 compare RESULT, 0 goto_if_eq FallarborTown_House2_EventScript_153D60 - msgbox FallarborTown_House2_Text_177BDB, 5 + msgbox FallarborTown_House2_Text_177BDB, MSGBOX_YESNO switch RESULT - case 0, FallarborTown_House2_EventScript_153D60 + case NO, FallarborTown_House2_EventScript_153D60 goto FallarborTown_House2_EventScript_153CE4 end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 239c1410d..937b435a6 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -64,8 +64,8 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 end FortreeCity_EventScript_14C9CF:: @ 814C9CF - msgbox FortreeCity_Text_16788B, 5 - compare RESULT, 1 + msgbox FortreeCity_Text_16788B, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FortreeCity_EventScript_14C9E4 release end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index f6f8aafa6..b308aa836 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -10,8 +10,8 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT - msgbox FortreeCity_House1_Text_18568C, 5 - compare RESULT, 0 + msgbox FortreeCity_House1_Text_18568C, MSGBOX_YESNO + compare RESULT, NO goto_if_eq FortreeCity_House1_EventScript_157E95 special SelectMonForNPCTrade waitstate diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index f1a6deed0..44a1e141b 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -274,8 +274,8 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A faceplayer checkflag FLAG_RECEIVED_LAVARIDGE_EGG goto_if_eq LavaridgeTown_EventScript_14E79E - msgbox LavaridgeTown_Text_16C174, 5 - compare RESULT, 0 + msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LavaridgeTown_EventScript_14E7B2 getpartysize compare RESULT, 6 diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 0d714003e..6ed8054f8 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -260,7 +260,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 call_if 1, LilycoveCity_EventScript_14CDB0 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CDB9 - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch VAR_STARTER_MON @@ -270,11 +270,11 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 end LilycoveCity_EventScript_14CDB0:: @ 814CDB0 - msgbox LilycoveCity_Text_167B55, 5 + msgbox LilycoveCity_Text_167B55, MSGBOX_YESNO return LilycoveCity_EventScript_14CDB9:: @ 814CDB9 - msgbox LilycoveCity_Text_1679BF, 5 + msgbox LilycoveCity_Text_1679BF, MSGBOX_YESNO return LilycoveCity_EventScript_14CDC2:: @ 814CDC2 @@ -291,7 +291,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 call_if 1, LilycoveCity_EventScript_14CE23 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CE2C - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch VAR_STARTER_MON @@ -301,11 +301,11 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 end LilycoveCity_EventScript_14CE23:: @ 814CE23 - msgbox LilycoveCity_Text_168067, 5 + msgbox LilycoveCity_Text_168067, MSGBOX_YESNO return LilycoveCity_EventScript_14CE2C:: @ 814CE2C - msgbox LilycoveCity_Text_167F75, 5 + msgbox LilycoveCity_Text_167F75, MSGBOX_YESNO return LilycoveCity_EventScript_14CE35:: @ 814CE35 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index bb13b95be..7aceecef6 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -30,10 +30,10 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 fadescreen 1 drawcontestwinner 0 lockall - msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -55,8 +55,8 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE end LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 - msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closemessage @@ -204,10 +204,10 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A lockall fadescreen 1 drawcontestwinner 0 - msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end @@ -228,8 +228,8 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE end LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 - msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closemessage @@ -327,8 +327,8 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA end LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 - msgbox LilycoveCity_ContestLobby_Text_188521, 5 - compare RESULT, 0 + msgbox LilycoveCity_ContestLobby_Text_188521, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog erasebox 0, 0, 15, 9 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 12d8bfb4e..db2b8edf9 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -13,8 +13,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag FLAG_DAILY_PICKED_LOTTO_TICKET goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 - compare RESULT, 0 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag FLAG_DAILY_PICKED_LOTTO_TICKET message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 9554b8fa4..3b884c233 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -47,8 +47,8 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 end LilycoveCity_Harbor_EventScript_159933:: @ 8159933 - msgbox LilycoveCity_Harbor_Text_18B47D, 5 - compare RESULT, 0 + msgbox LilycoveCity_Harbor_Text_18B47D, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_15998A @@ -58,8 +58,8 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 end LilycoveCity_Harbor_EventScript_15995B:: @ 815995B - msgbox LilycoveCity_Harbor_Text_18B499, 5 - compare RESULT, 0 + msgbox LilycoveCity_Harbor_Text_18B499, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 03203ed47..1a569bf5b 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -10,8 +10,8 @@ LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 lock faceplayer - msgbox LilycoveCity_House3_Text_18B8CC, 5 - compare RESULT, 0 + msgbox LilycoveCity_House3_Text_18B8CC, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closemessage diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 5d5b04114..95338f231 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -22,10 +22,10 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F end LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, 5 - compare RESULT, 0 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 - compare RESULT, 1 + compare RESULT, YES goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 0c9a9054b..8b8500a9c 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -5,10 +5,10 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE lockall applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839 waitmovement 0 - msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO switch RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_159ADE - case 0, LilycoveCity_MoveDeletersHouse_EventScript_159B7B + case YES, LilycoveCity_MoveDeletersHouse_EventScript_159ADE + case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B releaseall end @@ -31,10 +31,10 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE compare VAR_SPECIAL_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName - msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, MSGBOX_YESNO switch RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53 - case 0, LilycoveCity_MoveDeletersHouse_EventScript_159B7B + case YES, LilycoveCity_MoveDeletersHouse_EventScript_159B53 + case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B releaseall end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index e1cb348fd..10e4712bb 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -29,10 +29,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE waitmessage playfanfare BGM_FANFA4 waitfanfare - msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 - compare RESULT, 1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA - compare RESULT, 0 + compare RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end @@ -43,10 +43,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA end LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA - msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, 5 - compare RESULT, 1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, 0 + compare RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -58,10 +58,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 end LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B - msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, 5 - compare RESULT, 1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, 0 + compare RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index d7f0611e1..652a25f6f 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -100,14 +100,14 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 waitmovement 0 applymovement 6, MauvilleCity_Movement_1A0835 waitmovement 0 - msgbox MauvilleCity_Text_165D50, 5 + msgbox MauvilleCity_Text_165D50, MSGBOX_YESNO goto MauvilleCity_EventScript_14C154 end MauvilleCity_EventScript_14C154:: @ 814C154 - compare RESULT, 1 + compare RESULT, YES call_if 1, MauvilleCity_EventScript_14C23C - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_EventScript_14C285 closemessage switch FACING @@ -185,7 +185,7 @@ MauvilleCity_EventScript_14C285:: @ 814C285 MauvilleCity_EventScript_14C292:: @ 814C292 applymovement 6, MauvilleCity_Movement_1A0839 waitmovement 0 - msgbox MauvilleCity_Text_165EE2, 5 + msgbox MauvilleCity_Text_165EE2, MSGBOX_YESNO goto MauvilleCity_EventScript_14C154 end diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 6c2dc57e1..6bd7f0f4f 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -9,18 +9,18 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 checkflag FLAG_DECLINED_BIKE goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 - msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare RESULT, 1 + msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 - msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare RESULT, 1 + msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end @@ -63,10 +63,10 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 end MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E - msgbox MauvilleCity_BikeShop_Text_1813A0, 5 - compare RESULT, 1 + msgbox MauvilleCity_BikeShop_Text_1813A0, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_15688D - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index d150e1508..e938a1b4c 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -143,8 +143,8 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C - msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare RESULT, 0 + msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156C46 @@ -276,8 +276,8 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC - msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare RESULT, 0 + msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156E3C @@ -391,8 +391,8 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 faceplayer checkflag FLAG_RECEIVED_STARTER_DOLL goto_if_eq MauvilleCity_GameCorner_EventScript_157072 - msgbox MauvilleCity_GameCorner_Text_181F3D, 5 - compare RESULT, 0 + msgbox MauvilleCity_GameCorner_Text_181F3D, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_156FDB diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 32269ab89..9d3bce68a 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -19,10 +19,10 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 waitmovement 0 applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 waitmovement 0 - msgbox MauvilleCity_House2_Text_1824D8, 5 - compare RESULT, 1 + msgbox MauvilleCity_House2_Text_1824D8, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_House2_EventScript_15731B - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_House2_EventScript_157347 end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index fd4b8cfbf..3d1baf143 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -70,8 +70,8 @@ MossdeepCity_EventScript_14D027:: @ 814D027 faceplayer checkflag FLAG_RECEIVED_KINGS_ROCK goto_if_eq MossdeepCity_EventScript_14D069 - msgbox MossdeepCity_Text_1690A9, 5 - compare RESULT, 0 + msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem_std ITEM_KINGS_ROCK diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index ad3b366a8..eac7f4adb 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -93,14 +93,14 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty special BufferEReaderTrainerName - msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 - compare RESULT, 0 + msgbox MossdeepCity_GameCorner_1F_Text_18E650, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 - msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 - compare RESULT, 0 + msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO + compare RESULT, NO call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 6632ac793..fb44685d8 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -6,8 +6,8 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 faceplayer checkflag FLAG_RECEIVED_SUPER_ROD goto_if_eq MossdeepCity_House3_EventScript_15A9B1 - msgbox MossdeepCity_House3_Text_18D909, 5 - compare RESULT, 0 + msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem_std ITEM_SUPER_ROD diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 9aa9d8ef3..ce2f2aad5 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -71,8 +71,8 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall - msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 - compare RESULT, 0 + msgbox MossdeepCity_StevensHouse_Text_18DD12, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 getpartysize compare RESULT, 6 @@ -85,8 +85,8 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C waitmessage givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferspeciesname 1, SPECIES_BELDUM - msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 - compare RESULT, 1 + msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag FLAG_RECEIVED_BELDUM diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d93ec772a..be4799a45 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -17,8 +17,8 @@ MtChimney_EventScript_15CF95:: @ 815CF95 faceplayer showmoneybox 0, 0 nop - msgbox MtChimney_Text_195760, 5 - compare RESULT, 0 + msgbox MtChimney_Text_195760, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 compare RESULT, 0 @@ -410,8 +410,8 @@ MtChimney_EventScript_15D17D:: @ 815D17D goto_if 0, MtChimney_EventScript_15D1D0 checkflag FLAG_RECEIVED_METEORITE goto_if_eq MtChimney_EventScript_15D1C6 - msgbox MtChimney_Text_195870, 5 - compare RESULT, 0 + msgbox MtChimney_Text_195870, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem_std ITEM_METEORITE diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 6b919f2ca..aefc68bda 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -31,10 +31,10 @@ MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B lock faceplayer - msgbox MtChimney_CableCarStation_Text_19256A, 5 - compare RESULT, 1 + msgbox MtChimney_CableCarStation_Text_19256A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MtChimney_CableCarStation_EventScript_15C16C - compare RESULT, 0 + compare RESULT, NO goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 9cd4eecd1..56ef5db79 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -139,13 +139,13 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF lock faceplayer .ifdef SAPPHIRE - msgbox UnknownString_81B586F, 5 + msgbox UnknownString_81B586F, MSGBOX_YESNO .else - msgbox MtPyre_Summit_Text_1B64B3, 5 + msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO .endif - compare RESULT, 1 + compare RESULT, YES call_if 1, MtPyre_Summit_EventScript_15D611 - compare RESULT, 0 + compare RESULT, NO call_if 1, MtPyre_Summit_EventScript_15D61A release end @@ -185,13 +185,13 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 MtPyre_Summit_EventScript_15D64A:: @ 815D64A .ifdef SAPPHIRE - msgbox UnknownString_81B5647, 5 + msgbox UnknownString_81B5647, MSGBOX_YESNO .else - msgbox MtPyre_Summit_Text_1B6283, 5 + msgbox MtPyre_Summit_Text_1B6283, MSGBOX_YESNO .endif - compare RESULT, 1 + compare RESULT, YES goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -216,13 +216,13 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 MtPyre_Summit_EventScript_15D69B:: @ 815D69B .ifdef SAPPHIRE - msgbox UnknownString_81B56AB, 5 + msgbox UnknownString_81B56AB, MSGBOX_YESNO .else - msgbox MtPyre_Summit_Text_1B62E7, 5 + msgbox MtPyre_Summit_Text_1B62E7, MSGBOX_YESNO .endif - compare RESULT, 1 + compare RESULT, YES goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MtPyre_Summit_EventScript_15D69B end diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index b7d68b257..2a4d8afce 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -29,8 +29,8 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC checkitem ITEM_BASEMENT_KEY, 1 compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D - msgbox NewMauville_Entrance_Text_1982D4, 5 - compare RESULT, 0 + msgbox NewMauville_Entrance_Text_1982D4, MSGBOX_YESNO + compare RESULT, NO goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmetatile 3, 0, 707, 0 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index f5f93f05a..f51aea6f7 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -10,8 +10,8 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT - msgbox PacifidlogTown_House3_Text_17940E, 5 - compare RESULT, 0 + msgbox PacifidlogTown_House3_Text_17940E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq PacifidlogTown_House3_EventScript_154320 special SelectMonForNPCTrade waitstate diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index b7a6c9f86..584366c88 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -12,10 +12,10 @@ PacifidlogTown_House4_EventScript_154355:: @ 8154355 PacifidlogTown_House4_EventScript_15435E:: @ 815435E lock faceplayer - msgbox PacifidlogTown_House4_Text_17963D, 5 - compare RESULT, 1 + msgbox PacifidlogTown_House4_Text_17963D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PacifidlogTown_House4_EventScript_15437F - compare RESULT, 0 + compare RESULT, NO goto_if_eq PacifidlogTown_House4_EventScript_154389 end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index de141daf9..406f260b0 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -596,10 +596,10 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 85 - msgbox PetalburgCity_Gym_Text_17B870, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -626,10 +626,10 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 98 - msgbox PetalburgCity_Gym_Text_17B8D4, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -639,10 +639,10 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 - msgbox PetalburgCity_Gym_Text_17B90F, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -652,10 +652,10 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 - msgbox PetalburgCity_Gym_Text_17B950, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -665,10 +665,10 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 - msgbox PetalburgCity_Gym_Text_17B950, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -678,10 +678,10 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 - msgbox PetalburgCity_Gym_Text_17B98A, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -691,10 +691,10 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 - msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -704,10 +704,10 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 - msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -717,10 +717,10 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 - msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -730,10 +730,10 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 - msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -743,10 +743,10 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 - msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -756,10 +756,10 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 - msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index cb52908f5..4718f9bb9 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -36,8 +36,8 @@ Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E setflag FLAG_MR_BRINEY_SAILING_INTRO msgbox Route104_MrBrineysHouse_Text_191A82, 4 - msgbox Route104_MrBrineysHouse_Text_191AAD, 5 - compare RESULT, 0 + msgbox Route104_MrBrineysHouse_Text_191AAD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -53,15 +53,15 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 end Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 - msgbox Route104_MrBrineysHouse_Text_191CC3, 5 - compare RESULT, 0 + msgbox Route104_MrBrineysHouse_Text_191CC3, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E - msgbox Route104_MrBrineysHouse_Text_191DA6, 5 - compare RESULT, 0 + msgbox Route104_MrBrineysHouse_Text_191DA6, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 2de6bf51f..f7fbb58b5 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -24,19 +24,19 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 - compare RESULT, 1 + msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, 0 + compare RESULT, NO call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A - msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, 5 - compare RESULT, 1 + msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, 0 + compare RESULT, NO call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 28bf046a4..c0344f150 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -278,8 +278,8 @@ Route109_EventScript_14F680:: @ 814F680 Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 - msgbox Route109_Text_16E0F9, 5 - compare RESULT, 0 + msgbox Route109_Text_16E0F9, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 7a12f5850..4c1574824 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -42,8 +42,8 @@ Route109_SeashoreHouse_EventScript_160E2C:: @ 8160E2C Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoneybox 0, 0 nop - msgbox Route109_SeashoreHouse_Text_19B702, 5 - compare RESULT, 1 + msgbox Route109_SeashoreHouse_Text_19B702, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoneybox 0, 0 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index f34bba6e6..232d324a4 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -493,9 +493,9 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD end Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 - msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 + msgbox Route110_TrickHouseEntrance_Text_19BE7D, MSGBOX_YESNO closemessage - compare RESULT, 1 + compare RESULT, YES goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index c3d807f66..c338091a0 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -51,8 +51,8 @@ Route111_EventScript_15000D:: @ 815000D Route111_EventScript_150023:: @ 8150023 lockall - msgbox Route111_Text_16FA54, 5 - compare RESULT, 0 + msgbox Route111_Text_16FA54, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route111_EventScript_15005F giveitem_std ITEM_ROOT_FOSSIL closemessage @@ -73,8 +73,8 @@ Route111_EventScript_15005F:: @ 815005F Route111_EventScript_150069:: @ 8150069 lockall - msgbox Route111_Text_16FAED, 5 - compare RESULT, 0 + msgbox Route111_Text_16FAED, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route111_EventScript_1500A5 giveitem_std ITEM_CLAW_FOSSIL closemessage @@ -237,8 +237,8 @@ Route111_EventScript_1501D1:: @ 81501D1 lock faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY - msgbox Route111_Text_16F705, 5 - compare RESULT, 1 + msgbox Route111_Text_16F705, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index c0fb6f489..1263c4b83 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -9,10 +9,10 @@ Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7 Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB lock faceplayer - msgbox Route111_OldLadysRestStop_Text_1923AF, 5 - compare RESULT, 1 + msgbox Route111_OldLadysRestStop_Text_1923AF, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end @@ -20,10 +20,10 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC msgbox Route111_OldLadysRestStop_Text_192423, 4 closemessage call Route111_OldLadysRestStop_EventScript_1A02CA - msgbox Route111_OldLadysRestStop_Text_19244D, 5 - compare RESULT, 1 + msgbox Route111_OldLadysRestStop_Text_19244D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index cba6c33e8..adbea780e 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -32,10 +32,10 @@ Route112_CableCarStation_EventScript_15C068:: @ 815C068 Route112_CableCarStation_EventScript_15C08C:: @ 815C08C lock faceplayer - msgbox Route112_CableCarStation_Text_1924F5, 5 - compare RESULT, 1 + msgbox Route112_CableCarStation_Text_1924F5, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route112_CableCarStation_EventScript_15C0AD - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route112_CableCarStation_EventScript_15C0DC end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index e1bb038e3..3f991277f 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -72,8 +72,8 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 10 subvar VAR_ASH_GATHER_COUNT, 250 @@ -86,8 +86,8 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 11 subvar VAR_ASH_GATHER_COUNT, 500 @@ -100,8 +100,8 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 12 subvar VAR_ASH_GATHER_COUNT, 500 @@ -114,8 +114,8 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -128,8 +128,8 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -143,8 +143,8 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 @@ -158,8 +158,8 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index f8ff5de73..c34d4fc7e 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -31,16 +31,16 @@ Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall - msgbox Route114_LanettesHouse_Text_192B4A, 5 - compare RESULT, 1 + msgbox Route114_LanettesHouse_Text_192B4A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall end Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 - msgbox Route114_LanettesHouse_Text_192C01, 5 - compare RESULT, 1 + msgbox Route114_LanettesHouse_Text_192C01, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 0ed9e9b01..a4452d989 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -11,10 +11,10 @@ Route118_EventScript_150F34:: @ 8150F34 faceplayer checkflag FLAG_RECEIVED_GOOD_ROD goto_if_eq Route118_EventScript_150F89 - msgbox Route118_Text_170F12, 5 - compare RESULT, 1 + msgbox Route118_Text_170F12, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route118_EventScript_150F5E - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route118_EventScript_150F7F end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 3858c0e4f..bacdcd7dd 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -115,10 +115,10 @@ Route120_EventScript_151739:: @ 8151739 dodailyevents checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 goto_if_eq Route120_EventScript_151837 - msgbox Route120_Text_1C58F1, 5 - compare RESULT, 1 + msgbox Route120_Text_1C58F1, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route120_EventScript_151841 - compare RESULT, 0 + compare RESULT, NO call_if 1, Route120_EventScript_15184A specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT @@ -186,8 +186,8 @@ Route120_EventScript_151853:: @ 8151853 faceplayer checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 goto_if_eq Route120_EventScript_151884 - msgbox Route120_Text_171827, 5 - compare RESULT, 0 + msgbox Route120_Text_171827, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -199,8 +199,8 @@ Route120_EventScript_151877:: @ 8151877 end Route120_EventScript_151884:: @ 8151884 - msgbox Route120_Text_17196F, 5 - compare RESULT, 0 + msgbox Route120_Text_17196F, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 67fa830e9..ded372aa6 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -33,8 +33,8 @@ Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351 Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A lock faceplayer - msgbox Route121_SafariZoneEntrance_Text_1C3704, 5 - compare RESULT, 1 + msgbox Route121_SafariZoneEntrance_Text_1C3704, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release @@ -51,8 +51,8 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 waitmovement 0 showmoneybox 0, 0 nop - msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 - compare RESULT, 1 + msgbox Route121_SafariZoneEntrance_Text_1C3832, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index bc71fac41..9423cf845 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -246,8 +246,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitemname 0, VAR_SPECIAL_8 bufferitemname 1, VAR_SPECIAL_9 - msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 - compare RESULT, 0 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F checkitemspace VAR_SPECIAL_9, 1 compare RESULT, 1 @@ -265,8 +265,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 - msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 - compare RESULT, 1 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 9bbbaacfa..179140378 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -85,8 +85,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare RESULT, 0 + msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -103,8 +103,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare RESULT, 0 + msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -145,8 +145,8 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 waitfanfare waitmessage givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 - msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare RESULT, 1 + msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -165,8 +165,8 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 waitfanfare waitmessage givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 - msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare RESULT, 1 + msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 2e0d106bb..c0f1bc689 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -10,8 +10,8 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT - msgbox RustboroCity_House1_Text_184EBA, 5 - compare RESULT, 0 + msgbox RustboroCity_House1_Text_184EBA, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RustboroCity_House1_EventScript_157CFB special SelectMonForNPCTrade waitstate diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 2dbd716cb..b3eb297e9 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -54,8 +54,8 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 faceplayer compare VAR_TEMP_1, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 - msgbox SafariZone_Southeast_Text_1C3A56, 5 - compare RESULT, 1 + msgbox SafariZone_Southeast_Text_1C3A56, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 533c46850..4dcd88761 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -28,8 +28,8 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 checkitem ITEM_SHOAL_SHELL, 4 compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 - msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, 5 - compare RESULT, 0 + msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, MSGBOX_YESNO + compare RESULT, NO goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 compare RESULT, 0 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index d39f788d8..ae8534ad9 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -287,10 +287,10 @@ SlateportCity_EventScript_14BCFD:: @ 814BCFD SlateportCity_EventScript_14BD06:: @ 814BD06 lock faceplayer - msgbox SlateportCity_Text_1650F1, 5 - compare RESULT, 1 + msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO + compare RESULT, YES call_if 1, SlateportCity_EventScript_14BD28 - compare RESULT, 0 + compare RESULT, NO call_if 1, SlateportCity_EventScript_14BD31 release end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 72f2d0382..4be5c6daf 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -190,8 +190,8 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 end SlateportCity_Harbor_EventScript_15613F:: @ 815613F - msgbox SlateportCity_Harbor_Text_17FB81, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_17FB81, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_156196 @@ -201,8 +201,8 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F end SlateportCity_Harbor_EventScript_156167:: @ 8156167 - msgbox SlateportCity_Harbor_Text_17FB9C, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_17FB9C, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 @@ -332,8 +332,8 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 end SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA - msgbox SlateportCity_Harbor_Text_1803DD, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem_std ITEM_DEEP_SEA_TOOTH compare RESULT, 0 @@ -345,8 +345,8 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA end SlateportCity_Harbor_EventScript_15632A:: @ 815632A - msgbox SlateportCity_Harbor_Text_180412, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem_std ITEM_DEEP_SEA_SCALE compare RESULT, 0 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index aa1157d7e..13de091cb 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -4,10 +4,10 @@ SlateportCity_House1_MapScripts:: @ 815567A SlateportCity_House1_EventScript_15567B:: @ 815567B lock faceplayer - msgbox SlateportCity_House1_Text_17D46A, 5 - compare RESULT, 1 + msgbox SlateportCity_House1_Text_17D46A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_House1_EventScript_15569C - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -38,10 +38,10 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - msgbox SlateportCity_House1_Text_17D505, 5 - compare RESULT, 1 + msgbox SlateportCity_House1_Text_17D505, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_House1_EventScript_155730 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index ad349932a..5d0fdb411 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -33,8 +33,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoneybox 0, 0 nop - msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 - compare RESULT, 1 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closemessage hidemoneybox 0, 0 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index f2ccc9484..367677751 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -127,8 +127,8 @@ SootopolisCity_EventScript_14D220:: @ 814D220 end SootopolisCity_EventScript_14D241:: @ 814D241 - msgbox SootopolisCity_Text_1C6540, 5 - compare RESULT, 1 + msgbox SootopolisCity_Text_1C6540, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 011806291..e32e993dd 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -4,10 +4,10 @@ SootopolisCity_House2_MapScripts:: @ 815B2E4 SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 lock faceplayer - msgbox SootopolisCity_House2_Text_18FA66, 5 - compare RESULT, 1 + msgbox SootopolisCity_House2_Text_18FA66, MSGBOX_YESNO + compare RESULT, YES call_if 1, SootopolisCity_House2_EventScript_15B307 - compare RESULT, 0 + compare RESULT, NO call_if 1, SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index f1bf0bf19..6ffa30d3d 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -4,8 +4,8 @@ SootopolisCity_House3_MapScripts:: @ 815B319 SootopolisCity_House3_EventScript_15B31A:: @ 815B31A lock faceplayer - msgbox SootopolisCity_House3_Text_18FB36, 5 - compare RESULT, 1 + msgbox SootopolisCity_House3_Text_18FB36, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index fb91202f3..d2fb4ed7b 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -6,8 +6,8 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 faceplayer checkflag FLAG_RECEIVED_WAILMER_DOLL goto_if_eq SootopolisCity_House6_EventScript_15B3CD - msgbox SootopolisCity_House6_Text_18FEA1, 5 - compare RESULT, 0 + msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO + compare RESULT, NO call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration_std DECOR_WAILMER_DOLL diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index ab2a73460..874e3e901 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -9,8 +9,8 @@ SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 lock faceplayer - msgbox SouthernIsland_Exterior_Text_1C5215, 5 - compare RESULT, 0 + msgbox SouthernIsland_Exterior_Text_1C5215, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closemessage diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 2f5dd6f47..589d4e21c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -38,10 +38,10 @@ LilycoveCity_ContestLobby_EventScript_1B7681:: @ 81B7681 SlateportCity_ContestLobby_EventScript_1B7681:: @ 81B7681 VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall - msgbox FallarborTown_ContestLobby_Text_1B6E63, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1B6E63, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end @@ -66,10 +66,10 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 end FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF - msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1B6ED0, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end @@ -222,10 +222,10 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 - msgbox FallarborTown_ContestLobby_Text_1B727C, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1B727C, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 6b1e76a1b..f41fd1f8c 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -13,8 +13,8 @@ EventScript_1C341B: @ 81C341B gUnknown_081C342D:: @ 81C342D lockall - msgbox UnknownString_81C34B2, 5 - compare RESULT, 1 + msgbox UnknownString_81C34B2, MSGBOX_YESNO + compare RESULT, YES goto_if_eq EventScript_1C3443 releaseall end @@ -45,8 +45,8 @@ gUnknown_081C346A:: @ 81C346A special SafariZoneGetPokeblockNameInFeeder compare RESULT, 0xFFFF goto_if 5, EventScript_1C34A9 - msgbox UnknownString_81C354E, 5 - compare RESULT, 1 + msgbox UnknownString_81C354E, MSGBOX_YESNO + compare RESULT, YES goto_if_eq EventScript_1C348E releaseall end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index deb30187f..2a5905191 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -1,8 +1,8 @@ Route111_EventScript_1A3858:: @ 81A3858 lock faceplayer - msgbox Route111_Text_1A3520, 5 - compare RESULT, 1 + msgbox Route111_Text_1A3520, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_EventScript_1A3877 msgbox Route111_Text_1A37B5, 4 release -- cgit v1.2.3 From d7970fba2fef5fd8949eb1b2c24f0556103bda27 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 4 Jan 2018 22:26:27 -0600 Subject: decompile sub_80E9620 - sub_80EA184 --- data/easy_chat.s | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'data') diff --git a/data/easy_chat.s b/data/easy_chat.s index 44347345b..49972fbb3 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,28 +8,6 @@ .section .rodata -gUnknown_083DBDFC:: @ 83DBDFC - .incbin "graphics/unknown/unknown_3DBDFC.gbapal" - - .align 1 -gUnknown_083DBE1C:: @ 83DBE1C - .2byte 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300, 0x300 - .2byte 0x301, 0x301, 0x301, 0x301, 0x301, 0x300, 0x300, 0x300, 0x300 - -gUnknown_083DBE40:: @ 83DBE40 - .incbin "graphics/unknown/unknown_3DBE40.gbapal" - -@ unused tilemap? - .2byte 0x5036, 0x5037, 0x5038, 0x5039, 0x503A, 0x503B - .2byte 0x5046, 0x5047, 0x5048, 0x5049, 0x504A, 0x504B - .2byte 0x5056, 0x5057, 0x5058, 0x5059, 0x505A, 0x505B - .2byte 0x5030, 0x5031, 0x5032, 0x5033, 0x5034, 0x5035 - .2byte 0x5040, 0x5041, 0x5042, 0x5043, 0x5044, 0x5045 - .2byte 0x5050, 0x5051, 0x5052, 0x5053, 0x5054, 0x5055 - -gUnknown_083DBEA8:: @ 83DBEA8 - .string "{CLEAR_TO 88}$" - .ifdef GERMAN unk_83E7EB0: .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}" -- cgit v1.2.3 From 737e1403b6b2578d768e2cc808c5b2c60cb3af49 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 5 Jan 2018 00:18:16 -0600 Subject: decompile German code --- data/easy_chat.s | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'data') diff --git a/data/easy_chat.s b/data/easy_chat.s index 49972fbb3..d41ffccce 100644 --- a/data/easy_chat.s +++ b/data/easy_chat.s @@ -8,34 +8,6 @@ .section .rodata -.ifdef GERMAN -unk_83E7EB0: - .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}" -unk_83E7EC5: - .string "mehr$" -unk_83E7ECA:: - .string "{UNKNOWN_14 8} G H I J K L $" -unk_83E7EE1: - .string "{UNKNOWN_14 8} M N O P Q R S $" -unk_83E7EF8: - .string "{UNKNOWN_14 8} T U V W X Y Z $" -.endif - - .align 2 -gUnknown_083DBEAC:: @ 83DBEAC -.ifdef ENGLISH - .string "{UNKNOWN_14 8} A B C D E F {UNKNOWN_14 0}others$", 0x20 - .string "{UNKNOWN_14 8} G H I J K L $", 0x20 - .string "{UNKNOWN_14 8} M N O P Q R S $", 0x20 - .string "{UNKNOWN_14 8} T U V W X Y Z $", 0x20 -.else - .4byte unk_83E7EB0 - .4byte unk_83E7ECA - .4byte unk_83E7EE1 - .4byte unk_83E7EF8 - .4byte unk_83E7EC5 -.endif - @ 83DBF2C .include "data/text/easy_chat/group_words.inc" -- cgit v1.2.3 From aed64560bc222e4ea5ccec266c0d77859a05eaac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Jan 2018 11:36:47 -0800 Subject: Add friendly macros for goto_if and call_if variants --- data/event_scripts.s | 157 ++++++++---------- data/field_move_scripts.inc | 12 +- data/scripts/cable_club.inc | 23 ++- data/scripts/contest_hall.inc | 131 ++++++++------- data/scripts/day_care.inc | 6 +- data/scripts/gabby_and_ty.inc | 18 +-- data/scripts/magma_chimney.inc | 14 +- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 6 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 9 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 36 ++--- .../maps/AbandonedShip_HiddenFloorRooms.inc | 14 +- data/scripts/maps/AncientTomb.inc | 9 +- data/scripts/maps/AquaHideout_1F.inc | 6 +- data/scripts/maps/AquaHideout_B1F.inc | 3 +- data/scripts/maps/BattleTower_Lobby.inc | 20 +-- data/scripts/maps/CaveOfOrigin_1F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B1F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B2F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B3F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 8 +- data/scripts/maps/DesertRuins.inc | 9 +- data/scripts/maps/DewfordTown.inc | 12 +- data/scripts/maps/DewfordTown_Gym.inc | 20 +-- data/scripts/maps/DewfordTown_Hall.inc | 7 +- data/scripts/maps/DewfordTown_House2.inc | 3 +- data/scripts/maps/EverGrandeCity.inc | 3 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 13 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 8 +- data/scripts/maps/FallarborTown.inc | 3 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 3 +- data/scripts/maps/FallarborTown_House1.inc | 15 +- data/scripts/maps/FallarborTown_House2.inc | 3 +- data/scripts/maps/FortreeCity.inc | 3 +- data/scripts/maps/FortreeCity_Gym.inc | 12 +- data/scripts/maps/FortreeCity_House1.inc | 5 +- data/scripts/maps/FortreeCity_House2.inc | 6 +- data/scripts/maps/FortreeCity_House4.inc | 9 +- data/scripts/maps/GraniteCave_1F.inc | 3 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 10 +- data/scripts/maps/IslandCave.inc | 12 +- data/scripts/maps/JaggedPass.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 42 +++-- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 14 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 3 +- data/scripts/maps/LilycoveCity.inc | 65 +++----- data/scripts/maps/LilycoveCity_ContestLobby.inc | 19 +-- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 6 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 6 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 3 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 22 +-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 17 +- data/scripts/maps/LilycoveCity_Harbor.inc | 23 ++- data/scripts/maps/LilycoveCity_House2.inc | 3 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 33 ++-- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 3 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 16 +- data/scripts/maps/LittlerootTown.inc | 103 ++++++------ .../maps/LittlerootTown_BrendansHouse_1F.inc | 11 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 5 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 21 ++- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 34 ++-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 20 ++- data/scripts/maps/MagmaHideout_B1F.inc | 3 +- data/scripts/maps/MauvilleCity.inc | 20 +-- data/scripts/maps/MauvilleCity_BikeShop.inc | 6 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 28 ++-- data/scripts/maps/MauvilleCity_Gym.inc | 35 ++-- data/scripts/maps/MauvilleCity_House1.inc | 3 +- data/scripts/maps/MauvilleCity_House2.inc | 3 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 3 +- data/scripts/maps/MossdeepCity.inc | 6 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 20 +-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 36 ++--- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 3 +- data/scripts/maps/MossdeepCity_House4.inc | 3 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 7 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 10 +- data/scripts/maps/MtChimney.inc | 8 +- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/MtPyre_1F.inc | 3 +- data/scripts/maps/MtPyre_Exterior.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 37 ++--- data/scripts/maps/NewMauville_Entrance.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 9 +- data/scripts/maps/OldaleTown.inc | 18 +-- data/scripts/maps/OldaleTown_Mart.inc | 6 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 3 +- data/scripts/maps/PacifidlogTown_House2.inc | 18 +-- data/scripts/maps/PacifidlogTown_House3.inc | 5 +- data/scripts/maps/PetalburgCity.inc | 20 +-- data/scripts/maps/PetalburgCity_Gym.inc | 179 ++++++++++----------- data/scripts/maps/PetalburgCity_Mart.inc | 3 +- .../maps/PetalburgCity_PokemonCenter_1F.inc | 6 +- data/scripts/maps/PetalburgCity_WallysHouse.inc | 21 +-- data/scripts/maps/PetalburgWoods.inc | 3 +- data/scripts/maps/Route104.inc | 21 +-- data/scripts/maps/Route104_MrBrineysHouse.inc | 14 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 26 ++- data/scripts/maps/Route104_Prototype.inc | 30 ++-- data/scripts/maps/Route105.inc | 3 +- data/scripts/maps/Route109.inc | 6 +- data/scripts/maps/Route109_SeashoreHouse.inc | 15 +- data/scripts/maps/Route110.inc | 24 +-- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 6 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 26 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 83 +++++----- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 8 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 36 ++--- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 90 +++++------ data/scripts/maps/Route110_TrickHousePuzzle7.inc | 77 +++------ data/scripts/maps/Route111.inc | 26 ++- .../maps/Route111_WinstrateFamilysHouse.inc | 6 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/scripts/maps/Route113.inc | 4 +- data/scripts/maps/Route113_GlassWorkshop.inc | 28 ++-- data/scripts/maps/Route114.inc | 6 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 3 +- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 3 +- data/scripts/maps/Route114_LanettesHouse.inc | 5 +- data/scripts/maps/Route116.inc | 28 ++-- data/scripts/maps/Route116_TunnelersRestHouse.inc | 3 +- data/scripts/maps/Route117.inc | 3 +- data/scripts/maps/Route118.inc | 9 +- data/scripts/maps/Route119.inc | 29 ++-- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 2 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 7 +- data/scripts/maps/Route120.inc | 48 +++--- data/scripts/maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/Route123.inc | 3 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 21 +-- data/scripts/maps/Route124.inc | 3 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 11 +- data/scripts/maps/Route125.inc | 3 +- data/scripts/maps/Route126.inc | 3 +- data/scripts/maps/Route127.inc | 3 +- data/scripts/maps/Route128.inc | 3 +- data/scripts/maps/Route131.inc | 3 +- data/scripts/maps/RustboroCity.inc | 35 ++-- data/scripts/maps/RustboroCity_CuttersHouse.inc | 3 +- data/scripts/maps/RustboroCity_DevonCorp_1F.inc | 27 ++-- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 20 ++- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 11 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 3 +- data/scripts/maps/RustboroCity_Gym.inc | 14 +- data/scripts/maps/RustboroCity_House1.inc | 5 +- data/scripts/maps/RustboroCity_Mart.inc | 6 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 7 +- data/scripts/maps/RusturfTunnel.inc | 27 ++-- data/scripts/maps/SSTidalCorridor.inc | 25 ++- data/scripts/maps/SSTidalRooms.inc | 3 +- data/scripts/maps/SafariZone_Southeast.inc | 2 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 3 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 6 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 8 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 45 ++---- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 9 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 6 +- data/scripts/maps/SkyPillar_Top.inc | 3 +- data/scripts/maps/SlateportCity.inc | 43 +++-- data/scripts/maps/SlateportCity_ContestHall.inc | 3 +- data/scripts/maps/SlateportCity_ContestLobby.inc | 3 +- data/scripts/maps/SlateportCity_Harbor.inc | 32 ++-- data/scripts/maps/SlateportCity_House1.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 5 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 47 +++--- .../maps/SlateportCity_SternsShipyard_1F.inc | 12 +- data/scripts/maps/SootopolisCity.inc | 38 ++--- data/scripts/maps/SootopolisCity_Gym_1F.inc | 21 +-- data/scripts/maps/SootopolisCity_House1.inc | 3 +- data/scripts/maps/SootopolisCity_House2.inc | 4 +- data/scripts/maps/SootopolisCity_House6.inc | 5 +- data/scripts/maps/SootopolisCity_Mart.inc | 12 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 12 +- data/scripts/maps/SouthernIsland_Interior.inc | 9 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 6 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 14 +- data/scripts/maps/VerdanturfTown.inc | 6 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 3 +- data/scripts/maps/VerdanturfTown_WandasHouse.inc | 24 +-- data/scripts/maps/VictoryRoad_1F.inc | 3 +- data/scripts/mystery_event_club.inc | 13 +- data/scripts/players_house.inc | 42 +++-- data/scripts/pokeblocks.inc | 10 +- data/scripts/safari_zone.inc | 4 +- data/scripts/secret_power_tm.inc | 6 +- data/scripts/tv.inc | 10 +- 194 files changed, 1285 insertions(+), 1808 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 1ed419b52..1c8cff8d6 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -410,8 +410,7 @@ gUnknown_0815F36C:: @ 815F36C EventScript_15F384: message UnknownString_81A3A87 waitmessage - checkflag FLAG_DECORATION_16 - goto_if_eq EventScript_15F3A0 + goto_if_set FLAG_DECORATION_16, EventScript_15F3A0 goto EventScript_15F3E2 end @@ -948,7 +947,7 @@ gUnknown_0819F818:: @ 819F818 waitmovement 0 specialvar RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 - goto_if 5, EventScript_19F83F + goto_if_ne EventScript_19F83F special PlayTrainerEncounterMusic special sub_8082524 goto EventScript_19F8F2 @@ -962,10 +961,10 @@ gUnknown_0819F840:: @ 819F840 call EventScript_19F8E5 specialvar RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 - goto_if 5, EventScript_19F877 + goto_if_ne EventScript_19F877 special CheckForAlivePartyMons compare RESULT, 0 - goto_if 5, EventScript_19F870 + goto_if_ne EventScript_19F870 special PlayTrainerEncounterMusic special sub_8082524 goto EventScript_19F8F2 @@ -1011,7 +1010,7 @@ gUnknown_0819F8AE:: @ 819F8AE goto_if_eq EventScript_19F8DD special CheckForAlivePartyMons compare RESULT, 0 - goto_if 5, EventScript_19F8DE + goto_if_ne EventScript_19F8DE special PlayTrainerEncounterMusic special sub_8082524 special ScrSpecial_ShowTrainerIntroSpeech @@ -1302,14 +1301,10 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR special sub_810FAA0 - checkflag FLAG_RECEIVED_SS_TICKET - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC62 - checkflag FLAG_LATIOS_OR_LATIAS_ROAMING - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70 - checkflag FLAG_RECEIVED_BELDUM - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A - checkflag FLAG_RECEIVED_HM08 - call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E + call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_19FC62 + call_if_unset FLAG_LATIOS_OR_LATIAS_ROAMING, EverGrandeCity_HallOfFame_EventScript_19FC70 + call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_19FC5A + call_if_unset FLAG_RECEIVED_HM08, EverGrandeCity_HallOfFame_EventScript_19FC5E return EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A @@ -1337,10 +1332,8 @@ S_WhiteOut:: @ 819FC74 end EventScript_19FC84: - checkflag FLAG_RECEIVED_GO_GOGGLES - goto_if_eq Route101_EventScript_1A14DC - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if 0, Route101_EventScript_1A14DC + goto_if_set FLAG_RECEIVED_GO_GOGGLES, Route101_EventScript_1A14DC + goto_if_unset FLAG_DEFEATED_LAVARIDGE_GYM, Route101_EventScript_1A14DC clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 return @@ -1403,16 +1396,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B - checkflag FLAG_RECEIVED_POKENAV - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC - checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49 - checkflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD4F - checkflag FLAG_HIDE_MR_BRINEY_ROUTE109 - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD55 + goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_1A14DC + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_1A14DC + goto_if_unset FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, OldaleTown_PokemonCenter_1F_EventScript_19FD49 + goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_19FD4F + goto_if_unset FLAG_HIDE_MR_BRINEY_ROUTE109, OldaleTown_PokemonCenter_1F_EventScript_19FD55 return OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49 @@ -1461,8 +1449,7 @@ do_heal_party:: @ 819FD7C applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty - checkflag FLAG_POKERUS_EXPLAINED - goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE + goto_if_unset FLAG_POKERUS_EXPLAINED, OldaleTown_PokemonCenter_1F_EventScript_19FDCE goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1510,9 +1497,9 @@ Std_ObtainItem_: @ 819FE07 checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket compare VAR_SPECIAL_7, 0x1 - call_if 1, Std_ObtainItem_Success + call_if_eq Std_ObtainItem_Success compare VAR_SPECIAL_7, 0x0 - call_if 1, Std_ObtainItem_Fail + call_if_eq Std_ObtainItem_Fail return GetItem_HandlePocket: @@ -1527,31 +1514,31 @@ GetItem_HandlePocket: GetItem_HandlePocket_Items: bufferstdstring 2, 0xE compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return GetItem_HandlePocket_KeyItems: bufferstdstring 2, 0xF compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return GetItem_HandlePocket_PokeBalls: bufferstdstring 2, 0x10 compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return GetItem_HandlePocket_TMsHMs: bufferstdstring 2, 0x11 compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetTMHMFanfare + call_if_eq PlayGetTMHMFanfare return GetItem_HandlePocket_Berries: bufferstdstring 2, 0x12 compare VAR_SPECIAL_7, 1 - call_if 1, PlayGetItemFanfare + call_if_eq PlayGetItemFanfare return Std_ObtainItem_Success: @ 819FEB7 @@ -1583,9 +1570,9 @@ Std_ObtainDecoration: @ 819FEDA Std_ObtainDecoration_: @ 819FEE8 bufferdecorationname 1, VAR_SPECIAL_0 compare VAR_SPECIAL_7, 1 - call_if 1, Std_ObtainDecoration_Success + call_if_eq Std_ObtainDecoration_Success compare VAR_SPECIAL_7, 0 - call_if 1, Std_ObtainDecoration_Fail + call_if_eq Std_ObtainDecoration_Fail return Std_ObtainDecoration_Success: @ 819FF03 @@ -1611,9 +1598,9 @@ Std_FindItem: @ 819FF21 checkitemtype VAR_SPECIAL_0 call GetItem_HandlePocket compare VAR_SPECIAL_7, 1 - call_if 1, Std_FindItem_Success + call_if_eq Std_FindItem_Success compare VAR_SPECIAL_7, 0 - call_if 1, Std_FindItem_Fail + call_if_eq Std_FindItem_Fail release return @@ -1718,10 +1705,8 @@ EventScript_1A0070: EventScript_1A0085: playse SE_PC_LOGON - checkflag FLAG_SYS_PC_LANETTE - call_if 0, EventScript_1A00AC - checkflag FLAG_SYS_PC_LANETTE - call_if 1, EventScript_1A00B5 + call_if_unset FLAG_SYS_PC_LANETTE, EventScript_1A00AC + call_if_set FLAG_SYS_PC_LANETTE, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 special ShowPokemonStorageSystem waitstate @@ -1744,8 +1729,7 @@ EventScript_1A00BE: end EventScript_1A00CB: - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, EventScript_1A00BE + goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A00BE playse SE_PC_LOGON special AccessHallOfFamePC waitstate @@ -2150,21 +2134,21 @@ Route103_EventScript_1A02F4:: @ 81A02F4 compare VAR_PETALBURG_GYM_STATE, 0 goto_if_eq Route101_EventScript_1A14DC compare VAR_BIRCH_STATE, 0 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 compare VAR_BIRCH_STATE, 1 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 compare VAR_BIRCH_STATE, 2 - call_if 1, Route101_EventScript_1A0365 + call_if_eq Route101_EventScript_1A0365 compare VAR_BIRCH_STATE, 3 - call_if 1, Route101_EventScript_1A0365 + call_if_eq Route101_EventScript_1A0365 compare VAR_BIRCH_STATE, 4 - call_if 1, Route101_EventScript_1A0372 + call_if_eq Route101_EventScript_1A0372 compare VAR_BIRCH_STATE, 5 - call_if 1, Route101_EventScript_1A0372 + call_if_eq Route101_EventScript_1A0372 compare VAR_BIRCH_STATE, 6 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 compare VAR_BIRCH_STATE, 7 - call_if 1, Route101_EventScript_1A0358 + call_if_eq Route101_EventScript_1A0358 return Route101_EventScript_1A0358:: @ 81A0358 @@ -2291,9 +2275,9 @@ Movement_1A047A: BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C compare FACING, 1 - call_if 1, BattleTower_Outside_EventScript_160B2F + call_if_eq BattleTower_Outside_EventScript_160B2F compare FACING, 3 - call_if 1, BattleTower_Outside_EventScript_160B3A + call_if_eq BattleTower_Outside_EventScript_160B3A delay 30 hideobjectat 255, MAP_PETALBURG_CITY call BattleTower_Outside_EventScript_1A040E @@ -2461,19 +2445,19 @@ Route119_EventScript_1A05C3:: @ 81A05C3 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE compare VAR_SPECIAL_4, 1 - call_if 1, Route119_EventScript_1A0646 + call_if_eq Route119_EventScript_1A0646 compare VAR_SPECIAL_4, 2 - call_if 1, Route119_EventScript_1A064A + call_if_eq Route119_EventScript_1A064A compare VAR_SPECIAL_4, 3 - call_if 1, Route119_EventScript_1A064E + call_if_eq Route119_EventScript_1A064E compare VAR_SPECIAL_4, 4 - call_if 1, Route119_EventScript_1A0652 + call_if_eq Route119_EventScript_1A0652 compare VAR_SPECIAL_4, 5 - call_if 1, Route119_EventScript_1A0656 + call_if_eq Route119_EventScript_1A0656 compare VAR_SPECIAL_4, 6 - call_if 1, Route119_EventScript_1A065A + call_if_eq Route119_EventScript_1A065A compare VAR_SPECIAL_4, 7 - call_if 1, Route119_EventScript_1A065E + call_if_eq Route119_EventScript_1A065E setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE @@ -3944,8 +3928,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3086 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3086 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 lock @@ -3979,8 +3962,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 end SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3102 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3102 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 lock @@ -4014,8 +3996,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 end SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A317E + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A317E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D lock @@ -4049,8 +4030,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D end SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A31FA + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A31FA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 lock @@ -4084,8 +4064,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 end SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3276 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3276 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 lock @@ -4119,8 +4098,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 end SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A32F2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 lock @@ -4154,8 +4132,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 end SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A336E + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A336E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D lock @@ -4189,8 +4166,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D end SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A33EA + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A33EA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 lock @@ -4224,8 +4200,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 end SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A3466 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3466 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 lock @@ -4259,8 +4234,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 end SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 + goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A34E2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 lock @@ -4440,8 +4414,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar VAR_SPECIAL_9, VAR_SPECIAL_6 - checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER - goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 + goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, MSGBOX_YESNO compare RESULT, YES @@ -4569,8 +4542,7 @@ SlateportCity_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6 lock faceplayer - checkflag FLAG_TEMP_2 - goto_if_eq FallarborTown_ContestLobby_EventScript_1AE17E + goto_if_set FLAG_TEMP_2, FallarborTown_ContestLobby_EventScript_1AE17E setvar VAR_SPECIAL_5, 6 special InterviewBefore compare RESULT, 1 @@ -4630,7 +4602,7 @@ LilycoveCity_ContestLobby_EventScript_1AE188:: @ 81AE188 SlateportCity_ContestLobby_EventScript_1AE188:: @ 81AE188 VerdanturfTown_ContestLobby_EventScript_1AE188:: @ 81AE188 compare VAR_LINK_CONTEST_ROOM_STATE, 2 - goto_if 5, FallarborTown_ContestLobby_EventScript_1AE1FE + goto_if_ne FallarborTown_ContestLobby_EventScript_1AE1FE setvar VAR_SPECIAL_5, 6 special InterviewBefore compare RESULT, 1 @@ -4666,8 +4638,7 @@ FallarborTown_ContestLobby_EventScript_1AE1FE:: @ 81AE1FE BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF lock faceplayer - checkflag FLAG_TEMP_2 - goto_if_eq BattleTower_Lobby_EventScript_1AE2E3 + goto_if_set FLAG_TEMP_2, BattleTower_Lobby_EventScript_1AE2E3 setvar VAR_SPECIAL_5, 7 special InterviewBefore compare RESULT, 1 @@ -4686,9 +4657,9 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241 multichoice 19, 8, 45, 1 copyvar VAR_SPECIAL_8, RESULT compare RESULT, 0 - call_if 1, BattleTower_Lobby_EventScript_1AE2A1 + call_if_eq BattleTower_Lobby_EventScript_1AE2A1 compare RESULT, 1 - call_if 1, BattleTower_Lobby_EventScript_1AE2AA + call_if_eq BattleTower_Lobby_EventScript_1AE2AA msgbox BattleTower_Lobby_Text_1A79EB, 4 setvar VAR_SPECIAL_4, 12 copyvar VAR_SPECIAL_5, VAR_SPECIAL_9 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index a4a7513e5..f5ba25643 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,7 +1,6 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag FLAG_BADGE01_GET - goto_if 0, CannotUseCut + goto_if_unset FLAG_BADGE01_GET, CannotUseCut checkpartymove MOVE_CUT compare RESULT, 6 goto_if_eq CannotUseCut @@ -58,8 +57,7 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag FLAG_BADGE03_GET - goto_if 0, CannotUseRockSmash + goto_if_unset FLAG_BADGE03_GET, CannotUseRockSmash checkpartymove MOVE_ROCK_SMASH compare RESULT, 6 goto_if_eq CannotUseRockSmash @@ -125,10 +123,8 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag FLAG_BADGE04_GET - goto_if 0, CannotUseStrength - checkflag FLAG_SYS_USE_STRENGTH - goto_if_eq AlreadyUsedStrength + goto_if_unset FLAG_BADGE04_GET, CannotUseStrength + goto_if_set FLAG_SYS_USE_STRENGTH, AlreadyUsedStrength checkpartymove 70 compare RESULT, 6 goto_if_eq CannotUseStrength diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 334a52382..0e2012de9 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -174,8 +174,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_1A4342 copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer @@ -282,7 +281,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042 special CheckForAlivePartyMons compare RESULT, 0 - goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_1A4056 + goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_1A4056 setvar VAR_SPECIAL_4, 2 return @@ -346,8 +345,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC - checkflag FLAG_SYS_POKEDEX_GET - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 + goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_1A4339 copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer @@ -407,7 +405,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166 OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB specialvar RESULT, CalculatePlayerPartyCount compare RESULT, 2 - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A41E1 + goto_if_lt OldaleTown_PokemonCenter_2F_EventScript_1A41E1 specialvar RESULT, GetNameOfEnigmaBerryInPlayerParty compare RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A41EE @@ -443,8 +441,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SlateportCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB - checkflag FLAG_VISITED_MAUVILLE_CITY - goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B + goto_if_unset FLAG_VISITED_MAUVILLE_CITY, OldaleTown_PokemonCenter_2F_EventScript_1A434B copyvar VAR_SPECIAL_7, LAST_TALKED lock faceplayer @@ -691,7 +688,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418 special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A442D:: @ 81A442D @@ -699,7 +696,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A4442:: @ 81A4442 @@ -707,7 +704,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442 special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A4457:: @ 81A4457 @@ -715,7 +712,7 @@ RecordCorner_EventScript_1A4457:: @ 81A4457 special sub_80B929C waitstate compare VAR_TEMP_1, 0 - goto_if 5, RecordCorner_EventScript_1A446C + goto_if_ne RecordCorner_EventScript_1A446C end RecordCorner_EventScript_1A446C:: @ 81A446C @@ -771,7 +768,7 @@ TradeCenter_EventScript_1A44AD:: @ 81A44AD RecordCorner_EventScript_1A44BC:: @ 81A44BC compare VAR_TEMP_0, 0 - goto_if 5, RecordCorner_EventScript_1A44D6 + goto_if_ne RecordCorner_EventScript_1A44D6 special sub_8064EAC message RecordCorner_Text_1A4DD7 waitmessage diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index af2c39979..7f0f6b710 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -6,11 +6,10 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92 faceplayer checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 - call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD + call_if_eq FallarborTown_ContestLobby_EventScript_1A4EDD compare VAR_CONTEST_PRIZE_PICKUP, 0 - goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E - checkflag FLAG_TEMP_1 - goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F + goto_if_ne FallarborTown_ContestLobby_EventScript_1A4F4E + goto_if_set FLAG_TEMP_1, FallarborTown_ContestLobby_EventScript_1A4F8F bufferstdstring 0, VAR_SPECIAL_B msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4 checkitem ITEM_CONTEST_PASS, 1 @@ -40,8 +39,7 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 end FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 - checkflag FLAG_RECEIVED_CONTEST_PASS - goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44 + goto_if_set FLAG_RECEIVED_CONTEST_PASS, FallarborTown_ContestLobby_EventScript_1A4F44 msgbox FallarborTown_ContestLobby_Text_1A6583, 4 giveitem_std ITEM_CONTEST_PASS setflag FLAG_RECEIVED_CONTEST_PASS @@ -288,7 +286,7 @@ LinkContestRoom1_EventScript_1A527A:: @ 81A527A call LinkContestRoom1_EventScript_1A5880 addvar VAR_SPECIAL_6, 1 compare VAR_SPECIAL_6, 4 - goto_if 5, LinkContestRoom1_EventScript_1A527A + goto_if_ne LinkContestRoom1_EventScript_1A527A call LinkContestRoom1_EventScript_1A5377 setvar VAR_TEMP_1, 6 return @@ -432,15 +430,15 @@ LinkContestRoom1_EventScript_1A53E5:: @ 81A53E5 LinkContestRoom1_EventScript_1A5455:: @ 81A5455 special sub_80C47A0 compare VAR_CONTEST_LOCATION, 1 - call_if 1, LinkContestRoom1_EventScript_1A555A + call_if_eq LinkContestRoom1_EventScript_1A555A compare VAR_CONTEST_LOCATION, 2 - call_if 1, LinkContestRoom1_EventScript_1A55B8 + call_if_eq LinkContestRoom1_EventScript_1A55B8 compare VAR_CONTEST_LOCATION, 3 - call_if 1, LinkContestRoom1_EventScript_1A5616 + call_if_eq LinkContestRoom1_EventScript_1A5616 compare VAR_CONTEST_LOCATION, 4 - call_if 1, LinkContestRoom1_EventScript_1A5674 + call_if_eq LinkContestRoom1_EventScript_1A5674 compare VAR_CONTEST_LOCATION, 5 - call_if 1, LinkContestRoom1_EventScript_1A56D2 + call_if_eq LinkContestRoom1_EventScript_1A56D2 setvar VAR_TEMP_1, 9 setvar VAR_TEMP_2, 9 setvar VAR_TEMP_3, 9 @@ -450,7 +448,7 @@ LinkContestRoom1_EventScript_1A5455:: @ 81A5455 setvar VAR_TEMP_7, 9 setvar VAR_TEMP_8, 9 compare VAR_TEMP_0, 0 - call_if 2, LinkContestRoom1_EventScript_1A54EB + call_if_gt LinkContestRoom1_EventScript_1A54EB setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 @@ -465,123 +463,123 @@ LinkContestRoom1_EventScript_1A54EB:: @ 81A54EB setvar RESULT, 8 special ScriptRandom compare RESULT, 0 - call_if 1, LinkContestRoom1_EventScript_1A5760 + call_if_eq LinkContestRoom1_EventScript_1A5760 compare RESULT, 1 - call_if 1, LinkContestRoom1_EventScript_1A5784 + call_if_eq LinkContestRoom1_EventScript_1A5784 compare RESULT, 2 - call_if 1, LinkContestRoom1_EventScript_1A57A8 + call_if_eq LinkContestRoom1_EventScript_1A57A8 compare RESULT, 3 - call_if 1, LinkContestRoom1_EventScript_1A57CC + call_if_eq LinkContestRoom1_EventScript_1A57CC compare RESULT, 4 - call_if 1, LinkContestRoom1_EventScript_1A57F0 + call_if_eq LinkContestRoom1_EventScript_1A57F0 compare RESULT, 5 - call_if 1, LinkContestRoom1_EventScript_1A5814 + call_if_eq LinkContestRoom1_EventScript_1A5814 compare RESULT, 6 - call_if 1, LinkContestRoom1_EventScript_1A5838 + call_if_eq LinkContestRoom1_EventScript_1A5838 compare RESULT, 7 - call_if 1, LinkContestRoom1_EventScript_1A585C + call_if_eq LinkContestRoom1_EventScript_1A585C compare VAR_TEMP_0, 0 - goto_if 2, LinkContestRoom1_EventScript_1A54EB + goto_if_gt LinkContestRoom1_EventScript_1A54EB waitmovement 0 return LinkContestRoom1_EventScript_1A555A:: @ 81A555A compare VAR_SPECIAL_4, 80 - goto_if 2, LinkContestRoom1_EventScript_1A575A + goto_if_gt LinkContestRoom1_EventScript_1A575A compare VAR_SPECIAL_4, 70 - goto_if 2, LinkContestRoom1_EventScript_1A5754 + goto_if_gt LinkContestRoom1_EventScript_1A5754 compare VAR_SPECIAL_4, 60 - goto_if 2, LinkContestRoom1_EventScript_1A574E + goto_if_gt LinkContestRoom1_EventScript_1A574E compare VAR_SPECIAL_4, 50 - goto_if 2, LinkContestRoom1_EventScript_1A5748 + goto_if_gt LinkContestRoom1_EventScript_1A5748 compare VAR_SPECIAL_4, 40 - goto_if 2, LinkContestRoom1_EventScript_1A5742 + goto_if_gt LinkContestRoom1_EventScript_1A5742 compare VAR_SPECIAL_4, 30 - goto_if 2, LinkContestRoom1_EventScript_1A573C + goto_if_gt LinkContestRoom1_EventScript_1A573C compare VAR_SPECIAL_4, 20 - goto_if 2, LinkContestRoom1_EventScript_1A5736 + goto_if_gt LinkContestRoom1_EventScript_1A5736 compare VAR_SPECIAL_4, 10 - goto_if 2, LinkContestRoom1_EventScript_1A5730 + goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A55B8:: @ 81A55B8 compare VAR_SPECIAL_4, 230 - goto_if 2, LinkContestRoom1_EventScript_1A575A + goto_if_gt LinkContestRoom1_EventScript_1A575A compare VAR_SPECIAL_4, 210 - goto_if 2, LinkContestRoom1_EventScript_1A5754 + goto_if_gt LinkContestRoom1_EventScript_1A5754 compare VAR_SPECIAL_4, 190 - goto_if 2, LinkContestRoom1_EventScript_1A574E + goto_if_gt LinkContestRoom1_EventScript_1A574E compare VAR_SPECIAL_4, 170 - goto_if 2, LinkContestRoom1_EventScript_1A5748 + goto_if_gt LinkContestRoom1_EventScript_1A5748 compare VAR_SPECIAL_4, 150 - goto_if 2, LinkContestRoom1_EventScript_1A5742 + goto_if_gt LinkContestRoom1_EventScript_1A5742 compare VAR_SPECIAL_4, 130 - goto_if 2, LinkContestRoom1_EventScript_1A573C + goto_if_gt LinkContestRoom1_EventScript_1A573C compare VAR_SPECIAL_4, 110 - goto_if 2, LinkContestRoom1_EventScript_1A5736 + goto_if_gt LinkContestRoom1_EventScript_1A5736 compare VAR_SPECIAL_4, 90 - goto_if 2, LinkContestRoom1_EventScript_1A5730 + goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5616:: @ 81A5616 compare VAR_SPECIAL_4, 380 - goto_if 2, LinkContestRoom1_EventScript_1A575A + goto_if_gt LinkContestRoom1_EventScript_1A575A compare VAR_SPECIAL_4, 350 - goto_if 2, LinkContestRoom1_EventScript_1A5754 + goto_if_gt LinkContestRoom1_EventScript_1A5754 compare VAR_SPECIAL_4, 320 - goto_if 2, LinkContestRoom1_EventScript_1A574E + goto_if_gt LinkContestRoom1_EventScript_1A574E compare VAR_SPECIAL_4, 290 - goto_if 2, LinkContestRoom1_EventScript_1A5748 + goto_if_gt LinkContestRoom1_EventScript_1A5748 compare VAR_SPECIAL_4, 260 - goto_if 2, LinkContestRoom1_EventScript_1A5742 + goto_if_gt LinkContestRoom1_EventScript_1A5742 compare VAR_SPECIAL_4, 230 - goto_if 2, LinkContestRoom1_EventScript_1A573C + goto_if_gt LinkContestRoom1_EventScript_1A573C compare VAR_SPECIAL_4, 200 - goto_if 2, LinkContestRoom1_EventScript_1A5736 + goto_if_gt LinkContestRoom1_EventScript_1A5736 compare VAR_SPECIAL_4, 170 - goto_if 2, LinkContestRoom1_EventScript_1A5730 + goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A5674:: @ 81A5674 compare VAR_SPECIAL_4, 600 - goto_if 2, LinkContestRoom1_EventScript_1A575A + goto_if_gt LinkContestRoom1_EventScript_1A575A compare VAR_SPECIAL_4, 560 - goto_if 2, LinkContestRoom1_EventScript_1A5754 + goto_if_gt LinkContestRoom1_EventScript_1A5754 compare VAR_SPECIAL_4, 520 - goto_if 2, LinkContestRoom1_EventScript_1A574E + goto_if_gt LinkContestRoom1_EventScript_1A574E compare VAR_SPECIAL_4, 480 - goto_if 2, LinkContestRoom1_EventScript_1A5748 + goto_if_gt LinkContestRoom1_EventScript_1A5748 compare VAR_SPECIAL_4, 440 - goto_if 2, LinkContestRoom1_EventScript_1A5742 + goto_if_gt LinkContestRoom1_EventScript_1A5742 compare VAR_SPECIAL_4, 400 - goto_if 2, LinkContestRoom1_EventScript_1A573C + goto_if_gt LinkContestRoom1_EventScript_1A573C compare VAR_SPECIAL_4, 360 - goto_if 2, LinkContestRoom1_EventScript_1A5736 + goto_if_gt LinkContestRoom1_EventScript_1A5736 compare VAR_SPECIAL_4, 320 - goto_if 2, LinkContestRoom1_EventScript_1A5730 + goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return LinkContestRoom1_EventScript_1A56D2:: @ 81A56D2 compare VAR_SPECIAL_4, 600 - goto_if 2, LinkContestRoom1_EventScript_1A575A + goto_if_gt LinkContestRoom1_EventScript_1A575A compare VAR_SPECIAL_4, 550 - goto_if 2, LinkContestRoom1_EventScript_1A5754 + goto_if_gt LinkContestRoom1_EventScript_1A5754 compare VAR_SPECIAL_4, 500 - goto_if 2, LinkContestRoom1_EventScript_1A574E + goto_if_gt LinkContestRoom1_EventScript_1A574E compare VAR_SPECIAL_4, 450 - goto_if 2, LinkContestRoom1_EventScript_1A5748 + goto_if_gt LinkContestRoom1_EventScript_1A5748 compare VAR_SPECIAL_4, 400 - goto_if 2, LinkContestRoom1_EventScript_1A5742 + goto_if_gt LinkContestRoom1_EventScript_1A5742 compare VAR_SPECIAL_4, 300 - goto_if 2, LinkContestRoom1_EventScript_1A573C + goto_if_gt LinkContestRoom1_EventScript_1A573C compare VAR_SPECIAL_4, 200 - goto_if 2, LinkContestRoom1_EventScript_1A5736 + goto_if_gt LinkContestRoom1_EventScript_1A5736 compare VAR_SPECIAL_4, 100 - goto_if 2, LinkContestRoom1_EventScript_1A5730 + goto_if_gt LinkContestRoom1_EventScript_1A5730 setvar VAR_TEMP_0, 0 return @@ -909,7 +907,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 addvar VAR_TEMP_1, 1 lockall compare VAR_CONTEST_LOCATION, 1 - call_if 2, LinkContestRoom1_EventScript_1A5AE4 + call_if_gt LinkContestRoom1_EventScript_1A5AE4 applymovement 9, LinkContestRoom1_Movement_1A5DB7 applymovement 12, LinkContestRoom1_Movement_1A5DBB applymovement 7, LinkContestRoom1_Movement_1A5DB7 @@ -919,7 +917,7 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90 applymovement 6, LinkContestRoom1_Movement_1A5DB3 applymovement 8, LinkContestRoom1_Movement_1A5DAF compare VAR_TEMP_1, 4 - goto_if 5, LinkContestRoom1_EventScript_1A5A90 + goto_if_ne LinkContestRoom1_EventScript_1A5A90 delay 30 return @@ -996,8 +994,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB compare VAR_CONTEST_LOCATION, 5 goto_if_eq LinkContestRoom1_EventScript_1A5C4C call LinkContestRoom1_EventScript_1A5C12 - checkflag FLAG_TEMP_2 - goto_if_eq LinkContestRoom1_EventScript_1A5BF6 + goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_1A5BF6 msgbox LinkContestRoom1_Text_1A6DC5, 3 waitmessage call LinkContestRoom1_EventScript_1A5C7F @@ -1118,7 +1115,7 @@ LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5 LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC compare VAR_CONTEST_LOCATION, 2 - call_if 1, LinkContestRoom1_EventScript_1A5C42 + call_if_eq LinkContestRoom1_EventScript_1A5C42 incrementgamestat GAME_STAT_WON_CONTEST specialvar RESULT, sub_80C4440 compare RESULT, 0 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 0d0d83801..fc5df6abe 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -29,7 +29,7 @@ Route117_EventScript_1B2262:: @ 81B2262 Route117_EventScript_1B2298:: @ 81B2298 specialvar RESULT, CalculatePlayerPartyCount compare RESULT, 6 - goto_if 5, Route117_EventScript_1B22B2 + goto_if_ne Route117_EventScript_1B22B2 msgbox Route117_Text_1B2766, 4 release end @@ -49,7 +49,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 Route117_EventScript_1B22CD:: @ 81B22CD specialvar RESULT, sub_8042B4C compare RESULT, 1 - call_if 1, Route117_EventScript_1B22DE + call_if_eq Route117_EventScript_1B22DE return Route117_EventScript_1B22DE:: @ 81B22DE @@ -155,7 +155,7 @@ Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411 Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A specialvar RESULT, GetNumLevelsGainedFromDaycare compare RESULT, 0 - call_if 5, Route117_PokemonDayCare_EventScript_1B2411 + call_if_ne Route117_PokemonDayCare_EventScript_1B2411 return Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index ad7a3d3c5..5ddcf4a65 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -203,13 +203,12 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds compare FACING, 2 - call_if 1, Route111_EventScript_1AE5E0 + call_if_eq Route111_EventScript_1AE5E0 compare FACING, 1 - call_if 1, Route111_EventScript_1AE5EB + call_if_eq Route111_EventScript_1AE5EB compare FACING, 4 - call_if 1, Route111_EventScript_1AE5FD - checkflag FLAG_TEMP_1 - goto_if_eq Route111_EventScript_1AE73A + call_if_eq Route111_EventScript_1AE5FD + goto_if_set FLAG_TEMP_1, Route111_EventScript_1AE73A msgbox Route111_Text_1AC015, MSGBOX_YESNO goto Route111_EventScript_1AE6F3 end @@ -237,13 +236,12 @@ Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview special GabbyAndTySetScriptVarsToFieldObjectLocalIds compare FACING, 2 - call_if 1, Route111_EventScript_1AE5E0 + call_if_eq Route111_EventScript_1AE5E0 compare FACING, 1 - call_if 1, Route111_EventScript_1AE5EB + call_if_eq Route111_EventScript_1AE5EB compare FACING, 4 - call_if 1, Route111_EventScript_1AE5FD - checkflag FLAG_TEMP_1 - goto_if_eq Route111_EventScript_1AE73A + call_if_eq Route111_EventScript_1AE5FD + goto_if_set FLAG_TEMP_1, Route111_EventScript_1AE73A specialvar RESULT, GabbyAndTyGetLastQuote compare RESULT, 0 goto_if_eq Route111_EventScript_1AE69F diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index 11f42daf0..ed81e6628 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -1,10 +1,8 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95 lock faceplayer - checkflag FLAG_EVIL_LEADER_PLEASE_STOP - call_if 0, MtChimney_EventScript_1B2CB9 - checkflag FLAG_EVIL_LEADER_PLEASE_STOP - call_if 1, MtChimney_EventScript_1B2CC2 + call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CB9 + call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CC2 closemessage applymovement 1, MtChimney_Movement_1A083D waitmovement 0 @@ -68,9 +66,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB setobjectxyperm 1, 10, 12 addobject 1 compare FACING, 4 - call_if 1, MtChimney_EventScript_1B2D7D + call_if_eq MtChimney_EventScript_1B2D7D compare FACING, 2 - call_if 1, MtChimney_EventScript_1B2D88 + call_if_eq MtChimney_EventScript_1B2D88 applymovement 255, MtChimney_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE @@ -80,9 +78,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB .endif closemessage compare FACING, 4 - call_if 1, MtChimney_EventScript_1B2D93 + call_if_eq MtChimney_EventScript_1B2D93 compare FACING, 2 - call_if 1, MtChimney_EventScript_1B2D9E + call_if_eq MtChimney_EventScript_1B2D9E removeobject 1 setflag FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index 2430ba4af..22c76847a 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -4,13 +4,11 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4 AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 lock faceplayer - checkflag FLAG_EXCHANGED_SCANNER - goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 - checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 - goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, AbandonedShip_CaptainsOffice_EventScript_15EB2D msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4 release end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index b4d29632e..c34f2c28b 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -8,10 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 - checkflag FLAG_USED_STORAGE_KEY - call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6 - checkflag FLAG_USED_STORAGE_KEY - call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0 + call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9B6 + call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9C0 end AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 @@ -28,8 +26,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 lockall - checkflag FLAG_USED_STORAGE_KEY - goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 + goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 7b61190e5..e8e48a6f6 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -8,22 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A - checkflag FLAG_USED_ROOM_1_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB - checkflag FLAG_USED_ROOM_2_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 - checkflag FLAG_USED_ROOM_4_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF - checkflag FLAG_USED_ROOM_6_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 - checkflag FLAG_USED_ROOM_1_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 - checkflag FLAG_USED_ROOM_2_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD - checkflag FLAG_USED_ROOM_4_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 - checkflag FLAG_USED_ROOM_6_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 + call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB + call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 + call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF + call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 + call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 + call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD + call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 + call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 end AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 @@ -60,8 +52,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 lockall - checkflag FLAG_USED_ROOM_1_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF @@ -76,8 +67,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A lockall - checkflag FLAG_USED_ROOM_2_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 @@ -92,8 +82,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 lockall - checkflag FLAG_USED_ROOM_4_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 @@ -108,8 +97,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 lockall - checkflag FLAG_USED_ROOM_6_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 9ad419da1..7f9b06500 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -11,11 +11,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 getplayerxy VAR_TEMP_2, VAR_TEMP_3 setvar VAR_TEMP_4, 1 compare VAR_TEMP_2, 21 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED89 compare VAR_TEMP_2, 36 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED8F compare VAR_TEMP_3, 2 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED95 switch VAR_TEMP_4 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 @@ -45,7 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B dofieldeffect 54 specialvar RESULT, FoundAbandonedShipRoom4Key compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B waitfieldeffect 54 delay 10 end @@ -59,7 +59,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B waitfieldeffect 54 delay 10 end @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB dofieldeffect 54 specialvar RESULT, FoundAbandonedShipRoom6Key compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B waitfieldeffect 54 delay 10 end @@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 dofieldeffect 54 specialvar RESULT, FoundAbandonedShipRoom2Key compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B waitfieldeffect 54 delay 10 end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index b849f41ba..8ff39c0a4 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -5,8 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE .byte 0 AncientTomb_MapScript1_15EFCE:: @ 815EFCE - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AncientTomb_EventScript_15EFD8 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_15EFD8 end AncientTomb_EventScript_15EFD8:: @ 815EFD8 @@ -18,8 +17,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 - checkflag FLAG_SYS_BRAILLE_FLY - call_if 0, AncientTomb_EventScript_15EFEA + call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15EFEA end AncientTomb_EventScript_15EFEA:: @ 815EFEA @@ -33,8 +31,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall - checkflag FLAG_SYS_BRAILLE_FLY - goto_if_eq AncientTomb_EventScript_15F038 + goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E waitbuttonpress erasebox 0, 0, 29, 19 diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc index 028a0ee7b..ee49ba695 100644 --- a/data/scripts/maps/AquaHideout_1F.inc +++ b/data/scripts/maps/AquaHideout_1F.inc @@ -10,8 +10,7 @@ AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE lock faceplayer - checkflag FLAG_MT_PYRE_ORB_STOLEN - goto_if_eq AquaHideout_1F_EventScript_15D7E3 + goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D7E3 msgbox AquaHideout_1F_Text_196AFD, 4 release end @@ -25,8 +24,7 @@ AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED lock faceplayer - checkflag FLAG_MT_PYRE_ORB_STOLEN - goto_if_eq AquaHideout_1F_EventScript_15D802 + goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D802 msgbox AquaHideout_1F_Text_196C83, 4 release end diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 82d0c10c5..3be8d487d 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -4,8 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 .byte 0 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AquaHideout_B1F_EventScript_15D846 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_15D846 end AquaHideout_B1F_EventScript_15D846:: @ 815D846 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 14b85c5b0..57eb62dfe 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -13,13 +13,11 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar VAR_SPECIAL_4, 10 special SetBattleTowerProperty - checkflag FLAG_RECEIVED_GOLD_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_1602E4 - checkflag FLAG_RECEIVED_SILVER_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_1602CD + goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1602E4 + goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_1602CD specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 50 - goto_if 0, BattleTower_Lobby_EventScript_1602E4 + goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return @@ -27,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 100 - goto_if 0, BattleTower_Lobby_EventScript_1602E4 + goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return @@ -119,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar VAR_SPECIAL_4, 9 special BattleTowerUtil compare RESULT, 49 - goto_if 5, BattleTower_Lobby_EventScript_1603F8 + goto_if_ne BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 @@ -387,10 +385,8 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727 BattleTower_Lobby_EventScript_160733:: @ 8160733 lock faceplayer - checkflag FLAG_RECEIVED_GOLD_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_1607C5 - checkflag FLAG_RECEIVED_SILVER_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_160773 + goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5 + goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD givedecoration_std DECOR_SILVER_SHIELD @@ -404,7 +400,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 BattleTower_Lobby_EventScript_160773:: @ 8160773 specialvar RESULT, GetBestBattleTowerStreak compare RESULT, 100 - goto_if 0, BattleTower_Lobby_EventScript_1607C5 + goto_if_lt BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD givedecoration_std DECOR_GOLD_SHIELD diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc index 6411aad49..58c6563f6 100644 --- a/data/scripts/maps/CaveOfOrigin_1F.inc +++ b/data/scripts/maps/CaveOfOrigin_1F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C .byte 0 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_1F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc index b8d4149b6..c79eb088e 100644 --- a/data/scripts/maps/CaveOfOrigin_B1F.inc +++ b/data/scripts/maps/CaveOfOrigin_B1F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C .byte 0 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc index 9b014d0e9..66b02ee9f 100644 --- a/data/scripts/maps/CaveOfOrigin_B2F.inc +++ b/data/scripts/maps/CaveOfOrigin_B2F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C .byte 0 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B2F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc index d6f7bdaf1..8084ceb43 100644 --- a/data/scripts/maps/CaveOfOrigin_B3F.inc +++ b/data/scripts/maps/CaveOfOrigin_B3F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C .byte 0 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B3F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 315dda886..aa79e1213 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -4,8 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC .byte 0 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, CaveOfOrigin_B4F_EventScript_15DDC1 end CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 @@ -19,8 +18,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 setmaplayoutindex 313 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B4F_EventScript_1A04E3 end CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 @@ -67,7 +65,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar RESULT, GetBattleOutcome compare RESULT, 1 - call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 + call_if_eq CaveOfOrigin_B4F_EventScript_15DE73 setflag FLAG_HIDE_WALLACE_SOOTOPOLIS setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 7aa56a82d..2627a8261 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -5,8 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, DesertRuins_EventScript_15CB0D + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_15CB0D end DesertRuins_EventScript_15CB0D:: @ 815CB0D @@ -14,8 +13,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D return DesertRuins_MapScript1_15CB11:: @ 815CB11 - checkflag FLAG_SYS_BRAILLE_STRENGTH - call_if 0, DesertRuins_EventScript_15CB1B + call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB1B end DesertRuins_EventScript_15CB1B:: @ 815CB1B @@ -33,8 +31,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall - checkflag FLAG_SYS_BRAILLE_STRENGTH - goto_if_eq DesertRuins_EventScript_15CB6D + goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 waitbuttonpress erasebox 0, 0, 29, 19 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 50c9d8991..e7aeccbd0 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -9,8 +9,7 @@ DewfordTown_MapScript1_14DFFE:: @ 814DFFE DewfordTown_EventScript_14E002:: @ 814E002 lock faceplayer - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, DewfordTown_EventScript_14E076 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 waitmessage multichoicedefault 21, 6, 0, 2, 0 @@ -74,8 +73,7 @@ DewfordTown_EventScript_14E0BD:: @ 814E0BD DewfordTown_EventScript_14E0C6:: @ 814E0C6 lock faceplayer - checkflag FLAG_RECEIVED_OLD_ROD - goto_if_eq DewfordTown_EventScript_14E11B + goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, MSGBOX_YESNO compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E0F0 @@ -176,10 +174,8 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobjectat 4, MAP_DEWFORD_TOWN - checkflag FLAG_DELIVERED_DEVON_GOODS - call_if 0, DewfordTown_EventScript_14E281 - checkflag FLAG_DELIVERED_DEVON_GOODS - call_if 1, DewfordTown_EventScript_14E28A + call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E281 + call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A closemessage copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_DEWFORD_TOWN diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index ba933dbe9..2dc15d92c 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -82,17 +82,17 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_SPECIAL_0, 0 checktrainerflag OPPONENT_HIDEKI - goto_if 0, DewfordTown_Gym_EventScript_153135 + goto_if_lt DewfordTown_Gym_EventScript_153135 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA - goto_if 0, DewfordTown_Gym_EventScript_153143 + goto_if_lt DewfordTown_Gym_EventScript_153143 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA - goto_if 0, DewfordTown_Gym_EventScript_153151 + goto_if_lt DewfordTown_Gym_EventScript_153151 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 @@ -100,8 +100,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151 DewfordTown_Gym_EventScript_153152:: @ 8153152 trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 - checkflag FLAG_RECEIVED_TM08 - goto_if 0, DewfordTown_Gym_EventScript_1531B5 + goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release end @@ -116,7 +115,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag FLAG_BADGE02_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, DewfordTown_Gym_EventScript_1A00FB + call_if_eq DewfordTown_Gym_EventScript_1A00FB setvar VAR_SPECIAL_8, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 @@ -164,8 +163,7 @@ DewfordTown_Gym_EventScript_153238:: @ 8153238 DewfordTown_Gym_EventScript_15323F:: @ 815323F lock faceplayer - checkflag FLAG_DEFEATED_DEWFORD_GYM - goto_if_eq DewfordTown_Gym_EventScript_153254 + goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_153254 msgbox DewfordTown_Gym_Text_174D98, 4 release end @@ -177,15 +175,13 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall - checkflag FLAG_BADGE02_GET - goto_if_eq DewfordTown_Gym_EventScript_15327E + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall - checkflag FLAG_BADGE02_GET - goto_if_eq DewfordTown_Gym_EventScript_15327E + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index c4ccc769c..84334068e 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -218,9 +218,9 @@ DewfordTown_Hall_EventScript_153535:: @ 8153535 DewfordTown_Hall_EventScript_153556:: @ 8153556 compare FACING, 2 - call_if 1, DewfordTown_Hall_EventScript_15356D + call_if_eq DewfordTown_Hall_EventScript_15356D compare FACING, 1 - call_if 1, DewfordTown_Hall_EventScript_153578 + call_if_eq DewfordTown_Hall_EventScript_153578 return DewfordTown_Hall_EventScript_15356D:: @ 815356D @@ -252,8 +252,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - checkflag FLAG_RECEIVED_TM36 - goto_if_eq DewfordTown_Hall_EventScript_1535D1 + goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem_std ITEM_TM36 compare RESULT, 0 diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index e704efa50..a2341bc76 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -4,8 +4,7 @@ DewfordTown_House2_MapScripts:: @ 81535DB DewfordTown_House2_EventScript_1535DC:: @ 81535DC lock faceplayer - checkflag FLAG_RECEIVED_SILK_SCARF - goto_if_eq DewfordTown_House2_EventScript_153615 + goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem_std ITEM_SILK_SCARF compare RESULT, 0 diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index 9a1bd9fa7..293780716 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -3,8 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, EverGrandeCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_1A02C1 end EverGrandeCity_EventScript_14D4E5:: @ 814D4E5 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 29c29c80b..78009271b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -54,9 +54,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playse SE_DOOR checkplayergender compare RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C compare RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkplayergender @@ -129,9 +129,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkplayergender compare RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB compare RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index a738264fe..8eb7bbc45 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -24,10 +24,9 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 end EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 - checkflag FLAG_DEFEATED_ELITE_4_DRAKE - call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 + call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B758 compare VAR_ELITE_4_STATE, 4 - call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E + call_if_eq EverGrandeCity_DrakesRoom_EventScript_15B75E end EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758 @@ -41,8 +40,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_DRAKE - goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B + goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index e3a4145d6..a72b84440 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -24,10 +24,9 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C end EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 - checkflag FLAG_DEFEATED_ELITE_4_GLACIA - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE + call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6BE compare VAR_ELITE_4_STATE, 3 - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 + call_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE @@ -41,8 +40,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_GLACIA - goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 + goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index d23f234db..2d09f1ebb 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -24,10 +24,9 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 end EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F - checkflag FLAG_DEFEATED_ELITE_4_PHOEBE - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 + call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B624 compare VAR_ELITE_4_STATE, 2 - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A + call_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B62A end EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624 @@ -41,8 +40,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_PHOEBE - goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 + goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index a787b0f90..a8eb820ea 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -5,8 +5,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B setrespawn 20 setflag FLAG_SYS_POKEMON_LEAGUE_FLY - checkflag FLAG_ENTERED_ELITE_FOUR - call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B + call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B end EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B @@ -47,18 +46,16 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall - checkflag FLAG_ENTERED_ELITE_FOUR - goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 + goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 11 - call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 + call_if_ge EverGrandeCity_PokemonLeague_EventScript_15BB34 compare VAR_TEMP_0, 8 - call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F + call_if_le EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage delay 75 - checkflag FLAG_BADGE06_GET - goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A + goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_EventScript_15BB4A closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 4531845ab..45a729c0a 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -5,10 +5,9 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F .byte 0 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F - checkflag FLAG_DEFEATED_ELITE_4_SYDNEY - call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 + call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B564 compare VAR_ELITE_4_STATE, 1 - call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A + call_if_eq EverGrandeCity_SidneysRoom_EventScript_15B56A end EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564 @@ -42,8 +41,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_SYDNEY - goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD + goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 23295f778..a168a0ef5 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -12,8 +12,7 @@ FallarborTown_MapScript1_14E7E6:: @ 814E7E6 FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - goto_if_eq FallarborTown_EventScript_14E80A + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 641a201e3..11dd6159e 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -92,8 +92,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E end FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 - checkflag FLAG_CONTEST_SKETCH_CREATED - goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9 + goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9 msgbox FallarborTown_ContestLobby_Text_177246, 2 end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index d2b27f478..f62a2da37 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -8,8 +8,7 @@ FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4 FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 lock faceplayer - checkflag FLAG_RECEIVED_TM27 - goto_if_eq FallarborTown_House1_EventScript_153C54 + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 compare RESULT, 1 goto_if_eq FallarborTown_House1_EventScript_153BDA @@ -18,10 +17,8 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 end FallarborTown_House1_EventScript_153BDA:: @ 8153BDA - checkflag FLAG_TEMP_2 - call_if 0, FallarborTown_House1_EventScript_153C2D - checkflag FLAG_TEMP_2 - call_if 1, FallarborTown_House1_EventScript_153C3E + call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_153C2D + call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_153C3E compare RESULT, NO goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 @@ -58,10 +55,8 @@ FallarborTown_House1_EventScript_153C54:: @ 8153C54 FallarborTown_House1_EventScript_153C5E:: @ 8153C5E lock faceplayer - checkflag FLAG_RECEIVED_TM27 - goto_if_eq FallarborTown_House1_EventScript_153C86 - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - goto_if_eq FallarborTown_House1_EventScript_153C7C + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C86 + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_153C7C msgbox FallarborTown_House1_Text_177A2B, 4 release end diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 7ceaabdef..bb1656fc2 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -5,8 +5,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 lockall applymovement 1, FallarborTown_House2_Movement_1A0839 waitmovement 0 - checkflag FLAG_TEMP_1 - goto_if_eq FallarborTown_House2_EventScript_153CB6 + goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_153CB6 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 937b435a6..e576df5bd 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -18,8 +18,7 @@ FortreeCity_EventScript_14C955:: @ 814C955 FortreeCity_EventScript_14C95E:: @ 814C95E lock faceplayer - checkflag FLAG_KECLEON_FLED_FORTREE - goto_if_eq FortreeCity_EventScript_14C973 + goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_14C973 msgbox FortreeCity_Text_1675C2, 4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 9217ba8f4..94df378f8 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -17,8 +17,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 - checkflag FLAG_RECEIVED_TM40 - goto_if 0, FortreeCity_Gym_EventScript_157F3E + goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release end @@ -67,8 +66,7 @@ FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE lock faceplayer - checkflag FLAG_DEFEATED_FORTREE_GYM - goto_if_eq FortreeCity_Gym_EventScript_157FD3 + goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_157FD3 msgbox FortreeCity_Gym_Text_18589C, 4 release end @@ -80,15 +78,13 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall - checkflag FLAG_BADGE06_GET - goto_if_eq FortreeCity_Gym_EventScript_157FFD + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall - checkflag FLAG_BADGE06_GET - goto_if_eq FortreeCity_Gym_EventScript_157FFD + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index b308aa836..443cc3a5c 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -4,8 +4,7 @@ FortreeCity_House1_MapScripts:: @ 8157E12 FortreeCity_House1_EventScript_157E13:: @ 8157E13 lock faceplayer - checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED - goto_if_eq FortreeCity_House1_EventScript_157EAD + goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_157EAD setvar VAR_SPECIAL_8, 1 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo @@ -22,7 +21,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 - goto_if 5, FortreeCity_House1_EventScript_157E9F + goto_if_ne FortreeCity_House1_EventScript_157E9F copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special CreateInGameTradePokemon diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index ae70b8644..107c3708c 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -4,10 +4,8 @@ FortreeCity_House2_MapScripts:: @ 81580B3 FortreeCity_House2_EventScript_1580B4:: @ 81580B4 lock faceplayer - checkflag FLAG_RECEIVED_TM10 - goto_if_eq FortreeCity_House2_EventScript_158157 - checkflag FLAG_MET_HIDDEN_POWER_GIVER - call_if 0, FortreeCity_House2_EventScript_15814B + goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_158157 + call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_15814B msgbox FortreeCity_House2_Text_186360, 4 multichoice 21, 8, 54, 1 switch RESULT diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 1b1b41877..490ef0c9b 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -7,12 +7,9 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F FortreeCity_House4_EventScript_158188:: @ 8158188 lockall - checkflag FLAG_RECEIVED_MENTAL_HERB - goto_if_eq FortreeCity_House4_EventScript_158204 - checkflag FLAG_WINGULL_DELIVERED_MAIL - goto_if_eq FortreeCity_House4_EventScript_1581D6 - checkflag FLAG_WINGULL_SENT_ON_ERRAND - goto_if_eq FortreeCity_House4_EventScript_1581C2 + goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204 + goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6 + goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2 msgbox FortreeCity_House4_Text_186835, 4 closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index 33296e510..7419b5866 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -4,8 +4,7 @@ GraniteCave_1F_MapScripts:: @ 815CBA6 GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 lock faceplayer - checkflag FLAG_RECEIVED_HM05 - goto_if_eq GraniteCave_1F_EventScript_15CBD3 + goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 giveitem_std ITEM_HM05 setflag FLAG_RECEIVED_HM05 diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index c9616266e..9c69e649e 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -11,17 +11,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem_std ITEM_TM47 compare RESULT, 0 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closemessage compare FACING, 2 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 1 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC78 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC78 compare FACING, 3 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 4 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D playse SE_KAIDAN removeobject 1 release diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index dbc71b6bb..d8576e883 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -5,8 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, IslandCave_EventScript_15EED0 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_15EED0 end IslandCave_EventScript_15EED0:: @ 815EED0 @@ -14,8 +13,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0 return IslandCave_MapScript1_15EED4:: @ 815EED4 - checkflag FLAG_SYS_BRAILLE_WAIT - call_if 0, IslandCave_EventScript_15EEDE + call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EEDE end IslandCave_EventScript_15EEDE:: @ 815EEDE @@ -45,8 +43,7 @@ S_OpenRegiceChamber:: @ 815EF19 IslandCave_EventScript_15EF59:: @ 815EF59 lockall - checkflag FLAG_SYS_BRAILLE_WAIT - goto_if_eq IslandCave_EventScript_15EF72 + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF72 braillemessage IslandCave_Braille_1C54FC special DoBrailleWait waitstate @@ -61,8 +58,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemessage IslandCave_Braille_1C54FC - checkflag FLAG_SYS_BRAILLE_WAIT - goto_if_eq IslandCave_EventScript_15EF95 + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF95 special DoBrailleWait waitstate goto IslandCave_EventScript_15EF95 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index efe5d6a6e..d75420e88 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -9,7 +9,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 JaggedPass_MapScript1_15D274:: @ 815D274 compare VAR_JAGGED_PASS_ASH_WEATHER, 1 - call_if 1, JaggedPass_EventScript_15D280 + call_if_eq JaggedPass_EventScript_15D280 end JaggedPass_EventScript_15D280:: @ 815D280 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 44a1e141b..a7f71baf6 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -5,12 +5,11 @@ LavaridgeTown_MapScripts:: @ 814E4A3 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE setflag FLAG_VISITED_LAVARIDGE_TOWN - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - call_if 1, LavaridgeTown_EventScript_14E4DF + call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 compare VAR_LAVARIDGE_RIVAL_STATE, 2 - call_if 1, LavaridgeTown_EventScript_14E4D0 + call_if_eq LavaridgeTown_EventScript_14E4D0 end LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 @@ -45,11 +44,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED waitmovement 0 checkplayergender compare RESULT, 0 - call_if 1, LavaridgeTown_EventScript_14E56B + call_if_eq LavaridgeTown_EventScript_14E56B compare RESULT, 1 - call_if 1, LavaridgeTown_EventScript_14E570 + call_if_eq LavaridgeTown_EventScript_14E570 compare VAR_SPECIAL_8, 1 - call_if 1, LavaridgeTown_EventScript_14E68F + call_if_eq LavaridgeTown_EventScript_14E68F checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB @@ -71,9 +70,9 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 setvar VAR_SPECIAL_8, 0 checkplayergender compare RESULT, 0 - call_if 1, LavaridgeTown_EventScript_14E56B + call_if_eq LavaridgeTown_EventScript_14E56B compare RESULT, 1 - call_if 1, LavaridgeTown_EventScript_14E570 + call_if_eq LavaridgeTown_EventScript_14E570 checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB @@ -100,16 +99,16 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closemessage compare VAR_SPECIAL_8, 1 - call_if 1, LavaridgeTown_EventScript_14E646 + call_if_eq LavaridgeTown_EventScript_14E646 compare VAR_SPECIAL_8, 0 - call_if 1, LavaridgeTown_EventScript_14E64E + call_if_eq LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 compare VAR_SPECIAL_8, 1 - call_if 1, LavaridgeTown_EventScript_14E69A + call_if_eq LavaridgeTown_EventScript_14E69A compare VAR_SPECIAL_8, 0 - call_if 1, LavaridgeTown_EventScript_14E6A5 + call_if_eq LavaridgeTown_EventScript_14E6A5 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 @@ -129,13 +128,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 LavaridgeTown_EventScript_14E64E:: @ 814E64E compare FACING, 2 - call_if 1, LavaridgeTown_EventScript_14E67B + call_if_eq LavaridgeTown_EventScript_14E67B compare FACING, 1 - call_if 1, LavaridgeTown_EventScript_14E680 + call_if_eq LavaridgeTown_EventScript_14E680 compare FACING, 3 - call_if 1, LavaridgeTown_EventScript_14E685 + call_if_eq LavaridgeTown_EventScript_14E685 compare FACING, 4 - call_if 1, LavaridgeTown_EventScript_14E68A + call_if_eq LavaridgeTown_EventScript_14E68A return LavaridgeTown_EventScript_14E67B:: @ 814E67B @@ -166,13 +165,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 compare FACING, 2 - call_if 1, LavaridgeTown_EventScript_14E6D2 + call_if_eq LavaridgeTown_EventScript_14E6D2 compare FACING, 1 - call_if 1, LavaridgeTown_EventScript_14E6D2 + call_if_eq LavaridgeTown_EventScript_14E6D2 compare FACING, 3 - call_if 1, LavaridgeTown_EventScript_14E6DD + call_if_eq LavaridgeTown_EventScript_14E6DD compare FACING, 4 - call_if 1, LavaridgeTown_EventScript_14E6D2 + call_if_eq LavaridgeTown_EventScript_14E6D2 return LavaridgeTown_EventScript_14E6D2:: @ 814E6D2 @@ -272,8 +271,7 @@ LavaridgeTown_EventScript_14E751:: @ 814E751 LavaridgeTown_EventScript_14E75A:: @ 814E75A lock faceplayer - checkflag FLAG_RECEIVED_LAVARIDGE_EGG - goto_if_eq LavaridgeTown_EventScript_14E79E + goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO compare RESULT, NO goto_if_eq LavaridgeTown_EventScript_14E7B2 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 1bbad53bf..52d614436 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -70,8 +70,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 - checkflag FLAG_RECEIVED_TM50 - goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7 + goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release end @@ -85,7 +84,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag FLAG_BADGE04_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB + call_if_eq LavaridgeTown_Gym_1F_EventScript_1A00FB setvar VAR_SPECIAL_8, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE @@ -135,8 +134,7 @@ LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859 lock faceplayer - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_15386E msgbox LavaridgeTown_Gym_1F_Text_176312, 4 release end @@ -148,15 +146,13 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall - checkflag FLAG_BADGE04_GET - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall - checkflag FLAG_BADGE04_GET - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index 913734dd5..71fc2cbfe 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -28,8 +28,7 @@ LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 lock faceplayer - checkflag FLAG_RECEIVED_CHARCOAL - goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 + goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem_std ITEM_CHARCOAL compare RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 6ed8054f8..ee29b0f05 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -7,8 +7,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, LilycoveCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E end @@ -28,10 +27,8 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F setmetatile 71, 6, 368, 0 setmetatile 72, 6, 445, 0 .endif - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - call_if 0, LilycoveCity_EventScript_14CABE - checkflag FLAG_BADGE07_GET - call_if 1, LilycoveCity_EventScript_14CB2B + call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE + call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B end LilycoveCity_EventScript_14CABE:: @ 814CABE @@ -64,8 +61,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE - goto_if_eq LilycoveCity_EventScript_14CBB4 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 addvar RESULT, ITEM_CHERI_BERRY @@ -89,8 +85,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_EventScript_14CBDC + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release end @@ -107,8 +102,7 @@ LilycoveCity_EventScript_14CBE6:: @ 814CBE6 LilycoveCity_EventScript_14CBEF:: @ 814CBEF lock faceplayer - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - goto_if_eq LilycoveCity_EventScript_14CC04 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04 msgbox LilycoveCity_Text_1688C1, 4 release end @@ -121,8 +115,7 @@ LilycoveCity_EventScript_14CC04:: @ 814CC04 LilycoveCity_EventScript_14CC0E:: @ 814CC0E lock faceplayer - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - goto_if_eq LilycoveCity_EventScript_14CC23 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23 msgbox LilycoveCity_Text_1689BF, 4 release end @@ -147,8 +140,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_EventScript_14CC5D + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release end @@ -186,8 +178,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_EventScript_14CCC0 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall end @@ -211,8 +202,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC LilycoveCity_EventScript_14CCE5:: @ 814CCE5 lockall - checkflag FLAG_MET_WAILMER_TRAINER - goto_if_eq LilycoveCity_EventScript_14CD18 + goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 applymovement LAST_TALKED, LilycoveCity_Movement_1A0839 waitmovement 0 @@ -256,10 +246,8 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 LilycoveCity_EventScript_14CD60:: @ 814CD60 playbgm BGM_GIRL_SUP, TRUE - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 1, LilycoveCity_EventScript_14CDB0 - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 0, LilycoveCity_EventScript_14CDB9 + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0 + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9 compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 @@ -287,10 +275,8 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 LilycoveCity_EventScript_14CDD3:: @ 814CDD3 playbgm BGM_BOY_SUP, TRUE - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 1, LilycoveCity_EventScript_14CE23 - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 0, LilycoveCity_EventScript_14CE2C + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23 + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 @@ -349,20 +335,18 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96 LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_14CEDE + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE compare RESULT, 0 - call_if 1, LilycoveCity_EventScript_14CEEE + call_if_eq LilycoveCity_EventScript_14CEEE compare RESULT, 1 - call_if 1, LilycoveCity_EventScript_14CEF7 + call_if_eq LilycoveCity_EventScript_14CEF7 clearflag FLAG_HIDE_MAY_UPSTAIRS clearflag FLAG_HIDE_MAY_PICHU_DOLL goto LilycoveCity_EventScript_14CF6B end LilycoveCity_EventScript_14CEDE:: @ 814CEDE - checkflag FLAG_BADGE08_GET - goto_if_eq LilycoveCity_EventScript_14CEE8 + goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_14CEE8 return LilycoveCity_EventScript_14CEE8:: @ 814CEE8 @@ -374,8 +358,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE return LilycoveCity_EventScript_14CEF7:: @ 814CEF7 - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_EventScript_14CF09 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -386,12 +369,11 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09 LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_14CEDE + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE compare RESULT, 0 - call_if 1, LilycoveCity_EventScript_14CF47 + call_if_eq LilycoveCity_EventScript_14CF47 compare RESULT, 1 - call_if 1, LilycoveCity_EventScript_14CF50 + call_if_eq LilycoveCity_EventScript_14CF50 clearflag FLAG_HIDE_BRENDAN_UPSTAIRS goto LilycoveCity_EventScript_14CF6B end @@ -401,8 +383,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 return LilycoveCity_EventScript_14CF50:: @ 814CF50 - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_EventScript_14CF62 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7aceecef6..a04629903 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -13,8 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 .2byte 0 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 - checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158898 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end @@ -45,7 +44,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_158948 + call_if_eq LilycoveCity_ContestLobby_EventScript_158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 removeobject 4 @@ -188,8 +187,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 step_end LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B - checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end @@ -218,7 +216,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 + call_if_eq LilycoveCity_ContestLobby_EventScript_158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 removeobject 11 @@ -307,8 +305,7 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA - checkflag FLAG_TEMP_2 - goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE + goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C waitmessage setflag FLAG_TEMP_2 @@ -402,8 +399,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 end LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA - checkflag FLAG_TEMP_3 - call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4 + call_if_unset FLAG_TEMP_3, LilycoveCity_ContestLobby_EventScript_158BC4 message LilycoveCity_ContestLobby_Text_1886DC waitmessage multichoice 0, 0, 4, 0 @@ -707,8 +703,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E end LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027 - checkflag FLAG_RECEIVED_CONTEST_PASS - goto_if 0, LilycoveCity_ContestLobby_EventScript_159039 + goto_if_unset FLAG_RECEIVED_CONTEST_PASS, LilycoveCity_ContestLobby_EventScript_159039 msgbox LilycoveCity_ContestLobby_Text_188DDA, 2 end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index c8a3dcab9..b80b0873b 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -3,10 +3,8 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_158326 + goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 4878cc6bc..06b982610 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -4,10 +4,8 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0 LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 lock faceplayer - checkflag FLAG_TEMP_2 - call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 - checkflag FLAG_TEMP_2 - call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 + call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialvar RESULT, CompletedHoennPokedex compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 1198054f0..f895ea99d 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -4,8 +4,7 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C lock faceplayer - checkflag FLAG_TEMP_2 - call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF + call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR special DisplayCurrentElevatorFloor message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index cd5e0d980..e2274110c 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -5,9 +5,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 getpricereduction 3 compare RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F compare RESULT, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F @@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 faceplayer getpricereduction 3 compare RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release end @@ -128,22 +128,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 @@ -155,7 +155,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 @@ -167,7 +167,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index db2b8edf9..f6b23bc05 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -10,9 +10,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E faceplayer dodailyevents compare VAR_LOTTERY_PRIZE, 0 - goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 - checkflag FLAG_DAILY_PICKED_LOTTO_TICKET - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C + goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_159EB1 + goto_if_set FLAG_DAILY_PICKED_LOTTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, MSGBOX_YESNO compare RESULT, NO goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 @@ -37,18 +36,18 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY compare VAR_SPECIAL_6, 0 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare VAR_SPECIAL_6, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E43 bufferitemname 0, VAR_SPECIAL_5 compare VAR_SPECIAL_4, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare VAR_SPECIAL_4, 2 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E81 compare VAR_SPECIAL_4, 3 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E8A compare VAR_SPECIAL_4, 4 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E93 giveitem_std VAR_SPECIAL_5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 3b884c233..5dc217585 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -16,8 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_Harbor_EventScript_1598CD + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release end @@ -81,9 +80,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A delay 30 hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_1599D9 + call_if_eq LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_1599CE + call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_SPECIAL_4, 2 @@ -106,12 +105,9 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 end LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, LilycoveCity_Harbor_EventScript_1598BA - checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS - goto_if_eq LilycoveCity_Harbor_EventScript_1598BA - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, LilycoveCity_Harbor_EventScript_1598BA + goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA + goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA + goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 @@ -130,9 +126,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE delay 30 removeobject 4 compare FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_1599D9 + call_if_eq LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_1599CE + call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty @@ -159,8 +155,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index d0065c9e8..0572c23cc 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -4,8 +4,7 @@ LilycoveCity_House2_MapScripts:: @ 8159BA2 LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 lock faceplayer - checkflag FLAG_RECEIVED_TM44 - goto_if_eq LilycoveCity_House2_EventScript_159BDA + goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem_std ITEM_TM44 compare RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 120054e91..9cf3ecbd7 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -4,32 +4,27 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 - checkflag FLAG_COOL_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 - checkflag FLAG_BEAUTY_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158615 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 - checkflag FLAG_CUTE_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15862D goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 - checkflag FLAG_SMART_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158645 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 - checkflag FLAG_TOUGH_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15865D end LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD @@ -96,8 +91,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall - checkflag FLAG_RECEIVED_GLASS_ORNAMENT - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 + goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_158793 specialvar VAR_SPECIAL_4, sub_80C4D50 switch VAR_SPECIAL_4 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C @@ -146,36 +140,31 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D lockall - checkflag FLAG_CUTE_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 lockall - checkflag FLAG_TOUGH_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 lockall - checkflag FLAG_COOL_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 lockall - checkflag FLAG_BEAUTY_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 lockall - checkflag FLAG_SMART_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3 end diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index f6eb35c98..cff88caf0 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -21,8 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D + goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 4656f0182..85ee953ac 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -72,35 +72,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 setvar VAR_SPECIAL_4, 8 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar VAR_SPECIAL_4, 9 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar VAR_SPECIAL_4, 10 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar VAR_SPECIAL_4, 11 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar VAR_SPECIAL_4, 12 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar VAR_SPECIAL_4, 13 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar VAR_SPECIAL_4, 14 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar VAR_SPECIAL_4, 15 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index ef2145bbb..57ad9aae5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -6,19 +6,18 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag FLAG_VISITED_LITTLEROOT_TOWN compare VAR_LITTLEROOT_INTRO_STATE, 2 - call_if 1, LittlerootTown_EventScript_14D57B - checkflag FLAG_RESCUED_BIRCH - call_if 0, LittlerootTown_EventScript_14D583 + call_if_eq LittlerootTown_EventScript_14D57B + call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D583 compare VAR_LITTLEROOT_STATE, 3 - call_if 1, LittlerootTown_EventScript_14D5A6 + call_if_eq LittlerootTown_EventScript_14D5A6 compare VAR_LITTLEROOT_HOUSES_STATE, 4 - call_if 1, LittlerootTown_EventScript_14D570 + call_if_eq LittlerootTown_EventScript_14D570 compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 - call_if 1, LittlerootTown_EventScript_14D570 + call_if_eq LittlerootTown_EventScript_14D570 compare VAR_OLDALE_STATE, 1 - call_if 1, LittlerootTown_EventScript_14D567 + call_if_eq LittlerootTown_EventScript_14D567 compare VAR_LITTLEROOT_RIVAL_STATE, 3 - call_if 1, LittlerootTown_EventScript_14D563 + call_if_eq LittlerootTown_EventScript_14D563 end LittlerootTown_EventScript_14D563:: @ 814D563 @@ -56,9 +55,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 setobjectmovementtype 4, 8 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D5C5 + call_if_eq LittlerootTown_EventScript_14D5C5 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D5CD + call_if_eq LittlerootTown_EventScript_14D5CD return LittlerootTown_EventScript_14D5C5:: @ 814D5C5 @@ -187,12 +186,10 @@ LittlerootTown_EventScript_14D6D6:: @ 814D6D6 LittlerootTown_EventScript_14D6DF:: @ 814D6DF lock faceplayer - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq LittlerootTown_EventScript_14D72F - checkflag FLAG_RESCUED_BIRCH - goto_if_eq LittlerootTown_EventScript_14D722 + goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_14D72F + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722 compare VAR_LITTLEROOT_STATE, 0 - goto_if 5, LittlerootTown_EventScript_14D708 + goto_if_ne LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release end @@ -335,9 +332,9 @@ LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D822 + call_if_eq LittlerootTown_EventScript_14D822 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D82B + call_if_eq LittlerootTown_EventScript_14D82B releaseall end @@ -353,9 +350,9 @@ LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D84E + call_if_eq LittlerootTown_EventScript_14D84E compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D857 + call_if_eq LittlerootTown_EventScript_14D857 releaseall end @@ -408,27 +405,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D93C + call_if_eq LittlerootTown_EventScript_14D93C compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D947 + call_if_eq LittlerootTown_EventScript_14D947 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D926 + call_if_eq LittlerootTown_EventScript_14D926 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D931 + call_if_eq LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closemessage checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D952 + call_if_eq LittlerootTown_EventScript_14D952 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D995 + call_if_eq LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14DAAA + call_if_eq LittlerootTown_EventScript_14DAAA compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14DAED + call_if_eq LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end @@ -454,32 +451,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 LittlerootTown_EventScript_14D952:: @ 814D952 compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14D9D8 + call_if_eq LittlerootTown_EventScript_14D9D8 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14D9ED + call_if_eq LittlerootTown_EventScript_14D9ED compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DA02 + call_if_eq LittlerootTown_EventScript_14DA02 compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DA17 + call_if_eq LittlerootTown_EventScript_14DA17 compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DA2C + call_if_eq LittlerootTown_EventScript_14DA2C compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DA41 + call_if_eq LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14D9D8 + call_if_eq LittlerootTown_EventScript_14D9D8 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14D9ED + call_if_eq LittlerootTown_EventScript_14D9ED compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DA56 + call_if_eq LittlerootTown_EventScript_14DA56 compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DA6B + call_if_eq LittlerootTown_EventScript_14DA6B compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DA80 + call_if_eq LittlerootTown_EventScript_14DA80 compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DA95 + call_if_eq LittlerootTown_EventScript_14DA95 return LittlerootTown_EventScript_14D9D8:: @ 814D9D8 @@ -554,32 +551,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 LittlerootTown_EventScript_14DAAA:: @ 814DAAA compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14DB30 + call_if_eq LittlerootTown_EventScript_14DB30 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14DB3B + call_if_eq LittlerootTown_EventScript_14DB3B compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DB46 + call_if_eq LittlerootTown_EventScript_14DB46 compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DB6C + call_if_eq LittlerootTown_EventScript_14DB6C compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DB92 + call_if_eq LittlerootTown_EventScript_14DB92 compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DBB8 + call_if_eq LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14DB30 + call_if_eq LittlerootTown_EventScript_14DB30 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14DB3B + call_if_eq LittlerootTown_EventScript_14DB3B compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DBDE + call_if_eq LittlerootTown_EventScript_14DBDE compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DC04 + call_if_eq LittlerootTown_EventScript_14DC04 compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DC2A + call_if_eq LittlerootTown_EventScript_14DC2A compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DC50 + call_if_eq LittlerootTown_EventScript_14DC50 return LittlerootTown_EventScript_14DB30:: @ 814DB30 @@ -843,9 +840,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 faceplayer checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D926 + call_if_eq LittlerootTown_EventScript_14D926 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D931 + call_if_eq LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 8a86cd946..1de2e91a4 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -6,9 +6,8 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 - checkflag FLAG_RECEIVED_RUNNING_SHOES - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 + call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_152660 + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_152673 end LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 @@ -28,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526C4 compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526AC compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index e0e1a1086..ed6818fa0 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -4,10 +4,9 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF - checkflag FLAG_DEFEATED_RIVAL_ROUTE103 - call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE + call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare VAR_LITTLEROOT_INTRO_STATE, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D setvar VAR_0x4089, 0 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 45e9e0783..8096589aa 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -6,9 +6,8 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E - checkflag FLAG_RECEIVED_RUNNING_SHOES - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 + call_if_lt LittlerootTown_MaysHouse_1F_EventScript_15289E + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1528B1 end LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E @@ -28,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_152902 compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528EA compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528F6 end LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA @@ -118,9 +117,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E1 compare RESULT, 1 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -135,10 +134,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB lock faceplayer - checkflag FLAG_DEFEATED_RIVAL_ROUTE103 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 - checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A21 + goto_if_set FLAG_RIVAL_LEFT_FOR_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A17 compare VAR_LITTLEROOT_RIVAL_STATE, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 34300b13e..ede58e7a5 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -4,10 +4,9 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B - checkflag FLAG_DEFEATED_RIVAL_ROUTE103 - call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A + call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare VAR_LITTLEROOT_INTRO_STATE, 4 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D setvar VAR_0x4089, 0 end @@ -30,13 +29,12 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall - checkflag FLAG_MET_RIVAL_LILYCOVE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse SE_KAIDAN removeobject LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 @@ -58,11 +56,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closemessage compare FACING, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29 compare FACING, 2 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B34 compare FACING, 3 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B3F return LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29 @@ -92,11 +90,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closemessage compare FACING, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 2 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 3 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BAA return LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F @@ -114,22 +112,20 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 waitmovement 0 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB compare RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall end LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB - checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4 return LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED - checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08 + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08 msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4 return diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 10e4712bb..7608ba65d 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -86,9 +86,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer compare VAR_BIRCH_LAB_STATE, 3 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 - checkflag FLAG_BIRCH_AIDE_MET - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90 + goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86 msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4 setflag FLAG_BIRCH_AIDE_MET release @@ -107,8 +106,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A lock faceplayer - checkflag FLAG_UNKNOWN_BIRCH_380 - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F + goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 @@ -125,9 +123,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA waitmovement 0 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13 compare RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED setvar VAR_ROUTE102_ACCESSIBLE, 1 @@ -140,7 +138,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 setvar RESULT, 0 return @@ -149,7 +147,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 setvar RESULT, 1 return @@ -189,9 +187,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 faceplayer checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE compare RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 6dbdc0461..a55d260ab 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -3,8 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 .byte 0 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, MagmaHideout_B1F_EventScript_15F2B8 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MagmaHideout_B1F_EventScript_15F2B8 end MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 652a25f6f..03974ddae 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -8,8 +8,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar VAR_MAUVILLE_GYM_STATE, 0 - checkflag FLAG_RECEIVED_TM24 - call_if 1, MauvilleCity_EventScript_14C053 + call_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C053 end MauvilleCity_EventScript_14C053:: @ 814C053 @@ -52,8 +51,7 @@ MauvilleCity_EventScript_14C099:: @ 814C099 MauvilleCity_EventScript_14C0A2:: @ 814C0A2 lock faceplayer - checkflag FLAG_TV_EXPLAINED - goto_if_eq MauvilleCity_EventScript_14C0BA + goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_14C0BA msgbox MauvilleCity_Text_16674A, 4 setflag FLAG_TV_EXPLAINED release @@ -67,8 +65,7 @@ MauvilleCity_EventScript_14C0BA:: @ 814C0BA MauvilleCity_EventScript_14C0C4:: @ 814C0C4 lock faceplayer - checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE - goto_if_eq MauvilleCity_EventScript_14C0E4 + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 closemessage applymovement 7, MauvilleCity_Movement_1A083D @@ -86,8 +83,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4 MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall - checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE - goto_if_eq MauvilleCity_EventScript_14C292 + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 msgbox MauvilleCity_Text_165BE3, 4 @@ -106,7 +102,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 MauvilleCity_EventScript_14C154:: @ 814C154 compare RESULT, YES - call_if 1, MauvilleCity_EventScript_14C23C + call_if_eq MauvilleCity_EventScript_14C23C compare RESULT, NO goto_if_eq MauvilleCity_EventScript_14C285 closemessage @@ -284,12 +280,10 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8 MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock faceplayer - checkflag FLAG_RECEIVED_TM24 - goto_if_eq MauvilleCity_EventScript_14C368 + goto_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C368 compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_EventScript_14C33C - checkflag FLAG_RECEIVED_BASEMENT_KEY - goto_if_eq MauvilleCity_EventScript_14C332 + goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 giveitem_std ITEM_BASEMENT_KEY setflag FLAG_RECEIVED_BASEMENT_KEY diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 6bd7f0f4f..08f11d641 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -4,10 +4,8 @@ MauvilleCity_BikeShop_MapScripts:: @ 8156795 MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 lock faceplayer - checkflag FLAG_RECEIVED_BIKE - goto_if_eq MauvilleCity_BikeShop_EventScript_15686E - checkflag FLAG_DECLINED_BIKE - goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 + goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_15686E + goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO compare RESULT, YES diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index e938a1b4c..2b784aeb9 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -34,7 +34,7 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9950 - goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C + goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C @@ -53,7 +53,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9500 - goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C + goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C @@ -155,7 +155,7 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL compare RESULT, 0 @@ -171,7 +171,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL compare RESULT, 0 @@ -187,7 +187,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL compare RESULT, 0 @@ -290,7 +290,7 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1500 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -305,7 +305,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 3500 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -320,7 +320,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -335,7 +335,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -350,7 +350,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -389,8 +389,7 @@ MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 lock faceplayer - checkflag FLAG_RECEIVED_STARTER_DOLL - goto_if_eq MauvilleCity_GameCorner_EventScript_157072 + goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, MSGBOX_YESNO compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_157068 @@ -460,11 +459,10 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C end MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C - checkflag FLAG_RECEIVED_20_COINS - goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA + goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_1570CA checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 1 - goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA + goto_if_ge MauvilleCity_GameCorner_EventScript_1570CA setflag FLAG_RECEIVED_20_COINS givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index fd9c673dc..1dc7fc0c7 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -3,8 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 .byte 0 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1565A7 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1565A7 switch VAR_MAUVILLE_GYM_STATE case 0, MauvilleCity_Gym_EventScript_156491 case 1, MauvilleCity_Gym_EventScript_15657D @@ -13,8 +12,7 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456 end MauvilleCity_Gym_EventScript_156491:: @ 8156491 - checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - goto_if_eq MauvilleCity_Gym_EventScript_15649B + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_15649B end MauvilleCity_Gym_EventScript_15649B:: @ 815649B @@ -69,8 +67,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB - checkflag FLAG_RECEIVED_TM34 - goto_if 0, MauvilleCity_Gym_EventScript_15661D + goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 @@ -86,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag FLAG_BADGE03_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, MauvilleCity_Gym_EventScript_1A00FB + call_if_eq MauvilleCity_Gym_EventScript_1A00FB setvar VAR_SPECIAL_8, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 @@ -111,8 +108,7 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641 MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 1 @@ -122,8 +118,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 2 @@ -133,8 +128,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 3 @@ -147,10 +141,8 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial1 special DrawWholeMapView playse SE_KI_GASYAN - checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - goto_if_eq MauvilleCity_Gym_EventScript_1566E1 - checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - goto_if 0, MauvilleCity_Gym_EventScript_1566DC + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566E1 + goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566DC releaseall end @@ -191,8 +183,7 @@ MauvilleCity_Gym_EventScript_15672B:: @ 815672B MauvilleCity_Gym_EventScript_156742:: @ 8156742 lock faceplayer - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_156757 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_156757 msgbox MauvilleCity_Gym_Text_180815, 4 release end @@ -204,15 +195,13 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall - checkflag FLAG_BADGE03_GET - goto_if_eq MauvilleCity_Gym_EventScript_156781 + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall - checkflag FLAG_BADGE03_GET - goto_if_eq MauvilleCity_Gym_EventScript_156781 + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index 210288517..eb21a49e9 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -4,8 +4,7 @@ MauvilleCity_House1_MapScripts:: @ 81569FC MauvilleCity_House1_EventScript_1569FD:: @ 81569FD lock faceplayer - checkflag FLAG_RECEIVED_HM06 - goto_if_eq MauvilleCity_House1_EventScript_156A29 + goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 giveitem_std ITEM_HM06 setflag FLAG_RECEIVED_HM06 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 9d3bce68a..f18d278b5 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -4,8 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 81572BF MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 lock faceplayer - checkflag FLAG_RECEIVED_COIN_CASE - goto_if_eq MauvilleCity_House2_EventScript_15733D + goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 compare RESULT, 1 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index bf51408b8..272d7ed6e 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -215,8 +215,7 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock faceplayer - checkflag FLAG_MET_PROF_COSMO - goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E + goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_15C66E setflag FLAG_MET_PROF_COSMO msgbox MeteorFalls_1F_1R_Text_1937EB, 4 release diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 3d1baf143..7ec338927 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -7,8 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, MossdeepCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_1A02C1 end MossdeepCity_EventScript_14CFAE:: @ 814CFAE @@ -68,8 +67,7 @@ MossdeepCity_EventScript_14D011:: @ 814D011 MossdeepCity_EventScript_14D027:: @ 814D027 lock faceplayer - checkflag FLAG_RECEIVED_KINGS_ROCK - goto_if_eq MossdeepCity_EventScript_14D069 + goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO compare RESULT, NO goto_if_eq MossdeepCity_EventScript_14D073 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index eac7f4adb..364778613 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special ValidateEReaderTrainer compare RESULT, 1 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC71 end MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 @@ -18,9 +18,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special ValidateEReaderTrainer compare RESULT, 0 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC9E compare VAR_GAME_CORNER_STATE, 0 - call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF + call_if_ne MossdeepCity_GameCorner_1F_EventScript_15ACAF end MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E @@ -50,11 +50,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 compare VAR_GAME_CORNER_STATE, 1 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD22 compare VAR_GAME_CORNER_STATE, 2 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD2B compare VAR_GAME_CORNER_STATE, 3 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty setvar VAR_GAME_CORNER_STATE, 0 releaseall @@ -101,7 +101,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO compare RESULT, NO - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog compare RESULT, 0 @@ -112,11 +112,11 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closemessage compare FACING, 2 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE04 compare FACING, 4 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE16 compare FACING, 3 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1 waitstate release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 9f20b6310..f62693756 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -23,11 +23,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special StartSpecialBattle waitstate compare RESULT, 3 - call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AED5 compare RESULT, 1 - call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEE3 compare RESULT, 2 - call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEEE closemessage special ScrSpecial_HealPlayerParty applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index bc22ce3fe..341962431 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -3,26 +3,22 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 .byte 0 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 - goto_if_eq MossdeepCity_Gym_EventScript_15A510 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A510 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 - goto_if_eq MossdeepCity_Gym_EventScript_15A528 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A528 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 - goto_if_eq MossdeepCity_Gym_EventScript_15A540 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A540 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 - goto_if_eq MossdeepCity_Gym_EventScript_15A558 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A558 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 @@ -50,8 +46,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 - checkflag FLAG_RECEIVED_TM04 - goto_if 0, MossdeepCity_Gym_EventScript_15A5C6 + goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release end @@ -82,8 +77,7 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 - goto_if_eq MossdeepCity_Gym_EventScript_15A621 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A621 setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -109,8 +103,7 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 MossdeepCity_Gym_EventScript_15A646:: @ 815A646 lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 - goto_if_eq MossdeepCity_Gym_EventScript_15A675 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A675 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -130,8 +123,7 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 - goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A6C9 setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -151,8 +143,7 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 - goto_if_eq MossdeepCity_Gym_EventScript_15A71D + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A71D setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -210,8 +201,7 @@ MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8 lock faceplayer - checkflag FLAG_DEFEATED_MOSSDEEP_GYM - goto_if_eq MossdeepCity_Gym_EventScript_15A7ED + goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_15A7ED msgbox MossdeepCity_Gym_Text_18C7E3, 4 release end @@ -228,15 +218,13 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall - checkflag FLAG_BADGE07_GET - goto_if_eq MossdeepCity_Gym_EventScript_15A81A + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall - checkflag FLAG_BADGE07_GET - goto_if_eq MossdeepCity_Gym_EventScript_15A81A + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 1da204ff0..415dbfc33 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -20,9 +20,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE compare FACING, 2 - call_if 1, MossdeepCity_House2_EventScript_15A8AE + call_if_eq MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 - call_if 1, MossdeepCity_House2_EventScript_15A8B9 + call_if_eq MossdeepCity_House2_EventScript_15A8B9 removeobject 3 release end diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index fb44685d8..4c4d6cbdd 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -4,8 +4,7 @@ MossdeepCity_House3_MapScripts:: @ 815A971 MossdeepCity_House3_EventScript_15A972:: @ 815A972 lock faceplayer - checkflag FLAG_RECEIVED_SUPER_ROD - goto_if_eq MossdeepCity_House3_EventScript_15A9B1 + goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO compare RESULT, NO goto_if_eq MossdeepCity_House3_EventScript_15A9BB diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 856ee1287..5fb0f97ff 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -4,8 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq MossdeepCity_House4_EventScript_15AB46 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 884124567..83b859c26 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -8,9 +8,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B specialvar RESULT, GetWeekCount buffernumberstring 0, RESULT compare RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 - call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closemessage applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmovement 0 @@ -32,8 +32,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 lock faceplayer - checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem_std ITEM_SUN_STONE compare RESULT, 0 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index ce2f2aad5..d9ad70f70 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -5,8 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 .byte 0 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF + call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_15A9DF end MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF @@ -15,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 compare VAR_STEVENS_HOUSE_STATE, 1 - call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 + call_if_eq MossdeepCity_StevensHouse_EventScript_15A9F5 end MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 @@ -87,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C bufferspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO compare RESULT, YES - call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 + call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678 setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag FLAG_RECEIVED_BELDUM releaseall @@ -113,8 +112,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02 lockall - checkflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER - goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16 + goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16 msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4 releaseall end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index be4799a45..ac7c00013 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -26,7 +26,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 compare RESULT, 1 - call_if 1, MtChimney_EventScript_15D000 + call_if_eq MtChimney_EventScript_15D000 giveitem_std ITEM_LAVA_COOKIE compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 @@ -406,10 +406,8 @@ MtChimney_EventScript_15D174:: @ 815D174 MtChimney_EventScript_15D17D:: @ 815D17D lockall - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - goto_if 0, MtChimney_EventScript_15D1D0 - checkflag FLAG_RECEIVED_METEORITE - goto_if_eq MtChimney_EventScript_15D1C6 + goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_15D1D0 + goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, MSGBOX_YESNO compare RESULT, NO goto_if_eq MtChimney_EventScript_15D1BC diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index aefc68bda..d73c427f8 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 compare VAR_CABLE_CAR_STATION_STATE, 1 - call_if 1, MtChimney_CableCarStation_EventScript_15C111 + call_if_eq MtChimney_CableCarStation_EventScript_15C111 end MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 7073000d5..f34c31da0 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -4,8 +4,7 @@ MtPyre_1F_MapScripts:: @ 815D322 MtPyre_1F_EventScript_15D323:: @ 815D323 lock faceplayer - checkflag FLAG_RECEIVED_CLEANSE_TAG - goto_if_eq MtPyre_1F_EventScript_15D352 + goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem_std ITEM_CLEANSE_TAG compare RESULT, 0 diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index ec5864df5..f8b4141d7 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -9,7 +9,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C MtPyre_Exterior_EventScript_15D492:: @ 815D492 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 12 - goto_if 0, MtPyre_Exterior_EventScript_15D4A3 + goto_if_lt MtPyre_Exterior_EventScript_15D4A3 return MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 56ef5db79..d37100938 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -31,11 +31,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 waitmovement 0 delay 50 compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D593 + call_if_eq MtPyre_Summit_EventScript_15D593 compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D59E + call_if_eq MtPyre_Summit_EventScript_15D59E compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D59F + call_if_eq MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 .else @@ -53,11 +53,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 delay 20 call MtPyre_Summit_EventScript_15D57A compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D5AA + call_if_eq MtPyre_Summit_EventScript_15D5AA compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D5BF + call_if_eq MtPyre_Summit_EventScript_15D5BF compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D5CA + call_if_eq MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 .else @@ -144,9 +144,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO .endif compare RESULT, YES - call_if 1, MtPyre_Summit_EventScript_15D611 + call_if_eq MtPyre_Summit_EventScript_15D611 compare RESULT, NO - call_if 1, MtPyre_Summit_EventScript_15D61A + call_if_eq MtPyre_Summit_EventScript_15D61A release end @@ -169,12 +169,9 @@ MtPyre_Summit_EventScript_15D61A:: @ 815D61A MtPyre_Summit_EventScript_15D623:: @ 815D623 lock faceplayer - checkflag FLAG_RETURNED_RED_OR_BLUE_ORB - goto_if_eq MtPyre_Summit_EventScript_15D6C4 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq MtPyre_Summit_EventScript_15D64A - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if_eq MtPyre_Summit_EventScript_15D6BA + goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_15D6C4 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, MtPyre_Summit_EventScript_15D64A + goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_15D6BA .ifdef SAPPHIRE msgbox UnknownString_81B54BE, 4 .else @@ -269,11 +266,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 waitmovement 0 delay 50 compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D75E + call_if_eq MtPyre_Summit_EventScript_15D75E compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D769 + call_if_eq MtPyre_Summit_EventScript_15D769 compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D774 + call_if_eq MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 .else @@ -281,11 +278,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 .endif closemessage compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D77F + call_if_eq MtPyre_Summit_EventScript_15D77F compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D78A + call_if_eq MtPyre_Summit_EventScript_15D78A compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D795 + call_if_eq MtPyre_Summit_EventScript_15D795 removeobject 2 setvar VAR_MT_PYRE_STATE, 3 releaseall diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 2a4d8afce..1c8bdfb3f 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -5,7 +5,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A NewMauville_Entrance_MapScript1_15E495:: @ 815E495 compare VAR_NEW_MAUVILLE_STATE, 0 - call_if 1, NewMauville_Entrance_EventScript_15E4A1 + call_if_eq NewMauville_Entrance_EventScript_15E4A1 end NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index ae33d7978..e045cda5d 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -6,11 +6,10 @@ NewMauville_Inside_MapScripts:: @ 815E55F NewMauville_Inside_MapScript1_15E56F:: @ 815E56F compare VAR_TEMP_1, 1 - call_if 1, NewMauville_Inside_EventScript_15E5DA + call_if_eq NewMauville_Inside_EventScript_15E5DA compare VAR_TEMP_2, 1 - call_if 1, NewMauville_Inside_EventScript_15E728 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NewMauville_Inside_EventScript_15E58F + call_if_eq NewMauville_Inside_EventScript_15E728 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_15E58F end NewMauville_Inside_EventScript_15E58F:: @ 815E58F @@ -24,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 NewMauville_Inside_MapScript1_15E59E:: @ 815E59E compare VAR_NEW_MAUVILLE_STATE, 2 - call_if 1, NewMauville_Inside_EventScript_15E88B + call_if_eq NewMauville_Inside_EventScript_15E88B end NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index a2d2616d3..9b1c9dd80 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -5,12 +5,9 @@ OldaleTown_MapScripts:: @ 814DD62 OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E setflag FLAG_VISITED_OLDALE_TOWN - checkflag FLAG_ADVENTURE_STARTED - call_if 0, OldaleTown_EventScript_14DD92 - checkflag FLAG_RECEIVED_POTION_OLDALE - call_if 0, OldaleTown_EventScript_14DD9E - checkflag FLAG_ADVENTURE_STARTED - call_if 1, OldaleTown_EventScript_14DD8C + call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92 + call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E + call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD8C end OldaleTown_EventScript_14DD8C:: @ 814DD8C @@ -38,10 +35,8 @@ OldaleTown_EventScript_14DDB3:: @ 814DDB3 OldaleTown_EventScript_14DDBC:: @ 814DDBC lock faceplayer - checkflag FLAG_RECEIVED_POTION_OLDALE - goto_if_eq OldaleTown_EventScript_14DE79 - checkflag FLAG_TEMP_1 - goto_if_eq OldaleTown_EventScript_14DE79 + goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79 + goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79 setflag FLAG_TEMP_1 playbgm BGM_TSURETEK, FALSE msgbox OldaleTown_Text_16AEF2, 4 @@ -195,8 +190,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB OldaleTown_EventScript_14DEDF:: @ 814DEDF lock faceplayer - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq OldaleTown_EventScript_14DF26 + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closemessage applymovement 3, OldaleTown_Movement_1A083D diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index f90c787c2..15cf40027 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -6,8 +6,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 faceplayer message OldaleTown_Mart_Text_1A0BE4 waitmessage - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq OldaleTown_Mart_EventScript_152FA8 + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 msgbox OldaleTown_Mart_Text_1A0C02, 4 release @@ -43,8 +42,7 @@ OldaleTown_Mart_Items2:: @ 8152FB8 OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 lock faceplayer - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq OldaleTown_Mart_EventScript_152FDB + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FDB msgbox OldaleTown_Mart_Text_174A8A, 4 release end diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index d94e02227..c993807c6 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -26,8 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C + goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index df7f42a8b..8ad949bf2 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -6,28 +6,24 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 faceplayer dodailyevents call PacifidlogTown_House2_EventScript_1541B4 - checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - goto_if_eq PacifidlogTown_House2_EventScript_154254 - checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER - call_if 1, PacifidlogTown_House2_EventScript_1541CE - checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER - call_if 0, PacifidlogTown_House2_EventScript_1541D7 + goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_154254 + call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541CE + call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541D7 setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 4 - goto_if 4, PacifidlogTown_House2_EventScript_1541EC + goto_if_ge PacifidlogTown_House2_EventScript_1541EC specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 2 - goto_if 4, PacifidlogTown_House2_EventScript_15421B + goto_if_ge PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 - checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - goto_if 0, PacifidlogTown_House2_EventScript_1A14DC + goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_1A14DC specialvar RESULT, GetDaysUntilPacifidlogTMAvailable compare RESULT, 0 - call_if 1, PacifidlogTown_House2_EventScript_1541E8 + call_if_eq PacifidlogTown_House2_EventScript_1541E8 return PacifidlogTown_House2_EventScript_1541CE:: @ 81541CE diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index f51aea6f7..3b21ac996 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -4,8 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 815429D PacifidlogTown_House3_EventScript_15429E:: @ 815429E lock faceplayer - checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED - goto_if_eq PacifidlogTown_House3_EventScript_154338 + goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_154338 setvar VAR_SPECIAL_8, 2 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo @@ -22,7 +21,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 - goto_if 5, PacifidlogTown_House3_EventScript_15432A + goto_if_ne PacifidlogTown_House3_EventScript_15432A copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special CreateInGameTradePokemon diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index ea58f50c6..cb47a0edd 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -6,9 +6,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_PETALBURG_STATE, 0 - call_if 1, PetalburgCity_EventScript_14B731 + call_if_eq PetalburgCity_EventScript_14B731 compare VAR_PETALBURG_STATE, 2 - call_if 1, PetalburgCity_EventScript_14B739 + call_if_eq PetalburgCity_EventScript_14B739 end PetalburgCity_EventScript_14B731:: @ 814B731 @@ -188,23 +188,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_EventScript_14B91B + call_if_eq PetalburgCity_EventScript_14B91B compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_EventScript_14B930 + call_if_eq PetalburgCity_EventScript_14B930 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_EventScript_14B93B + call_if_eq PetalburgCity_EventScript_14B93B compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_EventScript_14B950 + call_if_eq PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_EventScript_14B965 + call_if_eq PetalburgCity_EventScript_14B965 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_EventScript_14B977 + call_if_eq PetalburgCity_EventScript_14B977 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_EventScript_14B989 + call_if_eq PetalburgCity_EventScript_14B989 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_EventScript_14B99B + call_if_eq PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 applymovement 255, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 406f260b0..54c0e89f6 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -9,26 +9,26 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 compare VAR_PETALBURG_GYM_STATE, 7 - call_if 4, PetalburgCity_Gym_EventScript_1544ED + call_if_ge PetalburgCity_Gym_EventScript_1544ED end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A checktrainerflag OPPONENT_RANDALL - call_if 1, PetalburgCity_Gym_EventScript_154FBB + call_if_eq PetalburgCity_Gym_EventScript_154FBB checktrainerflag OPPONENT_MARY - call_if 1, PetalburgCity_Gym_EventScript_154FDC + call_if_eq PetalburgCity_Gym_EventScript_154FDC checktrainerflag OPPONENT_PARKER - call_if 1, PetalburgCity_Gym_EventScript_154FFD + call_if_eq PetalburgCity_Gym_EventScript_154FFD checktrainerflag OPPONENT_LORI - call_if 1, PetalburgCity_Gym_EventScript_15501E + call_if_eq PetalburgCity_Gym_EventScript_15501E checktrainerflag OPPONENT_GEORGE - call_if 1, PetalburgCity_Gym_EventScript_15503F + call_if_eq PetalburgCity_Gym_EventScript_15503F checktrainerflag OPPONENT_JODY - call_if 1, PetalburgCity_Gym_EventScript_155060 + call_if_eq PetalburgCity_Gym_EventScript_155060 checktrainerflag OPPONENT_BERKE - call_if 1, PetalburgCity_Gym_EventScript_155081 + call_if_eq PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -45,11 +45,10 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED PetalburgCity_Gym_MapScript1_15451B:: @ 815451B compare VAR_PETALBURG_GYM_STATE, 1 - call_if 1, PetalburgCity_Gym_EventScript_15453B + call_if_eq PetalburgCity_Gym_EventScript_15453B compare VAR_PETALBURG_GYM_STATE, 6 - call_if 0, PetalburgCity_Gym_EventScript_154543 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, PetalburgCity_Gym_EventScript_15454B + call_if_lt PetalburgCity_Gym_EventScript_154543 + call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_15454B end PetalburgCity_Gym_EventScript_15453B:: @ 815453B @@ -145,65 +144,65 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse SE_DOOR compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_1547EE + call_if_eq PetalburgCity_Gym_EventScript_1547EE compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_154800 + call_if_eq PetalburgCity_Gym_EventScript_154800 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_15481C + call_if_eq PetalburgCity_Gym_EventScript_15481C compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_15481C + call_if_eq PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_154884 + call_if_eq PetalburgCity_Gym_EventScript_154884 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_15488F + call_if_eq PetalburgCity_Gym_EventScript_15488F compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_1548A1 + call_if_eq PetalburgCity_Gym_EventScript_1548A1 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_1548B3 + call_if_eq PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_1548C5 + call_if_eq PetalburgCity_Gym_EventScript_1548C5 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_1548D0 + call_if_eq PetalburgCity_Gym_EventScript_1548D0 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_1548DB + call_if_eq PetalburgCity_Gym_EventScript_1548DB compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_1548E6 + call_if_eq PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_15492F + call_if_eq PetalburgCity_Gym_EventScript_15492F compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_154930 + call_if_eq PetalburgCity_Gym_EventScript_154930 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_15493B + call_if_eq PetalburgCity_Gym_EventScript_15493B compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_15493C + call_if_eq PetalburgCity_Gym_EventScript_15493C compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_1548FC + call_if_eq PetalburgCity_Gym_EventScript_1548FC compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 playbgm BGM_TSURETEK, FALSE compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_154835 + call_if_eq PetalburgCity_Gym_EventScript_154835 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_15484E + call_if_eq PetalburgCity_Gym_EventScript_15484E compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_154860 + call_if_eq PetalburgCity_Gym_EventScript_154860 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_154872 + call_if_eq PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 setvar VAR_PETALBURG_GYM_STATE, 1 @@ -354,10 +353,8 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 - checkflag FLAG_RECEIVED_TM42 - goto_if 0, PetalburgCity_Gym_EventScript_154A2C - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq PetalburgCity_Gym_EventScript_154B69 + goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C + goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release end @@ -420,22 +417,22 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C msgbox PetalburgCity_Gym_Text_17A976, 4 closemessage compare FACING, 2 - call_if 1, PetalburgCity_Gym_EventScript_154ABC + call_if_eq PetalburgCity_Gym_EventScript_154ABC compare FACING, 1 - call_if 1, PetalburgCity_Gym_EventScript_154AC7 + call_if_eq PetalburgCity_Gym_EventScript_154AC7 compare FACING, 3 - call_if 1, PetalburgCity_Gym_EventScript_154AD2 + call_if_eq PetalburgCity_Gym_EventScript_154AD2 compare FACING, 4 - call_if 1, PetalburgCity_Gym_EventScript_154ADD + call_if_eq PetalburgCity_Gym_EventScript_154ADD delay 70 compare FACING, 2 - call_if 1, PetalburgCity_Gym_EventScript_154AE8 + call_if_eq PetalburgCity_Gym_EventScript_154AE8 compare FACING, 1 - call_if 1, PetalburgCity_Gym_EventScript_154AF3 + call_if_eq PetalburgCity_Gym_EventScript_154AF3 compare FACING, 3 - call_if 1, PetalburgCity_Gym_EventScript_154AFE + call_if_eq PetalburgCity_Gym_EventScript_154AFE compare FACING, 4 - call_if 1, PetalburgCity_Gym_EventScript_154B09 + call_if_eq PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release end @@ -593,7 +590,7 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 85 msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO @@ -623,7 +620,7 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 98 msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO @@ -636,7 +633,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall checktrainerflag OPPONENT_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -649,7 +646,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall checktrainerflag OPPONENT_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -662,7 +659,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall checktrainerflag OPPONENT_MARY - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -675,7 +672,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall checktrainerflag OPPONENT_MARY - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -688,7 +685,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall checktrainerflag OPPONENT_PARKER - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -701,7 +698,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall checktrainerflag OPPONENT_LORI - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -714,7 +711,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall checktrainerflag OPPONENT_LORI - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -727,7 +724,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall checktrainerflag OPPONENT_GEORGE - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -740,7 +737,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall checktrainerflag OPPONENT_JODY - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -753,7 +750,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall checktrainerflag OPPONENT_BERKE - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -765,8 +762,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154E29 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -783,8 +779,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154E65 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -801,8 +796,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154EA1 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -819,8 +813,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154EDD + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -837,8 +830,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154F19 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -855,8 +847,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154F55 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -873,8 +864,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154F91 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end @@ -892,72 +882,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A setvar VAR_SPECIAL_4, 1 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB setvar VAR_SPECIAL_4, 2 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC setvar VAR_SPECIAL_4, 3 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD setvar VAR_SPECIAL_4, 4 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E setvar VAR_SPECIAL_4, 5 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F setvar VAR_SPECIAL_4, 6 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 setvar VAR_SPECIAL_4, 7 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 setvar VAR_SPECIAL_4, 8 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return @@ -1021,8 +1011,7 @@ PetalburgCity_Gym_EventScript_155187:: @ 8155187 PetalburgCity_Gym_EventScript_15518B:: @ 815518B lock faceplayer - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_1551A0 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0 msgbox PetalburgCity_Gym_Text_17AB96, 4 release end @@ -1034,15 +1023,13 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall - checkflag FLAG_BADGE05_GET - goto_if_eq PetalburgCity_Gym_EventScript_1551CA + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall - checkflag FLAG_BADGE05_GET - goto_if_eq PetalburgCity_Gym_EventScript_1551CA + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc index 66e247323..7584f6f19 100644 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ b/data/scripts/maps/PetalburgCity_Mart.inc @@ -6,8 +6,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 faceplayer message PetalburgCity_Mart_Text_1A0BE4 waitmessage - checkflag FLAG_PETALBURG_MART_EXPANDED_ITEMS - goto_if_eq PetalburgCity_Mart_EventScript_1552EA + goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 msgbox PetalburgCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 8dda62ea1..136cc11c5 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -35,11 +35,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F compare VAR_STARTER_MON, 0 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155272 compare VAR_STARTER_MON, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15527B compare VAR_STARTER_MON, 2 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index 08bbcb0c7..d642d70ed 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -4,22 +4,17 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3 PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 lock faceplayer - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 - checkflag FLAG_RECEIVED_HM03 - goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 - checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY - goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_1543F7 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154427 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154406 + goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_15443B msgbox PetalburgCity_WallysHouse_Text_179805, 4 setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 - checkflag FLAG_RECEIVED_HM03 - goto_if_eq PetalburgCity_WallysHouse_EventScript_154431 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154431 goto PetalburgCity_WallysHouse_EventScript_154406 end @@ -49,10 +44,8 @@ PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 lock faceplayer - checkflag FLAG_RECEIVED_HM03 - goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_15446D + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154463 msgbox PetalburgCity_WallysHouse_Text_179C2C, 4 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 149fd4e46..17908440c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -241,8 +241,7 @@ PetalburgWoods_EventScript_15CED3:: @ 815CED3 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC lock faceplayer - checkflag FLAG_RECEIVED_MIRACLE_SEED - goto_if_eq PetalburgWoods_EventScript_15CF0B + goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem_std ITEM_MIRACLE_SEED compare RESULT, 0 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index c90a97531..a3824efcf 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -17,10 +17,8 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 end Route104_EventScript_14EEAE:: @ 814EEAE - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if 0, Route104_EventScript_14EEC4 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_EventScript_14EEC4 + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_14EEC4 + goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_14EEC4 clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return @@ -31,8 +29,7 @@ Route104_EventScript_14EEC4:: @ 814EEC4 Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer - checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 - goto_if_eq Route104_EventScript_14EEFF + goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem_std ITEM_CHESTO_BERRY compare RESULT, 0 @@ -50,8 +47,7 @@ Route104_EventScript_14EEFF:: @ 814EEFF Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer - checkflag FLAG_RECEIVED_WHITE_HERB - goto_if_eq Route104_EventScript_14EF38 + goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem_std ITEM_WHITE_HERB compare RESULT, 0 @@ -104,8 +100,7 @@ Route104_EventScript_14EF8A:: @ 814EF8A Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer - checkflag FLAG_RECEIVED_TM09 - goto_if_eq Route104_EventScript_14EFC2 + goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem_std ITEM_TM09 compare RESULT, 0 @@ -158,10 +153,8 @@ Route104_EventScript_14EFD5:: @ 814EFD5 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, Route104_EventScript_14F08B - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if_eq Route104_EventScript_14F095 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F08B + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F095 end Route104_EventScript_14F08B:: @ 814F08B diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 4718f9bb9..514b1b9cc 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -5,9 +5,8 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare VAR_BRINEY_HOUSE_STATE, 1 - call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 - checkflag FLAG_RECEIVED_POKENAV - call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 + call_if_eq Route104_MrBrineysHouse_EventScript_15BCD4 + call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_15BCD0 end Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 @@ -24,12 +23,9 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB lock faceplayer - checkflag FLAG_MR_BRINEY_SAILING_INTRO - call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65 - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E + call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_15BD0E + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_15BD65 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_15BD7E goto Route104_MrBrineysHouse_EventScript_15BD32 end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index f7fbb58b5..5e70a8ec2 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -4,10 +4,8 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag FLAG_LANDMARK_FLOWER_SHOP - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_15BE03 setflag FLAG_TEMP_1 end @@ -18,26 +16,24 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B lock faceplayer - checkflag FLAG_TEMP_1 - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C + goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A + goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A compare RESULT, NO - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A compare RESULT, NO - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -72,8 +68,7 @@ Route104_PrettyPetalFlowerShop_Items:: @ 815BE94 Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 lock faceplayer - checkflag FLAG_RECEIVED_WAILMER_PAIL - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 + goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 release end @@ -90,8 +85,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP, Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 addvar RESULT, ITEM_CHERI_BERRY diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index b3b256d79..7f1c4ca75 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -5,21 +5,20 @@ Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer checktrainerflag OPPONENT_BRIANNA_1 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_CINDY_2 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_LUCAS_2 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_MIKE_1 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 - checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 - goto_if_eq Route104_Prototype_EventScript_160CFB + goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB release end @@ -32,21 +31,20 @@ Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer checktrainerflag OPPONENT_BRIANNA_1 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_CINDY_2 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_LUCAS_2 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_MIKE_1 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 - checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 - goto_if_eq Route104_Prototype_EventScript_160CFB + goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB release end diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 30157e52f..305a2e9af 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -3,8 +3,7 @@ Route105_MapScripts:: @ 814F298 .byte 0 Route105_MapScript1_14F29E:: @ 814F29E - checkflag FLAG_REGI_DOORS_OPENED - call_if 0, Route105_EventScript_14F2A8 + call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_14F2A8 end Route105_EventScript_14F2A8:: @ 814F2A8 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index c0344f150..c70365b6a 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -271,8 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D Route109_EventScript_14F680:: @ 814F680 lock faceplayer - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if 0, Route109_EventScript_14F691 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_14F691 goto Route109_EventScript_14F6AF end @@ -328,8 +327,7 @@ Route109_EventScript_14F725:: @ 814F725 lock faceplayer special GetPlayerBigGuyGirlString - checkflag FLAG_RECEIVED_SOFT_SAND - goto_if_eq Route109_EventScript_14F762 + goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem_std ITEM_SOFT_SAND compare RESULT, 0 diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 4c1574824..e52958c50 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -9,12 +9,9 @@ Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 lock faceplayer - checkflag FLAG_RECEIVED_6_SODA_POP - goto_if_eq Route109_SeashoreHouse_EventScript_160E36 - checkflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS - goto_if_eq Route109_SeashoreHouse_EventScript_160E08 - checkflag FLAG_TEMP_2 - goto_if_eq Route109_SeashoreHouse_EventScript_160DFE + goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_160E36 + goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS, Route109_SeashoreHouse_EventScript_160E08 + goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_160DFE msgbox Route109_SeashoreHouse_Text_19B4D9, 4 setflag FLAG_TEMP_2 release @@ -95,11 +92,11 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 checktrainerflag OPPONENT_DWAYNE - goto_if 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if_lt Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_JOHANNA - goto_if 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if_lt Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_SIMON - goto_if 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if_lt Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index d5219582c..070340760 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -13,7 +13,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 compare VAR_CYCLING_CHALLENGE_STATE, 1 - call_if 1, Route110_EventScript_14F92F + call_if_eq Route110_EventScript_14F92F end Route110_EventScript_14F92F:: @ 814F92F @@ -327,9 +327,9 @@ Route110_EventScript_14FD34:: @ 814FD34 lockall checkplayergender compare RESULT, 0 - call_if 1, Route110_EventScript_14FDA7 + call_if_eq Route110_EventScript_14FDA7 compare RESULT, 1 - call_if 1, Route110_EventScript_14FDAC + call_if_eq Route110_EventScript_14FDAC applymovement 28, Route110_Movement_1A0845 waitmovement 0 applymovement 28, Route110_Movement_1A0833 @@ -338,11 +338,11 @@ Route110_EventScript_14FD34:: @ 814FD34 waitmovement 0 delay 30 compare VAR_SPECIAL_8, 1 - call_if 1, Route110_EventScript_14FF14 + call_if_eq Route110_EventScript_14FF14 compare VAR_SPECIAL_8, 2 - call_if 1, Route110_EventScript_14FF1F + call_if_eq Route110_EventScript_14FF1F compare VAR_SPECIAL_8, 3 - call_if 1, Route110_EventScript_14FF2A + call_if_eq Route110_EventScript_14FF2A checkplayergender compare RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 @@ -426,22 +426,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closemessage compare VAR_SPECIAL_8, 1 - call_if 1, Route110_EventScript_14FF56 + call_if_eq Route110_EventScript_14FF56 compare VAR_SPECIAL_8, 2 - call_if 1, Route110_EventScript_14FF5E + call_if_eq Route110_EventScript_14FF5E compare VAR_SPECIAL_8, 3 - call_if 1, Route110_EventScript_14FF66 + call_if_eq Route110_EventScript_14FF66 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 compare VAR_SPECIAL_8, 1 - call_if 1, Route110_EventScript_14FF35 + call_if_eq Route110_EventScript_14FF35 compare VAR_SPECIAL_8, 2 - call_if 1, Route110_EventScript_14FF40 + call_if_eq Route110_EventScript_14FF40 compare VAR_SPECIAL_8, 3 - call_if 1, Route110_EventScript_14FF4B + call_if_eq Route110_EventScript_14FF4B removeobject 29 setvar VAR_ROUTE110_STATE, 1 savebgm 0 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index af72dedd0..f05e2caa2 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -4,9 +4,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE compare VAR_CYCLING_CHALLENGE_STATE, 3 - call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 compare VAR_CYCLING_CHALLENGE_STATE, 2 - call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5 @@ -25,7 +25,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 lockall specialvar RESULT, GetPlayerAvatarBike @ player state? compare RESULT, 2 - call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag FLAG_SYS_CYCLING_ROAD diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 68ce0f5a7..020c61258 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_161994 + call_if_eq Route110_TrickHouseEnd_EventScript_161994 end Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 @@ -62,7 +62,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -75,7 +75,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -88,7 +88,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -101,7 +101,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -114,7 +114,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12 compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -127,7 +127,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -140,7 +140,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -151,13 +151,13 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closemessage compare FACING, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_161C74 + call_if_eq Route110_TrickHouseEnd_EventScript_161C74 compare FACING, 2 - call_if 1, Route110_TrickHouseEnd_EventScript_161C7F + call_if_eq Route110_TrickHouseEnd_EventScript_161C7F compare FACING, 3 - call_if 1, Route110_TrickHouseEnd_EventScript_161C8A + call_if_eq Route110_TrickHouseEnd_EventScript_161C8A compare FACING, 4 - call_if 1, Route110_TrickHouseEnd_EventScript_161C95 + call_if_eq Route110_TrickHouseEnd_EventScript_161C95 delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 closemessage @@ -172,7 +172,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF givedecoration_std DECOR_RED_TENT .endc compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C61 + call_if_eq Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E special ResetTrickHouseEndRoomFlag diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 232d324a4..527f09d27 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -13,11 +13,11 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_16109A case 1, Route110_TrickHouseEntrance_EventScript_1610A0 @@ -45,56 +45,49 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_16103C + call_if_eq Route110_TrickHouseEntrance_EventScript_16103C compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_161046 + call_if_eq Route110_TrickHouseEntrance_EventScript_161046 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_161050 + call_if_eq Route110_TrickHouseEntrance_EventScript_161050 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_16105A + call_if_eq Route110_TrickHouseEntrance_EventScript_16105A compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_161064 + call_if_eq Route110_TrickHouseEntrance_EventScript_161064 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_16106E + call_if_eq Route110_TrickHouseEntrance_EventScript_16106E compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_161078 + call_if_eq Route110_TrickHouseEntrance_EventScript_161078 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 - call_if 1, Route110_TrickHouseEntrance_EventScript_161082 + call_if_eq Route110_TrickHouseEntrance_EventScript_161082 return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C - checkflag FLAG_BADGE03_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 - checkflag FLAG_BADGE04_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 - checkflag FLAG_BADGE05_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A - checkflag FLAG_BADGE06_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 - checkflag FLAG_BADGE07_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E - checkflag FLAG_BADGE08_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082 @@ -214,7 +207,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall delay 20 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_161327 + call_if_eq Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closemessage delay 20 @@ -249,21 +242,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmovement 0 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD + call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612D6 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF + call_if_eq Route110_TrickHouseEntrance_EventScript_1612DF compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612E8 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612F1 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA + call_if_eq Route110_TrickHouseEntrance_EventScript_1612FA compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_161303 + call_if_eq Route110_TrickHouseEntrance_EventScript_161303 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_16130C + call_if_eq Route110_TrickHouseEntrance_EventScript_16130C closemessage setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 @@ -372,7 +365,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -382,7 +375,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -392,7 +385,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -402,7 +395,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -412,7 +405,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -422,7 +415,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -432,7 +425,7 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -457,7 +450,7 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall end @@ -727,11 +720,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 + call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 + call_if_eq Route110_TrickHouseEntrance_EventScript_1618F6 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_16190B + call_if_eq Route110_TrickHouseEntrance_EventScript_16190B setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index b1cb0c9df..cdde15d1a 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -5,13 +5,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E2C compare VAR_TEMP_2, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E3F compare VAR_TEMP_3, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E52 compare VAR_TEMP_4, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E65 end Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 8d5392ae8..14a021e8d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8 end Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 @@ -32,19 +32,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmetatile 1, 3, 600, 0 setmetatile 10, 2, 600, 0 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F + call_if_eq Route110_TrickHousePuzzle3_EventScript_161F9F compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FA9 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FB3 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FBD compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FC7 compare VAR_TEMP_8, 6 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FD1 compare VAR_TEMP_8, 7 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FDB return Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F @@ -303,19 +303,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar VAR_TEMP_6, 0 setvar VAR_TEMP_7, 0 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162683 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162689 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F + call_if_eq Route110_TrickHousePuzzle3_EventScript_16268F compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162695 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B + call_if_eq Route110_TrickHousePuzzle3_EventScript_16269B compare VAR_TEMP_8, 6 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A1 compare VAR_TEMP_8, 7 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A7 return Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 @@ -348,9 +348,9 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5 compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView compare VAR_TEMP_9, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 1bcdb8087..5ec1a4d64 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -166,11 +166,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 switch RESULT @@ -188,11 +188,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3 compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 switch RESULT @@ -210,11 +210,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 switch RESULT @@ -232,11 +232,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 switch RESULT @@ -254,11 +254,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3 compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 switch RESULT @@ -419,80 +419,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F43 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F4E compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F59 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F64 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F7A compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F85 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F90 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F9B compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FB1 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FBC compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FC7 compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FD2 compare VAR_TEMP_9, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FE8 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FF3 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FFE compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163009 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F + call_if_eq Route110_TrickHousePuzzle5_EventScript_16301F compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A + call_if_eq Route110_TrickHousePuzzle5_EventScript_16302A compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163035 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163040 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B + call_if_eq Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163056 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163061 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C + call_if_eq Route110_TrickHousePuzzle5_EventScript_16306C compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163077 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163082 return Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index d1de7682f..1ee608166 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -10,16 +10,11 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 end Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 return Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 @@ -87,7 +82,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 + call_if_eq Route110_TrickHousePuzzle7_EventScript_163167 end Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B @@ -121,76 +116,56 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A4 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A9 end Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633AE + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633B3 end Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633B8 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633BD end Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C2 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C7 end Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633CC + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633D1 end Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index c338091a0..11af07dce 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -4,8 +4,7 @@ Route111_MapScripts:: @ 814FF91 .byte 0 Route111_MapScript1_14FF9C:: @ 814FF9C - checkflag FLAG_REGI_DOORS_OPENED - call_if 0, Route111_EventScript_14FFA6 + call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_14FFA6 end Route111_EventScript_14FFA6:: @ 814FFA6 @@ -17,21 +16,21 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 checktrainerflag OPPONENT_VICKY - goto_if 0, Route111_EventScript_15000D + goto_if_lt Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 34 - goto_if 0, Route111_EventScript_15000C + goto_if_lt Route111_EventScript_15000C compare VAR_TEMP_1, 107 - goto_if 2, Route111_EventScript_15000C + goto_if_gt Route111_EventScript_15000C compare VAR_TEMP_1, 72 - goto_if 2, Route111_EventScript_150009 + goto_if_gt Route111_EventScript_150009 compare VAR_TEMP_0, 2000 - goto_if 2, Route111_EventScript_15000C + goto_if_gt Route111_EventScript_15000C compare VAR_TEMP_0, 8 - goto_if 0, Route111_EventScript_15000C + goto_if_lt Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 setweather WEATHER_SANDSTORM @@ -121,8 +120,7 @@ Route111_EventScript_1500C5:: @ 81500C5 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 - goto_if_eq Route111_EventScript_150100 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem_std ITEM_RAZZ_BERRY compare RESULT, 0 @@ -174,13 +172,13 @@ Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage compare VAR_SPECIAL_4, 0 - call_if 1, Route111_EventScript_150188 + call_if_eq Route111_EventScript_150188 compare VAR_SPECIAL_4, 1 - call_if 1, Route111_EventScript_150193 + call_if_eq Route111_EventScript_150193 compare VAR_SPECIAL_4, 2 - call_if 1, Route111_EventScript_15019E + call_if_eq Route111_EventScript_15019E compare VAR_SPECIAL_4, 3 - call_if 1, Route111_EventScript_1501A9 + call_if_eq Route111_EventScript_1501A9 releaseall end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 8352db786..020b51791 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -13,8 +13,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer setvar VAR_SPECIAL_8, 3 - checkflag FLAG_RECEIVED_MACHO_BRACE - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 + goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem_std ITEM_MACHO_BRACE compare RESULT, 0 @@ -40,8 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer setvar VAR_SPECIAL_8, 4 - checkflag FLAG_TEMP_4 - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 + goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index adbea780e..96eb68046 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -6,7 +6,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_CABLE_CAR_STATION_STATE, 2 - call_if 1, Route112_CableCarStation_EventScript_15C052 + call_if_eq Route112_CableCarStation_EventScript_15C052 end Route112_CableCarStation_EventScript_15C052:: @ 815C052 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index a1593ba1e..41b289db0 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -15,9 +15,9 @@ Route113_MapScript1_1505DA:: @ 81505DA Route113_EventScript_1505E5:: @ 81505E5 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 19 - goto_if 0, Route113_EventScript_150604 + goto_if_lt Route113_EventScript_150604 compare VAR_TEMP_0, 84 - goto_if 2, Route113_EventScript_150604 + goto_if_gt Route113_EventScript_150604 setweather WEATHER_ASH return diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 3f991277f..e42a6f89a 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag FLAG_LANDMARK_GLASS_WORKSHOP compare VAR_GLASS_WORKSHOP_STATE, 1 - call_if 1, Route113_GlassWorkshop_EventScript_16355F + call_if_eq Route113_GlassWorkshop_EventScript_16355F end Route113_GlassWorkshop_EventScript_16355F:: @ 816355F @@ -16,7 +16,7 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer compare VAR_GLASS_WORKSHOP_STATE, 10 - goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 + goto_if_ge Route113_GlassWorkshop_EventScript_1638D2 compare VAR_GLASS_WORKSHOP_STATE, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 compare VAR_GLASS_WORKSHOP_STATE, 1 @@ -39,7 +39,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_163818 + goto_if_lt Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waitmessage goto Route113_GlassWorkshop_EventScript_1635EE @@ -71,7 +71,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -85,7 +85,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -99,7 +99,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -113,7 +113,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -127,7 +127,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -142,7 +142,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -157,7 +157,7 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -202,9 +202,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare VAR_SPECIAL_9, 0 - call_if 1, Route113_GlassWorkshop_EventScript_163889 + call_if_eq Route113_GlassWorkshop_EventScript_163889 compare VAR_SPECIAL_9, 1 - call_if 1, Route113_GlassWorkshop_EventScript_1638A1 + call_if_eq Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end @@ -296,9 +296,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare VAR_SPECIAL_9, 0 - call_if 1, Route113_GlassWorkshop_EventScript_163889 + call_if_eq Route113_GlassWorkshop_EventScript_163889 compare VAR_SPECIAL_9, 1 - call_if 1, Route113_GlassWorkshop_EventScript_1638A1 + call_if_eq Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index f6bb6d8ba..30ab8c572 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,8 +5,7 @@ Route114_EventScript_150733:: @ 8150733 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 - goto_if_eq Route114_EventScript_150778 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar RESULT, 15 @@ -27,8 +26,7 @@ Route114_EventScript_150778:: @ 8150778 Route114_EventScript_150782:: @ 8150782 lock faceplayer - checkflag FLAG_RECEIVED_TM05 - goto_if_eq Route114_EventScript_1507B9 + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem_std ITEM_TM05 compare RESULT, 0 diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 1a1445fde..b191db5f6 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -9,8 +9,7 @@ Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 lock faceplayer - checkflag FLAG_RECEIVED_TM28 - goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 + goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem_std ITEM_TM28 compare RESULT, 0 diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 2ce9c1bfa..740a48314 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -4,8 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 815C20E Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F lock faceplayer - checkflag FLAG_RECEIVED_FOSSIL_MON - goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E + goto_if_set FLAG_RECEIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 compare RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index c34d4fc7e..30eb844ac 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -9,8 +9,7 @@ Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E Route114_LanettesHouse_EventScript_15C262:: @ 815C262 lock faceplayer - checkflag FLAG_RECEIVED_DOLL_LANETTE - goto_if_eq Route114_LanettesHouse_EventScript_15C28F + goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_15C28F setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE @@ -41,7 +40,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route114_LanettesHouse_EventScript_15C2CC + call_if_eq Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 4e08705cf..eea14e25d 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -3,8 +3,7 @@ Route116_MapScripts:: @ 8150A31 .byte 0 Route116_MapScript1_150A37:: @ 8150A37 - checkflag FLAG_RECOVERED_DEVON_GOODS - call_if 1, Route116_EventScript_150A41 + call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A41 end Route116_EventScript_150A41:: @ 8150A41 @@ -14,10 +13,8 @@ Route116_EventScript_150A41:: @ 8150A41 Route116_EventScript_150A49:: @ 8150A49 lock faceplayer - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq Route116_EventScript_150A67 - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq Route116_EventScript_150A71 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A67 + goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_150A71 msgbox Route116_Text_1703CF, 4 release end @@ -35,8 +32,7 @@ Route116_EventScript_150A71:: @ 8150A71 Route116_EventScript_150A7B:: @ 8150A7B lock faceplayer - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if_eq Route116_EventScript_150B04 + goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_150B04 msgbox Route116_Text_1705AE, 4 goto Route116_EventScript_150A94 end @@ -49,13 +45,13 @@ Route116_EventScript_150A94:: @ 8150A94 msgbox Route116_Text_1707B8, 4 closemessage compare FACING, 2 - call_if 1, Route116_EventScript_150AEE + call_if_eq Route116_EventScript_150AEE compare FACING, 1 - call_if 1, Route116_EventScript_150AEE + call_if_eq Route116_EventScript_150AEE compare FACING, 3 - call_if 1, Route116_EventScript_150AEE + call_if_eq Route116_EventScript_150AEE compare FACING, 4 - call_if 1, Route116_EventScript_150AF9 + call_if_eq Route116_EventScript_150AF9 removeobject LAST_TALKED clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F setflag FLAG_RECEIVED_REPEAT_BALL @@ -182,13 +178,13 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 delay 20 compare FACING, 2 - call_if 1, Route116_EventScript_150C37 + call_if_eq Route116_EventScript_150C37 compare FACING, 1 - call_if 1, Route116_EventScript_150C37 + call_if_eq Route116_EventScript_150C37 compare FACING, 3 - call_if 1, Route116_EventScript_150C37 + call_if_eq Route116_EventScript_150C37 compare FACING, 4 - call_if 1, Route116_EventScript_150C42 + call_if_eq Route116_EventScript_150C42 removeobject LAST_TALKED release end diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index 24091c4ac..5ec6ef642 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -17,8 +17,7 @@ Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_15C30F msgbox Route116_TunnelersRestHouse_Text_193135, 4 release end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index fa648f79e..9f42412ab 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -7,8 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40 end Route117_EventScript_150D46:: @ 8150D46 - checkflag FLAG_PENDING_DAYCARE_EGG - goto_if 0, Route117_EventScript_150D56 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_150D56 setobjectxyperm 3, 47, 6 Route117_EventScript_150D56:: @ 8150D56 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index a4452d989..569a7103e 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -9,8 +9,7 @@ Route118_MapScript1_150F2E:: @ 8150F2E Route118_EventScript_150F34:: @ 8150F34 lock faceplayer - checkflag FLAG_RECEIVED_GOOD_ROD - goto_if_eq Route118_EventScript_150F89 + goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_150F89 msgbox Route118_Text_170F12, MSGBOX_YESNO compare RESULT, YES goto_if_eq Route118_EventScript_150F5E @@ -84,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 msgbox Route118_Text_170D66, 4 closemessage compare VAR_SPECIAL_8, 0 - call_if 1, Route118_EventScript_151048 + call_if_eq Route118_EventScript_151048 compare VAR_SPECIAL_8, 1 - call_if 1, Route118_EventScript_151053 + call_if_eq Route118_EventScript_151053 compare VAR_SPECIAL_8, 2 - call_if 1, Route118_EventScript_15105E + call_if_eq Route118_EventScript_15105E setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 8d9f88474..4b9f3ce5f 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -4,15 +4,14 @@ Route119_MapScripts:: @ 8151167 .byte 0 Route119_MapScript1_151172:: @ 8151172 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route119_EventScript_15117C + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_15117C end Route119_EventScript_15117C:: @ 815117C compare VAR_SPECIAL_4, 6 - call_if 1, Route119_EventScript_151193 + call_if_eq Route119_EventScript_151193 compare VAR_SPECIAL_4, 7 - call_if 1, Route119_EventScript_151197 + call_if_eq Route119_EventScript_151197 return Route119_EventScript_151193:: @ 8151193 @@ -28,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_EventScript_1511B9 + call_if_eq Route119_EventScript_1511B9 special SetRoute119Weather end @@ -53,21 +52,21 @@ Route119_EventScript_1511DB:: @ 81511DB addobject 25 checkplayergender compare RESULT, 0 - call_if 1, Route119_EventScript_151254 + call_if_eq Route119_EventScript_151254 compare RESULT, 1 - call_if 1, Route119_EventScript_151259 + call_if_eq Route119_EventScript_151259 delay 65 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513A6 + call_if_eq Route119_EventScript_1513A6 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513B1 + call_if_eq Route119_EventScript_1513B1 applymovement 255, Route119_Movement_1A0845 waitmovement 0 delay 30 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513D2 + call_if_eq Route119_EventScript_1513D2 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513E1 + call_if_eq Route119_EventScript_1513E1 removeobject 25 addobject 16 delay 30 @@ -155,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closemessage compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513D2 + call_if_eq Route119_EventScript_1513D2 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513E1 + call_if_eq Route119_EventScript_1513E1 removeobject 16 addobject 25 delay 30 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513BC + call_if_eq Route119_EventScript_1513BC compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513C7 + call_if_eq Route119_EventScript_1513C7 removeobject 25 setvar VAR_ROUTE119_STATE, 1 savebgm 0 diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 8a5c1033f..e5ca6550b 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 + call_if_eq Route119_WeatherInstitute_1F_EventScript_163C41 end Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index b36500345..81037941f 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -5,9 +5,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 + call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4 compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 + call_if_eq Route119_WeatherInstitute_2F_EventScript_163CF0 end Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4 @@ -87,7 +87,6 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock faceplayer - checkflag FLAG_RECEIVED_CASTFORM - goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE + goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_163DBE goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index bacdcd7dd..b49834564 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -5,23 +5,22 @@ Route120_MapScripts:: @ 815160E .byte 0 Route120_MapScript1_15161E:: @ 815161E - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route120_EventScript_151628 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_151628 end Route120_EventScript_151628:: @ 8151628 compare VAR_SPECIAL_4, 0 - call_if 1, Route120_EventScript_15166B + call_if_eq Route120_EventScript_15166B compare VAR_SPECIAL_4, 1 - call_if 1, Route120_EventScript_151672 + call_if_eq Route120_EventScript_151672 compare VAR_SPECIAL_4, 2 - call_if 1, Route120_EventScript_151676 + call_if_eq Route120_EventScript_151676 compare VAR_SPECIAL_4, 3 - call_if 1, Route120_EventScript_15167A + call_if_eq Route120_EventScript_15167A compare VAR_SPECIAL_4, 4 - call_if 1, Route120_EventScript_15167E + call_if_eq Route120_EventScript_15167E compare VAR_SPECIAL_4, 5 - call_if 1, Route120_EventScript_151682 + call_if_eq Route120_EventScript_151682 return Route120_EventScript_15166B:: @ 815166B @@ -50,12 +49,9 @@ Route120_EventScript_151682:: @ 8151682 return Route120_MapScript1_151686:: @ 8151686 - checkflag FLAG_REGI_DOORS_OPENED - call_if 0, Route120_EventScript_1516A2 - checkflag FLAG_RECEIVED_DEVON_SCOPE - call_if 1, Route120_EventScript_1516B5 - checkflag FLAG_RECEIVED_DEVON_SCOPE - call_if 0, Route120_EventScript_1516DA + call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1516A2 + call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516B5 + call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516DA end Route120_EventScript_1516A2:: @ 81516A2 @@ -82,11 +78,11 @@ Route120_MapScript1_1516DF:: @ 81516DF Route120_EventScript_1516EA:: @ 81516EA getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 14 - goto_if 3, Route120_EventScript_151715 + goto_if_le Route120_EventScript_151715 compare VAR_TEMP_1, 60 - goto_if 3, Route120_EventScript_151719 + goto_if_le Route120_EventScript_151719 compare VAR_TEMP_1, 61 - goto_if 4, Route120_EventScript_151711 + goto_if_ge Route120_EventScript_151711 return Route120_EventScript_151711:: @ 8151711 @@ -99,9 +95,9 @@ Route120_EventScript_151715:: @ 8151715 Route120_EventScript_151719:: @ 8151719 compare VAR_TEMP_0, 7 - goto_if 3, Route120_EventScript_151735 + goto_if_le Route120_EventScript_151735 compare VAR_TEMP_0, 19 - goto_if 3, Route120_EventScript_151715 + goto_if_le Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -113,13 +109,12 @@ Route120_EventScript_151739:: @ 8151739 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 - goto_if_eq Route120_EventScript_151837 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837 msgbox Route120_Text_1C58F1, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route120_EventScript_151841 + call_if_eq Route120_EventScript_151841 compare RESULT, NO - call_if 1, Route120_EventScript_15184A + call_if_eq Route120_EventScript_15184A specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT case 0, Route120_EventScript_1517DC @@ -184,8 +179,7 @@ Route120_EventScript_15184A:: @ 815184A Route120_EventScript_151853:: @ 8151853 lock faceplayer - checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 - goto_if_eq Route120_EventScript_151884 + goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE120, Route120_EventScript_151884 msgbox Route120_Text_171827, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route120_EventScript_151877 @@ -209,9 +203,9 @@ Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closemessage compare FACING, 2 - call_if 1, Route120_EventScript_15197F + call_if_eq Route120_EventScript_15197F compare FACING, 3 - call_if 1, Route120_EventScript_15198A + call_if_eq Route120_EventScript_15198A applymovement 31, Route120_Movement_1A083F waitmovement 0 delay 20 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index ded372aa6..2648e19ce 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -89,7 +89,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 getpartysize compare RESULT, 6 - goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F + goto_if_ne Route121_SafariZoneEntrance_EventScript_15C44F specialvar RESULT, CheckFreePokemonStorageSpace compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index a25c306cc..5f77ea023 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -9,8 +9,7 @@ Route123_MapScript1_151C59:: @ 8151C59 Route123_EventScript_151C5D:: @ 8151C5D lock faceplayer - checkflag FLAG_RECEIVED_TM19 - goto_if_eq Route123_EventScript_151CAC + goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty compare RESULT, 0 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 26edb6fbb..3356df83b 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -10,8 +10,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER - goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER, Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 random 10 addvar RESULT, 20 @@ -40,8 +39,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE - goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE, Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 setvar VAR_SPECIAL_4, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 @@ -86,8 +84,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 end Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E - checkflag FLAG_RECEIVED_SPELON_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_SPELON_BERRY compare RESULT, 0 @@ -97,8 +94,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F - checkflag FLAG_RECEIVED_PAMTRE_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_PAMTRE_BERRY compare RESULT, 0 @@ -108,8 +104,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 - checkflag FLAG_RECEIVED_WATMEL_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_WATMEL_BERRY compare RESULT, 0 @@ -119,8 +114,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 - checkflag FLAG_RECEIVED_DURIN_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_DURIN_BERRY compare RESULT, 0 @@ -130,8 +124,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 - checkflag FLAG_RECEIVED_BELUE_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_BELUE_BERRY compare RESULT, 0 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 289ea2d29..3f02fc6e3 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -3,8 +3,7 @@ Route124_MapScripts:: @ 8151DDF .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route124_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_1A02C1 end Route124_EventScript_151DEF:: @ 8151DEF diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 9423cf845..7bcddfe19 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -9,8 +9,7 @@ Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00 Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 lock faceplayer - checkflag FLAG_MET_DIVING_TREASURE_HUNTER - goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20 + goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 setflag FLAG_MET_DIVING_TREASURE_HUNTER goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E @@ -32,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E9C return Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 58bf75c51..a1495ac83 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,8 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route125_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_1A02C1 end Route125_EventScript_151F2E:: @ 8151F2E diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index a89087994..4a28abfb7 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -3,8 +3,7 @@ Route126_MapScripts:: @ 8151FFE .byte 0 Route126_MapScript1_152004:: @ 8152004 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route126_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_1A02C1 end Route126_EventScript_15200E:: @ 815200E diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index 5fb122821..7552f7c5d 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -3,8 +3,7 @@ Route127_MapScripts:: @ 815206A .byte 0 Route127_MapScript1_152070:: @ 8152070 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route127_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_1A02C1 end Route127_EventScript_15207A:: @ 815207A diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index a97a1e93f..6550db979 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -4,8 +4,7 @@ Route128_MapScripts:: @ 815211B .byte 0 Route128_MapScript1_152126:: @ 8152126 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route128_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index efa26ecd2..ffd204bb9 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,8 +3,7 @@ Route131_MapScripts:: @ 815243E .byte 0 Route131_MapScript1_152444:: @ 8152444 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route131_EventScript_15244E + call_if_set FLAG_SYS_GAME_CLEAR, Route131_EventScript_15244E end Route131_EventScript_15244E:: @ 815244E diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c6bdbbdb7..415138d67 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -11,8 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378 RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_EventScript_14C39B + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release end @@ -36,8 +35,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag FLAG_BADGE01_GET - goto_if_eq RustboroCity_EventScript_14C3CF + goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release end @@ -50,8 +48,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer - checkflag FLAG_RECEIVED_POKENAV - goto_if_eq RustboroCity_EventScript_14C3EE + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release end @@ -326,8 +323,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq RustboroCity_EventScript_14C614 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release end @@ -364,13 +360,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 RustboroCity_EventScript_14C650:: @ 814C650 compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_14C691 + call_if_eq RustboroCity_EventScript_14C691 compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_14C6BD + call_if_eq RustboroCity_EventScript_14C6BD compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_14C6E9 + call_if_eq RustboroCity_EventScript_14C6E9 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_14C715 + call_if_eq RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 @@ -458,19 +454,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 RustboroCity_EventScript_14C77D:: @ 814C77D compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_14C7FE + call_if_eq RustboroCity_EventScript_14C7FE compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_14C82A + call_if_eq RustboroCity_EventScript_14C82A compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_14C856 + call_if_eq RustboroCity_EventScript_14C856 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_14C882 + call_if_eq RustboroCity_EventScript_14C882 compare VAR_TEMP_1, 4 - call_if 1, RustboroCity_EventScript_14C8B8 + call_if_eq RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem_std ITEM_GREAT_BALL compare RESULT, 0 - call_if 1, RustboroCity_EventScript_14C7F5 + call_if_eq RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closemessage setflag FLAG_RETURNED_DEVON_GOODS @@ -549,8 +545,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8 RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer - checkflag FLAG_MET_RIVAL_RUSTBORO - goto_if_eq RustboroCity_EventScript_14C917 + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_14C917 checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index 3371005c0..e18a1e029 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -4,8 +4,7 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26 RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 lock faceplayer - checkflag FLAG_RECEIVED_HM01 - goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 + goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 giveitem_std ITEM_HM01 setflag FLAG_RECEIVED_HM01 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index f9e902763..7b56c72a2 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -3,8 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 .byte 0 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C - checkflag FLAG_RETURNED_DEVON_GOODS - call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416 + call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157416 end RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 @@ -15,10 +14,8 @@ RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 lock faceplayer - checkflag FLAG_RETURNED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440 + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15744A + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157440 msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4 release end @@ -36,12 +33,9 @@ RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 lock faceplayer - checkflag FLAG_RETURNED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15747B + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157485 msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4 release end @@ -59,12 +53,9 @@ RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485 RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F lock faceplayer - checkflag FLAG_RETURNED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6 - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574B6 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_1574C0 msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 179140378..b7b36dd6d 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC end RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release end @@ -24,9 +24,8 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519 msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4 release end @@ -40,9 +39,8 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag FLAG_RECEIVED_POKENAV - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543 msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4 release end @@ -56,7 +54,7 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release end @@ -147,7 +145,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO compare RESULT, YES - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -167,7 +165,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO compare RESULT, YES - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index ff854d7ef..0b71effee 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -6,7 +6,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 compare VAR_DEVON_CORP_3F_STATE, 0 - call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D + call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D end RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D @@ -146,10 +146,8 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock faceplayer - checkflag FLAG_RECEIVED_EXP_SHARE - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 + goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D @@ -181,8 +179,7 @@ RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 lock faceplayer - checkflag FLAG_RECEIVED_REPEAT_BALL - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5 + goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5 msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4 release end diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 3a2242c7a..5ed9ac0ef 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -8,8 +8,7 @@ RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97 RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 lock faceplayer - checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO - goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF + goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem_std ITEM_PREMIER_BALL compare RESULT, 0 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 1e2256b47..bcd597541 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -3,8 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE - checkflag FLAG_RECEIVED_TM39 - goto_if 0, RustboroCity_Gym_EventScript_15793C + goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release end @@ -21,7 +20,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setvar VAR_SPECIAL_8, 1 call RustboroCity_Gym_EventScript_1A01C0 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, RustboroCity_Gym_EventScript_1A00FB + call_if_eq RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end @@ -47,8 +46,7 @@ RustboroCity_Gym_EventScript_157977:: @ 8157977 RustboroCity_Gym_EventScript_15798E:: @ 815798E lock faceplayer - checkflag FLAG_DEFEATED_RUSTBORO_GYM - goto_if_eq RustboroCity_Gym_EventScript_1579A3 + goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_1579A3 msgbox RustboroCity_Gym_Text_183A4B, 4 release end @@ -60,15 +58,13 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall - checkflag FLAG_BADGE01_GET - goto_if_eq RustboroCity_Gym_EventScript_1579CD + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall - checkflag FLAG_BADGE01_GET - goto_if_eq RustboroCity_Gym_EventScript_1579CD + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index c0f1bc689..abbac505b 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -4,8 +4,7 @@ RustboroCity_House1_MapScripts:: @ 8157C7C RustboroCity_House1_EventScript_157C7D:: @ 8157C7D lock faceplayer - checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED - goto_if_eq RustboroCity_House1_EventScript_157D13 + goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_157D13 setvar VAR_SPECIAL_8, 0 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo @@ -22,7 +21,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 - goto_if 5, RustboroCity_House1_EventScript_157D05 + goto_if_ne RustboroCity_House1_EventScript_157D05 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special CreateInGameTradePokemon diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc index 69f977e79..c8e3f3a43 100644 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ b/data/scripts/maps/RustboroCity_Mart.inc @@ -6,10 +6,8 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 faceplayer message RustboroCity_Mart_Text_1A0BE4 waitmessage - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if 0, RustboroCity_Mart_EventScript_157BEF - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if_eq RustboroCity_Mart_EventScript_157C18 + goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157BEF + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157C18 end RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 21fdf3d3b..155df8de5 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -77,12 +77,11 @@ RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5 RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE lock faceplayer - checkflag FLAG_RECEIVED_QUICK_CLAW - goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 + goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_157B34 compare FACING, 4 - call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E + call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E compare FACING, 3 - call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 + call_if_eq RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem_std ITEM_QUICK_CLAW compare RESULT, 0 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 050cf28c2..7c715b6c2 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -11,7 +11,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 compare VAR_RUSTURF_TUNNEL_STATE, 2 - call_if 1, RusturfTunnel_EventScript_15C773 + call_if_eq RusturfTunnel_EventScript_15C773 end RusturfTunnel_EventScript_15C773:: @ 815C773 @@ -32,8 +32,7 @@ RusturfTunnel_EventScript_15C782:: @ 815C782 RusturfTunnel_EventScript_15C799:: @ 815C799 lock faceplayer - checkflag FLAG_TEMP_1 - goto_if_eq RusturfTunnel_EventScript_15C7BC + goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_1944C5, 4 closemessage @@ -53,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_15C8CA + call_if_eq RusturfTunnel_EventScript_15C8CA compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C8DF + call_if_eq RusturfTunnel_EventScript_15C8DF compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C8EA + call_if_eq RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C8EB + call_if_eq RusturfTunnel_EventScript_15C8EB compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C8EB + call_if_eq RusturfTunnel_EventScript_15C8EB giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_15C880 + call_if_eq RusturfTunnel_EventScript_15C880 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C892 + call_if_eq RusturfTunnel_EventScript_15C892 compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C8AE + call_if_eq RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closemessage compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_15C8F7 + call_if_eq RusturfTunnel_EventScript_15C8F7 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C909 + call_if_eq RusturfTunnel_EventScript_15C909 compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C91B + call_if_eq RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index dd5aee95c..cd830f2b0 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -124,8 +124,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 setrespawn 8 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag FLAG_RECEIVED_TM49 - call_if 1, SSTidalCorridor_EventScript_15FE36 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release @@ -134,8 +133,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 SSTidalCorridor_EventScript_15FE17:: @ 815FE17 setrespawn 4 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag FLAG_RECEIVED_TM49 - call_if 1, SSTidalCorridor_EventScript_15FE36 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release @@ -163,8 +161,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B SSTidalCorridor_EventScript_15FE60:: @ 815FE60 lock faceplayer - checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS - goto_if_eq SSTidalCorridor_EventScript_15FE7A + goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_15FE7A call SSTidalCorridor_EventScript_15FE84 msgbox SSTidalCorridor_Text_199203, 4 release @@ -177,21 +174,21 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A SSTidalCorridor_EventScript_15FE84:: @ 815FE84 checktrainerflag OPPONENT_PHILLIP - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_LEONARD - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_COLTON - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_TUCKER - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_THOMAS - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_LEA_AND_JED - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_GARRET - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_ANETTE - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 0390177de..58e7c3235 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -4,8 +4,7 @@ SSTidalRooms_MapScripts:: @ 815FF05 SSTidalRooms_EventScript_15FF06:: @ 815FF06 lock faceplayer - checkflag FLAG_RECEIVED_TM49 - goto_if_eq SSTidalRooms_EventScript_15FF3D + goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem_std ITEM_TM49 compare RESULT, 0 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index b3eb297e9..493aa55a1 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -21,7 +21,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B SafariZone_Southeast_MapScript1_160073:: @ 8160073 compare VAR_SAFARI_ZONE_STATE, 2 - call_if 1, SafariZone_Southeast_EventScript_16007F + call_if_eq SafariZone_Southeast_EventScript_16007F end SafariZone_Southeast_EventScript_16007F:: @ 816007F diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index d788be9b3..11aba3ac8 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -6,8 +6,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 braillemessage SealedChamber_InnerRoom_Braille_1C53C1 waitbuttonpress erasebox 0, 0, 29, 19 - checkflag FLAG_REGI_DOORS_OPENED - goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 + goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord compare RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index ad17819c2..1f2159010 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -14,8 +14,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB - checkflag FLAG_SYS_BRAILLE_DIG - call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 + call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F0F5 end SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 @@ -109,8 +108,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall - checkflag FLAG_SYS_BRAILLE_DIG - goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF + goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbuttonpress erasebox 0, 0, 29, 19 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 4dcd88761..2005cb67b 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -4,8 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E @@ -20,8 +19,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer dodailyevents - checkflag FLAG_SYS_SHOAL_ITEM - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 + call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 @@ -33,7 +31,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 compare RESULT, 0 - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 + call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E106 compare RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index b6aba9523..21997d076 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -4,8 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB @@ -21,47 +20,39 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 end ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmetatile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmetatile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E213 setmetatile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E22B setmetatile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E243 setmetatile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E256 setmetatile 16, 13, 857, 1 return @@ -70,8 +61,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -88,8 +78,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -101,8 +90,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -114,8 +102,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -127,8 +114,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -145,8 +131,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index c7cb08a9b..19223a499 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 end ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E412 setmetatile 18, 2, 856, 1 return @@ -17,8 +16,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B @@ -36,8 +34,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445 ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F lock faceplayer - checkflag FLAG_RECEIVED_FOCUS_BAND - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E + goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem_std ITEM_FOCUS_BAND compare RESULT, 0 diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index efcad59d3..5f9726038 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D end ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3B6 setmetatile 11, 11, 856, 1 return @@ -17,8 +16,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 07a78d2c4..82149a4bc 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -3,8 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 .byte 0 SkyPillar_Top_MapScript1_15F308:: @ 815F308 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SkyPillar_Top_EventScript_15F312 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_15F312 end SkyPillar_Top_EventScript_15F312:: @ 815F312 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index ae8534ad9..4af912ed3 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -13,7 +13,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_14BA5C compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BA68 + call_if_eq SlateportCity_EventScript_14BA68 end SlateportCity_EventScript_14BA5C:: @ 814BA5C @@ -68,10 +68,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon compare RESULT, 1 - call_if 1, SlateportCity_EventScript_14BB35 + call_if_eq SlateportCity_EventScript_14BB35 specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare RESULT, 0 - call_if 1, SlateportCity_EventScript_14BB2B + call_if_eq SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 playfanfare BGM_FANFA4 message SlateportCity_Text_1646DD @@ -96,7 +96,7 @@ SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BB56 + call_if_eq SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release end @@ -110,7 +110,7 @@ SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BB77 + call_if_eq SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release end @@ -124,9 +124,8 @@ SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BBA1 - checkflag FLAG_RECEIVED_SECRET_POWER - goto_if_eq SlateportCity_EventScript_14BBAB + call_if_eq SlateportCity_EventScript_14BBA1 + goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB msgbox SlateportCity_Text_164937, 4 release end @@ -145,7 +144,7 @@ SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BBCC + call_if_eq SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release end @@ -169,7 +168,7 @@ SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BC0A + call_if_eq SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release end @@ -182,8 +181,7 @@ SlateportCity_EventScript_14BC0A:: @ 814BC0A SlateportCity_EventScript_14BC14:: @ 814BC14 lock faceplayer - checkflag FLAG_DOCK_REJECTED_DEVON_GOODS - goto_if_eq SlateportCity_EventScript_14BC29 + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29 msgbox SlateportCity_Text_164BBF, 4 release end @@ -199,10 +197,8 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_EventScript_14BC63 - checkflag FLAG_BADGE07_GET - goto_if_eq SlateportCity_EventScript_14BC59 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63 + goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall end @@ -235,8 +231,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_EventScript_14BCA5 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall end @@ -254,7 +249,7 @@ SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BCCF + call_if_eq SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release end @@ -289,9 +284,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 faceplayer msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO compare RESULT, YES - call_if 1, SlateportCity_EventScript_14BD28 + call_if_eq SlateportCity_EventScript_14BD28 compare RESULT, NO - call_if 1, SlateportCity_EventScript_14BD31 + call_if_eq SlateportCity_EventScript_14BD31 release end @@ -410,8 +405,7 @@ SlateportCity_EventScript_14BE16:: @ 814BE16 SlateportCity_EventScript_14BE20:: @ 814BE20 lock faceplayer - checkflag FLAG_RECEIVED_SECRET_POWER - goto_if 0, SlateportCity_EventScript_14BE16 + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage pokemartdecoration SlateportCity_Decorations2 @@ -442,8 +436,7 @@ SlateportCity_Decorations2:: @ 814BE40 @ 814BE60 lock faceplayer - checkflag FLAG_RECEIVED_SECRET_POWER - goto_if 0, SlateportCity_EventScript_14BE16 + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage pokemartdecoration SlateportCity_Decorations3 diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 0a6f40c75..4151579a2 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -12,8 +12,7 @@ SlateportCity_ContestHall_EventScript_155555:: @ 8155555 SlateportCity_ContestHall_EventScript_15555E:: @ 815555E lock faceplayer - checkflag FLAG_RECEIVED_TM41 - goto_if_eq SlateportCity_ContestHall_EventScript_155595 + goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem_std ITEM_TM41 compare RESULT, 0 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 59c5b13fc..22f797968 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -101,8 +101,7 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall - checkflag FLAG_RECEIVED_POKEBLOCK_CASE - goto_if_eq SlateportCity_ContestLobby_EventScript_155526 + goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_155526 applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 4be5c6daf..82a17b0a6 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -6,9 +6,8 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_SLATEPORT_HARBOR_STATE, 1 - call_if 1, SlateportCity_Harbor_EventScript_155F89 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, SlateportCity_Harbor_EventScript_155F85 + call_if_eq SlateportCity_Harbor_EventScript_155F89 + call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_155F85 end SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 @@ -64,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 8 setvar VAR_SLATEPORT_HARBOR_STATE, 2 compare VAR_SPECIAL_8, 0 - call_if 1, SlateportCity_Harbor_EventScript_15605C + call_if_eq SlateportCity_Harbor_EventScript_15605C compare VAR_SPECIAL_8, 1 - call_if 1, SlateportCity_Harbor_EventScript_156071 + call_if_eq SlateportCity_Harbor_EventScript_156071 compare VAR_SPECIAL_8, 2 - call_if 1, SlateportCity_Harbor_EventScript_156086 + call_if_eq SlateportCity_Harbor_EventScript_156086 compare VAR_SPECIAL_8, 3 - call_if 1, SlateportCity_Harbor_EventScript_156086 + call_if_eq SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT @@ -159,8 +158,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_Harbor_EventScript_1560D9 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release end @@ -224,9 +222,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 delay 30 hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare FACING, 2 - call_if 1, SlateportCity_Harbor_EventScript_1561EF + call_if_eq SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 - call_if 1, SlateportCity_Harbor_EventScript_1561E4 + call_if_eq SlateportCity_Harbor_EventScript_1561E4 delay 30 hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_SPECIAL_4, 5 @@ -268,12 +266,9 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208 SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq SlateportCity_Harbor_EventScript_15626F - checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE - goto_if_eq SlateportCity_Harbor_EventScript_156265 - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - goto_if_eq SlateportCity_Harbor_EventScript_156258 + goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_15626F + goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_156265 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258 compare VAR_SLATEPORT_HARBOR_STATE, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 @@ -305,8 +300,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_Harbor_EventScript_15629D + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release end diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 13de091cb..be2955937 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -16,7 +16,7 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 - goto_if 5, SlateportCity_House1_EventScript_1556C9 + goto_if_ne SlateportCity_House1_EventScript_1556C9 compare VAR_SPECIAL_4, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 5d0fdb411..c8ece697d 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -57,8 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D end SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closemessage hidemoneybox 0, 0 @@ -173,7 +172,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A compare FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 compare FACING, 2 - goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD + goto_if_ne SlateportCity_OceanicMuseum_1F_EventScript_155CAD end SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 5dae0bc6b..d84982e2e 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -22,21 +22,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmovement 0 compare FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 compare FACING, 4 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 compare FACING, 4 - call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D + call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmovement 0 compare FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare FACING, 3 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index f7cc67236..6a8c88e1e 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -23,18 +23,13 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 setvar VAR_TEMP_2, 0 - checkflag FLAG_RECEIVED_YELLOW_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_GREEN_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_PINK_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_BLUE_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_RED_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 compare VAR_TEMP_2, 5 - call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D + call_if_eq SlateportCity_PokemonFanClub_EventScript_15588D compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 @@ -49,16 +44,11 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 setvar VAR_TEMP_1, 0 - checkflag FLAG_RECEIVED_YELLOW_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE - checkflag FLAG_RECEIVED_GREEN_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7 - checkflag FLAG_RECEIVED_PINK_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0 - checkflag FLAG_RECEIVED_BLUE_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 - checkflag FLAG_RECEIVED_RED_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 + call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_1559FE + call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_1559E7 + call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_1559D0 + call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_1559B9 + call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_1559A2 bufferleadmonspeciesname 0 switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_155899 @@ -146,7 +136,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 specialvar RESULT, CheckLeadMonCool compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559B3 return SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 @@ -156,7 +146,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 specialvar RESULT, CheckLeadMonBeauty compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559CA return SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA @@ -166,7 +156,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 specialvar RESULT, CheckLeadMonCute compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559E1 return SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 @@ -176,7 +166,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 specialvar RESULT, CheckLeadMonSmart compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559F8 return SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 @@ -186,7 +176,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE specialvar RESULT, CheckLeadMonTough compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F + call_if_eq SlateportCity_PokemonFanClub_EventScript_155A0F return SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F @@ -196,12 +186,11 @@ SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 lock faceplayer - checkflag FLAG_RECEIVED_SOOTHE_BELL - goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 + goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 4 - goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A + goto_if_ge SlateportCity_PokemonFanClub_EventScript_155A3A release end diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 46dc8419c..dd31e8e26 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -3,14 +3,10 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 - checkflag FLAG_BADGE07_GET - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF - checkflag FLAG_DOCK_REJECTED_DEVON_GOODS - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_155388 + goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_15539C + goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553CF + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 waitmovement 0 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 367677751..669d4ecfa 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -5,10 +5,8 @@ SootopolisCity_MapScripts:: @ 814D07D .byte 0 SootopolisCity_MapScript1_14D08D:: @ 814D08D - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - call_if 0, SootopolisCity_EventScript_14D0A0 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - call_if 1, SootopolisCity_EventScript_14D0B1 + call_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0A0 + call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0B1 end SootopolisCity_EventScript_14D0A0:: @ 814D0A0 @@ -17,8 +15,7 @@ SootopolisCity_EventScript_14D0A0:: @ 814D0A0 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 0, SootopolisCity_EventScript_14D0BB + call_if_unset FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D0BB return SootopolisCity_EventScript_14D0BB:: @ 814D0BB @@ -35,10 +32,8 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag FLAG_VISITED_SOOTOPOLIS_CITY - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, SootopolisCity_EventScript_14D159 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, SootopolisCity_EventScript_14D123 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D159 + call_if_set FLAG_SYS_WEATHER_CTRL, SootopolisCity_EventScript_14D123 end SootopolisCity_EventScript_14D123:: @ 814D123 @@ -46,7 +41,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 setobjectxyperm 1, 29, 19 setobjectxyperm 2, 33, 19 compare VAR_SOOTOPOLIS_STATE, 1 - call_if 1, SootopolisCity_EventScript_14D142 + call_if_eq SootopolisCity_EventScript_14D142 return SootopolisCity_EventScript_14D142:: @ 814D142 @@ -68,8 +63,7 @@ SootopolisCity_MapScript1_14D165:: @ 814D165 SootopolisCity_EventScript_14D16E:: @ 814D16E lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D183 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D183 msgbox SootopolisCity_Text_1696A4, 4 release end @@ -92,8 +86,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F faceplayer dodailyevents special GetPlayerBigGuyGirlString - checkflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS - goto_if_eq SootopolisCity_EventScript_14D241 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 random 10 addvar RESULT, 20 @@ -142,8 +135,7 @@ SootopolisCity_EventScript_14D25E:: @ 814D25E SootopolisCity_EventScript_14D268:: @ 814D268 lock faceplayer - checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM - goto_if_eq SootopolisCity_EventScript_14D27D + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_EventScript_14D27D msgbox SootopolisCity_Text_16A4D6, 4 release end @@ -156,8 +148,7 @@ SootopolisCity_EventScript_14D27D:: @ 814D27D SootopolisCity_EventScript_14D287:: @ 814D287 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D29C + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D29C msgbox SootopolisCity_Text_169813, 4 release end @@ -170,8 +161,7 @@ SootopolisCity_EventScript_14D29C:: @ 814D29C SootopolisCity_EventScript_14D2A6:: @ 814D2A6 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D2BB + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2BB msgbox SootopolisCity_Text_1698A0, 4 release end @@ -184,8 +174,7 @@ SootopolisCity_EventScript_14D2BB:: @ 814D2BB SootopolisCity_EventScript_14D2C5:: @ 814D2C5 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D2DA + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2DA msgbox SootopolisCity_Text_1697A7, 4 release end @@ -445,8 +434,7 @@ SootopolisCity_EventScript_14D48F:: @ 814D48F SootopolisCity_EventScript_14D498:: @ 814D498 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D4AD + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D4AD .ifdef SAPPHIRE msgbox SootopolisCity_Text_169DA6, 4 .else diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 35fa306e6..44bcda12f 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -20,11 +20,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E compare VAR_ICE_STEP_COUNT, 8 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF85 compare VAR_ICE_STEP_COUNT, 28 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF73 compare VAR_ICE_STEP_COUNT, 69 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF61 setmetatile 8, 4, 519, 0 setmetatile 8, 5, 519, 0 @@ -87,10 +87,8 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D - checkflag FLAG_RECEIVED_TM03 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 - checkflag FLAG_BADGE06_GET - goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A + goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056 + goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release end @@ -124,8 +122,7 @@ SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084 lock faceplayer - checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM - goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099 + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_15B099 msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4 release end @@ -137,15 +134,13 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall - checkflag FLAG_BADGE08_GET - goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall - checkflag FLAG_BADGE08_GET - goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 074c9a179..67be3738b 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -4,8 +4,7 @@ SootopolisCity_House1_MapScripts:: @ 815B29A SootopolisCity_House1_EventScript_15B29B:: @ 815B29B lock faceplayer - checkflag FLAG_RECEIVED_TM31 - goto_if_eq SootopolisCity_House1_EventScript_15B2C7 + goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 giveitem_std ITEM_TM31 setflag FLAG_RECEIVED_TM31 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index e32e993dd..d714993d4 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -6,9 +6,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 faceplayer msgbox SootopolisCity_House2_Text_18FA66, MSGBOX_YESNO compare RESULT, YES - call_if 1, SootopolisCity_House2_EventScript_15B307 + call_if_eq SootopolisCity_House2_EventScript_15B307 compare RESULT, NO - call_if 1, SootopolisCity_House2_EventScript_15B310 + call_if_eq SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index d2fb4ed7b..24c59500a 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -4,11 +4,10 @@ SootopolisCity_House6_MapScripts:: @ 815B385 SootopolisCity_House6_EventScript_15B386:: @ 815B386 lock faceplayer - checkflag FLAG_RECEIVED_WAILMER_DOLL - goto_if_eq SootopolisCity_House6_EventScript_15B3CD + goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO compare RESULT, NO - call_if 1, SootopolisCity_House6_EventScript_15B3C3 + call_if_eq SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration_std DECOR_WAILMER_DOLL compare RESULT, 0 diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index 115ed0453..1687bd91e 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -29,10 +29,8 @@ SootopolisCity_Mart_Items:: @ 815B234 SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_Mart_EventScript_15B268 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_Mart_EventScript_15B268 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B268 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B268 msgbox SootopolisCity_Mart_Text_18F8D7, 4 release end @@ -45,10 +43,8 @@ SootopolisCity_Mart_EventScript_15B268:: @ 815B268 SootopolisCity_Mart_EventScript_15B272:: @ 815B272 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_Mart_EventScript_15B290 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_Mart_EventScript_15B290 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B290 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B290 msgbox SootopolisCity_Mart_Text_18F96B, 4 release end diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 9eb5b4a57..820dd4858 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -17,10 +17,8 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4 release end @@ -33,10 +31,8 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6 SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4 release end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index cbc451a18..5878a43d5 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -4,8 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 .byte 0 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SouthernIsland_Interior_EventScript_160B68 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_160B68 end SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 @@ -44,10 +43,8 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B end SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 - checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS - goto_if_eq SouthernIsland_Interior_EventScript_160C08 - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, SouthernIsland_Interior_EventScript_160C08 + goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_160C08 + goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_160C08 setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS special SpawnCameraDummy applymovement 127, SouthernIsland_Interior_Movement_160C12 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index d991a7096..d34558e40 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -6,8 +6,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE setflag FLAG_LANDMARK_SEAFLOOR_CAVERN - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB + goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_15D9BB end Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB @@ -15,8 +14,7 @@ Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB end Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9 + call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_15D9C9 end Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 8d3e8e723..3151c4575 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -5,9 +5,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 getplayerxy VAR_SPECIAL_4, VAR_SPECIAL_5 compare VAR_SPECIAL_4, 12 - goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 + goto_if_ne Underwater_SealedChamber_EventScript_15F0A6 compare VAR_SPECIAL_5, 44 - goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 + goto_if_ne Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index ffd184ddf..44b9463b4 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -14,15 +14,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId compare RESULT, 0 - call_if 1, LinkContestRoom1_EventScript_15F5E0 + call_if_eq LinkContestRoom1_EventScript_15F5E0 compare RESULT, 1 - call_if 1, LinkContestRoom1_EventScript_15F5E4 + call_if_eq LinkContestRoom1_EventScript_15F5E4 compare RESULT, 2 - call_if 1, LinkContestRoom1_EventScript_15F5E8 + call_if_eq LinkContestRoom1_EventScript_15F5E8 compare RESULT, 3 - call_if 1, LinkContestRoom1_EventScript_15F5EC + call_if_eq LinkContestRoom1_EventScript_15F5EC compare RESULT, 4 - call_if 1, LinkContestRoom1_EventScript_15F5F0 + call_if_eq LinkContestRoom1_EventScript_15F5F0 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 @@ -47,7 +47,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 compare VAR_TEMP_9, 1 - call_if 1, LinkContestRoom1_EventScript_15F600 + call_if_eq LinkContestRoom1_EventScript_15F600 end LinkContestRoom1_EventScript_15F600:: @ 815F600 @@ -76,7 +76,7 @@ LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 compare VAR_TEMP_0, 8 - goto_if 0, LinkContestRoom1_EventScript_15F630 + goto_if_lt LinkContestRoom1_EventScript_15F630 return LinkContestRoom1_EventScript_15F646:: @ 815F646 diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index ca2a3c245..c8adf85c3 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -11,8 +11,7 @@ VerdanturfTown_MapScript1_14E85A:: @ 814E85A VerdanturfTown_EventScript_14E866:: @ 814E866 lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq VerdanturfTown_EventScript_14E885 + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 applymovement 2, VerdanturfTown_Movement_1A083D waitmovement 0 @@ -37,8 +36,7 @@ VerdanturfTown_EventScript_14E8A2:: @ 814E8A2 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq VerdanturfTown_EventScript_14E8C0 + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E8C0 msgbox VerdanturfTown_Text_16CD4D, 4 release end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 37811dbc1..85b524c99 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -101,8 +101,7 @@ VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 lock faceplayer - checkflag FLAG_RECEIVED_TM45 - goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 + goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem_std ITEM_TM45 compare RESULT, 0 diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index 205a4315c..4410beaba 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -4,8 +4,7 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B lock faceplayer - checkflag FLAG_WALLY_SPEECH - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73 + goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_153F73 msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4 setflag FLAG_WALLY_SPEECH release @@ -19,10 +18,8 @@ VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73 VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D lock faceplayer - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_153FA5 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153F9B msgbox VerdanturfTown_WandasHouse_Text_17859A, 4 release end @@ -44,10 +41,8 @@ VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 lock faceplayer - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 - checkflag FLAG_DEFEATED_WALLY_MAUVILLE - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153FE0 + goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_153FD6 msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 release end @@ -65,12 +60,9 @@ VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0 VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA lock faceplayer - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_154025 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_15401B + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_154011 msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4 release end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index ed0440343..4f3180318 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -3,8 +3,7 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 .byte 0 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - call_if 1, VictoryRoad_1F_EventScript_15DE93 + call_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VictoryRoad_1F_EventScript_15DE93 end VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index b02ab4faa..4813caa68 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,8 +1,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 lock faceplayer - checkflag FLAG_SYS_CHAT_USED - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB + goto_if_set FLAG_SYS_CHAT_USED, PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4 goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D end @@ -30,7 +29,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A lock faceplayer compare VAR_SPECIAL_4, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 compare RESULT, 1 @@ -84,7 +83,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36 lock faceplayer compare VAR_SPECIAL_4, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C77 compare RESULT, 0 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1 compare RESULT, 1 @@ -97,10 +96,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D end PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77 - checkflag FLAG_BADGE05_GET - goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - checkflag FLAG_SYS_EXDATA_ENABLE - goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 + goto_if_unset FLAG_BADGE05_GET, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 + goto_if_set FLAG_SYS_EXDATA_ENABLE, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 setflag FLAG_SYS_EXDATA_ENABLE msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3 release diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index b1ead4060..3d8f5532f 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -9,9 +9,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956 applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 compare VAR_SPECIAL_5, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B699F + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B699F compare VAR_SPECIAL_5, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B69AA msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4 closemessage setvar VAR_LITTLEROOT_INTRO_STATE, 4 @@ -59,8 +59,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB - checkflag FLAG_SET_WALL_CLOCK - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 + goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_1B6A91 msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4 call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B delay 30 @@ -70,9 +69,9 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB setflag FLAG_HIDE_MACHOKE_MOVER_2 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A31 compare RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A61 playse SE_KAIDAN removeobject VAR_SPECIAL_8 releaseall @@ -256,14 +255,12 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - checkflag FLAG_BADGE05_GET - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D - checkflag FLAG_RESCUED_BIRCH - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 + goto_if_set FLAG_BADGE05_GET, LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 compare VAR_TEMP_1, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80 compare VAR_LITTLEROOT_INTRO_STATE, 7 - goto_if 4, LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C + goto_if_ge LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4 release end @@ -274,8 +271,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33 end LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D - checkflag FLAG_RECEIVED_AMULET_COIN - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 + goto_if_set FLAG_RECEIVED_AMULET_COIN, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 giveitem_std ITEM_AMULET_COIN compare RESULT, 0 @@ -363,13 +359,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DAD compare RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DBD compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E28 applymovement VAR_SPECIAL_9, LittlerootTown_BrendansHouse_1F_Movement_1A0839 waitmovement 0 playse SE_PIN @@ -379,23 +375,23 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE waitmovement 0 delay 20 compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8 msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4 giveitem_std ITEM_SS_TICKET msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4 closemessage compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4 closemessage compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B playse SE_DOOR removeobject VAR_SPECIAL_9 setflag FLAG_RECEIVED_SS_TICKET diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 589d4e21c..4b21aa99b 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -55,7 +55,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, -1 - goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF + goto_if_ne FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -76,8 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR - goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end @@ -162,8 +161,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR - goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 end @@ -216,7 +214,7 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, -1 - goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 + goto_if_ne FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index f41fd1f8c..d34b357ea 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -44,7 +44,7 @@ gUnknown_081C346A:: @ 81C346A lockall special SafariZoneGetPokeblockNameInFeeder compare RESULT, 0xFFFF - goto_if 5, EventScript_1C34A9 + goto_if_ne EventScript_1C34A9 msgbox UnknownString_81C354E, MSGBOX_YESNO compare RESULT, YES goto_if_eq EventScript_1C348E @@ -56,7 +56,7 @@ EventScript_1C348E: special OpenPokeblockCaseOnFeeder waitstate compare RESULT, 0xFFFF - goto_if 5, EventScript_1C34A0 + goto_if_ne EventScript_1C34A0 end EventScript_1C34A0: diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 2a5905191..1f5e074d9 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -17,11 +17,11 @@ Route111_EventScript_1A3877:: @ 81A3877 setflag FLAG_RECEIVED_SECRET_POWER clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT compare FACING, 3 - call_if 1, Route111_EventScript_1A38C3 + call_if_eq Route111_EventScript_1A38C3 compare FACING, 4 - call_if 1, Route111_EventScript_1A38C3 + call_if_eq Route111_EventScript_1A38C3 compare FACING, 2 - call_if 1, Route111_EventScript_1A38CE + call_if_eq Route111_EventScript_1A38CE removeobject LAST_TALKED release end diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index cf82cf943..5a84a1b48 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -7,10 +7,8 @@ Event_TV:: @ 81A6E72 goto_if_eq EventScript_1A6F01 compare RESULT, 1 goto_if_eq EventScript_1A6F0B - checkflag FLAG_SYS_TV_START - goto_if 0, EventScript_1A6EF1 - checkflag FLAG_SYS_TV_WATCH - goto_if_eq EventScript_1A6EF1 + goto_if_unset FLAG_SYS_TV_START, EventScript_1A6EF1 + goto_if_set FLAG_SYS_TV_WATCH, EventScript_1A6EF1 specialvar RESULT, IsTVShowInSearchOfTrainersAiring compare RESULT, 1 goto_if_eq EventScript_1A6F66 @@ -27,7 +25,7 @@ EventScript_1A6EBB: copyvar VAR_SPECIAL_4, RESULT specialvar RESULT, GetTVShowType compare RESULT, 0 - goto_if 5, EventScript_1A6F21 + goto_if_ne EventScript_1A6F21 end EventScript_1A6EF1: @@ -60,7 +58,7 @@ EventScript_1A6F21: waitmessage waitbuttonpress compare RESULT, 1 - goto_if 5, EventScript_1A6F21 + goto_if_ne EventScript_1A6F21 goto EventScript_1A6F37 end -- cgit v1.2.3 From 43b4ba34dc05dc6be31b58f0b18df1b3d57f608d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Jan 2018 12:39:57 -0800 Subject: Add friendly macros for checking trainer flags --- data/scripts/maps/DewfordTown_Gym.inc | 12 +++---- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 30 ++++++---------- data/scripts/maps/PetalburgCity_Gym.inc | 51 ++++++++++------------------ data/scripts/maps/Route104_Prototype.inc | 36 +++++++------------- data/scripts/maps/Route109_SeashoreHouse.inc | 9 ++--- data/scripts/maps/Route111.inc | 3 +- data/scripts/maps/SSTidalCorridor.inc | 24 +++++-------- 7 files changed, 55 insertions(+), 110 deletions(-) (limited to 'data') diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 2dc15d92c..7cdf3dd6a 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -7,8 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B end DewfordTown_Gym_EventScript_153071:: @ 8153071 - checktrainerflag OPPONENT_BRAWLY - goto_if_eq DewfordTown_Gym_EventScript_1530AA + goto_if_trainer_defeated OPPONENT_BRAWLY, DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 compare VAR_SPECIAL_0, 0 @@ -81,18 +80,15 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_SPECIAL_0, 0 - checktrainerflag OPPONENT_HIDEKI - goto_if_lt DewfordTown_Gym_EventScript_153135 + goto_if_trainer_not_defeated OPPONENT_HIDEKI, DewfordTown_Gym_EventScript_153135 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 - checktrainerflag OPPONENT_TESSA - goto_if_lt DewfordTown_Gym_EventScript_153143 + goto_if_trainer_not_defeated OPPONENT_TESSA, DewfordTown_Gym_EventScript_153143 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 - checktrainerflag OPPONENT_LAURA - goto_if_lt DewfordTown_Gym_EventScript_153151 + goto_if_trainer_not_defeated OPPONENT_LAURA, DewfordTown_Gym_EventScript_153151 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 52d614436..c0604400e 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -13,56 +13,46 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 - checktrainerflag OPPONENT_COLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 - checktrainerflag OPPONENT_ZANE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4 + goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 - checktrainerflag OPPONENT_AXLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2 + goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 - checktrainerflag OPPONENT_SADIE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0 + goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 - checktrainerflag OPPONENT_ANDY - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE + goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF - checktrainerflag OPPONENT_COLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_15370C + goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_15370C setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C - checktrainerflag OPPONENT_ZANE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153719 + goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 - checktrainerflag OPPONENT_AXLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153726 + goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 - checktrainerflag OPPONENT_SADIE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153733 + goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 - checktrainerflag OPPONENT_ANDY - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153740 + goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 setobjectmovementtype 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 54c0e89f6..1199b3571 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -15,20 +15,13 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A - checktrainerflag OPPONENT_RANDALL - call_if_eq PetalburgCity_Gym_EventScript_154FBB - checktrainerflag OPPONENT_MARY - call_if_eq PetalburgCity_Gym_EventScript_154FDC - checktrainerflag OPPONENT_PARKER - call_if_eq PetalburgCity_Gym_EventScript_154FFD - checktrainerflag OPPONENT_LORI - call_if_eq PetalburgCity_Gym_EventScript_15501E - checktrainerflag OPPONENT_GEORGE - call_if_eq PetalburgCity_Gym_EventScript_15503F - checktrainerflag OPPONENT_JODY - call_if_eq PetalburgCity_Gym_EventScript_155060 - checktrainerflag OPPONENT_BERKE - call_if_eq PetalburgCity_Gym_EventScript_155081 + call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB + call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC + call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD + call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E + call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F + call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060 + call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -632,8 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall - checktrainerflag OPPONENT_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -645,8 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall - checktrainerflag OPPONENT_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -658,8 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall - checktrainerflag OPPONENT_MARY - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -671,8 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall - checktrainerflag OPPONENT_MARY - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -684,8 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall - checktrainerflag OPPONENT_PARKER - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -697,8 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall - checktrainerflag OPPONENT_LORI - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -710,8 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall - checktrainerflag OPPONENT_LORI - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -723,8 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall - checktrainerflag OPPONENT_GEORGE - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -736,8 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall - checktrainerflag OPPONENT_JODY - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -749,8 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall - checktrainerflag OPPONENT_BERKE - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index 7f1c4ca75..e0aba01c9 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -4,18 +4,12 @@ Route104_Prototype_MapScripts:: @ 8160C4A Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer - checktrainerflag OPPONENT_BRIANNA_1 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_CINDY_2 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_LUCAS_2 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_MIKE_1 - goto_if_lt Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB @@ -30,18 +24,12 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99 Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer - checktrainerflag OPPONENT_BRIANNA_1 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_CINDY_2 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_LUCAS_2 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_MIKE_1 - goto_if_lt Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index e52958c50..13d37e7bd 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -91,12 +91,9 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE end Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 - checktrainerflag OPPONENT_DWAYNE - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 - checktrainerflag OPPONENT_JOHANNA - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 - checktrainerflag OPPONENT_SIMON - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 11af07dce..99fa29efb 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -15,8 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6 Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 - checktrainerflag OPPONENT_VICKY - goto_if_lt Route111_EventScript_15000D + goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index cd830f2b0..7bc5a7fdd 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -173,22 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - checktrainerflag OPPONENT_PHILLIP - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_LEONARD - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_COLTON - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_TUCKER - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_THOMAS - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_LEA_AND_JED - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_GARRET - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_ANETTE - goto_if_lt SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return -- cgit v1.2.3 From 2692979c40ce3bc93901ea7194c68c01d14c1c9f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 21:46:59 -0500 Subject: some renaming --- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/specials.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index aefc68bda..6b0858bc5 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -48,7 +48,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp - special sub_8123218 + special CableCar waitstate release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index adbea780e..0264342ea 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -49,7 +49,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp - special sub_8123218 + special CableCar waitstate release end diff --git a/data/specials.inc b/data/specials.inc index 032a3884c..6904a2b6b 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -159,7 +159,7 @@ gSpecials:: def_special GetRivalSonDaughterString def_special SetFlagInVar def_special CableCarWarp - def_special sub_8123218 + def_special CableCar def_special Overworld_PlaySpecialMapMusic def_special StartWallClock def_special ScrSpecial_ViewWallClock -- cgit v1.2.3 From c0e0004ffabfcb9bc9827bdce28e3c18a6e52922 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 7 Jan 2018 10:59:12 -0800 Subject: Decompile through HandleEndTurn_BattleWon, and update trainer class constant names --- data/data2a.s | 2 +- data/trainer_money.inc | 108 ++-- data/trainers.inc | 1388 ++++++++++++++++++++++++------------------------ 3 files changed, 749 insertions(+), 749 deletions(-) (limited to 'data') diff --git a/data/data2a.s b/data/data2a.s index 103b723e8..3bd3f6ebd 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -964,7 +964,7 @@ gUnknown_081FA640:: @ 81FA640 .align 2 gUnknown_081FA678:: @ 81FA678 .4byte bc_8013B1C - .4byte sub_8013998 + .4byte HandleEndTurn_BattleWon .4byte sub_8013B64 .4byte sub_8013B64 .4byte sub_8013BDC diff --git a/data/trainer_money.inc b/data/trainer_money.inc index 95da92fea..ceffb0a61 100644 --- a/data/trainer_money.inc +++ b/data/trainer_money.inc @@ -1,58 +1,58 @@ @ This is a factor in how much money you get for beating a trainer. .align 2 gTrainerMoney:: @ 81F98F0 - .byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0 - .byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0 - .byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0 - .byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_TUBER_F, 1, 0, 0 - .byte TRAINER_CLASS_NAME_TUBER_M, 1, 0, 0 - .byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0 - .byte TRAINER_CLASS_NAME_COOL_TRAINER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0 - .byte TRAINER_CLASS_NAME_LADY, 50, 0, 0 - .byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0 - .byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0 - .byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0 - .byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0 - .byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0 - .byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0 - .byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0 - .byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0 - .byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0 - .byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0 - .byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0 - .byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0 - .byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0 - .byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0 - .byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0 - .byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0 - .byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0 - .byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0 - .byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0 - .byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0 - .byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0 - .byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0 - .byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0 - .byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0 - .byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0 - .byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0 - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3, 15, 0, 0 - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER, 10, 0, 0 - .byte TRAINER_CLASS_NAME_POKEMON_RANGER, 12, 0, 0 - .byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0 - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0 - .byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0 - .byte TRAINER_CLASS_NAME_LASS, 4, 0, 0 - .byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0 - .byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0 - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0 + .byte TRAINER_CLASS_TEAM_AQUA, 5, 0, 0 + .byte TRAINER_CLASS_AQUA_ADMIN, 10, 0, 0 + .byte TRAINER_CLASS_AQUA_LEADER, 20, 0, 0 + .byte TRAINER_CLASS_AROMA_LADY, 10, 0, 0 + .byte TRAINER_CLASS_RUIN_MANIAC, 15, 0, 0 + .byte TRAINER_CLASS_INTERVIEWER, 12, 0, 0 + .byte TRAINER_CLASS_TUBER_F, 1, 0, 0 + .byte TRAINER_CLASS_TUBER_M, 1, 0, 0 + .byte TRAINER_CLASS_SIS_AND_BRO, 3, 0, 0 + .byte TRAINER_CLASS_COOL_TRAINER, 12, 0, 0 + .byte TRAINER_CLASS_HEX_MANIAC, 6, 0, 0 + .byte TRAINER_CLASS_LADY, 50, 0, 0 + .byte TRAINER_CLASS_BEAUTY, 20, 0, 0 + .byte TRAINER_CLASS_RICH_BOY, 50, 0, 0 + .byte TRAINER_CLASS_POKEMANIAC, 15, 0, 0 + .byte TRAINER_CLASS_SWIMMER_M, 2, 0, 0 + .byte TRAINER_CLASS_BLACK_BELT, 8, 0, 0 + .byte TRAINER_CLASS_GUITARIST, 8, 0, 0 + .byte TRAINER_CLASS_KINDLER, 8, 0, 0 + .byte TRAINER_CLASS_CAMPER, 4, 0, 0 + .byte TRAINER_CLASS_OLD_COUPLE, 10, 0, 0 + .byte TRAINER_CLASS_BUG_MANIAC, 15, 0, 0 + .byte TRAINER_CLASS_PSYCHIC, 6, 0, 0 + .byte TRAINER_CLASS_GENTLEMAN, 20, 0, 0 + .byte TRAINER_CLASS_ELITE_FOUR, 25, 0, 0 + .byte TRAINER_CLASS_LEADER, 25, 0, 0 + .byte TRAINER_CLASS_SCHOOL_KID, 5, 0, 0 + .byte TRAINER_CLASS_SR_AND_JR, 4, 0, 0 + .byte TRAINER_CLASS_POKEFAN, 20, 0, 0 + .byte TRAINER_CLASS_EXPERT, 10, 0, 0 + .byte TRAINER_CLASS_YOUNGSTER, 4, 0, 0 + .byte TRAINER_CLASS_CHAMPION, 50, 0, 0 + .byte TRAINER_CLASS_FISHERMAN, 10, 0, 0 + .byte TRAINER_CLASS_TRIATHLETE, 10, 0, 0 + .byte TRAINER_CLASS_DRAGON_TAMER, 12, 0, 0 + .byte TRAINER_CLASS_BIRD_KEEPER, 8, 0, 0 + .byte TRAINER_CLASS_NINJA_BOY, 3, 0, 0 + .byte TRAINER_CLASS_BATTLE_GIRL, 6, 0, 0 + .byte TRAINER_CLASS_PARASOL_LADY, 10, 0, 0 + .byte TRAINER_CLASS_SWIMMER_F, 2, 0, 0 + .byte TRAINER_CLASS_PICNICKER, 4, 0, 0 + .byte TRAINER_CLASS_TWINS, 3, 0, 0 + .byte TRAINER_CLASS_SAILOR, 8, 0, 0 + .byte TRAINER_CLASS_COLLECTOR, 15, 0, 0 + .byte TRAINER_CLASS_POKEMON_TRAINER_3, 15, 0, 0 + .byte TRAINER_CLASS_POKEMON_BREEDER, 10, 0, 0 + .byte TRAINER_CLASS_POKEMON_RANGER, 12, 0, 0 + .byte TRAINER_CLASS_TEAM_MAGMA, 5, 0, 0 + .byte TRAINER_CLASS_MAGMA_ADMIN, 10, 0, 0 + .byte TRAINER_CLASS_MAGMA_LEADER, 20, 0, 0 + .byte TRAINER_CLASS_LASS, 4, 0, 0 + .byte TRAINER_CLASS_BUG_CATCHER, 4, 0, 0 + .byte TRAINER_CLASS_HIKER, 10, 0, 0 + .byte TRAINER_CLASS_YOUNG_COUPLE, 8, 0, 0 .byte -1, 5, 0, 0 diff --git a/data/trainers.inc b/data/trainers.inc index 8e80cd77f..be9ce1a81 100644 --- a/data/trainers.inc +++ b/data/trainers.inc @@ -2,7 +2,7 @@ gTrainers:: @ 81F04FC @ NONE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_1 + .byte TRAINER_CLASS_POKEMON_TRAINER_1 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "$", 12 @@ -14,7 +14,7 @@ gTrainers:: @ 81F04FC @ ARCHIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_LEADER + .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE .string "ARCHIE$", 12 @@ -26,7 +26,7 @@ gTrainers:: @ 81F04FC @ GRUNT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -38,7 +38,7 @@ gTrainers:: @ 81F04FC @ GRUNT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -50,7 +50,7 @@ gTrainers:: @ 81F04FC @ GRUNT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -62,7 +62,7 @@ gTrainers:: @ 81F04FC @ GRUNT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -74,7 +74,7 @@ gTrainers:: @ 81F04FC @ GRUNT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -86,7 +86,7 @@ gTrainers:: @ 81F04FC @ GRUNT_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -98,7 +98,7 @@ gTrainers:: @ 81F04FC @ GRUNT_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -110,7 +110,7 @@ gTrainers:: @ 81F04FC @ GRUNT_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -122,7 +122,7 @@ gTrainers:: @ 81F04FC @ GRUNT_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -134,7 +134,7 @@ gTrainers:: @ 81F04FC @ GRUNT_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -146,7 +146,7 @@ gTrainers:: @ 81F04FC @ GRUNT_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -158,7 +158,7 @@ gTrainers:: @ 81F04FC @ GRUNT_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -170,7 +170,7 @@ gTrainers:: @ 81F04FC @ GRUNT_13 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -182,7 +182,7 @@ gTrainers:: @ 81F04FC @ GRUNT_14 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -194,7 +194,7 @@ gTrainers:: @ 81F04FC @ GRUNT_15 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -206,7 +206,7 @@ gTrainers:: @ 81F04FC @ GRUNT_16 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -218,7 +218,7 @@ gTrainers:: @ 81F04FC @ GRUNT_17 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -230,7 +230,7 @@ gTrainers:: @ 81F04FC @ GRUNT_18 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -242,7 +242,7 @@ gTrainers:: @ 81F04FC @ GRUNT_19 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -254,7 +254,7 @@ gTrainers:: @ 81F04FC @ GRUNT_20 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -266,7 +266,7 @@ gTrainers:: @ 81F04FC @ GRUNT_21 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -278,7 +278,7 @@ gTrainers:: @ 81F04FC @ GRUNT_22 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -290,7 +290,7 @@ gTrainers:: @ 81F04FC @ GRUNT_23 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -302,7 +302,7 @@ gTrainers:: @ 81F04FC @ GRUNT_24 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_M .string "GRUNT$", 12 @@ -314,7 +314,7 @@ gTrainers:: @ 81F04FC @ GRUNT_25 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F .string "GRUNT$", 12 @@ -326,7 +326,7 @@ gTrainers:: @ 81F04FC @ GRUNT_26 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F .string "GRUNT$", 12 @@ -338,7 +338,7 @@ gTrainers:: @ 81F04FC @ GRUNT_27 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_AQUA + .byte TRAINER_CLASS_TEAM_AQUA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_GRUNT_F .string "GRUNT$", 12 @@ -350,7 +350,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M .string "$", 12 @@ -362,7 +362,7 @@ gTrainers:: @ 81F04FC @ MATT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M .string "MATT$", 12 @@ -374,7 +374,7 @@ gTrainers:: @ 81F04FC @ MATT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_M .string "MATT$", 12 @@ -386,7 +386,7 @@ gTrainers:: @ 81F04FC @ SHELLY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_F .string "SHELLY$", 12 @@ -398,7 +398,7 @@ gTrainers:: @ 81F04FC @ SHELLY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_ADMIN + .byte TRAINER_CLASS_AQUA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_AQUA_ADMIN_F .string "SHELLY$", 12 @@ -410,7 +410,7 @@ gTrainers:: @ 81F04FC @ ARCHIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_LEADER + .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE .string "ARCHIE$", 12 @@ -422,7 +422,7 @@ gTrainers:: @ 81F04FC @ ARCHIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AQUA_LEADER + .byte TRAINER_CLASS_AQUA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music .byte TRAINER_PIC_ARCHIE .string "ARCHIE$", 12 @@ -434,7 +434,7 @@ gTrainers:: @ 81F04FC @ DAISY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "DAISY$", 12 @@ -446,7 +446,7 @@ gTrainers:: @ 81F04FC @ ROSE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSE$", 12 @@ -458,7 +458,7 @@ gTrainers:: @ 81F04FC @ LILY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "LILY$", 12 @@ -470,7 +470,7 @@ gTrainers:: @ 81F04FC @ VIOLET .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "VIOLET$", 12 @@ -482,7 +482,7 @@ gTrainers:: @ 81F04FC @ ROSE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSE$", 12 @@ -494,7 +494,7 @@ gTrainers:: @ 81F04FC @ ROSE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSE$", 12 @@ -506,7 +506,7 @@ gTrainers:: @ 81F04FC @ ROSE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSE$", 12 @@ -518,7 +518,7 @@ gTrainers:: @ 81F04FC @ ROSE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_AROMA_LADY + .byte TRAINER_CLASS_AROMA_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_AROMA_LADY .string "ROSE$", 12 @@ -530,7 +530,7 @@ gTrainers:: @ 81F04FC @ DUSTY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "DUSTY$", 12 @@ -542,7 +542,7 @@ gTrainers:: @ 81F04FC @ CHIP .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "CHIP$", 12 @@ -554,7 +554,7 @@ gTrainers:: @ 81F04FC @ FOSTER .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "FOSTER$", 12 @@ -566,7 +566,7 @@ gTrainers:: @ 81F04FC @ DUSTY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "DUSTY$", 12 @@ -578,7 +578,7 @@ gTrainers:: @ 81F04FC @ DUSTY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "DUSTY$", 12 @@ -590,7 +590,7 @@ gTrainers:: @ 81F04FC @ DUSTY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "DUSTY$", 12 @@ -602,7 +602,7 @@ gTrainers:: @ 81F04FC @ DUSTY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RUIN_MANIAC + .byte TRAINER_CLASS_RUIN_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_RUIN_MANIAC .string "DUSTY$", 12 @@ -614,7 +614,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -626,7 +626,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -638,7 +638,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -650,7 +650,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -662,7 +662,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -674,7 +674,7 @@ gTrainers:: @ 81F04FC @ GABBY_AND_TY_6 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_INTERVIEWER + .byte TRAINER_CLASS_INTERVIEWER .byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music .byte TRAINER_PIC_INTERVIEWER .string "GABBY & TY$", 12 @@ -686,7 +686,7 @@ gTrainers:: @ 81F04FC @ LOLA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -698,7 +698,7 @@ gTrainers:: @ 81F04FC @ CARMEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "CARMEN$", 12 @@ -710,7 +710,7 @@ gTrainers:: @ 81F04FC @ GWEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "GWEN $", 12 @@ -722,7 +722,7 @@ gTrainers:: @ 81F04FC @ LOLA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -734,7 +734,7 @@ gTrainers:: @ 81F04FC @ LOLA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -746,7 +746,7 @@ gTrainers:: @ 81F04FC @ LOLA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -758,7 +758,7 @@ gTrainers:: @ 81F04FC @ LOLA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_F + .byte TRAINER_CLASS_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_F .string "LOLA$", 12 @@ -770,7 +770,7 @@ gTrainers:: @ 81F04FC @ RICKY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "RICKY$", 12 @@ -782,7 +782,7 @@ gTrainers:: @ 81F04FC @ SIMON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "SIMON$", 12 @@ -794,7 +794,7 @@ gTrainers:: @ 81F04FC @ CHARLIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "CHARLIE$", 12 @@ -806,7 +806,7 @@ gTrainers:: @ 81F04FC @ RICKY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "RICKY$", 12 @@ -818,7 +818,7 @@ gTrainers:: @ 81F04FC @ RICKY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "RICKY$", 12 @@ -830,7 +830,7 @@ gTrainers:: @ 81F04FC @ RICKY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "RICKY$", 12 @@ -842,7 +842,7 @@ gTrainers:: @ 81F04FC @ RICKY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TUBER_M + .byte TRAINER_CLASS_TUBER_M .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_TUBER_M .string "RICKY$", 12 @@ -854,7 +854,7 @@ gTrainers:: @ 81F04FC @ RANDALL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "RANDALL$", 12 @@ -866,7 +866,7 @@ gTrainers:: @ 81F04FC @ PARKER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "PARKER$", 12 @@ -878,7 +878,7 @@ gTrainers:: @ 81F04FC @ GEORGE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "GEORGE$", 12 @@ -890,7 +890,7 @@ gTrainers:: @ 81F04FC @ BERKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "BERKE$", 12 @@ -902,7 +902,7 @@ gTrainers:: @ 81F04FC @ CLYDE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "CLYDE$", 12 @@ -914,7 +914,7 @@ gTrainers:: @ 81F04FC @ VINCENT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "VINCENT$", 12 @@ -926,7 +926,7 @@ gTrainers:: @ 81F04FC @ LEROY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "LEROY$", 12 @@ -938,7 +938,7 @@ gTrainers:: @ 81F04FC @ WILTON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WILTON$", 12 @@ -950,7 +950,7 @@ gTrainers:: @ 81F04FC @ EDGAR .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "EDGAR$", 12 @@ -962,7 +962,7 @@ gTrainers:: @ 81F04FC @ ALBERT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "ALBERT$", 12 @@ -974,7 +974,7 @@ gTrainers:: @ 81F04FC @ SAMUEL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "SAMUEL$", 12 @@ -986,7 +986,7 @@ gTrainers:: @ 81F04FC @ VITO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "VITO$", 12 @@ -998,7 +998,7 @@ gTrainers:: @ 81F04FC @ OWEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "OWEN$", 12 @@ -1010,7 +1010,7 @@ gTrainers:: @ 81F04FC @ WILTON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WILTON$", 12 @@ -1022,7 +1022,7 @@ gTrainers:: @ 81F04FC @ WILTON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WILTON$", 12 @@ -1034,7 +1034,7 @@ gTrainers:: @ 81F04FC @ WILTON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WILTON$", 12 @@ -1046,7 +1046,7 @@ gTrainers:: @ 81F04FC @ WILTON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WILTON$", 12 @@ -1058,7 +1058,7 @@ gTrainers:: @ 81F04FC @ WARREN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "WARREN$", 12 @@ -1070,7 +1070,7 @@ gTrainers:: @ 81F04FC @ MARY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "MARY$", 12 @@ -1082,7 +1082,7 @@ gTrainers:: @ 81F04FC @ LORI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "LORI$", 12 @@ -1094,7 +1094,7 @@ gTrainers:: @ 81F04FC @ JODY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "JODY$", 12 @@ -1106,7 +1106,7 @@ gTrainers:: @ 81F04FC @ WENDY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "WENDY$", 12 @@ -1118,7 +1118,7 @@ gTrainers:: @ 81F04FC @ ELAINE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "ELAINE$", 12 @@ -1130,7 +1130,7 @@ gTrainers:: @ 81F04FC @ BROOKE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "BROOKE$", 12 @@ -1142,7 +1142,7 @@ gTrainers:: @ 81F04FC @ JENNIFER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "JENNIFER$", 12 @@ -1154,7 +1154,7 @@ gTrainers:: @ 81F04FC @ HOPE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "HOPE$", 12 @@ -1166,7 +1166,7 @@ gTrainers:: @ 81F04FC @ SHANNON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "SHANNON$", 12 @@ -1178,7 +1178,7 @@ gTrainers:: @ 81F04FC @ MICHELLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "MICHELLE$", 12 @@ -1190,7 +1190,7 @@ gTrainers:: @ 81F04FC @ CAROLINE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "CAROLINE$", 12 @@ -1202,7 +1202,7 @@ gTrainers:: @ 81F04FC @ JULIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "JULIE$", 12 @@ -1214,7 +1214,7 @@ gTrainers:: @ 81F04FC @ BROOKE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "BROOKE$", 12 @@ -1226,7 +1226,7 @@ gTrainers:: @ 81F04FC @ BROOKE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "BROOKE$", 12 @@ -1238,7 +1238,7 @@ gTrainers:: @ 81F04FC @ BROOKE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "BROOKE$", 12 @@ -1250,7 +1250,7 @@ gTrainers:: @ 81F04FC @ BROOKE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "BROOKE$", 12 @@ -1262,7 +1262,7 @@ gTrainers:: @ 81F04FC @ PATRICIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "PATRICIA$", 12 @@ -1274,7 +1274,7 @@ gTrainers:: @ 81F04FC @ KINDRA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "KINDRA$", 12 @@ -1286,7 +1286,7 @@ gTrainers:: @ 81F04FC @ TAMMY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "TAMMY$", 12 @@ -1298,7 +1298,7 @@ gTrainers:: @ 81F04FC @ VALERIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "VALERIE$", 12 @@ -1310,7 +1310,7 @@ gTrainers:: @ 81F04FC @ TASHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "TASHA$", 12 @@ -1322,7 +1322,7 @@ gTrainers:: @ 81F04FC @ VALERIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "VALERIE$", 12 @@ -1334,7 +1334,7 @@ gTrainers:: @ 81F04FC @ VALERIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "VALERIE$", 12 @@ -1346,7 +1346,7 @@ gTrainers:: @ 81F04FC @ VALERIE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "VALERIE$", 12 @@ -1358,7 +1358,7 @@ gTrainers:: @ 81F04FC @ VALERIE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HEX_MANIAC + .byte TRAINER_CLASS_HEX_MANIAC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_HEX_MANIAC .string "VALERIE$", 12 @@ -1370,7 +1370,7 @@ gTrainers:: @ 81F04FC @ CINDY_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1382,7 +1382,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "$", 12 @@ -1394,7 +1394,7 @@ gTrainers:: @ 81F04FC @ BRIANNA_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "BRIANNA$", 12 @@ -1406,7 +1406,7 @@ gTrainers:: @ 81F04FC @ CINDY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1418,7 +1418,7 @@ gTrainers:: @ 81F04FC @ BRIANNA_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "BRIANNA$", 12 @@ -1430,7 +1430,7 @@ gTrainers:: @ 81F04FC @ ANETTE .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "ANETTE$", 12 @@ -1442,7 +1442,7 @@ gTrainers:: @ 81F04FC @ CINDY_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1454,7 +1454,7 @@ gTrainers:: @ 81F04FC @ CINDY_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1466,7 +1466,7 @@ gTrainers:: @ 81F04FC @ CINDY_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1478,7 +1478,7 @@ gTrainers:: @ 81F04FC @ CINDY_6 .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LADY + .byte TRAINER_CLASS_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LADY .string "CINDY$", 12 @@ -1490,7 +1490,7 @@ gTrainers:: @ 81F04FC @ MELISSA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "MELISSA$", 12 @@ -1502,7 +1502,7 @@ gTrainers:: @ 81F04FC @ SHEILA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "SHEILA$", 12 @@ -1514,7 +1514,7 @@ gTrainers:: @ 81F04FC @ SHIRLEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "SHIRLEY$", 12 @@ -1526,7 +1526,7 @@ gTrainers:: @ 81F04FC @ JESSICA_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JESSICA$", 12 @@ -1538,7 +1538,7 @@ gTrainers:: @ 81F04FC @ CONNIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "CONNIE$", 12 @@ -1550,7 +1550,7 @@ gTrainers:: @ 81F04FC @ BRIDGET .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "BRIDGET$", 12 @@ -1562,7 +1562,7 @@ gTrainers:: @ 81F04FC @ OLIVIA .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "OLIVIA$", 12 @@ -1574,7 +1574,7 @@ gTrainers:: @ 81F04FC @ TIFFANY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "TIFFANY$", 12 @@ -1586,7 +1586,7 @@ gTrainers:: @ 81F04FC @ JESSICA_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JESSICA$", 12 @@ -1598,7 +1598,7 @@ gTrainers:: @ 81F04FC @ JESSICA_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JESSICA$", 12 @@ -1610,7 +1610,7 @@ gTrainers:: @ 81F04FC @ JESSICA_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JESSICA$", 12 @@ -1622,7 +1622,7 @@ gTrainers:: @ 81F04FC @ JESSICA_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JESSICA$", 12 @@ -1634,7 +1634,7 @@ gTrainers:: @ 81F04FC @ WINSTON_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "WINSTON$", 12 @@ -1646,7 +1646,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "$", 12 @@ -1658,7 +1658,7 @@ gTrainers:: @ 81F04FC @ GARRET .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "GARRET$", 12 @@ -1670,7 +1670,7 @@ gTrainers:: @ 81F04FC @ WINSTON_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "WINSTON$", 12 @@ -1682,7 +1682,7 @@ gTrainers:: @ 81F04FC @ WINSTON_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "WINSTON$", 12 @@ -1694,7 +1694,7 @@ gTrainers:: @ 81F04FC @ WINSTON_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "WINSTON$", 12 @@ -1706,7 +1706,7 @@ gTrainers:: @ 81F04FC @ WINSTON_5 .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_RICH_BOY + .byte TRAINER_CLASS_RICH_BOY .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_RICH_BOY .string "WINSTON$", 12 @@ -1718,7 +1718,7 @@ gTrainers:: @ 81F04FC @ STEVE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "STEVE$", 12 @@ -1730,7 +1730,7 @@ gTrainers:: @ 81F04FC @ CHRIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "CHRIS$", 12 @@ -1742,7 +1742,7 @@ gTrainers:: @ 81F04FC @ MARK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "MARK$", 12 @@ -1754,7 +1754,7 @@ gTrainers:: @ 81F04FC @ KENN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "KENN$", 12 @@ -1766,7 +1766,7 @@ gTrainers:: @ 81F04FC @ STEVE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "STEVE$", 12 @@ -1778,7 +1778,7 @@ gTrainers:: @ 81F04FC @ STEVE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "STEVE$", 12 @@ -1790,7 +1790,7 @@ gTrainers:: @ 81F04FC @ STEVE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "STEVE$", 12 @@ -1802,7 +1802,7 @@ gTrainers:: @ 81F04FC @ STEVE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMANIAC + .byte TRAINER_CLASS_POKEMANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_POKEMANIAC .string "STEVE$", 12 @@ -1814,7 +1814,7 @@ gTrainers:: @ 81F04FC @ LUIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "LUIS$", 12 @@ -1826,7 +1826,7 @@ gTrainers:: @ 81F04FC @ AUSTIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "AUSTIN$", 12 @@ -1838,7 +1838,7 @@ gTrainers:: @ 81F04FC @ DOUGLAS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DOUGLAS$", 12 @@ -1850,7 +1850,7 @@ gTrainers:: @ 81F04FC @ DARRIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DARRIN$", 12 @@ -1862,7 +1862,7 @@ gTrainers:: @ 81F04FC @ TONY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TONY$", 12 @@ -1874,7 +1874,7 @@ gTrainers:: @ 81F04FC @ JEROME .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "JEROME$", 12 @@ -1886,7 +1886,7 @@ gTrainers:: @ 81F04FC @ MATTHEW .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "MATTHEW$", 12 @@ -1898,7 +1898,7 @@ gTrainers:: @ 81F04FC @ DAVID .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DAVID$", 12 @@ -1910,7 +1910,7 @@ gTrainers:: @ 81F04FC @ SPENCER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "SPENCER$", 12 @@ -1922,7 +1922,7 @@ gTrainers:: @ 81F04FC @ ROLAND .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "ROLAND$", 12 @@ -1934,7 +1934,7 @@ gTrainers:: @ 81F04FC @ CODY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "CODY$", 12 @@ -1946,7 +1946,7 @@ gTrainers:: @ 81F04FC @ STAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "STAN$", 12 @@ -1958,7 +1958,7 @@ gTrainers:: @ 81F04FC @ BARRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "BARRY$", 12 @@ -1970,7 +1970,7 @@ gTrainers:: @ 81F04FC @ DEAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DEAN$", 12 @@ -1982,7 +1982,7 @@ gTrainers:: @ 81F04FC @ RODNEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "RODNEY$", 12 @@ -1994,7 +1994,7 @@ gTrainers:: @ 81F04FC @ RICHARD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "RICHARD$", 12 @@ -2006,7 +2006,7 @@ gTrainers:: @ 81F04FC @ HERMAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "HERMAN$", 12 @@ -2018,7 +2018,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "$", 12 @@ -2030,7 +2030,7 @@ gTrainers:: @ 81F04FC @ GILBERT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "GILBERT$", 12 @@ -2042,7 +2042,7 @@ gTrainers:: @ 81F04FC @ FRANKLIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "FRANKLIN$", 12 @@ -2054,7 +2054,7 @@ gTrainers:: @ 81F04FC @ DANNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DANNY$", 12 @@ -2066,7 +2066,7 @@ gTrainers:: @ 81F04FC @ JACK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "JACK$", 12 @@ -2078,7 +2078,7 @@ gTrainers:: @ 81F04FC @ DUDLEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "DUDLEY$", 12 @@ -2090,7 +2090,7 @@ gTrainers:: @ 81F04FC @ CHAD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "CHAD$", 12 @@ -2102,7 +2102,7 @@ gTrainers:: @ 81F04FC @ TONY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TONY$", 12 @@ -2114,7 +2114,7 @@ gTrainers:: @ 81F04FC @ TONY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TONY$", 12 @@ -2126,7 +2126,7 @@ gTrainers:: @ 81F04FC @ TONY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TONY$", 12 @@ -2138,7 +2138,7 @@ gTrainers:: @ 81F04FC @ TONY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "TONY$", 12 @@ -2150,7 +2150,7 @@ gTrainers:: @ 81F04FC @ HIDEKI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "HIDEKI$", 12 @@ -2162,7 +2162,7 @@ gTrainers:: @ 81F04FC @ HITOSHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "HITOSHI$", 12 @@ -2174,7 +2174,7 @@ gTrainers:: @ 81F04FC @ KIYO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "KIYO$", 12 @@ -2186,7 +2186,7 @@ gTrainers:: @ 81F04FC @ KOICHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "KOICHI$", 12 @@ -2198,7 +2198,7 @@ gTrainers:: @ 81F04FC @ NOB_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "NOB$", 12 @@ -2210,7 +2210,7 @@ gTrainers:: @ 81F04FC @ NOB_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "NOB$", 12 @@ -2222,7 +2222,7 @@ gTrainers:: @ 81F04FC @ NOB_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "NOB$", 12 @@ -2234,7 +2234,7 @@ gTrainers:: @ 81F04FC @ NOB_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "NOB$", 12 @@ -2246,7 +2246,7 @@ gTrainers:: @ 81F04FC @ NOB_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "NOB$", 12 @@ -2258,7 +2258,7 @@ gTrainers:: @ 81F04FC @ YUJI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "YUJI$", 12 @@ -2270,7 +2270,7 @@ gTrainers:: @ 81F04FC @ DAISUKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "DAISUKE$", 12 @@ -2282,7 +2282,7 @@ gTrainers:: @ 81F04FC @ ATSUSHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "ATSUSHI$", 12 @@ -2294,7 +2294,7 @@ gTrainers:: @ 81F04FC @ KIRK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "KIRK$", 12 @@ -2306,7 +2306,7 @@ gTrainers:: @ 81F04FC @ SCOTT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "SCOTT$", 12 @@ -2318,7 +2318,7 @@ gTrainers:: @ 81F04FC @ HARVEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "HARVEY$", 12 @@ -2330,7 +2330,7 @@ gTrainers:: @ 81F04FC @ SHAWN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "SHAWN$", 12 @@ -2342,7 +2342,7 @@ gTrainers:: @ 81F04FC @ RANDY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "RANDY$", 12 @@ -2354,7 +2354,7 @@ gTrainers:: @ 81F04FC @ DALTON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "DALTON$", 12 @@ -2366,7 +2366,7 @@ gTrainers:: @ 81F04FC @ DALTON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "DALTON$", 12 @@ -2378,7 +2378,7 @@ gTrainers:: @ 81F04FC @ DALTON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "DALTON$", 12 @@ -2390,7 +2390,7 @@ gTrainers:: @ 81F04FC @ DALTON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "DALTON$", 12 @@ -2402,7 +2402,7 @@ gTrainers:: @ 81F04FC @ DALTON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GUITARIST + .byte TRAINER_CLASS_GUITARIST .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_GUITARIST .string "DALTON$", 12 @@ -2414,7 +2414,7 @@ gTrainers:: @ 81F04FC @ COLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "COLE$", 12 @@ -2426,7 +2426,7 @@ gTrainers:: @ 81F04FC @ FLINT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "FLINT$", 12 @@ -2438,7 +2438,7 @@ gTrainers:: @ 81F04FC @ AXLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "AXLE$", 12 @@ -2450,7 +2450,7 @@ gTrainers:: @ 81F04FC @ JAKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "JAKE$", 12 @@ -2462,7 +2462,7 @@ gTrainers:: @ 81F04FC @ ANDY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "ANDY$", 12 @@ -2474,7 +2474,7 @@ gTrainers:: @ 81F04FC @ BERNIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "BERNIE$", 12 @@ -2486,7 +2486,7 @@ gTrainers:: @ 81F04FC @ BERNIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "BERNIE$", 12 @@ -2498,7 +2498,7 @@ gTrainers:: @ 81F04FC @ BERNIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "BERNIE$", 12 @@ -2510,7 +2510,7 @@ gTrainers:: @ 81F04FC @ BERNIE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "BERNIE$", 12 @@ -2522,7 +2522,7 @@ gTrainers:: @ 81F04FC @ BERNIE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_KINDLER + .byte TRAINER_CLASS_KINDLER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_KINDLER .string "BERNIE$", 12 @@ -2534,7 +2534,7 @@ gTrainers:: @ 81F04FC @ DREW .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "DREW$", 12 @@ -2546,7 +2546,7 @@ gTrainers:: @ 81F04FC @ CLIFF .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "CLIFF$", 12 @@ -2558,7 +2558,7 @@ gTrainers:: @ 81F04FC @ LARRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "LARRY$", 12 @@ -2570,7 +2570,7 @@ gTrainers:: @ 81F04FC @ SHANE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "SHANE$", 12 @@ -2582,7 +2582,7 @@ gTrainers:: @ 81F04FC @ JUSTIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "JUSTIN$", 12 @@ -2594,7 +2594,7 @@ gTrainers:: @ 81F04FC @ ETHAN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ETHAN$", 12 @@ -2606,7 +2606,7 @@ gTrainers:: @ 81F04FC @ JEFF .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "JEFF$", 12 @@ -2618,7 +2618,7 @@ gTrainers:: @ 81F04FC @ TRAVIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "TRAVIS$", 12 @@ -2630,7 +2630,7 @@ gTrainers:: @ 81F04FC @ ETHAN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ETHAN$", 12 @@ -2642,7 +2642,7 @@ gTrainers:: @ 81F04FC @ ETHAN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ETHAN$", 12 @@ -2654,7 +2654,7 @@ gTrainers:: @ 81F04FC @ ETHAN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ETHAN$", 12 @@ -2666,7 +2666,7 @@ gTrainers:: @ 81F04FC @ ETHAN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "ETHAN$", 12 @@ -2678,7 +2678,7 @@ gTrainers:: @ 81F04FC @ BRENT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRENT$", 12 @@ -2690,7 +2690,7 @@ gTrainers:: @ 81F04FC @ DONALD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "DONALD$", 12 @@ -2702,7 +2702,7 @@ gTrainers:: @ 81F04FC @ TAYLOR .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "TAYLOR$", 12 @@ -2714,7 +2714,7 @@ gTrainers:: @ 81F04FC @ BRANDON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRANDON$", 12 @@ -2726,7 +2726,7 @@ gTrainers:: @ 81F04FC @ DEREK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "DEREK$", 12 @@ -2738,7 +2738,7 @@ gTrainers:: @ 81F04FC @ BRANDON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRANDON$", 12 @@ -2750,7 +2750,7 @@ gTrainers:: @ 81F04FC @ BRANDON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRANDON$", 12 @@ -2762,7 +2762,7 @@ gTrainers:: @ 81F04FC @ BRANDON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRANDON$", 12 @@ -2774,7 +2774,7 @@ gTrainers:: @ 81F04FC @ BRANDON_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_BUG_MANIAC + .byte TRAINER_CLASS_BUG_MANIAC .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_BUG_MANIAC .string "BRANDON$", 12 @@ -2786,7 +2786,7 @@ gTrainers:: @ 81F04FC @ EDWARD .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "EDWARD$", 12 @@ -2798,7 +2798,7 @@ gTrainers:: @ 81F04FC @ PRESTON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "PRESTON$", 12 @@ -2810,7 +2810,7 @@ gTrainers:: @ 81F04FC @ VIRGIL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "VIRGIL$", 12 @@ -2822,7 +2822,7 @@ gTrainers:: @ 81F04FC @ FRITZ .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "FRITZ$", 12 @@ -2834,7 +2834,7 @@ gTrainers:: @ 81F04FC @ WILLIAM .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "WILLIAM$", 12 @@ -2846,7 +2846,7 @@ gTrainers:: @ 81F04FC @ JOSHUA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "JOSHUA$", 12 @@ -2858,7 +2858,7 @@ gTrainers:: @ 81F04FC @ CAMERON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "CAMERON$", 12 @@ -2870,7 +2870,7 @@ gTrainers:: @ 81F04FC @ CAMERON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "CAMERON$", 12 @@ -2882,7 +2882,7 @@ gTrainers:: @ 81F04FC @ CAMERON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "CAMERON$", 12 @@ -2894,7 +2894,7 @@ gTrainers:: @ 81F04FC @ CAMERON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "CAMERON$", 12 @@ -2906,7 +2906,7 @@ gTrainers:: @ 81F04FC @ CAMERON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_M .string "CAMERON$", 12 @@ -2918,7 +2918,7 @@ gTrainers:: @ 81F04FC @ JACLYN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACLYN$", 12 @@ -2930,7 +2930,7 @@ gTrainers:: @ 81F04FC @ HANNAH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "HANNAH$", 12 @@ -2942,7 +2942,7 @@ gTrainers:: @ 81F04FC @ SAMANTHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "SAMANTHA$", 12 @@ -2954,7 +2954,7 @@ gTrainers:: @ 81F04FC @ MAURA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "MAURA$", 12 @@ -2966,7 +2966,7 @@ gTrainers:: @ 81F04FC @ KAYLA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "KAYLA$", 12 @@ -2978,7 +2978,7 @@ gTrainers:: @ 81F04FC @ ALEXIS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "ALEXIS$", 12 @@ -2990,7 +2990,7 @@ gTrainers:: @ 81F04FC @ JACKI_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACKI$", 12 @@ -3002,7 +3002,7 @@ gTrainers:: @ 81F04FC @ JACKI_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACKI$", 12 @@ -3014,7 +3014,7 @@ gTrainers:: @ 81F04FC @ JACKI_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACKI$", 12 @@ -3026,7 +3026,7 @@ gTrainers:: @ 81F04FC @ JACKI_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACKI$", 12 @@ -3038,7 +3038,7 @@ gTrainers:: @ 81F04FC @ JACKI_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PSYCHIC + .byte TRAINER_CLASS_PSYCHIC .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_PSYCHIC_F .string "JACKI$", 12 @@ -3050,7 +3050,7 @@ gTrainers:: @ 81F04FC @ WALTER_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "WALTER$", 12 @@ -3062,7 +3062,7 @@ gTrainers:: @ 81F04FC @ TUCKER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "TUCKER$", 12 @@ -3074,7 +3074,7 @@ gTrainers:: @ 81F04FC @ THOMAS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "THOMAS$", 12 @@ -3086,7 +3086,7 @@ gTrainers:: @ 81F04FC @ WALTER_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "WALTER$", 12 @@ -3098,7 +3098,7 @@ gTrainers:: @ 81F04FC @ WALTER_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "WALTER$", 12 @@ -3110,7 +3110,7 @@ gTrainers:: @ 81F04FC @ WALTER_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "WALTER$", 12 @@ -3122,7 +3122,7 @@ gTrainers:: @ 81F04FC @ WALTER_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_GENTLEMAN + .byte TRAINER_CLASS_GENTLEMAN .byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music .byte TRAINER_PIC_GENTLEMAN .string "WALTER$", 12 @@ -3134,7 +3134,7 @@ gTrainers:: @ 81F04FC @ SIDNEY .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_SIDNEY .string "SIDNEY$", 12 @@ -3146,7 +3146,7 @@ gTrainers:: @ 81F04FC @ PHOEBE .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_PHOEBE .string "PHOEBE$", 12 @@ -3158,7 +3158,7 @@ gTrainers:: @ 81F04FC @ GLACIA .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_GLACIA .string "GLACIA$", 12 @@ -3170,7 +3170,7 @@ gTrainers:: @ 81F04FC @ DRAKE .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_ELITE_FOUR + .byte TRAINER_CLASS_ELITE_FOUR .byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music .byte TRAINER_PIC_DRAKE .string "DRAKE$", 12 @@ -3182,7 +3182,7 @@ gTrainers:: @ 81F04FC @ ROXANNE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_ROXANNE .string "ROXANNE$", 12 @@ -3194,7 +3194,7 @@ gTrainers:: @ 81F04FC @ BRAWLY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRAWLY .string "BRAWLY$", 12 @@ -3206,7 +3206,7 @@ gTrainers:: @ 81F04FC @ WATTSON .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WATTSON .string "WATTSON$", 12 @@ -3218,7 +3218,7 @@ gTrainers:: @ 81F04FC @ FLANNERY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_FLANNERY .string "FLANNERY$", 12 @@ -3230,7 +3230,7 @@ gTrainers:: @ 81F04FC @ NORMAN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_NORMAN .string "NORMAN$", 12 @@ -3242,7 +3242,7 @@ gTrainers:: @ 81F04FC @ WINONA .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_WINONA .string "WINONA$", 12 @@ -3254,7 +3254,7 @@ gTrainers:: @ 81F04FC @ TATE_AND_LIZA .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_TATE_AND_LIZA .string "TATE&LIZA$", 12 @@ -3266,7 +3266,7 @@ gTrainers:: @ 81F04FC @ WALLACE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_LEADER + .byte TRAINER_CLASS_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLACE .string "WALLACE$", 12 @@ -3278,7 +3278,7 @@ gTrainers:: @ 81F04FC @ JERRY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JERRY$", 12 @@ -3290,7 +3290,7 @@ gTrainers:: @ 81F04FC @ TED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "TED$", 12 @@ -3302,7 +3302,7 @@ gTrainers:: @ 81F04FC @ PAUL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "PAUL$", 12 @@ -3314,7 +3314,7 @@ gTrainers:: @ 81F04FC @ JERRY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JERRY$", 12 @@ -3326,7 +3326,7 @@ gTrainers:: @ 81F04FC @ JERRY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JERRY$", 12 @@ -3338,7 +3338,7 @@ gTrainers:: @ 81F04FC @ JERRY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JERRY$", 12 @@ -3350,7 +3350,7 @@ gTrainers:: @ 81F04FC @ JERRY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_M .string "JERRY$", 12 @@ -3362,7 +3362,7 @@ gTrainers:: @ 81F04FC @ KAREN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KAREN$", 12 @@ -3374,7 +3374,7 @@ gTrainers:: @ 81F04FC @ GEORGIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "GEORGIA$", 12 @@ -3386,7 +3386,7 @@ gTrainers:: @ 81F04FC @ KAREN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KAREN$", 12 @@ -3398,7 +3398,7 @@ gTrainers:: @ 81F04FC @ KAREN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KAREN$", 12 @@ -3410,7 +3410,7 @@ gTrainers:: @ 81F04FC @ KAREN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KAREN$", 12 @@ -3422,7 +3422,7 @@ gTrainers:: @ 81F04FC @ KAREN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SCHOOL_KID + .byte TRAINER_CLASS_SCHOOL_KID .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_SCHOOL_KID_F .string "KAREN$", 12 @@ -3434,7 +3434,7 @@ gTrainers:: @ 81F04FC @ KATE_AND_JOY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "KATE & JOY$", 12 @@ -3446,7 +3446,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ANNA & MEG$", 12 @@ -3458,7 +3458,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ANNA & MEG$", 12 @@ -3470,7 +3470,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ANNA & MEG$", 12 @@ -3482,7 +3482,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ANNA & MEG$", 12 @@ -3494,7 +3494,7 @@ gTrainers:: @ 81F04FC @ ANNA_AND_MEG_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "ANNA & MEG$", 12 @@ -3506,7 +3506,7 @@ gTrainers:: @ 81F04FC @ VICTOR .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "VICTOR$", 12 @@ -3518,7 +3518,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3530,7 +3530,7 @@ gTrainers:: @ 81F04FC @ COLTON .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "COLTON$", 12 @@ -3542,7 +3542,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3554,7 +3554,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3566,7 +3566,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3578,7 +3578,7 @@ gTrainers:: @ 81F04FC @ MIGUEL_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_M .string "MIGUEL$", 12 @@ -3590,7 +3590,7 @@ gTrainers:: @ 81F04FC @ VICTORIA .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "VICTORIA$", 12 @@ -3602,7 +3602,7 @@ gTrainers:: @ 81F04FC @ VANESSA .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "VANESSA$", 12 @@ -3614,7 +3614,7 @@ gTrainers:: @ 81F04FC @ MARISSA .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "MARISSA$", 12 @@ -3626,7 +3626,7 @@ gTrainers:: @ 81F04FC @ ISABEL_1 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3638,7 +3638,7 @@ gTrainers:: @ 81F04FC @ ISABEL_2 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3650,7 +3650,7 @@ gTrainers:: @ 81F04FC @ ISABEL_3 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3662,7 +3662,7 @@ gTrainers:: @ 81F04FC @ ISABEL_4 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3674,7 +3674,7 @@ gTrainers:: @ 81F04FC @ ISABEL_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_POKEFAN + .byte TRAINER_CLASS_POKEFAN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_POKEFAN_F .string "ISABEL$", 12 @@ -3686,7 +3686,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "TIMOTHY$", 12 @@ -3698,7 +3698,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "TIMOTHY$", 12 @@ -3710,7 +3710,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "TIMOTHY$", 12 @@ -3722,7 +3722,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "TIMOTHY$", 12 @@ -3734,7 +3734,7 @@ gTrainers:: @ 81F04FC @ TIMOTHY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_M .string "TIMOTHY$", 12 @@ -3746,7 +3746,7 @@ gTrainers:: @ 81F04FC @ VICKY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "VICKY$", 12 @@ -3758,7 +3758,7 @@ gTrainers:: @ 81F04FC @ SHELBY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "SHELBY$", 12 @@ -3770,7 +3770,7 @@ gTrainers:: @ 81F04FC @ SHELBY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "SHELBY$", 12 @@ -3782,7 +3782,7 @@ gTrainers:: @ 81F04FC @ SHELBY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "SHELBY$", 12 @@ -3794,7 +3794,7 @@ gTrainers:: @ 81F04FC @ SHELBY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "SHELBY$", 12 @@ -3806,7 +3806,7 @@ gTrainers:: @ 81F04FC @ SHELBY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_EXPERT + .byte TRAINER_CLASS_EXPERT .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_EXPERT_F .string "SHELBY$", 12 @@ -3818,7 +3818,7 @@ gTrainers:: @ 81F04FC @ CALVIN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "CALVIN$", 12 @@ -3830,7 +3830,7 @@ gTrainers:: @ 81F04FC @ BILLY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "BILLY$", 12 @@ -3842,7 +3842,7 @@ gTrainers:: @ 81F04FC @ JOSH .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "JOSH$", 12 @@ -3854,7 +3854,7 @@ gTrainers:: @ 81F04FC @ TOMMY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "TOMMY$", 12 @@ -3866,7 +3866,7 @@ gTrainers:: @ 81F04FC @ JOEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "JOEY$", 12 @@ -3878,7 +3878,7 @@ gTrainers:: @ 81F04FC @ BEN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "BEN$", 12 @@ -3890,7 +3890,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -3902,7 +3902,7 @@ gTrainers:: @ 81F04FC @ KEVIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "KEVIN$", 12 @@ -3914,7 +3914,7 @@ gTrainers:: @ 81F04FC @ NEAL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "NEAL$", 12 @@ -3926,7 +3926,7 @@ gTrainers:: @ 81F04FC @ DILLON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "DILLON$", 12 @@ -3938,7 +3938,7 @@ gTrainers:: @ 81F04FC @ CALVIN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "CALVIN$", 12 @@ -3950,7 +3950,7 @@ gTrainers:: @ 81F04FC @ CALVIN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "CALVIN$", 12 @@ -3962,7 +3962,7 @@ gTrainers:: @ 81F04FC @ CALVIN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "CALVIN$", 12 @@ -3974,7 +3974,7 @@ gTrainers:: @ 81F04FC @ CALVIN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "CALVIN$", 12 @@ -3986,7 +3986,7 @@ gTrainers:: @ 81F04FC @ EDDIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "EDDIE$", 12 @@ -3998,7 +3998,7 @@ gTrainers:: @ 81F04FC @ ALLEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "ALLEN$", 12 @@ -4010,7 +4010,7 @@ gTrainers:: @ 81F04FC @ TIMMY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNGSTER + .byte TRAINER_CLASS_YOUNGSTER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "TIMMY$", 12 @@ -4022,7 +4022,7 @@ gTrainers:: @ 81F04FC @ STEVEN .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_CHAMPION + .byte TRAINER_CLASS_CHAMPION .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_STEVEN .string "STEVEN$", 12 @@ -4034,7 +4034,7 @@ gTrainers:: @ 81F04FC @ ANDREW .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ANDREW$", 12 @@ -4046,7 +4046,7 @@ gTrainers:: @ 81F04FC @ IVAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "IVAN$", 12 @@ -4058,7 +4058,7 @@ gTrainers:: @ 81F04FC @ CLAUDE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "CLAUDE$", 12 @@ -4070,7 +4070,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ELLIOT$", 12 @@ -4082,7 +4082,7 @@ gTrainers:: @ 81F04FC @ NED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "NED$", 12 @@ -4094,7 +4094,7 @@ gTrainers:: @ 81F04FC @ DALE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "DALE$", 12 @@ -4106,7 +4106,7 @@ gTrainers:: @ 81F04FC @ NOLAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "NOLAN$", 12 @@ -4118,7 +4118,7 @@ gTrainers:: @ 81F04FC @ BARNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "BARNY$", 12 @@ -4130,7 +4130,7 @@ gTrainers:: @ 81F04FC @ WADE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "WADE$", 12 @@ -4142,7 +4142,7 @@ gTrainers:: @ 81F04FC @ CARTER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "CARTER$", 12 @@ -4154,7 +4154,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ELLIOT$", 12 @@ -4166,7 +4166,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ELLIOT$", 12 @@ -4178,7 +4178,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ELLIOT$", 12 @@ -4190,7 +4190,7 @@ gTrainers:: @ 81F04FC @ ELLIOT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ELLIOT$", 12 @@ -4202,7 +4202,7 @@ gTrainers:: @ 81F04FC @ RONALD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "RONALD$", 12 @@ -4214,7 +4214,7 @@ gTrainers:: @ 81F04FC @ JACOB .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "JACOB$", 12 @@ -4226,7 +4226,7 @@ gTrainers:: @ 81F04FC @ ANTHONY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "ANTHONY$", 12 @@ -4238,7 +4238,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "BENJAMIN$", 12 @@ -4250,7 +4250,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "BENJAMIN$", 12 @@ -4262,7 +4262,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "BENJAMIN$", 12 @@ -4274,7 +4274,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "BENJAMIN$", 12 @@ -4286,7 +4286,7 @@ gTrainers:: @ 81F04FC @ BENJAMIN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_M .string "BENJAMIN$", 12 @@ -4298,7 +4298,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "ABIGAIL$", 12 @@ -4310,7 +4310,7 @@ gTrainers:: @ 81F04FC @ JASMINE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "JASMINE$", 12 @@ -4322,7 +4322,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "ABIGAIL$", 12 @@ -4334,7 +4334,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "ABIGAIL$", 12 @@ -4346,7 +4346,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "ABIGAIL$", 12 @@ -4358,7 +4358,7 @@ gTrainers:: @ 81F04FC @ ABIGAIL_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_CYCLING_TRIATHLETE_F .string "ABIGAIL$", 12 @@ -4370,7 +4370,7 @@ gTrainers:: @ 81F04FC @ DYLAN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "DYLAN$", 12 @@ -4382,7 +4382,7 @@ gTrainers:: @ 81F04FC @ DYLAN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "DYLAN$", 12 @@ -4394,7 +4394,7 @@ gTrainers:: @ 81F04FC @ DYLAN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "DYLAN$", 12 @@ -4406,7 +4406,7 @@ gTrainers:: @ 81F04FC @ DYLAN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "DYLAN$", 12 @@ -4418,7 +4418,7 @@ gTrainers:: @ 81F04FC @ DYLAN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_M .string "DYLAN$", 12 @@ -4430,7 +4430,7 @@ gTrainers:: @ 81F04FC @ MARIA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "MARIA$", 12 @@ -4442,7 +4442,7 @@ gTrainers:: @ 81F04FC @ MARIA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "MARIA$", 12 @@ -4454,7 +4454,7 @@ gTrainers:: @ 81F04FC @ MARIA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "MARIA$", 12 @@ -4466,7 +4466,7 @@ gTrainers:: @ 81F04FC @ MARIA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "MARIA$", 12 @@ -4478,7 +4478,7 @@ gTrainers:: @ 81F04FC @ MARIA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_RUNNING_TRIATHLETE_F .string "MARIA$", 12 @@ -4490,7 +4490,7 @@ gTrainers:: @ 81F04FC @ CALEB .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "CALEB$", 12 @@ -4502,7 +4502,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "$", 12 @@ -4514,7 +4514,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "ISAIAH$", 12 @@ -4526,7 +4526,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "$", 12 @@ -4538,7 +4538,7 @@ gTrainers:: @ 81F04FC @ CHASE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "CHASE$", 12 @@ -4550,7 +4550,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "ISAIAH$", 12 @@ -4562,7 +4562,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "ISAIAH$", 12 @@ -4574,7 +4574,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "ISAIAH$", 12 @@ -4586,7 +4586,7 @@ gTrainers:: @ 81F04FC @ ISAIAH_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_M .string "ISAIAH$", 12 @@ -4598,7 +4598,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "$", 12 @@ -4610,7 +4610,7 @@ gTrainers:: @ 81F04FC @ CONNOR .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "CONNOR$", 12 @@ -4622,7 +4622,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "$", 12 @@ -4634,7 +4634,7 @@ gTrainers:: @ 81F04FC @ KATELYN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "KATELYN$", 12 @@ -4646,7 +4646,7 @@ gTrainers:: @ 81F04FC @ ALLISON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "ALLISON$", 12 @@ -4658,7 +4658,7 @@ gTrainers:: @ 81F04FC @ KATELYN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "KATELYN$", 12 @@ -4670,7 +4670,7 @@ gTrainers:: @ 81F04FC @ KATELYN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "KATELYN$", 12 @@ -4682,7 +4682,7 @@ gTrainers:: @ 81F04FC @ KATELYN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "KATELYN$", 12 @@ -4694,7 +4694,7 @@ gTrainers:: @ 81F04FC @ KATELYN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TRIATHLETE + .byte TRAINER_CLASS_TRIATHLETE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMING_TRIATHLETE_F .string "KATELYN$", 12 @@ -4706,7 +4706,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "NICOLAS$", 12 @@ -4718,7 +4718,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "NICOLAS$", 12 @@ -4730,7 +4730,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "NICOLAS$", 12 @@ -4742,7 +4742,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "NICOLAS$", 12 @@ -4754,7 +4754,7 @@ gTrainers:: @ 81F04FC @ NICOLAS_5 .byte F_TRAINER_PARTY_HELD_ITEM @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "NICOLAS$", 12 @@ -4766,7 +4766,7 @@ gTrainers:: @ 81F04FC @ AARON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_DRAGON_TAMER + .byte TRAINER_CLASS_DRAGON_TAMER .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_DRAGON_TAMER .string "AARON$", 12 @@ -4778,7 +4778,7 @@ gTrainers:: @ 81F04FC @ PERRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "PERRY$", 12 @@ -4790,7 +4790,7 @@ gTrainers:: @ 81F04FC @ HUGH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "HUGH$", 12 @@ -4802,7 +4802,7 @@ gTrainers:: @ 81F04FC @ PHIL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "PHIL$", 12 @@ -4814,7 +4814,7 @@ gTrainers:: @ 81F04FC @ JARED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "JARED$", 12 @@ -4826,7 +4826,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "$", 12 @@ -4838,7 +4838,7 @@ gTrainers:: @ 81F04FC @ TANNER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "TANNER$", 12 @@ -4850,7 +4850,7 @@ gTrainers:: @ 81F04FC @ WILL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "WILL$", 12 @@ -4862,7 +4862,7 @@ gTrainers:: @ 81F04FC @ COLIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "COLIN$", 12 @@ -4874,7 +4874,7 @@ gTrainers:: @ 81F04FC @ ROBERT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ROBERT$", 12 @@ -4886,7 +4886,7 @@ gTrainers:: @ 81F04FC @ BENNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "BENNY$", 12 @@ -4898,7 +4898,7 @@ gTrainers:: @ 81F04FC @ CHESTER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "CHESTER$", 12 @@ -4910,7 +4910,7 @@ gTrainers:: @ 81F04FC @ ROBERT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ROBERT$", 12 @@ -4922,7 +4922,7 @@ gTrainers:: @ 81F04FC @ ROBERT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ROBERT$", 12 @@ -4934,7 +4934,7 @@ gTrainers:: @ 81F04FC @ ROBERT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ROBERT$", 12 @@ -4946,7 +4946,7 @@ gTrainers:: @ 81F04FC @ ROBERT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ROBERT$", 12 @@ -4958,7 +4958,7 @@ gTrainers:: @ 81F04FC @ ALEX .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "ALEX$", 12 @@ -4970,7 +4970,7 @@ gTrainers:: @ 81F04FC @ BECK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "BECK$", 12 @@ -4982,7 +4982,7 @@ gTrainers:: @ 81F04FC @ YASU .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "YASU$", 12 @@ -4994,7 +4994,7 @@ gTrainers:: @ 81F04FC @ TAKASHI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "TAKASHI$", 12 @@ -5006,7 +5006,7 @@ gTrainers:: @ 81F04FC @ MAKOTO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "MAKOTO$", 12 @@ -5018,7 +5018,7 @@ gTrainers:: @ 81F04FC @ HIDEO_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "HIDEO$", 12 @@ -5030,7 +5030,7 @@ gTrainers:: @ 81F04FC @ LAO_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LAO$", 12 @@ -5042,7 +5042,7 @@ gTrainers:: @ 81F04FC @ LUNG .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LUNG$", 12 @@ -5054,7 +5054,7 @@ gTrainers:: @ 81F04FC @ LAO_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LAO$", 12 @@ -5066,7 +5066,7 @@ gTrainers:: @ 81F04FC @ LAO_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LAO$", 12 @@ -5078,7 +5078,7 @@ gTrainers:: @ 81F04FC @ LAO_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LAO$", 12 @@ -5090,7 +5090,7 @@ gTrainers:: @ 81F04FC @ LAO_5 .byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "LAO$", 12 @@ -5102,7 +5102,7 @@ gTrainers:: @ 81F04FC @ TESSA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "TESSA$", 12 @@ -5114,7 +5114,7 @@ gTrainers:: @ 81F04FC @ LAURA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "LAURA$", 12 @@ -5126,7 +5126,7 @@ gTrainers:: @ 81F04FC @ CYNDY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CYNDY$", 12 @@ -5138,7 +5138,7 @@ gTrainers:: @ 81F04FC @ CORA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CORA$", 12 @@ -5150,7 +5150,7 @@ gTrainers:: @ 81F04FC @ JILL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "JILL$", 12 @@ -5162,7 +5162,7 @@ gTrainers:: @ 81F04FC @ CYNDY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CYNDY$", 12 @@ -5174,7 +5174,7 @@ gTrainers:: @ 81F04FC @ CYNDY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CYNDY$", 12 @@ -5186,7 +5186,7 @@ gTrainers:: @ 81F04FC @ CYNDY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CYNDY$", 12 @@ -5198,7 +5198,7 @@ gTrainers:: @ 81F04FC @ CYNDY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "CYNDY$", 12 @@ -5210,7 +5210,7 @@ gTrainers:: @ 81F04FC @ MADELINE_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MADELINE$", 12 @@ -5222,7 +5222,7 @@ gTrainers:: @ 81F04FC @ CLARISSA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "CLARISSA$", 12 @@ -5234,7 +5234,7 @@ gTrainers:: @ 81F04FC @ ANGELICA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "ANGELICA$", 12 @@ -5246,7 +5246,7 @@ gTrainers:: @ 81F04FC @ MADELINE_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MADELINE$", 12 @@ -5258,7 +5258,7 @@ gTrainers:: @ 81F04FC @ MADELINE_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MADELINE$", 12 @@ -5270,7 +5270,7 @@ gTrainers:: @ 81F04FC @ MADELINE_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MADELINE$", 12 @@ -5282,7 +5282,7 @@ gTrainers:: @ 81F04FC @ MADELINE_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PARASOL_LADY + .byte TRAINER_CLASS_PARASOL_LADY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_PARASOL_LADY .string "MADELINE$", 12 @@ -5294,7 +5294,7 @@ gTrainers:: @ 81F04FC @ BEVERLY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "BEVERLY$", 12 @@ -5306,7 +5306,7 @@ gTrainers:: @ 81F04FC @ DAWN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DAWN$", 12 @@ -5318,7 +5318,7 @@ gTrainers:: @ 81F04FC @ NICOLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "NICOLE$", 12 @@ -5330,7 +5330,7 @@ gTrainers:: @ 81F04FC @ DENISE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DENISE$", 12 @@ -5342,7 +5342,7 @@ gTrainers:: @ 81F04FC @ BETH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "BETH$", 12 @@ -5354,7 +5354,7 @@ gTrainers:: @ 81F04FC @ TARA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "TARA$", 12 @@ -5366,7 +5366,7 @@ gTrainers:: @ 81F04FC @ MISSY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "MISSY$", 12 @@ -5378,7 +5378,7 @@ gTrainers:: @ 81F04FC @ ALICE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "ALICE$", 12 @@ -5390,7 +5390,7 @@ gTrainers:: @ 81F04FC @ JENNY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JENNY$", 12 @@ -5402,7 +5402,7 @@ gTrainers:: @ 81F04FC @ GRACE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "GRACE$", 12 @@ -5414,7 +5414,7 @@ gTrainers:: @ 81F04FC @ TANYA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "TANYA$", 12 @@ -5426,7 +5426,7 @@ gTrainers:: @ 81F04FC @ SHARON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "SHARON$", 12 @@ -5438,7 +5438,7 @@ gTrainers:: @ 81F04FC @ NIKKI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "NIKKI$", 12 @@ -5450,7 +5450,7 @@ gTrainers:: @ 81F04FC @ BRENDA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "BRENDA$", 12 @@ -5462,7 +5462,7 @@ gTrainers:: @ 81F04FC @ KATIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "KATIE$", 12 @@ -5474,7 +5474,7 @@ gTrainers:: @ 81F04FC @ SUSIE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "SUSIE$", 12 @@ -5486,7 +5486,7 @@ gTrainers:: @ 81F04FC @ KARA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "KARA$", 12 @@ -5498,7 +5498,7 @@ gTrainers:: @ 81F04FC @ DANA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DANA$", 12 @@ -5510,7 +5510,7 @@ gTrainers:: @ 81F04FC @ ERIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "ERIN$", 12 @@ -5522,7 +5522,7 @@ gTrainers:: @ 81F04FC @ DEBRA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DEBRA$", 12 @@ -5534,7 +5534,7 @@ gTrainers:: @ 81F04FC @ LINDA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "LINDA$", 12 @@ -5546,7 +5546,7 @@ gTrainers:: @ 81F04FC @ KAYLEE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "KAYLEE$", 12 @@ -5558,7 +5558,7 @@ gTrainers:: @ 81F04FC @ LAUREL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "LAUREL$", 12 @@ -5570,7 +5570,7 @@ gTrainers:: @ 81F04FC @ DARCY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "DARCY$", 12 @@ -5582,7 +5582,7 @@ gTrainers:: @ 81F04FC @ JENNY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JENNY$", 12 @@ -5594,7 +5594,7 @@ gTrainers:: @ 81F04FC @ JENNY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JENNY$", 12 @@ -5606,7 +5606,7 @@ gTrainers:: @ 81F04FC @ JENNY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JENNY$", 12 @@ -5618,7 +5618,7 @@ gTrainers:: @ 81F04FC @ JENNY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "JENNY$", 12 @@ -5630,7 +5630,7 @@ gTrainers:: @ 81F04FC @ HEIDI .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "HEIDI$", 12 @@ -5642,7 +5642,7 @@ gTrainers:: @ 81F04FC @ BECKY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "BECKY$", 12 @@ -5654,7 +5654,7 @@ gTrainers:: @ 81F04FC @ CAROL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "CAROL$", 12 @@ -5666,7 +5666,7 @@ gTrainers:: @ 81F04FC @ NANCY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "NANCY$", 12 @@ -5678,7 +5678,7 @@ gTrainers:: @ 81F04FC @ MARTHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "MARTHA$", 12 @@ -5690,7 +5690,7 @@ gTrainers:: @ 81F04FC @ DIANA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "DIANA$", 12 @@ -5702,7 +5702,7 @@ gTrainers:: @ 81F04FC @ NINA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "NINA$", 12 @@ -5714,7 +5714,7 @@ gTrainers:: @ 81F04FC @ IRENE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "IRENE$", 12 @@ -5726,7 +5726,7 @@ gTrainers:: @ 81F04FC @ DIANA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "DIANA$", 12 @@ -5738,7 +5738,7 @@ gTrainers:: @ 81F04FC @ DIANA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "DIANA$", 12 @@ -5750,7 +5750,7 @@ gTrainers:: @ 81F04FC @ DIANA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "DIANA$", 12 @@ -5762,7 +5762,7 @@ gTrainers:: @ 81F04FC @ DIANA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "DIANA$", 12 @@ -5774,7 +5774,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5786,7 +5786,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5798,7 +5798,7 @@ gTrainers:: @ 81F04FC @ GINA_AND_MIA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "GINA & MIA$", 12 @@ -5810,7 +5810,7 @@ gTrainers:: @ 81F04FC @ MIU_AND_YUKI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "MIU & YUKI$", 12 @@ -5822,7 +5822,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5834,7 +5834,7 @@ gTrainers:: @ 81F04FC @ GINA_AND_MIA_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "GINA & MIA$", 12 @@ -5846,7 +5846,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5858,7 +5858,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5870,7 +5870,7 @@ gTrainers:: @ 81F04FC @ AMY_AND_LIV_6 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "AMY & LIV$", 12 @@ -5882,7 +5882,7 @@ gTrainers:: @ 81F04FC @ HUEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "HUEY$", 12 @@ -5894,7 +5894,7 @@ gTrainers:: @ 81F04FC @ EDMOND .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "EDMOND$", 12 @@ -5906,7 +5906,7 @@ gTrainers:: @ 81F04FC @ ERNEST_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ERNEST$", 12 @@ -5918,7 +5918,7 @@ gTrainers:: @ 81F04FC @ DWAYNE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "DWAYNE$", 12 @@ -5930,7 +5930,7 @@ gTrainers:: @ 81F04FC @ PHILLIP .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "PHILLIP$", 12 @@ -5942,7 +5942,7 @@ gTrainers:: @ 81F04FC @ LEONARD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "LEONARD$", 12 @@ -5954,7 +5954,7 @@ gTrainers:: @ 81F04FC @ DUNCAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "DUNCAN$", 12 @@ -5966,7 +5966,7 @@ gTrainers:: @ 81F04FC @ ERNEST_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ERNEST$", 12 @@ -5978,7 +5978,7 @@ gTrainers:: @ 81F04FC @ ERNEST_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ERNEST$", 12 @@ -5990,7 +5990,7 @@ gTrainers:: @ 81F04FC @ ERNEST_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ERNEST$", 12 @@ -6002,7 +6002,7 @@ gTrainers:: @ 81F04FC @ ERNEST_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SAILOR + .byte TRAINER_CLASS_SAILOR .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_SAILOR .string "ERNEST$", 12 @@ -6014,7 +6014,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -6026,7 +6026,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -6038,7 +6038,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_13 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "$", 12 @@ -6050,7 +6050,7 @@ gTrainers:: @ 81F04FC @ SONNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "SONNY$", 12 @@ -6062,7 +6062,7 @@ gTrainers:: @ 81F04FC @ DONOVAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "DONOVAN$", 12 @@ -6074,7 +6074,7 @@ gTrainers:: @ 81F04FC @ GERALD .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "GERALD$", 12 @@ -6086,7 +6086,7 @@ gTrainers:: @ 81F04FC @ KELVIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "KELVIN$", 12 @@ -6098,7 +6098,7 @@ gTrainers:: @ 81F04FC @ KODY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "KODY$", 12 @@ -6110,7 +6110,7 @@ gTrainers:: @ 81F04FC @ TEVIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "TEVIN$", 12 @@ -6122,7 +6122,7 @@ gTrainers:: @ 81F04FC @ DAMON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "DAMON$", 12 @@ -6134,7 +6134,7 @@ gTrainers:: @ 81F04FC @ PABLO .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BOARDER + .byte TRAINER_CLASS_BOARDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_YOUNGSTER .string "PABLO$", 12 @@ -6146,7 +6146,7 @@ gTrainers:: @ 81F04FC @ EDWIN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6158,7 +6158,7 @@ gTrainers:: @ 81F04FC @ HECTOR_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "HECTOR$", 12 @@ -6170,7 +6170,7 @@ gTrainers:: @ 81F04FC @ HECTOR_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "HECTOR$", 12 @@ -6182,7 +6182,7 @@ gTrainers:: @ 81F04FC @ EDWIN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6194,7 +6194,7 @@ gTrainers:: @ 81F04FC @ EDWIN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6206,7 +6206,7 @@ gTrainers:: @ 81F04FC @ EDWIN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6218,7 +6218,7 @@ gTrainers:: @ 81F04FC @ EDWIN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COLLECTOR + .byte TRAINER_CLASS_COLLECTOR .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_COLLECTOR .string "EDWIN$", 12 @@ -6230,7 +6230,7 @@ gTrainers:: @ 81F04FC @ WALLY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -6242,7 +6242,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6254,7 +6254,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6266,7 +6266,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6278,7 +6278,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6290,7 +6290,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6302,7 +6302,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6314,7 +6314,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6326,7 +6326,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6338,7 +6338,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -6350,7 +6350,7 @@ gTrainers:: @ 81F04FC @ MAY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6362,7 +6362,7 @@ gTrainers:: @ 81F04FC @ MAY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6374,7 +6374,7 @@ gTrainers:: @ 81F04FC @ MAY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6386,7 +6386,7 @@ gTrainers:: @ 81F04FC @ MAY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6398,7 +6398,7 @@ gTrainers:: @ 81F04FC @ MAY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6410,7 +6410,7 @@ gTrainers:: @ 81F04FC @ MAY_6 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6422,7 +6422,7 @@ gTrainers:: @ 81F04FC @ MAY_7 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6434,7 +6434,7 @@ gTrainers:: @ 81F04FC @ MAY_8 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6446,7 +6446,7 @@ gTrainers:: @ 81F04FC @ MAY_9 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -6458,7 +6458,7 @@ gTrainers:: @ 81F04FC @ ISAAC_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "ISAAC$", 12 @@ -6470,7 +6470,7 @@ gTrainers:: @ 81F04FC @ RILEY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "RILEY$", 12 @@ -6482,7 +6482,7 @@ gTrainers:: @ 81F04FC @ AIDAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "AIDAN$", 12 @@ -6494,7 +6494,7 @@ gTrainers:: @ 81F04FC @ ISAAC_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "ISAAC$", 12 @@ -6506,7 +6506,7 @@ gTrainers:: @ 81F04FC @ ISAAC_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "ISAAC$", 12 @@ -6518,7 +6518,7 @@ gTrainers:: @ 81F04FC @ ISAAC_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "ISAAC$", 12 @@ -6530,7 +6530,7 @@ gTrainers:: @ 81F04FC @ ISAAC_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_M .string "ISAAC$", 12 @@ -6542,7 +6542,7 @@ gTrainers:: @ 81F04FC @ LYDIA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6554,7 +6554,7 @@ gTrainers:: @ 81F04FC @ ALEXIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "ALEXIA$", 12 @@ -6566,7 +6566,7 @@ gTrainers:: @ 81F04FC @ DANIELLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "DANIELLE$", 12 @@ -6578,7 +6578,7 @@ gTrainers:: @ 81F04FC @ LYDIA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6590,7 +6590,7 @@ gTrainers:: @ 81F04FC @ LYDIA_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6602,7 +6602,7 @@ gTrainers:: @ 81F04FC @ LYDIA_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6614,7 +6614,7 @@ gTrainers:: @ 81F04FC @ LYDIA_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_BREEDER + .byte TRAINER_CLASS_POKEMON_BREEDER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_BREEDER_F .string "LYDIA$", 12 @@ -6626,7 +6626,7 @@ gTrainers:: @ 81F04FC @ JACKSON_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "JACKSON$", 12 @@ -6638,7 +6638,7 @@ gTrainers:: @ 81F04FC @ CARLOS .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "CARLOS$", 12 @@ -6650,7 +6650,7 @@ gTrainers:: @ 81F04FC @ SEBASTIAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "SEBASTIAN$", 12 @@ -6662,7 +6662,7 @@ gTrainers:: @ 81F04FC @ JACKSON_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "JACKSON$", 12 @@ -6674,7 +6674,7 @@ gTrainers:: @ 81F04FC @ JACKSON_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "JACKSON$", 12 @@ -6686,7 +6686,7 @@ gTrainers:: @ 81F04FC @ JACKSON_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "JACKSON$", 12 @@ -6698,7 +6698,7 @@ gTrainers:: @ 81F04FC @ JACKSON_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_M .string "JACKSON$", 12 @@ -6710,7 +6710,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "CATHERINE$", 12 @@ -6722,7 +6722,7 @@ gTrainers:: @ 81F04FC @ JENNA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "JENNA$", 12 @@ -6734,7 +6734,7 @@ gTrainers:: @ 81F04FC @ SOPHIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "SOPHIA$", 12 @@ -6746,7 +6746,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "CATHERINE$", 12 @@ -6758,7 +6758,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "CATHERINE$", 12 @@ -6770,7 +6770,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "CATHERINE$", 12 @@ -6782,7 +6782,7 @@ gTrainers:: @ 81F04FC @ CATHERINE_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_RANGER + .byte TRAINER_CLASS_POKEMON_RANGER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_POKEMON_RANGER_F .string "CATHERINE$", 12 @@ -6794,7 +6794,7 @@ gTrainers:: @ 81F04FC @ MAXIE_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_LEADER + .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE .string "MAXIE$", 12 @@ -6806,7 +6806,7 @@ gTrainers:: @ 81F04FC @ GRUNT_28 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6818,7 +6818,7 @@ gTrainers:: @ 81F04FC @ GRUNT_29 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6830,7 +6830,7 @@ gTrainers:: @ 81F04FC @ GRUNT_30 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6842,7 +6842,7 @@ gTrainers:: @ 81F04FC @ GRUNT_31 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6854,7 +6854,7 @@ gTrainers:: @ 81F04FC @ GRUNT_32 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6866,7 +6866,7 @@ gTrainers:: @ 81F04FC @ GRUNT_33 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6878,7 +6878,7 @@ gTrainers:: @ 81F04FC @ GRUNT_34 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6890,7 +6890,7 @@ gTrainers:: @ 81F04FC @ GRUNT_35 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6902,7 +6902,7 @@ gTrainers:: @ 81F04FC @ GRUNT_36 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6914,7 +6914,7 @@ gTrainers:: @ 81F04FC @ GRUNT_37 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6926,7 +6926,7 @@ gTrainers:: @ 81F04FC @ GRUNT_38 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6938,7 +6938,7 @@ gTrainers:: @ 81F04FC @ GRUNT_39 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6950,7 +6950,7 @@ gTrainers:: @ 81F04FC @ GRUNT_40 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6962,7 +6962,7 @@ gTrainers:: @ 81F04FC @ GRUNT_41 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6974,7 +6974,7 @@ gTrainers:: @ 81F04FC @ GRUNT_42 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6986,7 +6986,7 @@ gTrainers:: @ 81F04FC @ GRUNT_43 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -6998,7 +6998,7 @@ gTrainers:: @ 81F04FC @ GRUNT_44 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7010,7 +7010,7 @@ gTrainers:: @ 81F04FC @ GRUNT_45 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7022,7 +7022,7 @@ gTrainers:: @ 81F04FC @ GRUNT_46 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7034,7 +7034,7 @@ gTrainers:: @ 81F04FC @ GRUNT_47 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7046,7 +7046,7 @@ gTrainers:: @ 81F04FC @ GRUNT_48 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7058,7 +7058,7 @@ gTrainers:: @ 81F04FC @ GRUNT_49 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7070,7 +7070,7 @@ gTrainers:: @ 81F04FC @ GRUNT_50 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7082,7 +7082,7 @@ gTrainers:: @ 81F04FC @ GRUNT_51 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_M .string "GRUNT$", 12 @@ -7094,7 +7094,7 @@ gTrainers:: @ 81F04FC @ GRUNT_52 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F .string "GRUNT$", 12 @@ -7106,7 +7106,7 @@ gTrainers:: @ 81F04FC @ GRUNT_53 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F .string "GRUNT$", 12 @@ -7118,7 +7118,7 @@ gTrainers:: @ 81F04FC @ GRUNT_54 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TEAM_MAGMA + .byte TRAINER_CLASS_TEAM_MAGMA .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_GRUNT_F .string "GRUNT$", 12 @@ -7130,7 +7130,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_14 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "$", 12 @@ -7142,7 +7142,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_15 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "$", 12 @@ -7154,7 +7154,7 @@ gTrainers:: @ 81F04FC @ TABITHA_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "TABITHA$", 12 @@ -7166,7 +7166,7 @@ gTrainers:: @ 81F04FC @ TABITHA_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "TABITHA$", 12 @@ -7178,7 +7178,7 @@ gTrainers:: @ 81F04FC @ ANONYMOUS_16 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_M .string "$", 12 @@ -7190,7 +7190,7 @@ gTrainers:: @ 81F04FC @ COURTNEY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_F .string "COURTNEY$", 12 @@ -7202,7 +7202,7 @@ gTrainers:: @ 81F04FC @ COURTNEY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_ADMIN + .byte TRAINER_CLASS_MAGMA_ADMIN .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAGMA_ADMIN_F .string "COURTNEY$", 12 @@ -7214,7 +7214,7 @@ gTrainers:: @ 81F04FC @ MAXIE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_LEADER + .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE .string "MAXIE$", 12 @@ -7226,7 +7226,7 @@ gTrainers:: @ 81F04FC @ MAXIE_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_MAGMA_LEADER + .byte TRAINER_CLASS_MAGMA_LEADER .byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music .byte TRAINER_PIC_MAXIE .string "MAXIE$", 12 @@ -7238,7 +7238,7 @@ gTrainers:: @ 81F04FC @ TIANA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "TIANA$", 12 @@ -7250,7 +7250,7 @@ gTrainers:: @ 81F04FC @ HALEY_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "HALEY$", 12 @@ -7262,7 +7262,7 @@ gTrainers:: @ 81F04FC @ JANICE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "JANICE$", 12 @@ -7274,7 +7274,7 @@ gTrainers:: @ 81F04FC @ VIVI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_WINSTRATE + .byte TRAINER_CLASS_WINSTRATE .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "VIVI$", 12 @@ -7286,7 +7286,7 @@ gTrainers:: @ 81F04FC @ HALEY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "HALEY$", 12 @@ -7298,7 +7298,7 @@ gTrainers:: @ 81F04FC @ HALEY_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "HALEY$", 12 @@ -7310,7 +7310,7 @@ gTrainers:: @ 81F04FC @ HALEY_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "HALEY$", 12 @@ -7322,7 +7322,7 @@ gTrainers:: @ 81F04FC @ HALEY_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "HALEY$", 12 @@ -7334,7 +7334,7 @@ gTrainers:: @ 81F04FC @ SALLY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "SALLY$", 12 @@ -7346,7 +7346,7 @@ gTrainers:: @ 81F04FC @ ROBIN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ROBIN$", 12 @@ -7358,7 +7358,7 @@ gTrainers:: @ 81F04FC @ ANDREA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "ANDREA$", 12 @@ -7370,7 +7370,7 @@ gTrainers:: @ 81F04FC @ CRISSY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_LASS + .byte TRAINER_CLASS_LASS .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_LASS .string "CRISSY$", 12 @@ -7382,7 +7382,7 @@ gTrainers:: @ 81F04FC @ RICK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "RICK$", 12 @@ -7394,7 +7394,7 @@ gTrainers:: @ 81F04FC @ LYLE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "LYLE$", 12 @@ -7406,7 +7406,7 @@ gTrainers:: @ 81F04FC @ JOSE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JOSE$", 12 @@ -7418,7 +7418,7 @@ gTrainers:: @ 81F04FC @ DOUG .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "DOUG$", 12 @@ -7430,7 +7430,7 @@ gTrainers:: @ 81F04FC @ GREG .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "GREG$", 12 @@ -7442,7 +7442,7 @@ gTrainers:: @ 81F04FC @ KENT .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "KENT$", 12 @@ -7454,7 +7454,7 @@ gTrainers:: @ 81F04FC @ JAMES_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JAMES$", 12 @@ -7466,7 +7466,7 @@ gTrainers:: @ 81F04FC @ JAMES_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JAMES$", 12 @@ -7478,7 +7478,7 @@ gTrainers:: @ 81F04FC @ JAMES_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JAMES$", 12 @@ -7490,7 +7490,7 @@ gTrainers:: @ 81F04FC @ JAMES_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JAMES$", 12 @@ -7502,7 +7502,7 @@ gTrainers:: @ 81F04FC @ JAMES_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BUG_CATCHER + .byte TRAINER_CLASS_BUG_CATCHER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BUG_CATCHER .string "JAMES$", 12 @@ -7514,7 +7514,7 @@ gTrainers:: @ 81F04FC @ BRICE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "BRICE$", 12 @@ -7526,7 +7526,7 @@ gTrainers:: @ 81F04FC @ TRENT_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "TRENT$", 12 @@ -7538,7 +7538,7 @@ gTrainers:: @ 81F04FC @ LENNY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "LENNY$", 12 @@ -7550,7 +7550,7 @@ gTrainers:: @ 81F04FC @ LUCAS_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "LUCAS$", 12 @@ -7562,7 +7562,7 @@ gTrainers:: @ 81F04FC @ ALAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "ALAN$", 12 @@ -7574,7 +7574,7 @@ gTrainers:: @ 81F04FC @ CLARK .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "CLARK$", 12 @@ -7586,7 +7586,7 @@ gTrainers:: @ 81F04FC @ ERIC .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "ERIC$", 12 @@ -7598,7 +7598,7 @@ gTrainers:: @ 81F04FC @ LUCAS_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "LUCAS$", 12 @@ -7610,7 +7610,7 @@ gTrainers:: @ 81F04FC @ MIKE_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "MIKE$", 12 @@ -7622,7 +7622,7 @@ gTrainers:: @ 81F04FC @ MIKE_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "MIKE$", 12 @@ -7634,7 +7634,7 @@ gTrainers:: @ 81F04FC @ TRENT_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "TRENT$", 12 @@ -7646,7 +7646,7 @@ gTrainers:: @ 81F04FC @ TRENT_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "TRENT$", 12 @@ -7658,7 +7658,7 @@ gTrainers:: @ 81F04FC @ TRENT_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "TRENT$", 12 @@ -7670,7 +7670,7 @@ gTrainers:: @ 81F04FC @ TRENT_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_HIKER + .byte TRAINER_CLASS_HIKER .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_HIKER .string "TRENT$", 12 @@ -7682,7 +7682,7 @@ gTrainers:: @ 81F04FC @ DEZ_AND_LUKE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "DEZ & LUKE$", 12 @@ -7694,7 +7694,7 @@ gTrainers:: @ 81F04FC @ LEA_AND_JED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LEA & JED$", 12 @@ -7706,7 +7706,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LOIS & HAL$", 12 @@ -7718,7 +7718,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LOIS & HAL$", 12 @@ -7730,7 +7730,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LOIS & HAL$", 12 @@ -7742,7 +7742,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LOIS & HAL$", 12 @@ -7754,7 +7754,7 @@ gTrainers:: @ 81F04FC @ LOIS_AND_HAL_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "LOIS & HAL$", 12 @@ -7766,7 +7766,7 @@ gTrainers:: @ 81F04FC @ JOHANNA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BEAUTY + .byte TRAINER_CLASS_BEAUTY .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_BEAUTY .string "JOHANNA$", 12 @@ -7778,7 +7778,7 @@ gTrainers:: @ 81F04FC @ ZANE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "ZANE$", 12 @@ -7790,7 +7790,7 @@ gTrainers:: @ 81F04FC @ VIVIAN .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "VIVIAN$", 12 @@ -7802,7 +7802,7 @@ gTrainers:: @ 81F04FC @ SADIE .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_BATTLE_GIRL + .byte TRAINER_CLASS_BATTLE_GIRL .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BATTLE_GIRL .string "SADIE$", 12 @@ -7814,7 +7814,7 @@ gTrainers:: @ 81F04FC @ HIDEO_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "HIDEO$", 12 @@ -7826,7 +7826,7 @@ gTrainers:: @ 81F04FC @ KEIGO .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "KEIGO$", 12 @@ -7838,7 +7838,7 @@ gTrainers:: @ 81F04FC @ TSUNAO .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_NINJA_BOY + .byte TRAINER_CLASS_NINJA_BOY .byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music .byte TRAINER_PIC_NINJA_BOY .string "TSUNAO$", 12 @@ -7850,7 +7850,7 @@ gTrainers:: @ 81F04FC @ TERRELL .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_CAMPER + .byte TRAINER_CLASS_CAMPER .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_CAMPER .string "TERRELL$", 12 @@ -7862,7 +7862,7 @@ gTrainers:: @ 81F04FC @ KYLEE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_PICNICKER + .byte TRAINER_CLASS_PICNICKER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_PICNICKER .string "KYLEE$", 12 @@ -7874,7 +7874,7 @@ gTrainers:: @ 81F04FC @ WALLY_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -7886,7 +7886,7 @@ gTrainers:: @ 81F04FC @ WALLY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -7898,7 +7898,7 @@ gTrainers:: @ 81F04FC @ WALLY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -7910,7 +7910,7 @@ gTrainers:: @ 81F04FC @ WALLY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -7922,7 +7922,7 @@ gTrainers:: @ 81F04FC @ WALLY_6 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_WALLY .string "WALLY$", 12 @@ -7934,7 +7934,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -7946,7 +7946,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -7958,7 +7958,7 @@ gTrainers:: @ 81F04FC @ BRENDAN_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music .byte TRAINER_PIC_BRENDAN .string "BRENDAN$", 12 @@ -7970,7 +7970,7 @@ gTrainers:: @ 81F04FC @ MAY_10 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -7982,7 +7982,7 @@ gTrainers:: @ 81F04FC @ MAY_11 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -7994,7 +7994,7 @@ gTrainers:: @ 81F04FC @ MAY_12 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3 + .byte TRAINER_CLASS_POKEMON_TRAINER_3 .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music .byte TRAINER_PIC_MAY .string "MAY$", 12 @@ -8006,7 +8006,7 @@ gTrainers:: @ 81F04FC @ JONAH .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "JONAH$", 12 @@ -8018,7 +8018,7 @@ gTrainers:: @ 81F04FC @ HENRY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "HENRY$", 12 @@ -8030,7 +8030,7 @@ gTrainers:: @ 81F04FC @ ROGER .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "ROGER$", 12 @@ -8042,7 +8042,7 @@ gTrainers:: @ 81F04FC @ ALEXA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_F .string "ALEXA$", 12 @@ -8054,7 +8054,7 @@ gTrainers:: @ 81F04FC @ RUBEN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_COOL_TRAINER + .byte TRAINER_CLASS_COOL_TRAINER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_COOL_TRAINER_M .string "RUBEN$", 12 @@ -8066,7 +8066,7 @@ gTrainers:: @ 81F04FC @ KOJI .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BLACK_BELT + .byte TRAINER_CLASS_BLACK_BELT .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_BLACK_BELT .string "KOJI$", 12 @@ -8078,7 +8078,7 @@ gTrainers:: @ 81F04FC @ WAYNE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "WAYNE$", 12 @@ -8090,7 +8090,7 @@ gTrainers:: @ 81F04FC @ BYRON .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_BIRD_KEEPER + .byte TRAINER_CLASS_BIRD_KEEPER .byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music .byte TRAINER_PIC_BIRD_KEEPER .string "BYRON$", 12 @@ -8102,7 +8102,7 @@ gTrainers:: @ 81F04FC @ REED .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_M + .byte TRAINER_CLASS_SWIMMER_M .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_M .string "REED$", 12 @@ -8114,7 +8114,7 @@ gTrainers:: @ 81F04FC @ TISHA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SWIMMER_F + .byte TRAINER_CLASS_SWIMMER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SWIMMER_F .string "TISHA$", 12 @@ -8126,7 +8126,7 @@ gTrainers:: @ 81F04FC @ TORI_AND_TIA .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_TWINS + .byte TRAINER_CLASS_TWINS .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_TWINS .string "TORI & TIA$", 12 @@ -8138,7 +8138,7 @@ gTrainers:: @ 81F04FC @ KIM_AND_IRIS .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "KIM & IRIS$", 12 @@ -8150,7 +8150,7 @@ gTrainers:: @ 81F04FC @ TYRA_AND_IVY .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_SR_AND_JR + .byte TRAINER_CLASS_SR_AND_JR .byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music .byte TRAINER_PIC_SR_AND_JR .string "TYRA & IVY$", 12 @@ -8162,7 +8162,7 @@ gTrainers:: @ 81F04FC @ MEL_AND_PAUL .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_YOUNG_COUPLE + .byte TRAINER_CLASS_YOUNG_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music .byte TRAINER_PIC_YOUNG_COUPLE .string "MEL & PAUL$", 12 @@ -8174,7 +8174,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_1 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "JOHN & JAY$", 12 @@ -8186,7 +8186,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_2 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "JOHN & JAY$", 12 @@ -8198,7 +8198,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_3 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "JOHN & JAY$", 12 @@ -8210,7 +8210,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_4 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "JOHN & JAY$", 12 @@ -8222,7 +8222,7 @@ gTrainers:: @ 81F04FC @ JOHN_AND_JAY_5 .byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags - .byte TRAINER_CLASS_NAME_OLD_COUPLE + .byte TRAINER_CLASS_OLD_COUPLE .byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music .byte TRAINER_PIC_OLD_COUPLE .string "JOHN & JAY$", 12 @@ -8234,7 +8234,7 @@ gTrainers:: @ 81F04FC @ RELI_AND_IAN .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RELI & IAN$", 12 @@ -8246,7 +8246,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_1 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RITA & SAM$", 12 @@ -8258,7 +8258,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_2 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RITA & SAM$", 12 @@ -8270,7 +8270,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_3 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RITA & SAM$", 12 @@ -8282,7 +8282,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_4 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RITA & SAM$", 12 @@ -8294,7 +8294,7 @@ gTrainers:: @ 81F04FC @ RITA_AND_SAM_5 .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "RITA & SAM$", 12 @@ -8306,7 +8306,7 @@ gTrainers:: @ 81F04FC @ LISA_AND_RAY .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_SIS_AND_BRO + .byte TRAINER_CLASS_SIS_AND_BRO .byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music .byte TRAINER_PIC_SIS_AND_BRO .string "LISA & RAY$", 12 @@ -8318,7 +8318,7 @@ gTrainers:: @ 81F04FC @ EUGENE .byte 0 @ party type flags - .byte TRAINER_CLASS_NAME_FISHERMAN + .byte TRAINER_CLASS_FISHERMAN .byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music .byte TRAINER_PIC_FISHERMAN .string "EUGENE$", 12 -- cgit v1.2.3 From 82ab732d673946af609f896dc51639030eb1bd19 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 7 Jan 2018 14:59:16 -0800 Subject: Finish decompiling battle_2 --- data/battle_scripts_1.s | 4 ++-- data/data2a.s | 40 ++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 3c255b461..41edcb514 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3065,7 +3065,7 @@ BattleScript_LocalBattleLost:: @ 81D8DD1 BattleScript_LocalBattleLostEnd: @ 81D8E01 end2 -gUnknown_081D8E02:: @ 81D8E02 +BattleScript_LinkBattleWonOrLost:: @ 81D8E02 printstring 5 waitmessage 64 atk57 @@ -3248,7 +3248,7 @@ BattleScript_DamagingWeatherContinues:: @ 81D8F7D setbyte gBattleCommunication, 0 BattleScript_DamagingWeatherLoop: @ 81D8F95 - copyarraywithindex gBankAttacker, gTurnOrder, gBattleCommunication, 1 + copyarraywithindex gBankAttacker, gBanksByTurnOrder, gBattleCommunication, 1 weatherdamage jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement printfromtable gSandStormHailDmgStringIds diff --git a/data/data2a.s b/data/data2a.s index 3bd3f6ebd..bd455ce29 100644 --- a/data/data2a.s +++ b/data/data2a.s @@ -946,32 +946,32 @@ gSpriteAffineAnimTable_81F971C:: @ 81F971C .align 2 gUnknown_081FA640:: @ 81FA640 - .4byte sub_8013FE8 - .4byte sub_80147A0 - .4byte sub_80146F4 - .4byte sub_8014BF4 - .4byte sub_8014D50 - .4byte sub_8014D98 - .4byte sub_8014DF8 - .4byte sub_8014EBC - .4byte bs8_exit_by_flight - .4byte sub_8014FBC + .4byte HandleAction_UseMove + .4byte HandleAction_UseItem + .4byte HandleAction_Switch + .4byte HandleAction_Run + .4byte HandleAction_WatchesCarefully + .4byte HandleAction_SafariZoneBallThrow + .4byte HandleAction_ThrowPokeblock + .4byte HandleAction_GoNear + .4byte HandleAction_SafriZoneRun + .4byte HandleAction_Action9 .4byte sub_801B594 - .4byte bsB_exit_by_move - .4byte bsC_8016D70 - .4byte sub_8015060 + .4byte HandleAction_Action11 + .4byte HandleAction_ActionFinished + .4byte HandleAction_NothingIsFainted .align 2 gUnknown_081FA678:: @ 81FA678 .4byte bc_8013B1C .4byte HandleEndTurn_BattleWon - .4byte sub_8013B64 - .4byte sub_8013B64 - .4byte sub_8013BDC - .4byte sub_8013C9C - .4byte sub_8013C48 - .4byte sub_8013C9C - .4byte sub_8013C9C + .4byte HandleEndTurn_BattleLost + .4byte HandleEndTurn_BattleLost + .4byte HandleEndTurn_RanFromBattle + .4byte HandleEndTurn_FinishBattle + .4byte HandleEndTurn_MonFled + .4byte HandleEndTurn_FinishBattle + .4byte HandleEndTurn_FinishBattle gStatusConditionString_PoisonJpn:: @ 81FA69C .string "どく$$$$$$" -- cgit v1.2.3